 @@ -1,17 +1,17 @@
 /*
  * $OpenBSD: inp.c,v 1.34 2006/03/11 19:41:30 otto Exp $
  * $DragonFly: src/usr.bin/patch/inp.c,v 1.6 2007/09/29 23:11:10 swildner Exp $
- * $NetBSD: inp.c,v 1.23 2009/10/21 17:16:11 joerg Exp $
+ * $NetBSD: inp.c,v 1.24 2015/07/24 18:56:00 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,34 +21,36 @@
  * 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: inp.c,v 1.23 2009/10/21 17:16:11 joerg Exp $");
+__RCSID("$NetBSD: inp.c,v 1.24 2015/07/24 18:56:00 christos Exp $");
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "common.h"
 #include "util.h"
 #include "pch.h"
 #include "inp.h"
 @@ -129,32 +131,34 @@ reallocate_lines(size_t *lines_allocated
 		*lines_allocated = 0;
 		return false;
+	}
 	*lines_allocated = new_size;
 	i_ptr = p;
 	return true;
+}
 /* Try keeping everything in memory. */
 static bool
 plan_a(const char *filename)
+{
-	int		ifd, statfailed;
+	int		ifd, statfailed, devnull, pstat;
 	char		*p, *s, lbuf[MAXLINELEN];
 	struct stat	filestat;
 	off_t		i;
 	ptrdiff_t	sz;
 	size_t		iline, lines_allocated;
 	pid_t		pid;
 	char		*argp[4] = {NULL};
 #ifdef DEBUGGING
 	if (debug & 8)
 		return false;
 #endif
 	if (filename == NULL || *filename == '\0')
 		return false;
 	statfailed = stat(filename, &filestat);
 	if (statfailed && ok_to_create_file) {
 		if (verbose)
 			say("(Creating file %s...)\n", filename);
 @@ -162,99 +166,120 @@ plan_a(const char *filename)
 		/*
 		 * in check_patch case, we still display `Creating file' even
 		 * though we're not. The rule is that -C should be as similar
 		 * to normal patch behavior as possible
 		 */
 		if (check_only)
 			return true;
 		makedirs(filename, true);
 		close(creat(filename, 0666));
 		statfailed = stat(filename, &filestat);
+	}
 	if (statfailed && check_only)
 		fatal("%s not found, -C mode, can't probe further\n", filename);
-	/* For nonexistent or read-only files, look for RCS or SCCS versions.  */
+	/* For nonexistent or read-only files, look for RCS versions.  */
 	if (statfailed ||
 	    /* No one can write to it.  */
 	    (filestat.st_mode & 0222) == 0 ||
 	    /* I can't write to it.  */
 	    ((filestat.st_mode & 0022) == 0 && filestat.st_uid != getuid())) {
-		const char	*cs = NULL, *filebase, *filedir;
+		char	*filebase, *filedir;
 		struct stat	cstat;
 		char *tmp_filename1, *tmp_filename2;
 		tmp_filename1 = strdup(filename);
 		tmp_filename2 = strdup(filename);
 		if (tmp_filename1 == NULL || tmp_filename2 == NULL)
 			fatal("strdupping filename");
 		filebase = basename(tmp_filename1);
-		filedir = dirname(tmp_filename2);
+ 		filebase = basename(tmp_filename1);
  		filedir = dirname(tmp_filename2);
 		/* Leave room in lbuf for the diff command.  */
 		s = lbuf + 20;
 #define try(f, a1, a2, a3) \
-	(snprintf(s, sizeof lbuf - 20, f, a1, a2, a3), stat(s, &cstat) == 0)
+	(snprintf(lbuf, sizeof lbuf, f, a1, a2, a3), stat(lbuf, &cstat) == 0)
 		if (try("%s/RCS/%s%s", filedir, filebase, RCSSUFFIX) ||
 		    try("%s/RCS/%s%s", filedir, filebase, "") ||
 		    try("%s/%s%s", filedir, filebase, RCSSUFFIX)) {
 			snprintf(buf, buf_len, CHECKOUT, filename);
 			snprintf(lbuf, sizeof lbuf, RCSDIFF, filename);
 			cs = "RCS";
 		} else if (try("%s/SCCS/%s%s", filedir, SCCSPREFIX, filebase) ||
 		    try("%s/%s%s", filedir, SCCSPREFIX, filebase)) {
 			snprintf(buf, buf_len, GET, s);
 			snprintf(lbuf, sizeof lbuf, SCCSDIFF, s, filename);
 			cs = "SCCS";
 		} else if (statfailed)
 			fatal("can't find %s\n", filename);
 		free(tmp_filename1);
 		free(tmp_filename2);
 		/*
 		 * else we can't write to it but it's not under a version
 		 * control system, so just proceed.
 		 */
-		if (cs) {
+		if (try("%s/RCS/%s%s", filedir, filebase, RCSSUFFIX) ||
 		    try("%s/RCS/%s%s", filedir, filebase, "") ||
 		    try("%s/%s%s", filedir, filebase, RCSSUFFIX)) {
 			if (!statfailed) {
 				if ((filestat.st_mode & 0222) != 0)
 					/* The owner can write to it.  */
 					fatal("file %s seems to be locked "
-					    "by somebody else under %s\n",
+					    "by somebody else under RCS\n",
-					    filename, cs);
+					    filename);
 				/*
 				 * It might be checked out unlocked.  See if
 				 * it's safe to check out the default version
 				 * locked.
 				 */
 				if (verbose)
 					say("Comparing file %s to default "
-					    "%s version...\n",
+					    "RCS version...\n", filename);
 					    filename, cs);
-				if (system(lbuf))
+				switch (pid = fork()) {
 				case -1:
 					fatal("can't fork: %s\n",
 					    strerror(errno));
 				case 0:
 					devnull = open("/dev/null", O_RDONLY);
 					if (devnull == -1) {
 						fatal("can't open /dev/null: %s",
 						    strerror(errno));
+					}
 					(void)dup2(devnull, STDOUT_FILENO);
 					argp[0] = __UNCONST(RCSDIFF);
 					argp[1] = __UNCONST(filename);
 					execv(RCSDIFF, argp);
 					exit(127);
+				}
 				pid = waitpid(pid, &pstat, 0);
 				if (pid == -1 || WEXITSTATUS(pstat) != 0) {
 					fatal("can't check out file %s: "
-					    "differs from default %s version\n",
+					    "differs from default RCS version\n",
-					    filename, cs);
+					    filename);
+				}
+			}
 			if (verbose)
-				say("Checking out file %s from %s...\n",
+				say("Checking out file %s from RCS...\n",
-				    filename, cs);
+				    filename);
 			if (system(buf) || stat(filename, &filestat))
-				fatal("can't check out file %s from %s\n",
+			switch (pid = fork()) {
-				    filename, cs);
+			case -1:
 				fatal("can't fork: %s\n", strerror(errno));
 			case 0:
 				argp[0] = __UNCONST(CHECKOUT);
 				argp[1] = __UNCONST("-l");
 				argp[2] = __UNCONST(filename);
 				execv(CHECKOUT, argp);
 				exit(127);
+			}
 			pid = waitpid(pid, &pstat, 0);
 			if (pid == -1 || WEXITSTATUS(pstat) != 0 ||
 			    stat(filename, &filestat)) {
 				fatal("can't check out file %s from RCS\n",
 				    filename);
+			}
 		} else if (statfailed) {
 			fatal("can't find %s\n", filename);
+		}
 		free(tmp_filename1);
 		free(tmp_filename2);
+	}
 	filemode = filestat.st_mode;
 	if (!S_ISREG(filemode))
 		fatal("%s is not a normal file--can't patch\n", filename);
 	i_size = filestat.st_size;
 	if (out_of_mem) {
 		set_hunkmax();	/* make sure dynamic arrays are allocated */
 		out_of_mem = false;
 		return false;	/* force plan b because plan a bombed */
+	}
 	if ((uintmax_t)i_size > (uintmax_t)SIZE_MAX) {
 		say("block too large to mmap\n");
 		return false;
+	}