===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/find/function.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/find/function.c	2014/05/18 08:10:00	1.41
--- src/usr.bin/find/function.c	2015/01/16 06:40:07	1.42
***************
*** 1,4 ****
! /*	$OpenBSD: function.c,v 1.41 2014/05/18 08:10:00 espie Exp $	*/
  
  /*-
   * Copyright (c) 1990, 1993
--- 1,4 ----
! /*	$OpenBSD: function.c,v 1.42 2015/01/16 06:40:07 deraadt Exp $	*/
  
  /*-
   * Copyright (c) 1990, 1993
***************
*** 32,39 ****
   * SUCH DAMAGE.
   */
  
- #include <sys/param.h>
- #include <sys/ucred.h>
  #include <sys/stat.h>
  #include <sys/wait.h>
  #include <sys/mount.h>
--- 32,37 ----
***************
*** 575,582 ****
  			for (p = *argv; *p; ++p)
  				if (p[0] == '{' && p[1] == '}') {
  					new->e_argv[cnt] =
! 						emalloc((u_int)MAXPATHLEN);
! 					new->e_len[cnt] = MAXPATHLEN;
  					break;
  				}
  			if (!*p) {
--- 573,580 ----
  			for (p = *argv; *p; ++p)
  				if (p[0] == '{' && p[1] == '}') {
  					new->e_argv[cnt] =
! 						emalloc((u_int)PATH_MAX);
! 					new->e_len[cnt] = PATH_MAX;
  					break;
  				}
  			if (!*p) {
***************
*** 607,613 ****
  	int cnt;
  	pid_t pid;
  	int status, fd;
! 	char base[MAXPATHLEN];
  
  	/* fts(3) does not chdir for the root level so we do it ourselves. */
  	if (entry->fts_level == FTS_ROOTLEVEL) {
--- 605,611 ----
  	int cnt;
  	pid_t pid;
  	int status, fd;
! 	char base[PATH_MAX];
  
  	/* fts(3) does not chdir for the root level so we do it ourselves. */
  	if (entry->fts_level == FTS_ROOTLEVEL) {
***************
*** 693,700 ****
  		new->e_orig[cnt] = *argv;
  		for (p = *argv; *p; ++p)
  			if (p[0] == '{' && p[1] == '}') {
! 				new->e_argv[cnt] = emalloc((u_int)MAXPATHLEN);
! 				new->e_len[cnt] = MAXPATHLEN;
  				break;
  			}
  		if (!*p) {
--- 691,698 ----
  		new->e_orig[cnt] = *argv;
  		for (p = *argv; *p; ++p)
  			if (p[0] == '{' && p[1] == '}') {
! 				new->e_argv[cnt] = emalloc((u_int)PATH_MAX);
! 				new->e_len[cnt] = PATH_MAX;
  				break;
  			}
  		if (!*p) {