BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / find / find.c

diff --git a/usr/src/usr.bin/find/find.c b/usr/src/usr.bin/find/find.c
index 03be2bd..a332682 100644 (file)
--- a/usr/src/usr.bin/find/find.c
+++ b/usr/src/usr.bin/find/find.c
@@ -1,83 +1,52 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1991 The Regents of the University of California.

  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Cimarron D. Taylor of the University of California, Berkeley.
  *
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Cimarron D. Taylor of the University of California, Berkeley.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)find.c     4.36 (Berkeley) %G%";
+static char sccsid[] = "@(#)find.c     5.3 (Berkeley) 5/25/91";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include <sys/param.h>
+#include <sys/types.h>

 #include <sys/stat.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <sys/errno.h>

-#include <time.h>

 #include <fts.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include "find.h"
 
 #include <fts.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include "find.h"
 

-FTS *tree;                     /* pointer to top of FTS hierarchy */
-time_t now;                    /* time find was run */
-                               /* options for the ftsopen(3) call */
-int ftsoptions = FTS_NOSTAT|FTS_PHYSICAL;
-int isdeprecated;              /* using deprecated syntax */
-int isdepth;                   /* do directories on post-order visit */
-int isoutput;                  /* user specified output operator */
-int isrelative;                        /* can do -exec/ok on relative path */
-
-main(argc, argv)
-       int argc;
-       char **argv;
-{
-       PLAN *plan;
-       char **p, **paths;
-       PLAN *find_formplan();
-       time_t time();
-       void newsyntax(), oldsyntax();
-    
-       (void)time(&now);                       /* initialize the time-of-day */
-
-       if (argc < 2)
-               usage();
-
-       paths = argv;
-
-       /*
-        * if arguments start with an option, treat it like new syntax;
-        * otherwise, if has a "-option" anywhere (which isn't an argument
-        * to another command) treat it as old syntax.
-        */
-       if (argv[1][0] != '-')
-               for (p = argv + 1; *p; ++p) {
-                       if (!strcmp(*p, "exec") || !strcmp(*p, "ok")) {
-                               while (p[1] && strcmp(*++p, ";"));
-                               continue;
-                       }
-                       if (**p == '-') {
-                               isdeprecated = 1;
-                               oldsyntax(&argv);
-                               break;
-                       }
-               }
-       if (!isdeprecated)
-               newsyntax(argc, &argv);
-    
-       plan = find_formplan(argv);             /* execution plan */
-       find_execute(plan, paths);
-}
-

 /*
  * find_formplan --
  *     process the command line and create a "plan" corresponding to the
 /*
  * find_formplan --
  *     process the command line and create a "plan" corresponding to the


@@ -163,11 +132,14 @@ find_formplan(argv)
        return(plan);
 }
  
        return(plan);
 }
  

+FTS *tree;                     /* pointer to top of FTS hierarchy */
+

 /*
  * find_execute --
  *     take a search plan and an array of search paths and executes the plan
  *     over all FTSENT's returned for the given search paths.
  */
 /*
  * find_execute --
  *     take a search plan and an array of search paths and executes the plan
  *     over all FTSENT's returned for the given search paths.
  */

+void

 find_execute(plan, paths)
        PLAN *plan;             /* search plan */
        char **paths;           /* array of pathnames to traverse */
 find_execute(plan, paths)
        PLAN *plan;             /* search plan */
        char **paths;           /* array of pathnames to traverse */


@@ -175,10 +147,8 @@ find_execute(plan, paths)
        register FTSENT *entry;
        PLAN *p;
     
        register FTSENT *entry;
        PLAN *p;
     

-       if (!(tree = fts_open(paths, ftsoptions, (int (*)())NULL))) {
-               error("ftsopen", errno);
-               exit(1);
-       }
+       if (!(tree = fts_open(paths, ftsoptions, (int (*)())NULL)))
+               err("ftsopen: %s", strerror(errno));

 
        while (entry = fts_read(tree)) {
                switch(entry->fts_info) {
 
        while (entry = fts_read(tree)) {
                switch(entry->fts_info) {


@@ -193,10 +163,24 @@ find_execute(plan, paths)
                case FTS_DNR:
                case FTS_ERR:
                case FTS_NS:
                case FTS_DNR:
                case FTS_ERR:
                case FTS_NS:

-                       error(entry->fts_path, errno);
+                       (void)fprintf(stderr, "find: %s: %s\n", 
+                           entry->fts_path, strerror(errno));

                        continue;
                        continue;

+               case FTS_SL:
+                       if (entry->fts_level == FTS_ROOTLEVEL) {
+                               (void)fts_set(tree, entry, FTS_FOLLOW);
+                               continue;
+                       }
+                       break;

                }
 
                }
 

+#define        BADCH   " \t\n\\'\""
+               if (isxargs && strpbrk(entry->fts_path, BADCH)) {
+                       (void)fprintf(stderr,
+                           "find: illegal path: %s\n", entry->fts_path);
+                       continue;
+               }
+                

                /*
                 * call all the functions in the execution plan until one is
                 * false or all have been executed.  This is where we do all
                /*
                 * call all the functions in the execution plan until one is
                 * false or all have been executed.  This is where we do all