===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/find/function.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/find/function.c	1996/12/23 04:58:10	1.8
--- src/usr.bin/find/function.c	1997/06/30 23:54:07	1.9
***************
*** 1,4 ****
! /*	$OpenBSD: function.c,v 1.8 1996/12/23 04:58:10 millert Exp $	*/
  
  /*-
   * Copyright (c) 1990, 1993
--- 1,4 ----
! /*	$OpenBSD: function.c,v 1.9 1997/06/30 23:54:07 millert Exp $	*/
  
  /*-
   * Copyright (c) 1990, 1993
***************
*** 38,44 ****
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)function.c	8.1 (Berkeley) 6/6/93";*/
! static char rcsid[] = "$OpenBSD: function.c,v 1.8 1996/12/23 04:58:10 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 38,44 ----
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)function.c	8.1 (Berkeley) 6/6/93";*/
! static char rcsid[] = "$OpenBSD: function.c,v 1.9 1997/06/30 23:54:07 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 77,82 ****
--- 77,86 ----
  
  static PLAN *palloc __P((enum ntype, int (*) __P((PLAN *, FTSENT *))));
  
+ extern int dotfd;
+ extern time_t now;
+ extern FTS *tree;
+ 
  /*
   * find_parsenum --
   *	Parse a string of the form [+-]# and return the value.
***************
*** 141,147 ****
  	PLAN *plan;
  	FTSENT *entry;
  {
- 	extern time_t now;
  
  	COMPARE((now - entry->fts_statp->st_atime +
  	    SECSPERDAY - 1) / SECSPERDAY, plan->t_data);
--- 145,150 ----
***************
*** 171,177 ****
  	PLAN *plan;
  	FTSENT *entry;
  {
- 	extern time_t now;
  
  	COMPARE((now - entry->fts_statp->st_ctime +
  	    SECSPERDAY - 1) / SECSPERDAY, plan->t_data);
--- 174,179 ----
***************
*** 273,279 ****
  	register PLAN *plan;
  	FTSENT *entry;
  {
- 	extern int dotfd;
  	register int cnt;
  	pid_t pid;
  	int status;
--- 275,280 ----
***************
*** 375,381 ****
  	register PLAN *plan;
  	FTSENT *entry;
  {
- 	extern int dotfd;
  	register int cnt;
  	pid_t pid;
  	int status;
--- 376,381 ----
***************
*** 503,509 ****
  		 */
  		if (entry->fts_info == FTS_SL ||
  		    entry->fts_info == FTS_SLNONE) {
! 			if (p = strrchr(entry->fts_accpath, '/'))
  				++p;
  			else
  				p = entry->fts_accpath;
--- 503,509 ----
  		 */
  		if (entry->fts_info == FTS_SL ||
  		    entry->fts_info == FTS_SLNONE) {
! 			if ((p = strrchr(entry->fts_accpath, '/')))
  				++p;
  			else
  				p = entry->fts_accpath;
***************
*** 697,703 ****
  	PLAN *plan;
  	FTSENT *entry;
  {
- 	extern FTS *tree;
  
  	if (entry->fts_level >= plan->max_data)
  		fts_set(tree, entry, FTS_SKIP);
--- 697,702 ----
***************
*** 726,732 ****
  	PLAN *plan;
  	FTSENT *entry;
  {
- 	extern FTS *tree;
  
  	return (entry->fts_level >= plan->min_data);
  }
--- 725,730 ----
***************
*** 753,759 ****
  	PLAN *plan;
  	FTSENT *entry;
  {
- 	extern time_t now;
  
  	COMPARE((now - entry->fts_statp->st_mtime + SECSPERDAY - 1) /
  	    SECSPERDAY, plan->t_data);
--- 751,756 ----
***************
*** 964,969 ****
--- 961,967 ----
  }
  
  /* ARGSUSED */
+ int
  f_print0(plan, entry)
  	PLAN *plan;
  	FTSENT *entry;
***************
*** 999,1005 ****
  	PLAN *plan;
  	FTSENT *entry;
  {
- 	extern FTS *tree;
  
  	if (fts_set(tree, entry, FTS_SKIP))
  		err(1, "%s", entry->fts_path);
--- 997,1002 ----
***************
*** 1260,1266 ****
  {
  	PLAN *new;
  
! 	if (new = malloc(sizeof(PLAN))) {
  		new->type = t;
  		new->eval = f;
  		new->flags = 0;
--- 1257,1263 ----
  {
  	PLAN *new;
  
! 	if ((new = malloc(sizeof(PLAN)))) {
  		new->type = t;
  		new->eval = f;
  		new->flags = 0;