From owner-svn-src-all@FreeBSD.ORG  Sat May 25 07:17:16 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D47AA2A4;
 Sat, 25 May 2013 07:17:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C6E93275;
 Sat, 25 May 2013 07:17:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4P7HGAj002517;
 Sat, 25 May 2013 07:17:16 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4P7HG5x002515;
 Sat, 25 May 2013 07:17:16 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201305250717.r4P7HG5x002515@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 25 May 2013 07:17:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250975 - head/usr.bin/patch
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 May 2013 07:17:16 -0000

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);
 }