From owner-svn-src-all@FreeBSD.ORG  Tue Jul  2 17:09:58 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 19FBFAA5;
 Tue,  2 Jul 2013 17:09:58 +0000 (UTC)
 (envelope-from obrien@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 0AE711ABC;
 Tue,  2 Jul 2013 17:09:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r62H9vcA012082;
 Tue, 2 Jul 2013 17:09:57 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r62H9vIT012081;
 Tue, 2 Jul 2013 17:09:57 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201307021709.r62H9vIT012081@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 2 Jul 2013 17:09:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252512 - head/gnu/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: Tue, 02 Jul 2013 17:09:58 -0000

Author: obrien
Date: Tue Jul  2 17:09:57 2013
New Revision: 252512
URL: http://svnweb.freebsd.org/changeset/base/252512

Log:
  Make it so that 'patch < FUBAR' and 'patch -i FUBAR' operate the same.
  
  The former makes a copy of stdin, but was not accurately putting the
  content of stdin into a temp file.  This lead to the undercounting
  the number of lines in hunks containing NUL characters when reading
  from stdin.  Thus resulting in "unexpected end of file in patch" errors.

Modified:
  head/gnu/usr.bin/patch/pch.c

Modified: head/gnu/usr.bin/patch/pch.c
==============================================================================
--- head/gnu/usr.bin/patch/pch.c	Tue Jul  2 16:58:15 2013	(r252511)
+++ head/gnu/usr.bin/patch/pch.c	Tue Jul  2 17:09:57 2013	(r252512)
@@ -83,12 +83,17 @@ re_patch(void)
 void
 open_patch_file(char *filename)
 {
+	int nr, nw;
+
 	if (filename == Nullch || !*filename || strEQ(filename, "-")) {
 		pfp = fopen(TMPPATNAME, "w");
 		if (pfp == Nullfp)
 			pfatal2("can't create %s", TMPPATNAME);
-		while (fgets(buf, buf_size, stdin) != Nullch)
-			fputs(buf, pfp);
+		while ((nr = fread(buf, 1, buf_size, stdin)) > 0) {
+			nw = fwrite(buf, 1, nr, pfp);
+			if (nr != nw)
+				pfatal2("write error to %s", TMPPATNAME);
+		}
 		Fclose(pfp);
 		filename = TMPPATNAME;
 	}