Date: Sat, 25 May 2013 07:17:16 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250975 - head/usr.bin/patch Message-ID: <201305250717.r4P7HG5x002515@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb (doc,ports committer) Date: Sat May 25 07:17:16 2013 New Revision: 250975 URL: http://svnweb.freebsd.org/changeset/base/250975 Log: Revert r250972 to fix build. Modified: head/usr.bin/patch/patch.c head/usr.bin/patch/util.c Modified: head/usr.bin/patch/patch.c ============================================================================== --- head/usr.bin/patch/patch.c Sat May 25 06:28:30 2013 (r250974) +++ head/usr.bin/patch/patch.c Sat May 25 07:17:16 2013 (r250975) @@ -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; } Modified: head/usr.bin/patch/util.c ============================================================================== --- head/usr.bin/patch/util.c Sat May 25 06:28:30 2013 (r250974) +++ head/usr.bin/patch/util.c Sat May 25 07:17:16 2013 (r250975) @@ -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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305250717.r4P7HG5x002515>