diff options
| author |   michaels <michaels@openbsd.org> | 1996-08-01 00:01:38 +0000 |
|---|---|---|
| committer | michaels <michaels@openbsd.org> | 1996-08-01 00:01:38 +0000 |
| commit | ff8a497c6de77b5d1d428d00cf7641b97113286c (patch) | |
| tree | d6dfa4007ef45d28595a7147ebde82254ce5a0c8 /usr.bin/cmp/cmp.c | |
| parent | UCONSOLE hole goes away (diff) | |
| download | wireguard-openbsd-ff8a497c6de77b5d1d428d00cf7641b97113286c.tar.xz wireguard-openbsd-ff8a497c6de77b5d1d428d00cf7641b97113286c.zip | |
Modified cmp to, when given arg -s, really be silent. (reported by
marc@mit.edu, netbsd pr #2642.) Changed main() to use return()
rather than exit().
(just tried checking it in, but local cvs got killed while writting
log message)
Diffstat (limited to 'usr.bin/cmp/cmp.c')
| -rw-r--r-- | usr.bin/cmp/cmp.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index dd1aa7c402d..1ac921d9068 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmp.c,v 1.2 1996/06/26 05:32:05 deraadt Exp $ */ +/* $OpenBSD: cmp.c,v 1.3 1996/08/01 00:01:38 michaels Exp $ */ /* $NetBSD: cmp.c,v 1.7 1995/09/08 03:22:56 tls Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: cmp.c,v 1.2 1996/06/26 05:32:05 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cmp.c,v 1.3 1996/08/01 00:01:38 michaels Exp $"; #endif #endif /* not lint */ @@ -106,8 +106,12 @@ endargs: fd1 = 0; file1 = "stdin"; } - else if ((fd1 = open(file1, O_RDONLY, 0)) < 0) - err(ERR_EXIT, "%s", file1); + else if ((fd1 = open(file1, O_RDONLY, 0)) < 0) { + if (sflag) + exit(ERR_EXIT); + else + err(ERR_EXIT, "%s", file1); + } if (strcmp(file2 = argv[1], "-") == 0) { if (special) errx(ERR_EXIT, @@ -140,7 +144,7 @@ endargs: else c_regular(fd1, file1, skip1, sb1.st_size, fd2, file2, skip2, sb2.st_size); - exit(0); + return 0; } static void |