BSD 4_4 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 d42816c..87337ca 100644 (file)
--- a/usr/src/usr.bin/find/option.c
+++ b/usr/src/usr.bin/find/option.c
@@ -1,69 +1,87 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     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.
  *
  *
  * 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

-static char sccsid[] = "@(#)option.c   5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)option.c   8.1 (Berkeley) 6/6/93";

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

+
+#include <err.h>

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

-#include "find.h"

 
 

-typedef struct _option {
-       char *name;             /* option name */
-       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 */
-#define        O_ARGVP         0x08    /* pass: *argv, N_OK || N_EXEC */
-       int flags;
-} OPTION;
+#include "find.h"

 
 /* NB: the following table must be sorted lexically. */
 static OPTION options[] = {
 
 /* NB: the following table must be sorted lexically. */
 static OPTION options[] = {

-       "!",            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,
-       "-path",        N_PATH,         c_path,         O_ARGV,
-       "-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,
+       { "!",          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 },
+       { "-path",      N_PATH,         c_path,         O_ARGV },
+       { "-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 },

 };
 
 /*
 };
 
 /*


@@ -81,20 +99,14 @@ find_create(argvp)
        register OPTION *p;
        PLAN *new;
        char **argv;
        register OPTION *p;
        PLAN *new;
        char **argv;

-       OPTION *option();

 
        argv = *argvp;
 
 
        argv = *argvp;
 

-       if ((p = option(*argv)) == NULL) {
-               (void)fprintf(stderr, "find: unknown option %s.\n", *argv);
-               exit(1);
-       }
+       if ((p = option(*argv)) == NULL)
+               errx(1, "%s: unknown option", *argv);

        ++argv;
        ++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)
+               errx(1, "%s: requires additional arguments", *--argv);

 
        switch(p->flags) {
        case O_NONE:
 
        switch(p->flags) {
        case O_NONE:


@@ -109,9 +121,11 @@ find_create(argvp)
        case O_ARGVP:
                new = (p->create)(&argv, p->token == N_OK);
                break;
        case O_ARGVP:
                new = (p->create)(&argv, p->token == N_OK);
                break;

+       default:
+               abort();

        }
        *argvp = argv;
        }
        *argvp = argv;

-       return(new);
+       return (new);

 }
 
 OPTION *
 }
 
 OPTION *


@@ -122,12 +136,13 @@ option(name)
        int typecompare __P((const void *, const void *));
 
        tmp.name = name;
        int typecompare __P((const void *, const void *));
 
        tmp.name = name;

-       return((OPTION *)bsearch(&tmp, options,
+       return ((OPTION *)bsearch(&tmp, options,

            sizeof(options)/sizeof(OPTION), sizeof(OPTION), typecompare));
 }
            sizeof(options)/sizeof(OPTION), sizeof(OPTION), typecompare));
 }

-       
+
+int

 typecompare(a, b)
        const void *a, *b;
 {
 typecompare(a, b)
        const void *a, *b;
 {

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

 }
 }