BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/find/option.c b/usr/src/usr.bin/find/option.c
index 3494582..934d2d7 100644 (file)
--- a/usr/src/usr.bin/find/option.c
+++ b/usr/src/usr.bin/find/option.c
@@ -5,83 +5,89 @@
  * This code is derived from software contributed to Berkeley by
  * Cimarron D. Taylor of the University of California, Berkeley.
  *
  * This code is derived from software contributed to Berkeley by
  * Cimarron D. Taylor of the University of California, Berkeley.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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

-static char sccsid[] = "@(#)option.c   5.3 (Berkeley) 7/1/90";
+static char sccsid[] = "@(#)option.c   5.8 (Berkeley) 6/4/91";

 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fts.h>
 #include <stdio.h>
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fts.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>

 #include "find.h"
 
 typedef struct _option {
        char *name;             /* option name */
 #include "find.h"
 
 typedef struct _option {
        char *name;             /* option name */

-       int token;              /* token value */
+       enum ntype token;       /* token type */

        PLAN *(*create)();      /* create function */
 #define        O_NONE          0x01    /* no call required */
 #define        O_ZERO          0x02    /* pass: nothing */
 #define        O_ARGV          0x04    /* pass: argv, increment argv */
        PLAN *(*create)();      /* create function */
 #define        O_NONE          0x01    /* no call required */
 #define        O_ZERO          0x02    /* pass: nothing */
 #define        O_ARGV          0x04    /* pass: argv, increment argv */

-#define        O_ARGVP         0x08    /* pass: *argv, T_OK || T_EXEC */
-#define        O_MASK          0x0f    /* mask of op bits */
-#define        O_OLD           0x10    /* deprecated syntax */
-#define        O_NEW           0x20    /* new syntax */
+#define        O_ARGVP         0x08    /* pass: *argv, N_OK || N_EXEC */

        int flags;
 } OPTION;
 
        int flags;
 } OPTION;
 

-PLAN   *c_atime(), *c_ctime(), *c_depth(), *c_exec(), *c_follow(),
-       *c_fstype(), *c_group(), *c_inum(), *c_links(), *c_ls(),
-       *c_mtime(), *c_name(), *c_newer(), *c_nogroup(), *c_nouser(),
-       *c_perm(), *c_print(), *c_prune(), *c_size(), *c_type(),
-       *c_user(), *c_xdev(), *c_openparen(), *c_closeparen(), *c_not(),
-       *c_or();
-

 OPTION options[] = {
 OPTION options[] = {

-       "!",            T_NOT,          c_not,          O_ZERO,
-       "(",            T_OPENPAREN,    c_openparen,    O_ZERO,
-       ")",            T_CLOSEPAREN,   c_closeparen,   O_ZERO,
-       "a",            T_AND,          NULL,           O_NONE|O_OLD,
-       "and",          T_AND,          NULL,           O_NONE|O_NEW,
-       "atime",        T_ATIME,        c_atime,        O_ARGV,
-       "ctime",        T_CTIME,        c_ctime,        O_ARGV,
-       "depth",        T_DEPTH,        c_depth,        O_ZERO|O_OLD,
-       "exec",         T_EXEC,         c_exec,         O_ARGVP,
-       "follow",       T_FOLLOW,       c_follow,       O_ZERO|O_OLD,
-       "fstype",       T_FSTYPE,       c_fstype,       O_ARGV,
-       "group",        T_GROUP,        c_group,        O_ARGV,
-       "inum",         T_INUM,         c_inum,         O_ARGV,
-       "links",        T_LINKS,        c_links,        O_ARGV,
-       "ls",           T_LS,           c_ls,           O_ZERO,
-       "mtime",        T_MTIME,        c_mtime,        O_ARGV,
-       "name",         T_NAME,         c_name,         O_ARGV,
-       "newer",        T_NEWER,        c_newer,        O_ARGV,
-       "nogroup",      T_NOGROUP,      c_nogroup,      O_ZERO,
-       "nouser",       T_NOUSER,       c_nouser,       O_ZERO,
-       "o",            T_OR,           c_or,           O_ZERO|O_OLD,
-       "ok",           T_OK,           c_exec,         O_ARGVP,
-       "or",           T_OR,           c_or,           O_ZERO|O_NEW,
-       "perm",         T_PERM,         c_perm,         O_ARGV,
-       "print",        T_PRINT,        c_print,        O_ZERO,
-       "prune",        T_PRUNE,        c_prune,        O_ZERO,
-       "size",         T_SIZE,         c_size,         O_ARGV,
-       "type",         T_TYPE,         c_type,         O_ARGV,
-       "user",         T_USER,         c_user,         O_ARGV,
-       "xdev",         T_XDEV,         c_xdev,         O_ZERO|O_OLD,
+       "!",            N_NOT,          c_not,          O_ZERO,
+       "(",            N_OPENPAREN,    c_openparen,    O_ZERO,
+       ")",            N_CLOSEPAREN,   c_closeparen,   O_ZERO,
+       "-a",           N_AND,          NULL,           O_NONE,
+       "-and",         N_AND,          NULL,           O_NONE,
+       "-atime",       N_ATIME,        c_atime,        O_ARGV,
+       "-ctime",       N_CTIME,        c_ctime,        O_ARGV,
+       "-depth",       N_DEPTH,        c_depth,        O_ZERO,
+       "-exec",        N_EXEC,         c_exec,         O_ARGVP,
+       "-follow",      N_FOLLOW,       c_follow,       O_ZERO,
+       "-fstype",      N_FSTYPE,       c_fstype,       O_ARGV,
+       "-group",       N_GROUP,        c_group,        O_ARGV,
+       "-inum",        N_INUM,         c_inum,         O_ARGV,
+       "-links",       N_LINKS,        c_links,        O_ARGV,
+       "-ls",          N_LS,           c_ls,           O_ZERO,
+       "-mtime",       N_MTIME,        c_mtime,        O_ARGV,
+       "-name",        N_NAME,         c_name,         O_ARGV,
+       "-newer",       N_NEWER,        c_newer,        O_ARGV,
+       "-nogroup",     N_NOGROUP,      c_nogroup,      O_ZERO,
+       "-nouser",      N_NOUSER,       c_nouser,       O_ZERO,
+       "-o",           N_OR,           c_or,           O_ZERO,
+       "-ok",          N_OK,           c_exec,         O_ARGVP,
+       "-or",          N_OR,           c_or,           O_ZERO,
+       "-perm",        N_PERM,         c_perm,         O_ARGV,
+       "-print",       N_PRINT,        c_print,        O_ZERO,
+       "-prune",       N_PRUNE,        c_prune,        O_ZERO,
+       "-size",        N_SIZE,         c_size,         O_ARGV,
+       "-type",        N_TYPE,         c_type,         O_ARGV,
+       "-user",        N_USER,         c_user,         O_ARGV,
+       "-xdev",        N_XDEV,         c_xdev,         O_ZERO,

        { NULL },
 };
 
        { NULL },
 };
 


@@ -97,34 +103,25 @@ PLAN *
 find_create(argvp)
        char ***argvp;
 {
 find_create(argvp)
        char ***argvp;
 {

-       extern int deprecated;

        register OPTION *p;
        register OPTION *p;

-       OPTION tmp;

        PLAN *new;
        char **argv;
        PLAN *new;
        char **argv;

-       int typecompare();
+       OPTION *option();

 
        argv = *argvp;
 
        argv = *argvp;

-       tmp.name = *argv++;
-
-       /* strip off any leading dash */
-       if (*tmp.name == '-')
-               ++tmp.name;

 
 

-       p = (OPTION *)bsearch(&tmp, options, sizeof(options)/sizeof(OPTION),
-           sizeof(OPTION), typecompare);
-       if (!p || deprecated && p->flags&O_NEW ||
-           !deprecated && p->flags&O_OLD) {
-               (void)fprintf(stderr, "find: unknown option %s.\n", *--argv);
+       if ((p = option(*argv)) == NULL) {
+               (void)fprintf(stderr, "find: unknown option %s.\n", *argv);

                exit(1);
        }
                exit(1);
        }

+       ++argv;

        if (p->flags & (O_ARGV|O_ARGVP) && !*argv) {
                (void)fprintf(stderr,
                    "find: %s requires additional arguments.\n", *--argv);
                exit(1);
        }
 
        if (p->flags & (O_ARGV|O_ARGVP) && !*argv) {
                (void)fprintf(stderr,
                    "find: %s requires additional arguments.\n", *--argv);
                exit(1);
        }
 

-       switch(p->flags&O_MASK) {
+       switch(p->flags) {

        case O_NONE:
                new = NULL;
                break;
        case O_NONE:
                new = NULL;
                break;


@@ -135,15 +132,27 @@ find_create(argvp)
                new = (p->create)(*argv++);
                break;
        case O_ARGVP:
                new = (p->create)(*argv++);
                break;
        case O_ARGVP:

-               new = (p->create)(&argv, p->token == T_OK);
+               new = (p->create)(&argv, p->token == N_OK);

                break;
        }
        *argvp = argv;
        return(new);
 }
 
                break;
        }
        *argvp = argv;
        return(new);
 }
 

+OPTION *
+option(name)
+       char *name;
+{
+       OPTION tmp;
+       int typecompare __P((const void *, const void *));
+
+       tmp.name = name;
+       return((OPTION *)bsearch(&tmp, options,
+           sizeof(options)/sizeof(OPTION), sizeof(OPTION), typecompare));
+}
+       

 typecompare(a, b)
 typecompare(a, b)

-       OPTION *a, *b;
+       const void *a, *b;

 {
 {

-       return(strcmp(a->name, b->name));
+       return(strcmp(((OPTION *)a)->name, ((OPTION *)b)->name));

 }
 }