diff options
| author | gjb <gjb@FreeBSD.org> | 2013-05-25 07:17:16 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-05-25 07:17:16 +0000 |
| commit | 987739080987bee39127ec6c8175ca15e60a57d9 (patch) | |
| tree | 2cce5ee49c46d8a4178afcc8b8fde87031919b3e /usr.bin/patch | |
| parent | 58d0c29676a96ac1c8c14b4717051336c64a04ec (diff) | |
| download | FreeBSD-src-987739080987bee39127ec6c8175ca15e60a57d9.zip FreeBSD-src-987739080987bee39127ec6c8175ca15e60a57d9.tar.gz | |
Revert r250972 to fix build.
Diffstat (limited to 'usr.bin/patch')
| -rw-r--r-- | usr.bin/patch/patch.c | 6 | ||||
| -rw-r--r-- | usr.bin/patch/util.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c index c898ee4..d008c0f 100644 --- a/usr.bin/patch/patch.c +++ b/usr.bin/patch/patch.c @@ -303,7 +303,7 @@ main(int argc, char *argv[]) ++fuzz <= mymaxfuzz); if (skip_rest_of_patch) { /* just got decided */ - if (ferror(ofp) | fclose(ofp)) { + if (ferror(ofp) || fclose(ofp)) { say("Error writing %s\n", TMPOUTNAME); error = 1; @@ -385,7 +385,7 @@ main(int argc, char *argv[]) } } } - if (ferror(rejfp) | fclose(rejfp)) { + if (ferror(rejfp) || fclose(rejfp)) { say("Error writing %s\n", rejname); error = 1; } @@ -977,7 +977,7 @@ spew_output(void) #endif if (input_lines) copy_till(input_lines, true); /* dump remainder of file */ - rv = ferror(ofp) == 0 & fclose(ofp) == 0; + rv = ferror(ofp) == 0 && fclose(ofp) == 0; ofp = NULL; return rv; } diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c index c19918b..28a3cb0 100644 --- a/usr.bin/patch/util.c +++ b/usr.bin/patch/util.c @@ -412,7 +412,7 @@ checked_in(char *file) void version(void) { - fprintf(stderr, "patch 2.0-12u9 FreeBSD\n"); + fprintf(stderr, "patch 2.0-12u8 FreeBSD\n"); my_exit(EXIT_SUCCESS); } |
