===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/inp.c,v
retrieving revision 1.37.6.1
retrieving revision 1.38
diff -c -r1.37.6.1 -r1.38
*** src/usr.bin/patch/inp.c	2015/07/27 16:08:18	1.37.6.1
--- src/usr.bin/patch/inp.c	2014/10/08 04:06:23	1.38
***************
*** 1,4 ****
! /*	$OpenBSD: inp.c,v 1.37.6.1 2015/07/27 16:08:18 guenther Exp $	*/
  
  /*
   * patch - a program to apply diffs to original files
--- 1,4 ----
! /*	$OpenBSD: inp.c,v 1.38 2014/10/08 04:06:23 doug Exp $	*/
  
  /*
   * patch - a program to apply diffs to original files
***************
*** 111,117 ****
  	size_t	new_size;
  
  	new_size = *lines_allocated * 3 / 2;
! 	p = realloc(i_ptr, (new_size + 2) * sizeof(char *));
  	if (p == NULL) {	/* shucks, it was a near thing */
  		munmap(i_womp, i_size);
  		i_womp = NULL;
--- 111,117 ----
  	size_t	new_size;
  
  	new_size = *lines_allocated * 3 / 2;
! 	p = reallocarray(i_ptr, new_size + 2, sizeof(char *));
  	if (p == NULL) {	/* shucks, it was a near thing */
  		munmap(i_womp, i_size);
  		i_womp = NULL;
***************
*** 131,137 ****
  plan_a(const char *filename)
  {
  	int		ifd, statfailed;
! 	char		*p, *s;
  	struct stat	filestat;
  	off_t		i;
  	ptrdiff_t	sz;
--- 131,137 ----
  plan_a(const char *filename)
  {
  	int		ifd, statfailed;
! 	char		*p, *s, lbuf[MAXLINELEN];
  	struct stat	filestat;
  	off_t		i;
  	ptrdiff_t	sz;
***************
*** 161,168 ****
  		close(creat(filename, 0666));
  		statfailed = stat(filename, &filestat);
  	}
! 	if (statfailed)
! 		fatal("can't find %s\n", filename);
  	filemode = filestat.st_mode;
  	if (!S_ISREG(filemode))
  		fatal("%s is not a normal file--can't patch\n", filename);
--- 161,232 ----
  		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.  */
! 	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())) {
! 		char	*cs = NULL, *filebase, *filedir;
! 		struct stat	cstat;
! 
! 		filebase = basename(filename);
! 		filedir = dirname(filename);
! 
! 		/* 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)
! 
! 		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, sizeof buf, 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, sizeof buf, GET, s);
! 			snprintf(lbuf, sizeof lbuf, SCCSDIFF, s, filename);
! 			cs = "SCCS";
! 		} else if (statfailed)
! 			fatal("can't find %s\n", filename);
! 		/*
! 		 * else we can't write to it but it's not under a version
! 		 * control system, so just proceed.
! 		 */
! 		if (cs) {
! 			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",
! 					    filename, cs);
! 				/*
! 				 * 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",
! 					    filename, cs);
! 				if (system(lbuf))
! 					fatal("can't check out file %s: "
! 					    "differs from default %s version\n",
! 					    filename, cs);
! 			}
! 			if (verbose)
! 				say("Checking out file %s from %s...\n",
! 				    filename, cs);
! 			if (system(buf) || stat(filename, &filestat))
! 				fatal("can't check out file %s from %s\n",
! 				    filename, cs);
! 		}
! 	}
  	filemode = filestat.st_mode;
  	if (!S_ISREG(filemode))
  		fatal("%s is not a normal file--can't patch\n", filename);