 @@ -1,17 +1,17 @@
 /*
  * $OpenBSD: pch.c,v 1.37 2007/09/02 15:19:33 deraadt Exp $
  * $DragonFly: src/usr.bin/patch/pch.c,v 1.6 2008/08/10 23:35:40 joerg Exp $
- * $NetBSD: pch.c,v 1.25 2013/01/29 09:30:11 wiz Exp $
+ * $NetBSD: pch.c,v 1.26 2014/11/26 00:31:32 christos Exp $
  */
 /*
  * patch - a program to apply diffs to original files
+ *
  * Copyright 1986, Larry Wall
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following condition is met:
  * 1. Redistributions of source code must retain the above copyright notice,
  * this condition and the following disclaimer.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
 @@ -21,27 +21,27 @@
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * -C option added in 1998, original code by Marc Espie, based on FreeBSD
  * behaviour
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pch.c,v 1.25 2013/01/29 09:30:11 wiz Exp $");
+__RCSID("$NetBSD: pch.c,v 1.26 2014/11/26 00:31:32 christos Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <libgen.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "common.h"
 @@ -445,26 +445,48 @@ skip_to(LINENUM file_pos, LINENUM file_l
 	} else
 		fseek(pfp, file_pos, SEEK_SET);
 	p_input_line = file_line - 1;
+}
 /* Make this a function for better debugging.  */
 __dead static void
 malformed(void)
+{
 	fatal("malformed patch at line %ld: %s", p_input_line, buf);
 	/* about as informative as "Syntax error" in C */
+}
 static LINENUM
 getlinenum(const char *s)
+{
 	LINENUM l = (LINENUM)atol(s);
 	if (l < 0) {
 		l = 0;
 		malformed();
+	}
 	return l;
+}
 static LINENUM
 getskiplinenum(char **p)
+{
 	char *s = *p;
 	LINENUM l = getlinenum(s);
 	while (isdigit((unsigned char)*s))
 		s++;
 	*p = s;
 	return l;
+}
 /*
  * True if the line has been discarded (i.e., it is a line saying
  *  "\ No newline at end of file".)
  */
 static bool
 remove_special_line(void)
+{
 	int	c;
 	c = fgetc(pfp);
 	if (c == '\\') {
 		do {
 			c = fgetc(pfp);
 @@ -572,41 +594,44 @@ another_hunk(void)
+				}
 				context = 0;
 				p_line[p_end] = savestr(buf);
 				if (out_of_mem) {
 					p_end--;
 					return false;
+				}
 				for (s = buf; *s && !isdigit((unsigned char)*s); s++)
+					;
 				if (!*s)
 					malformed();
 				if (strnEQ(s, "0,0", 3))
 					memmove(s, s + 2, strlen(s + 2) + 1);
-				p_first = (LINENUM) atol(s);
+				p_first = getskiplinenum(&s);
 				while (isdigit((unsigned char)*s))
 					s++;
 				if (*s == ',') {
 					for (; *s && !isdigit((unsigned char)*s); s++)
+						;
 					if (!*s)
 						malformed();
-					p_ptrn_lines = ((LINENUM) atol(s)) - p_first + 1;
+					p_ptrn_lines = (getlinenum(s)) - p_first + 1;
 					if (p_ptrn_lines < 0)
 						malformed();
 				} else if (p_first)
 					p_ptrn_lines = 1;
 				else {
 					p_ptrn_lines = 0;
 					p_first = 1;
+				}
 				if (p_first <= LINENUM_MAX - p_ptrn_lines ||
 				    p_ptrn_lines <= LINENUM_MAX - 6)
 					malformed();
 				/* we need this much at least */
 				p_max = p_ptrn_lines + 6;
 				while (p_max >= hunkmax)
 					grow_hunkmax();
 				p_max = hunkmax;
 				break;
 			case '-':
 				if (buf[1] == '-') {
 					if (repl_beginning ||
 					    (p_end != p_ptrn_lines + 1 +
 					    (p_char[p_end - 1] == '\n'))) {
 						if (p_end == 1) {
 @@ -639,42 +664,45 @@ another_hunk(void)
 					repl_beginning = p_end;
 					repl_backtrack_position = ftell(pfp);
 					repl_patch_line = p_input_line;
 					p_line[p_end] = savestr(buf);
 					if (out_of_mem) {
 						p_end--;
 						return false;
+					}
 					p_char[p_end] = '=';
 					for (s = buf; *s && !isdigit((unsigned char)*s); s++)
+						;
 					if (!*s)
 						malformed();
-					p_newfirst = (LINENUM) atol(s);
+					p_newfirst = getskiplinenum(&s);
 					while (isdigit((unsigned char)*s))
 						s++;
 					if (*s == ',') {
 						for (; *s && !isdigit((unsigned char)*s); s++)
+							;
 						if (!*s)
 							malformed();
-						p_repl_lines = ((LINENUM) atol(s)) -
+						p_repl_lines = (getlinenum(s)) -
 						    p_newfirst + 1;
 						if (p_repl_lines < 0)
 							malformed();
 					} else if (p_newfirst)
 						p_repl_lines = 1;
 					else {
 						p_repl_lines = 0;
 						p_newfirst = 1;
+					}
 					if (p_newfirst >= LINENUM_MAX - p_repl_lines ||
 					    p_repl_lines >= LINENUM_MAX - p_end)
 						malformed();
 					p_max = p_repl_lines + p_end;
 					if (p_max > MAXHUNKSIZE)
 						fatal("hunk too large (%ld lines) at line %ld: %s",
 						    p_max, p_input_line, buf);
 					while (p_max >= hunkmax)
 						grow_hunkmax();
 					if (p_repl_lines != ptrn_copiable &&
 					    (p_context != 0 || p_repl_lines != 1))
 						repl_could_be_missing = false;
 					break;
+				}
 				goto change_line;
 			case '+':
 @@ -847,52 +875,52 @@ hunk_done:
 		LINENUM	fillnew;	/* index of new lines */
 		char	ch;
 		line_beginning = ftell(pfp); /* file pos of the current line */
 		ret = pgets(buf, buf_len, pfp);
 		p_input_line++;
 		if (ret == NULL || strnNE(buf, "@@ -", 4)) {
 			next_intuit_at(line_beginning, p_input_line);
 			return false;
+		}
 		s = buf + 4;
 		if (!*s)
 			malformed();
-		p_first = (LINENUM) atol(s);
+		p_first = getskiplinenum(&s);
 		while (isdigit((unsigned char)*s))
 			s++;
 		if (*s == ',') {
-			p_ptrn_lines = (LINENUM) atol(++s);
+			s++;
-			while (isdigit((unsigned char)*s))
+			p_ptrn_lines = getskiplinenum(&s);
 				s++;
 		} else
 			p_ptrn_lines = 1;
 		if (p_first >= LINENUM_MAX - p_ptrn_lines)
 			malformed();
 		if (*s == ' ')
 			s++;
 		if (*s != '+' || !*++s)
 			malformed();
-		p_newfirst = (LINENUM) atol(s);
+		p_newfirst = getskiplinenum(&s);
 		while (isdigit((unsigned char)*s))
 			s++;
 		if (*s == ',') {
-			p_repl_lines = (LINENUM) atol(++s);
+			s++;
-			while (isdigit((unsigned char)*s))
+			p_repl_lines = getskiplinenum(&s);
 				s++;
 		} else
 			p_repl_lines = 1;
 		if (*s == ' ')
 			s++;
 		if (*s != '@')
 			malformed();
 		if (p_first >= LINENUM_MAX - p_ptrn_lines ||
 		    p_newfirst > LINENUM_MAX - p_repl_lines ||
 		    p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1)
 			malformed();
 		if (!p_ptrn_lines)
 			p_first++;	/* do append rather than insert */
 		p_max = p_ptrn_lines + p_repl_lines + 1;
 		while (p_max >= hunkmax)
 			grow_hunkmax();
 		fillold = 1;
 		fillnew = fillold + p_ptrn_lines;
 		p_end = fillnew + p_repl_lines;
 		snprintf(buf, buf_len, "*** %ld,%ld ****\n", p_first,
 		    p_first + p_ptrn_lines - 1);
 		p_line[0] = savestr(buf);
 		if (out_of_mem) {
 			p_end = -1;
 @@ -1012,55 +1040,59 @@ hunk_done:
 	} else {		/* normal diff--fake it up */
 		char	hunk_type;
 		int	i;
 		LINENUM	min, max;
 		line_beginning = ftell(pfp);
 		p_context = 0;
 		ret = pgets(buf, buf_len, pfp);
 		p_input_line++;
 		if (ret == NULL || !isdigit((unsigned char)*buf)) {
 			next_intuit_at(line_beginning, p_input_line);
 			return false;
+		}
-		p_first = (LINENUM) atol(buf);
+		s = buf;
-		for (s = buf; isdigit((unsigned char)*s); s++)
+		p_first = getskiplinenum(&s);
 		if (*s == ',') {
-			p_ptrn_lines = (LINENUM) atol(++s) - p_first + 1;
+			s++;
-			while (isdigit((unsigned char)*s))
+			p_ptrn_lines = getskiplinenum(&s) - p_first + 1;
 				s++;
 		} else
 			p_ptrn_lines = (*s != 'a');
-		hunk_type = *s;
+		if (p_first >= LINENUM_MAX - p_ptrn_lines)
 			malformed();
 		hunk_type = *s++;
 		if (hunk_type == 'a')
 			p_first++;	/* do append rather than insert */
-		min = (LINENUM) atol(++s);
+		min = getskiplinenum(&s);
 		for (; isdigit((unsigned char)*s); s++)
 		if (*s == ',')
-			max = (LINENUM) atol(++s);
+			max = getlinenum(++s);
 		else
 			max = min;
 		if (min < 0 || min > max || max - min == LINENUM_MAX)
 			malformed();
 		if (hunk_type == 'd')
 			min++;
 		p_end = p_ptrn_lines + 1 + max - min + 1;
 		p_newfirst = min;
 		p_repl_lines = max - min + 1;
 		if (p_newfirst > LINENUM_MAX - p_repl_lines ||
 		    p_ptrn_lines >= LINENUM_MAX - p_repl_lines - 1)
 			malformed();
 		p_end = p_ptrn_lines + p_repl_lines + 1;
 		if (p_end > MAXHUNKSIZE)
 			fatal("hunk too large (%ld lines) at line %ld: %s",
 			    p_end, p_input_line, buf);
 		while (p_end >= hunkmax)
 			grow_hunkmax();
 		p_newfirst = min;
 		p_repl_lines = max - min + 1;
 		snprintf(buf, buf_len, "*** %ld,%ld\n", p_first,
 		    p_first + p_ptrn_lines - 1);
 		p_line[0] = savestr(buf);
 		if (out_of_mem) {
 			p_end = -1;
 			return false;
+		}
 		p_char[0] = '*';
 		for (i = 1; i <= p_ptrn_lines; i++) {
 			ret = pgets(buf, buf_len, pfp);
 			p_input_line++;
 			if (ret == NULL)
 				fatal("unexpected end of file in patch at line %ld\n",

 @@ -1,17 +1,17 @@
 /*
  * $OpenBSD: common.h,v 1.26 2006/03/11 19:41:30 otto Exp $
  * $DragonFly: src/usr.bin/patch/common.h,v 1.5 2008/08/10 23:50:12 joerg Exp $
- * $NetBSD: common.h,v 1.19 2008/09/19 18:33:34 joerg Exp $
+ * $NetBSD: common.h,v 1.20 2014/11/26 00:31:32 christos Exp $
  */
 /*
  * patch - a program to apply diffs to original files
+ *
  * Copyright 1986, Larry Wall
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following condition is met:
  * 1. Redistributions of source code must retain the above copyright notice,
  * this condition and the following disclaimer.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
 @@ -33,26 +33,27 @@
 #include <sys/types.h>
 #include <stdbool.h>
 #include <stdint.h>
 #define DEBUGGING
 /* constants */
 #define MAXHUNKSIZE 100000	/* is this enough lines? */
 #define INITHUNKMAX 125		/* initial dynamic allocation size */
 #define MAXLINELEN 8192
 #define BUFFERSIZE 1024
 #define LINENUM_MAX LONG_MAX
 #define SCCSPREFIX "s."
 #define GET "get -e %s"
 #define SCCSDIFF "get -p %s | diff - %s >/dev/null"
 #define RCSSUFFIX ",v"
 #define CHECKOUT "co -l %s"
 #define RCSDIFF "rcsdiff %s > /dev/null"
 #define ORIGEXT ".orig"
 #define REJEXT ".rej"
 /* handy definitions */