diff options
| author | Brian Feldman <green@FreeBSD.org> | 2000-06-20 20:28:40 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2000-06-20 20:28:40 +0000 |
| commit | 84ad3d8fc444a77a0c4db6e3d33fe75adcd382a8 (patch) | |
| tree | 24cfe328c3d5e3cab60d4509801e067614d0d063 /usr.bin/cmp | |
| parent | a8cef3390b2cc76ea29a825a713c5a9a1b124ac4 (diff) | |
| download | src-84ad3d8fc444a77a0c4db6e3d33fe75adcd382a8.tar.gz src-84ad3d8fc444a77a0c4db6e3d33fe75adcd382a8.zip | |
Make cmp -s work properly if skip values are given. Also, exit(1)
is now exit(DIFF_EXIT).
PR: 18597
Submitted by: Anatoly Vorobey <mellon@pobox.com>
Committed at: Usenix terminal room
Notes
Notes:
svn path=/head/; revision=61883
Diffstat (limited to 'usr.bin/cmp')
| -rw-r--r-- | usr.bin/cmp/regular.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index a0ed182b37dd..e2d04358ddd4 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -65,9 +65,6 @@ c_regular(fd1, file1, skip1, len1, fd2, file2, skip2, len2) off_t pagemask, off1, off2; size_t pagesize; - if (sflag && len1 != len2) - exit(1); - if (skip1 > len1) eofmsg(file1); len1 -= skip1; @@ -75,6 +72,9 @@ c_regular(fd1, file1, skip1, len1, fd2, file2, skip2, len2) eofmsg(file2); len2 -= skip2; + if (sflag && len1 != len2) + exit(DIFF_EXIT); + pagesize = getpagesize(); pagemask = (off_t)pagesize - 1; off1 = ROUNDPAGE(skip1); |