===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/inp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/patch/inp.c	2003/07/16 16:06:53	1.10
--- src/usr.bin/patch/inp.c	2003/07/18 02:00:09	1.11
***************
*** 1,7 ****
! /*	$OpenBSD: inp.c,v 1.10 2003/07/16 16:06:53 otto Exp $	*/
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: inp.c,v 1.10 2003/07/16 16:06:53 otto Exp $";
  #endif /* not lint */
  
  #include "EXTERN.h"
--- 1,7 ----
! /*	$OpenBSD: inp.c,v 1.11 2003/07/18 02:00:09 deraadt Exp $	*/
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: inp.c,v 1.11 2003/07/18 02:00:09 deraadt Exp $";
  #endif /* not lint */
  
  #include "EXTERN.h"
***************
*** 25,34 ****
  static LINENUM lines_per_buf;		/* how many lines per buffer */
  static int tireclen;			/* length of records in tmp file */
  
  /* New patch--prepare to edit another file. */
  
  void
! re_input()
  {
      if (using_plan_a) {
  	i_size = 0;
--- 25,36 ----
  static LINENUM lines_per_buf;		/* how many lines per buffer */
  static int tireclen;			/* length of records in tmp file */
  
+ void re_input(void);
+ 
  /* New patch--prepare to edit another file. */
  
  void
! re_input(void)
  {
      if (using_plan_a) {
  	i_size = 0;
***************
*** 43,49 ****
      }
      else {
  	using_plan_a = TRUE;		/* maybe the next one is smaller */
! 	Close(tifd);
  	tifd = -1;
  	free(tibuf[0]);
  	free(tibuf[1]);
--- 45,51 ----
      }
      else {
  	using_plan_a = TRUE;		/* maybe the next one is smaller */
! 	close(tifd);
  	tifd = -1;
  	free(tibuf[0]);
  	free(tibuf[1]);
***************
*** 62,68 ****
      if (!plan_a(filename))
  	plan_b(filename);
      if (verbose) {
! 	say3("Patching file %s using Plan %s...\n", filename,
  	  (using_plan_a ? "A" : "B") );
      }
  }
--- 64,70 ----
      if (!plan_a(filename))
  	plan_b(filename);
      if (verbose) {
! 	say("Patching file %s using Plan %s...\n", filename,
  	  (using_plan_a ? "A" : "B") );
      }
  }
***************
*** 74,81 ****
  char *filename;
  {
      int ifd, statfailed;
!     Reg1 char *s;
!     Reg2 LINENUM iline;
      char lbuf[MAXLINELEN];
  
      if (!filename || *filename == '\0')
--- 76,83 ----
  char *filename;
  {
      int ifd, statfailed;
!     char *s;
!     LINENUM iline;
      char lbuf[MAXLINELEN];
  
      if (!filename || *filename == '\0')
***************
*** 84,102 ****
      statfailed = stat(filename, &filestat);
      if (statfailed && ok_to_create_file) {
  	if (verbose)
! 	    say2("(Creating file %s...)\n",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)
!         fatal2("%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.  */
--- 86,104 ----
      statfailed = stat(filename, &filestat);
      if (statfailed && ok_to_create_file) {
  	if (verbose)
! 	    say("(Creating file %s...)\n",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.  */
      if (statfailed
  	/* No one can write to it.  */
***************
*** 113,158 ****
  	/* 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)
! 	    fatal2("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.  */
! 		    fatal3("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)
! 		    say3("Comparing file %s to default %s version...\n",
  			 filename, cs);
  		if (system(lbuf))
! 		    fatal3("can't check out file %s: differs from default %s version\n",
  			   filename, cs);
  	    }
  	    if (verbose)
! 		say3("Checking out file %s from %s...\n", filename, cs);
  	    if (system(buf) || stat(filename, &filestat))
! 		fatal3("can't check out file %s from %s\n", filename, cs);
  	}
      }
      filemode = filestat.st_mode;
      if (!S_ISREG(filemode))
! 	fatal2("%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 */
--- 115,160 ----
  	/* 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);
      i_size = filestat.st_size;
      if (out_of_mem) {
  	set_hunkmax();		/* make sure dynamic arrays are allocated */
***************
*** 168,182 ****
      if (i_womp == Nullch)
  	return FALSE;
      if ((ifd = open(filename, O_RDONLY)) < 0)
! 	pfatal2("can't open file %s", filename);
  #ifndef lint
      if (read(ifd, i_womp, (size_t)i_size) != i_size) {
! 	Close(ifd);	/* probably means i_size > 15 or 16 bits worth */
  	free(i_womp);	/* at this point it doesn't matter if i_womp was */
  	return FALSE;	/*   undersized. */
      }
  #endif
!     Close(ifd);
      if (i_size && i_womp[i_size-1] != '\n')
  	i_womp[i_size++] = '\n';
      i_womp[i_size] = '\0';
--- 170,184 ----
      if (i_womp == Nullch)
  	return FALSE;
      if ((ifd = open(filename, O_RDONLY)) < 0)
! 	pfatal("can't open file %s", filename);
  #ifndef lint
      if (read(ifd, i_womp, (size_t)i_size) != i_size) {
! 	close(ifd);	/* probably means i_size > 15 or 16 bits worth */
  	free(i_womp);	/* at this point it doesn't matter if i_womp was */
  	return FALSE;	/*   undersized. */
      }
  #endif
!     close(ifd);
      if (i_size && i_womp[i_size-1] != '\n')
  	i_womp[i_size++] = '\n';
      i_womp[i_size] = '\0';
***************
*** 197,203 ****
  	free((char *)i_womp);
  	return FALSE;
      }
!     
      /* now scan the buffer and build pointer array */
  
      iline = 1;
--- 199,205 ----
  	free((char *)i_womp);
  	return FALSE;
      }
! 
      /* now scan the buffer and build pointer array */
  
      iline = 1;
***************
*** 210,237 ****
  
      /* now check for revision, if any */
  
!     if (revision != Nullch) { 
  	if (!rev_in_string(i_womp)) {
  	    if (force) {
  		if (verbose)
! 		    say2(
  "Warning: this file doesn't appear to be the %s version--patching anyway.\n",
  			revision);
  	    }
  	    else if (batch) {
! 		fatal2(
  "this file doesn't appear to be the %s version--aborting.\n", revision);
  	    }
  	    else {
! 		ask2(
  "This file doesn't appear to be the %s version--patch anyway? [n] ",
  		    revision);
  	    if (*buf != 'y')
! 		fatal1("aborted\n");
  	    }
  	}
  	else if (verbose)
! 	    say2("Good.  This file appears to be the %s version.\n",
  		revision);
      }
      return TRUE;			/* plan a will work */
--- 212,239 ----
  
      /* now check for revision, if any */
  
!     if (revision != Nullch) {
  	if (!rev_in_string(i_womp)) {
  	    if (force) {
  		if (verbose)
! 		    say(
  "Warning: this file doesn't appear to be the %s version--patching anyway.\n",
  			revision);
  	    }
  	    else if (batch) {
! 		fatal(
  "this file doesn't appear to be the %s version--aborting.\n", revision);
  	    }
  	    else {
! 		ask(
  "This file doesn't appear to be the %s version--patch anyway? [n] ",
  		    revision);
  	    if (*buf != 'y')
! 		fatal("aborted\n");
  	    }
  	}
  	else if (verbose)
! 	    say("Good.  This file appears to be the %s version.\n",
  		revision);
      }
      return TRUE;			/* plan a will work */
***************
*** 243,259 ****
  plan_b(filename)
  char *filename;
  {
!     Reg3 FILE *ifp;
!     Reg1 int i = 0;
!     Reg2 int maxlen = 1;
!     Reg4 bool found_revision = (revision == Nullch);
  
      using_plan_a = FALSE;
      if ((ifp = fopen(filename, "r")) == Nullfp)
! 	pfatal2("can't open file %s", filename);
      (void) unlink(TMPINNAME);
      if ((tifd = open(TMPINNAME, O_EXCL|O_CREAT|O_WRONLY, 0666)) < 0)
! 	pfatal2("can't open file %s", TMPINNAME);
      while (fgets(buf, sizeof buf, ifp) != Nullch) {
  	if (revision != Nullch && !found_revision && rev_in_string(buf))
  	    found_revision = TRUE;
--- 245,261 ----
  plan_b(filename)
  char *filename;
  {
!     FILE *ifp;
!     int i = 0;
!     int maxlen = 1;
!     bool found_revision = (revision == Nullch);
  
      using_plan_a = FALSE;
      if ((ifp = fopen(filename, "r")) == Nullfp)
! 	pfatal("can't open file %s", filename);
      (void) unlink(TMPINNAME);
      if ((tifd = open(TMPINNAME, O_EXCL|O_CREAT|O_WRONLY, 0666)) < 0)
! 	pfatal("can't open file %s", TMPINNAME);
      while (fgets(buf, sizeof buf, ifp) != Nullch) {
  	if (revision != Nullch && !found_revision && rev_in_string(buf))
  	    found_revision = TRUE;
***************
*** 264,315 ****
  	if (!found_revision) {
  	    if (force) {
  		if (verbose)
! 		    say2(
  "Warning: this file doesn't appear to be the %s version--patching anyway.\n",
  			revision);
  	    }
  	    else if (batch) {
! 		fatal2(
  "this file doesn't appear to be the %s version--aborting.\n", revision);
  	    }
  	    else {
! 		ask2(
  "This file doesn't appear to be the %s version--patch anyway? [n] ",
  		    revision);
  		if (*buf != 'y')
! 		    fatal1("aborted\n");
  	    }
  	}
  	else if (verbose)
! 	    say2("Good.  This file appears to be the %s version.\n",
  		revision);
      }
!     Fseek(ifp, 0L, 0);		/* rewind file */
      lines_per_buf = BUFFERSIZE / maxlen;
      tireclen = maxlen;
      tibuf[0] = malloc((MEM)(BUFFERSIZE + 1));
      if (tibuf[0] == Nullch)
! 	fatal1("out of memory\n");
      tibuf[1] = malloc((MEM)(BUFFERSIZE + 1));
      if (tibuf[1] == Nullch)
! 	fatal1("out of memory\n");
      for (i=1; ; i++) {
  	if (! (i % lines_per_buf))	/* new block */
  	    if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE)
! 		pfatal1("can't write temp file");
  	if (fgets(tibuf[0] + maxlen * (i%lines_per_buf), maxlen + 1, ifp)
  	  == Nullch) {
  	    input_lines = i - 1;
  	    if (i % lines_per_buf)
  		if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE)
! 		    pfatal1("can't write temp file");
  	    break;
  	}
      }
!     Fclose(ifp);
!     Close(tifd);
      if ((tifd = open(TMPINNAME, O_RDONLY)) < 0) {
! 	pfatal2("can't reopen file %s", TMPINNAME);
      }
  }
  
--- 266,317 ----
  	if (!found_revision) {
  	    if (force) {
  		if (verbose)
! 		    say(
  "Warning: this file doesn't appear to be the %s version--patching anyway.\n",
  			revision);
  	    }
  	    else if (batch) {
! 		fatal(
  "this file doesn't appear to be the %s version--aborting.\n", revision);
  	    }
  	    else {
! 		ask(
  "This file doesn't appear to be the %s version--patch anyway? [n] ",
  		    revision);
  		if (*buf != 'y')
! 		    fatal("aborted\n");
  	    }
  	}
  	else if (verbose)
! 	    say("Good.  This file appears to be the %s version.\n",
  		revision);
      }
!     fseek(ifp, 0L, 0);		/* rewind file */
      lines_per_buf = BUFFERSIZE / maxlen;
      tireclen = maxlen;
      tibuf[0] = malloc((MEM)(BUFFERSIZE + 1));
      if (tibuf[0] == Nullch)
! 	fatal("out of memory\n");
      tibuf[1] = malloc((MEM)(BUFFERSIZE + 1));
      if (tibuf[1] == Nullch)
! 	fatal("out of memory\n");
      for (i=1; ; i++) {
  	if (! (i % lines_per_buf))	/* new block */
  	    if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE)
! 		pfatal("can't write temp file");
  	if (fgets(tibuf[0] + maxlen * (i%lines_per_buf), maxlen + 1, ifp)
  	  == Nullch) {
  	    input_lines = i - 1;
  	    if (i % lines_per_buf)
  		if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE)
! 		    pfatal("can't write temp file");
  	    break;
  	}
      }
!     fclose(ifp);
!     close(tifd);
      if ((tifd = open(TMPINNAME, O_RDONLY)) < 0) {
! 	pfatal("can't reopen file %s", TMPINNAME);
      }
  }
  
***************
*** 317,327 ****
  
  char *
  ifetch(line,whichbuf)
! Reg1 LINENUM line;
  int whichbuf;				/* ignored when file in memory */
  {
      if (line < 1 || line > input_lines) {
! 	say2("No such line %ld in input file, ignoring\n", line);
  	return NULL;
      }
      if (using_plan_a)
--- 319,329 ----
  
  char *
  ifetch(line,whichbuf)
! LINENUM line;
  int whichbuf;				/* ignored when file in memory */
  {
      if (line < 1 || line > input_lines) {
! 	say("No such line %ld in input file, ignoring\n", line);
  	return NULL;
      }
      if (using_plan_a)
***************
*** 337,346 ****
  	else {
  	    tiline[whichbuf] = baseline;
  #ifndef lint		/* complains of long accuracy */
! 	    Lseek(tifd, (off_t)(baseline / lines_per_buf * BUFFERSIZE), 0);
  #endif
  	    if (read(tifd, tibuf[whichbuf], BUFFERSIZE) < 0)
! 		pfatal2("error reading tmp file %s", TMPINNAME);
  	}
  	return tibuf[whichbuf] + (tireclen*offline);
      }
--- 339,348 ----
  	else {
  	    tiline[whichbuf] = baseline;
  #ifndef lint		/* complains of long accuracy */
! 	    lseek(tifd, (off_t)(baseline / lines_per_buf * BUFFERSIZE), 0);
  #endif
  	    if (read(tifd, tibuf[whichbuf], BUFFERSIZE) < 0)
! 		pfatal("error reading tmp file %s", TMPINNAME);
  	}
  	return tibuf[whichbuf] + (tireclen*offline);
      }
***************
*** 352,359 ****
  rev_in_string(string)
  char *string;
  {
!     Reg1 char *s;
!     Reg2 int patlen;
  
      if (revision == Nullch)
  	return TRUE;
--- 354,361 ----
  rev_in_string(string)
  char *string;
  {
!     char *s;
!     int patlen;
  
      if (revision == Nullch)
  	return TRUE;
***************
*** 361,367 ****
      if (strnEQ(string,revision,patlen) && isspace(string[patlen]))
  	return TRUE;
      for (s = string; *s; s++) {
! 	if (isspace(*s) && strnEQ(s+1, revision, patlen) && 
  		isspace(s[patlen+1] )) {
  	    return TRUE;
  	}
--- 363,369 ----
      if (strnEQ(string,revision,patlen) && isspace(string[patlen]))
  	return TRUE;
      for (s = string; *s; s++) {
! 	if (isspace(*s) && strnEQ(s+1, revision, patlen) &&
  		isspace(s[patlen+1] )) {
  	    return TRUE;
  	}