system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

bspatch: remove superfluous newlines from errx strings

Browse source
This commit is contained in:
Ed Maste 2016-09-12 14:28:38 +00:00
parent e0e273e2d4
commit 04708d25e0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=305737
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
usr.bin/bsdiff/bspatch/bspatch.c
View file

@ -183,13 +183,13 @@ int main(int argc, char *argv[])
/* Read header */ /* Read header */
if (fread(header, 1, 32, f) < 32) { if (fread(header, 1, 32, f) < 32) {
if (feof(f)) if (feof(f))
errx(1, "Corrupt patch\n"); errx(1, "Corrupt patch");
err(1, "fread(%s)", argv[3]); err(1, "fread(%s)", argv[3]);
} }
/* Check for appropriate magic */ /* Check for appropriate magic */
if (memcmp(header, "BSDIFF40", 8) != 0) if (memcmp(header, "BSDIFF40", 8) != 0)
errx(1, "Corrupt patch\n"); errx(1, "Corrupt patch");
/* Read lengths from header */ /* Read lengths from header */
bzctrllen = offtin(header + 8); bzctrllen = offtin(header + 8);
@ -198,7 +198,7 @@ int main(int argc, char *argv[])
if (bzctrllen < 0 || bzctrllen > OFF_MAX - 32 || if (bzctrllen < 0 || bzctrllen > OFF_MAX - 32 ||
bzdatalen < 0 || bzctrllen + 32 > OFF_MAX - bzdatalen || bzdatalen < 0 || bzctrllen + 32 > OFF_MAX - bzdatalen ||
newsize < 0 || newsize > SSIZE_MAX) newsize < 0 || newsize > SSIZE_MAX)
errx(1, "Corrupt patch\n"); errx(1, "Corrupt patch");
/* Close patch file and re-open it via libbzip2 at the right places */ /* Close patch file and re-open it via libbzip2 at the right places */
if (fclose(f)) if (fclose(f))
@ -237,24 +237,24 @@ int main(int argc, char *argv[])
lenread = BZ2_bzRead(&cbz2err, cpfbz2, buf, 8); lenread = BZ2_bzRead(&cbz2err, cpfbz2, buf, 8);
if ((lenread < 8) || ((cbz2err != BZ_OK) && if ((lenread < 8) || ((cbz2err != BZ_OK) &&
(cbz2err != BZ_STREAM_END))) (cbz2err != BZ_STREAM_END)))
errx(1, "Corrupt patch\n"); errx(1, "Corrupt patch");
ctrl[i] = offtin(buf); ctrl[i] = offtin(buf);
} }
/* Sanity-check */ /* Sanity-check */
if (ctrl[0] < 0 || ctrl[0] > INT_MAX || if (ctrl[0] < 0 || ctrl[0] > INT_MAX ||
ctrl[1] < 0 || ctrl[1] > INT_MAX) ctrl[1] < 0 || ctrl[1] > INT_MAX)
errx(1, "Corrupt patch\n"); errx(1, "Corrupt patch");
/* Sanity-check */ /* Sanity-check */
if (newpos + ctrl[0] > newsize) if (newpos + ctrl[0] > newsize)
errx(1, "Corrupt patch\n"); errx(1, "Corrupt patch");
/* Read diff string */ /* Read diff string */
lenread = BZ2_bzRead(&dbz2err, dpfbz2, new + newpos, ctrl[0]); lenread = BZ2_bzRead(&dbz2err, dpfbz2, new + newpos, ctrl[0]);
if ((lenread < ctrl[0]) || if ((lenread < ctrl[0]) ||
((dbz2err != BZ_OK) && (dbz2err != BZ_STREAM_END))) ((dbz2err != BZ_OK) && (dbz2err != BZ_STREAM_END)))
errx(1, "Corrupt patch\n"); errx(1, "Corrupt patch");
/* Add old data to diff string */ /* Add old data to diff string */
for (i = 0; i < ctrl[0]; i++) for (i = 0; i < ctrl[0]; i++)
@ -267,13 +267,13 @@ int main(int argc, char *argv[])
/* Sanity-check */ /* Sanity-check */
if (newpos + ctrl[1] > newsize) if (newpos + ctrl[1] > newsize)
errx(1, "Corrupt patch\n"); errx(1, "Corrupt patch");
/* Read extra string */ /* Read extra string */
lenread = BZ2_bzRead(&ebz2err, epfbz2, new + newpos, ctrl[1]); lenread = BZ2_bzRead(&ebz2err, epfbz2, new + newpos, ctrl[1]);
if ((lenread < ctrl[1]) || if ((lenread < ctrl[1]) ||
((ebz2err != BZ_OK) && (ebz2err != BZ_STREAM_END))) ((ebz2err != BZ_OK) && (ebz2err != BZ_STREAM_END)))
errx(1, "Corrupt patch\n"); errx(1, "Corrupt patch");
/* Adjust pointers */ /* Adjust pointers */
newpos+=ctrl[1]; newpos+=ctrl[1];