diff options
| author |   ray <ray@openbsd.org> | 2010-07-15 11:10:23 +0000 |
|---|---|---|
| committer | ray <ray@openbsd.org> | 2010-07-15 11:10:23 +0000 |
| commit | 09523d6f279bf59a03f25320dd3bfcfc3972e297 (patch) | |
| tree | 406f3a5b8825b157fb64f010774103c026694945 /usr.bin/rcs/diff.c | |
| parent | whitespace (diff) | |
| download | wireguard-openbsd-09523d6f279bf59a03f25320dd3bfcfc3972e297.tar.xz wireguard-openbsd-09523d6f279bf59a03f25320dd3bfcfc3972e297.zip | |
Sync with diff/diffreg.c r1.75:
Return -1 on error as advertised.
Handle case when only one stream failed.
OK xsa, stsp
Diffstat (limited to 'usr.bin/rcs/diff.c')
| -rw-r--r-- | usr.bin/rcs/diff.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/rcs/diff.c b/usr.bin/rcs/diff.c index 8139c173119..e34cdaae409 100644 --- a/usr.bin/rcs/diff.c +++ b/usr.bin/rcs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.26 2009/06/07 08:39:13 ray Exp $ */ +/* $OpenBSD: diff.c,v 1.27 2010/07/15 11:10:23 ray Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -413,13 +413,12 @@ files_differ(FILE *f1, FILE *f2) for (;;) { i = fread(buf1, 1, sizeof(buf1), f1); j = fread(buf2, 1, sizeof(buf2), f2); + if ((!i && ferror(f1)) || (!j && ferror(f2))) + return (-1); if (i != j) return (1); - if (i == 0 && j == 0) { - if (ferror(f1) || ferror(f2)) - return (-1); + if (i == 0) return (0); - } if (memcmp(buf1, buf2, i) != 0) return (1); } |