diff options
| author | green <green@FreeBSD.org> | 2000-06-20 20:28:40 +0000 |
|---|---|---|
| committer | green <green@FreeBSD.org> | 2000-06-20 20:28:40 +0000 |
| commit | 0cb871361940624853d87af04c820ef1cbfb2d7d (patch) | |
| tree | c83d908655b35f4ff649750ff287aaa3b69a607f /usr.bin/cmp/regular.c | |
| parent | 94d9b497c725b1556bd321aa14701837535b40c7 (diff) | |
| download | FreeBSD-src-0cb871361940624853d87af04c820ef1cbfb2d7d.zip FreeBSD-src-0cb871361940624853d87af04c820ef1cbfb2d7d.tar.gz | |
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
Diffstat (limited to 'usr.bin/cmp/regular.c')
| -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 a0ed182..e2d0435 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); |
