===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/pch.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/patch/pch.c	1996/09/23 10:54:22	1.6
--- src/usr.bin/patch/pch.c	1996/09/24 04:19:29	1.7
***************
*** 1,7 ****
! /*	$OpenBSD: pch.c,v 1.6 1996/09/23 10:54:22 deraadt Exp $	*/
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: pch.c,v 1.6 1996/09/23 10:54:22 deraadt Exp $";
  #endif /* not lint */
  
  #include "EXTERN.h"
--- 1,7 ----
! /*	$OpenBSD: pch.c,v 1.7 1996/09/24 04:19:29 millert Exp $	*/
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: pch.c,v 1.7 1996/09/24 04:19:29 millert Exp $";
  #endif /* not lint */
  
  #include "EXTERN.h"
***************
*** 781,794 ****
  	fillsrc = 1;
  	filldst = fillsrc + p_ptrn_lines;
  	p_end = filldst + p_repl_lines;
! 	Sprintf(buf,"*** %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] = '*';
!         Sprintf(buf,"--- %ld,%ld ----\n",p_newfirst,p_newfirst+p_repl_lines-1);
  	p_line[filldst] = savestr(buf);
  	if (out_of_mem) {
  	    p_end = 0;
--- 781,796 ----
  	fillsrc = 1;
  	filldst = fillsrc + p_ptrn_lines;
  	p_end = filldst + p_repl_lines;
! 	Snprintf(buf, sizeof buf, "*** %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] = '*';
!         Snprintf(buf, sizeof buf, "--- %ld,%ld ----\n", p_newfirst,
! 	    p_newfirst + p_repl_lines - 1);
  	p_line[filldst] = savestr(buf);
  	if (out_of_mem) {
  	    p_end = 0;
***************
*** 920,926 ****
  	    grow_hunkmax();
  	p_newfirst = min;
  	p_repl_lines = max - min + 1;
! 	Sprintf(buf, "*** %ld,%ld\n", p_first, p_first + p_ptrn_lines - 1);
  	p_line[0] = savestr(buf);
  	if (out_of_mem) {
  	    p_end = -1;
--- 922,929 ----
  	    grow_hunkmax();
  	p_newfirst = min;
  	p_repl_lines = max - min + 1;
! 	Snprintf(buf, sizeof buf, "*** %ld,%ld\n", p_first,
! 	    p_first + p_ptrn_lines - 1);
  	p_line[0] = savestr(buf);
  	if (out_of_mem) {
  	    p_end = -1;
***************
*** 952,958 ****
  	    if (*buf != '-')
  		fatal2("--- expected at line %ld of patch\n", p_input_line);
  	}
! 	Sprintf(buf, "--- %ld,%ld\n", min, max);
  	p_line[i] = savestr(buf);
  	if (out_of_mem) {
  	    p_end = i-1;
--- 955,961 ----
  	    if (*buf != '-')
  		fatal2("--- expected at line %ld of patch\n", p_input_line);
  	}
! 	Snprintf(buf, sizeof(buf), "--- %ld,%ld\n", min, max);
  	p_line[i] = savestr(buf);
  	if (out_of_mem) {
  	    p_end = i-1;
***************
*** 1227,1235 ****
  	Unlink(TMPOUTNAME);
  	copy_file(filearg[0], TMPOUTNAME);
  	if (verbose)
! 	    Sprintf(buf, "/bin/ed %s", TMPOUTNAME);
  	else
! 	    Sprintf(buf, "/bin/ed - %s", TMPOUTNAME);
  	pipefp = popen(buf, "w");
      }
      for (;;) {
--- 1230,1238 ----
  	Unlink(TMPOUTNAME);
  	copy_file(filearg[0], TMPOUTNAME);
  	if (verbose)
! 	    Snprintf(buf, sizeof buf, "/bin/ed %s", TMPOUTNAME);
  	else
! 	    Snprintf(buf, sizeof buf, "/bin/ed - %s", TMPOUTNAME);
  	pipefp = popen(buf, "w");
      }
      for (;;) {