diff options
author | ed <ed@FreeBSD.org> | 2014-04-23 14:05:28 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2014-04-23 14:05:28 +0000 |
commit | 28c93d1bb4d77db279289bcf516d2d15eae462ce (patch) | |
tree | 8e86931c3407e7095d2744423492b353bb0f62b5 /usr.bin/bsdiff | |
parent | fc8a412064230f9fe48c173a5923e549786e7831 (diff) | |
download | FreeBSD-src-28c93d1bb4d77db279289bcf516d2d15eae462ce.zip FreeBSD-src-28c93d1bb4d77db279289bcf516d2d15eae462ce.tar.gz |
Make usage printing more consistent with other tools.
- Introduce a separate usage() function.
- Don't use argv[0]. Directly name the application, as we do elsewhere.
- Don't prepend the application name.
- Don't print two newlines.
Diffstat (limited to 'usr.bin/bsdiff')
-rw-r--r-- | usr.bin/bsdiff/bsdiff/bsdiff.c | 11 | ||||
-rw-r--r-- | usr.bin/bsdiff/bspatch/bspatch.c | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c index 8b764da..d46eed9 100644 --- a/usr.bin/bsdiff/bsdiff/bsdiff.c +++ b/usr.bin/bsdiff/bsdiff/bsdiff.c @@ -196,6 +196,14 @@ static void offtout(off_t x,u_char *buf) if(x<0) buf[7]|=0x80; } +static void +usage(void) +{ + + fprintf(stderr, "usage: bsdiff oldfile newfile patchfile\n"); + exit(1); +} + int main(int argc,char *argv[]) { int fd; @@ -216,7 +224,8 @@ int main(int argc,char *argv[]) BZFILE * pfbz2; int bz2err; - if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]); + if (argc != 4) + usage(); /* Allocate oldsize+1 bytes instead of oldsize bytes to ensure that we never try to malloc(0) and get a NULL pointer */ diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c index d2af3ca..db72e5c 100644 --- a/usr.bin/bsdiff/bspatch/bspatch.c +++ b/usr.bin/bsdiff/bspatch/bspatch.c @@ -57,6 +57,14 @@ static off_t offtin(u_char *buf) return y; } +static void +usage(void) +{ + + fprintf(stderr, "usage: bspatch oldfile newfile patchfile\n"); + exit(1); +} + int main(int argc,char * argv[]) { FILE * f, * cpf, * dpf, * epf; @@ -72,7 +80,8 @@ int main(int argc,char * argv[]) off_t lenread; off_t i; - if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]); + if (argc != 4) + usage(); /* Open patch file */ if ((f = fopen(argv[3], "rb")) == NULL) |