svn commit: r325564 - head/usr.bin/patch

Kyle Evans kevans at FreeBSD.org
Wed Nov 8 23:11:17 UTC 2017


Author: kevans
Date: Wed Nov  8 23:11:15 2017
New Revision: 325564
URL: https://svnweb.freebsd.org/changeset/base/325564

Log:
  Revert r325365
  
  r325365 caused several ports to fail to patch correctly. Revert it for the
  time being until an exp-run can be completed.
  
  Requested by:	antoine
  Approved by:	emaste (implicit)

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

Modified: head/usr.bin/patch/patch.c
==============================================================================
--- head/usr.bin/patch/patch.c	Wed Nov  8 21:24:06 2017	(r325563)
+++ head/usr.bin/patch/patch.c	Wed Nov  8 23:11:15 2017	(r325564)
@@ -1026,9 +1026,6 @@ patch_match(LINENUM base, LINENUM offset, LINENUM fuzz
 	const char	*plineptr;
 	unsigned short	plinelen;
 
-	/* Patch does not match if we don't have anymore context to use */
-	if (pline > pat_lines)
-		return false;
 	for (iline = base + offset + fuzz; pline <= pat_lines; pline++, iline++) {
 		ilineptr = ifetch(iline, offset >= 0);
 		if (ilineptr == NULL)


More information about the svn-src-all mailing list