===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/inp.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/patch/inp.c	2003/08/05 18:20:33	1.24
--- src/usr.bin/patch/inp.c	2003/08/08 07:53:19	1.25
***************
*** 1,7 ****
! /*	$OpenBSD: inp.c,v 1.24 2003/08/05 18:20:33 deraadt Exp $	*/
  
  #ifndef lint
! static const char     rcsid[] = "$OpenBSD: inp.c,v 1.24 2003/08/05 18:20:33 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 1,7 ----
! /*	$OpenBSD: inp.c,v 1.25 2003/08/08 07:53:19 otto Exp $	*/
  
  #ifndef lint
! static const char     rcsid[] = "$OpenBSD: inp.c,v 1.25 2003/08/08 07:53:19 otto Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 37,42 ****
--- 37,43 ----
  static int	tireclen;	/* length of records in tmp file */
  
  static bool	rev_in_string(const char *);
+ static bool	reallocate_lines(size_t *);
  
  /* returns false if insufficient memory */
  static bool	plan_a(const char *);
***************
*** 81,86 ****
--- 82,105 ----
  	}
  }
  
+ static bool
+ reallocate_lines(size_t *lines_allocated)
+ {
+ 	char **p;
+ 
+ 	*lines_allocated = *lines_allocated * 3 / 2;
+ 	p = realloc(i_ptr, (*lines_allocated + 2) * sizeof(char *));
+ 	if (p == NULL) {	/* shucks, it was a near thing */
+ 		munmap(i_womp, i_size);
+ 		i_womp = NULL;
+ 		free(i_ptr);
+ 		i_ptr = NULL;
+ 		return false;
+ 	}
+ 	i_ptr = p;
+ 	return true;
+ }
+ 
  /* Try keeping everything in memory. */
  
  static bool
***************
*** 92,97 ****
--- 111,117 ----
  	struct stat	filestat;
  	off_t		i;
  	ptrdiff_t	sz;
+ 	size_t		lines_allocated;
  
  #ifdef DEBUGGING
  	if (debug & 8)
***************
*** 208,240 ****
  
  	close(ifd);
  
! 	/* count the lines in the buffer so we know how many pointers we need */
! 	iline = 0;
  
! 	/* test for NUL too, to maintain the behavior of the original code */
! 	for (i = 0; i < i_size && i_womp[i] != '\0'; i++) {
! 		if (i_womp[i] == '\n')
! 			iline++;
! 	}
! 	if (i_size > 0 && i_womp[i_size - 1] != '\n')
! 		iline++;
! 
! 
! 	i_ptr = (char **) malloc((iline + 2) * sizeof(char *));
! 
! 	if (i_ptr == NULL) {	/* shucks, it was a near thing */
! 		munmap(i_womp, i_size);
! 		i_womp = NULL;
  		return false;
- 	}
  
  	/* now scan the buffer and build pointer array */
  	iline = 1;
  	i_ptr[iline] = i_womp;
  	/* test for NUL too, to maintain the behavior of the original code */
  	for (s = i_womp, i = 0; i < i_size && *s != '\0'; s++, i++) {
! 		if (*s == '\n')
! 			i_ptr[++iline] = s + 1;	/* these are NOT NUL terminated */
  	}
  	/* if the last line contains no EOL, append one */
  	if (i_size > 0 && i_womp[i_size - 1] != '\n') {
--- 228,254 ----
  
  	close(ifd);
  
! 	/* estimate the number of lines */
! 	lines_allocated = i_size / 25;
! 	if (lines_allocated < 100)
! 		lines_allocated = 100;
  
! 	if (!reallocate_lines(&lines_allocated)) 
  		return false;
  
  	/* now scan the buffer and build pointer array */
  	iline = 1;
  	i_ptr[iline] = i_womp;
  	/* test for NUL too, to maintain the behavior of the original code */
  	for (s = i_womp, i = 0; i < i_size && *s != '\0'; s++, i++) {
! 		if (*s == '\n') {
! 			if (iline == lines_allocated) {
! 				if (!reallocate_lines(&lines_allocated))
! 					return false;
! 			}
! 			/* these are NOT NUL terminated */
! 			i_ptr[++iline] = s + 1;
! 		}
  	}
  	/* if the last line contains no EOL, append one */
  	if (i_size > 0 && i_womp[i_size - 1] != '\n') {