From 202dd4ce070b42fff294eb5621255250845cdb3b Mon Sep 17 00:00:00 2001 From: Keith Bostic Date: Sat, 12 May 1990 22:29:40 -0800 Subject: [PATCH] new syntax SCCS-vsn: usr.bin/find/find.1 6.10 SCCS-vsn: usr.bin/find/find.c 4.26 SCCS-vsn: usr.bin/find/misc.c 5.2 SCCS-vsn: usr.bin/find/option.c 5.2 --- usr/src/usr.bin/find/find.1 | 242 +++++++++++++++++++--------------- usr/src/usr.bin/find/find.c | 28 +++- usr/src/usr.bin/find/misc.c | 50 ++----- usr/src/usr.bin/find/option.c | 70 +++++----- 4 files changed, 210 insertions(+), 180 deletions(-) diff --git a/usr/src/usr.bin/find/find.1 b/usr/src/usr.bin/find/find.1 index 7b9f48935e..c70d624a0d 100644 --- a/usr/src/usr.bin/find/find.1 +++ b/usr/src/usr.bin/find/find.1 @@ -3,7 +3,7 @@ .\" .\" %sccs.include.redist.man% .\" -.\" @(#)find.1 6.9 (Berkeley) %G% +.\" @(#)find.1 6.10 (Berkeley) %G% .\" .TH FIND 1 "" .AT 3 @@ -11,16 +11,64 @@ find \- walk a file hierarchy .SH SYNOPSIS .ft B -find path ... expression +find [ \-dsx ] [ \-f path ] [ path ] expression .ft R .SH DESCRIPTION .I Find recursively descends the directory tree for each .I path -listed, evaluating an ``expression'' composed of the ``primaries'' -listed below (each of which is a separate argument to -.IR find ) -in terms of each file in the tree. +listed, evaluating an ``expression'' (composed of the ``primaries'' +and ``operands'' listed below) in terms of each file in the tree. +.PP +The options are as follows: +.TP +.B \-d +The +.B \-d +option causes find to perform a depth\-first traversal, i.e. directories +are visited in post\-order and all entries in a directory will be acted +on before the directory itself. +By default, +.I find +visits directories in pre\-order, i.e. before their contents. +Note, the default is +.I not +a breadth\-first traversal. +.TP +.B \-f +The +.B \-f +option specifies a file hierarchy for +.I find +to traverse. +If no +.B \-f +option is specified, the first operand after the options is +expected to be the file to be traversed. +.TP +.B \-s +The +.B \-s +option causes the file information and file type (see +.IR stat (2)), +returned for each symbolic link to be those of the file referenced by the +link, not the link itself. +If the referenced file does not exist, the file information and type will +be for the link itself. +.TP +.B \-x +The +.B \-x +option causes +.I find +to not descend into directories that have a different device number +than the file the descent began from. +.PP +Operands and primaries must each be a separate argument to +.IR find . +Primaries which themselves take arguments expect each argument +to be a separate argument to +.IR find . .PP All primaries which take a numeric argument allow the number to be preceded by a plus sign (``+'') or a minus sign (``\-''). @@ -32,14 +80,14 @@ and neither means ``exactly .BR n ''. .SH PRIMARIES .TP -.B \-atime n +.B atime n True if the difference between the file last access time and the time .I find was started, rounded up to the next full 24\-hour period, is .B n 24\-hour periods. .TP -.B \-ctime n +.B ctime n True if the difference between the time of last change of file status information and the time .I find @@ -47,49 +95,24 @@ was started, rounded up to the next full 24\-hour period, is .B n 24\-hour periods. .TP -.B \-depth -This primary always evaluates to true. -It causes find to perform a depth\-first traversal, i.e. directories are -visited in post\-order and all entries in a directory will be acted on -before the directory itself. -By default, -.I find -visits directories in pre\-order, i.e. before their contents. -Note, the default is not a breadth-first traversal. -.TP -.B \-exec utility [argument ...] ; +.B exec utility [argument ...] ; True if the program named .B utility returns a zero value as its exit status. Optional arguments may be passed to the utility. The expression must be terminated by a semicolon (``;''). -If the string ``{}'' appears anywhere in the utility name or the arguments -it is replaced by the pathname of the current file. +If the string ``{}'' appears anywhere in the utility name or the +arguments it is replaced by the pathname of the current file. Utility will be executed in the directory from which .I find was executed. -Note, the -.IR utility , -optional -.I arguments -and terminating semicolon must each be a separate argument to -.IR find . -.TP -.B \-follow -This primary always evaluates to true. -It causes the file information and file type (see -.IR stat (2)), -returned for each symbolic link to be those of the file referenced by the -link, not the link itself. -If the referenced file does not exist, the file information and type will -be for the link itself. .TP -.B \-fstype type +.B fstype type True if the file is contained in a file system of type .BR type. Currently supported types are ``mfs'', ``nfs'', ``pc'' and ``ufs''. .TP -.B \-group gname +.B group gname True if the file belongs to the group .BR gname . If @@ -98,16 +121,16 @@ is numeric and there is no such group name, then .B gname is treated as a group id. .TP -.B \-inum n +.B inum n True if the file has inode number .BR n . .TP -.B \-links n +.B links n True if the file has .B n links. .TP -.B \-ls +.B ls This primary always evaluates to true. The following information for the current file is written to standard output: its inode number, size in 512\-byte blocks, file permissions, number of hard @@ -118,46 +141,47 @@ If the file is a symbolic link, the pathname of the linked\-to file will be displayed preceded by ``\->''. The format is identical to that produced by ``ls \-dgils''. .TP -.B \-mtime n +.B mtime n True if the difference between the file last modification time and the time .I find was started, rounded up to the next full 24\-hour period, is .B n 24\-hour periods. .TP -.B \-ok utility [argument ...] ; +.B ok utility [argument ...] ; The -.B \-ok +.B ok primary is identical to the -.B \-exec +.B exec primary with the exception that .I find requests user affirmation for the execution of the utility by printing a message to the terminal and reading a response. If the response is other than ``y'' the command is not executed and the value of the -.B \-ok +.B ok expression is false. .TP -.B \-name pattern +.B name pattern True if the last component of the pathname being examined matches .BR pattern . Special shell pattern matching characters (``['', ``]'', ``*'', and ``?'') may be used as part of .BR pattern . -These characters may be escaped with a backslash (``\e''). +These characters may be matched explicitly by escaping them with a +backslash (``\e''). .TP -.B \-newer file +.B newer file True if the current file has a more recent last modification time than .BR file . .TP -.B \-nouser +.B nouser True if the file belongs to an unknown user. .TP -.B \-nogroup +.B nogroup True if the file belongs to an unknown group. .TP -.B \-perm [\-]mode +.B perm [\-]mode The .B mode may be either symbolic (see @@ -174,23 +198,23 @@ If the mode is not preceded by a dash, this primary evaluates to true if the bits in the mode exactly match the file's mode bits. Note, the first character of a symbolic mode may not be a dash (``\-''). .TP -.B \-print +.B print This primary always evaluates to true. It prints the pathname of the current file to standard output. The expression is appended to the user specified expression if neither -.BR \-exec , -.BR \-ls , +.BR exec , +.BR ls , or -.B \-ok +.B ok is specified. .TP -.B \-prune +.B prune This primary always evaluates to true. It causes .I find to not descend into the current file. .TP -.B \-size n[c] +.B size n[c] True if the file's size, rounded up, in 512\-byte blocks is .BR n . If @@ -200,7 +224,7 @@ file's size is .I n bytes. .TP -.B \-type t +.B type t True if the file is of the specified type. Possible file types are as follows: .RS @@ -239,7 +263,7 @@ FIFO socket .RE .TP -.B \-user uname +.B user uname True if the file belongs to the user .BR uname . If @@ -247,13 +271,6 @@ If is numeric and there is no such user name, then .B uname is treated as a user id. -.TP -.B \-xdev -This primary always evaluates to true. -It causes -.I find -to not descend into directories that have a different device number -than the file the descent began from. .SH OPERATORS The primaries may be combined using the following operators. The operators are listed in order of decreasing precedence. @@ -266,22 +283,22 @@ true. This is the unary NOT operator. It evaluates to true if the expression is false. .TP -.B "expression \-a expression" +.B "expression and expression" .br .ns .TP .B "expression expression" The -.B \-a +.B and operator is the logical AND operator. As it is implied by the juxtaposition of two expressions it does not have to be specified. The expression evaluates to true if both expressions are true. The second expression is not evaluated if the first expression is false. .TP -.B "expression \-o expression" +.B "expression or expression" The -.B \-o +.B or operator is the logical OR operator. The expression evaluates to true if either the first or the second expression is true. @@ -290,18 +307,18 @@ The second expression is not evaluated if the first expression is true. .PP The following examples are shown as given to the shell: .TP -find / \e! \-name "*.c" \-print +find / \e! name "*.c" print Print out a list of all the files whose names do not end in ``.c''. .TP -find / \-newer ttt \-user wnj \-print +find / newer ttt user wnj print Print out a list of all the files owned by user ``wnj'' that are newer than the file ``ttt''. .TP -find / \e! \e( \-newer ttt \-user wnj \e) \-print +find / \e! \e( newer ttt user wnj \e) print Print out a list of all the files which are not both newer than ``ttt'' and owned by ``wnj''. .TP -find / \e( \-newer ttt \-o \-user wnj \e) \-print +find / \e( newer ttt or user wnj \e) print Print out a list of all the files that are either owned by ``wnj'' or that are newer than ``ttt''. .SH "SEE ALSO" @@ -310,38 +327,57 @@ getpwent(3), getgrent(3), strmode(3) .SH STANDARDS The .I find -utility is expected to be POSIX 1003.2 compatible. -The primaries -.B \-follow -.B \-inum -and -.BR \-ls -are Berkeley extensions. -.SH BUGS -The primaries -.BR \-depth , -.BR \-follow , +utility syntax is a replacement for the syntax specified by the POSIX +1003.2 standard. +The standard syntax is also supported; see the COMPATIBILITY section +below for details. +.PP +The +.B \-s +option as well as the primaries +.B inum and -.B \-xdev -are really global variables that take effect before the traversal begins, -possibly leading to unexpected results. -An example would be the expression ``\-print \-o \-depth''. -As \-print always evaluates to true, the standard order of evaluation -would imply that \-depth would never be evaluated. -These primaries actually behave as multi-letter options which are -evaluated and replaced with the moral equivalent of \-true when +.BR ls +are extensions to the POSIX standard. +.SH COMPATIBILITY +The traditional, and standardized, syntax for .I find -begins execution. +is as follows. +All of the primaries are preceded by a dash (``\-''), i.e. the +primary ``group'' is specified as ``\-group''. +The +.BR \-d , +.BR \-s , +and +.BR \-x +options are implemented using the primaries ``\-depth'', ``\-follow'', +and ``\-xdev''. +These primaries always evaluate to true. +The operator ``or'' is implemented as ``\-o'', and the operator +``and'' is implemented as ``\-a''. +The set of file trees to be traversed are specified as the first operands +to +.IR find . +The first operand beginning with a dash (``\-''), exclamation point (``!'') +or left parenthesis (``('') is assumed to be the beginning of the expression +and the end of the files to be traversed. .PP -Any command line argument beginning with a dash (``\-''), exclamation point -(``!'') or left parenthesis (``('') is assumed to be part of an expression. -The first such argument is used to delimit the end of the file names and -the beginning of the expression. -Traversing file trees with names beginning with one of these characters -is tough. +The +.I find +syntax was changed for two reasons. +The first is that the ``\-depth'', ``\-follow'' and ``\-xdev'' primaries +are really global variables that take effect before the traversal begins. +This causes some legal expressions to have unexpected results. +An example is the expression ``\-print \-o \-depth''. +As \-print always evaluates to true, the standard order of evaluation +implies that \-depth would never be evaluated. +This is not the case. .PP -Several special characters used by +The second reason is that traversing file trees with names beginning with +a dash, exclamation point or left parenthesis was impossible. +.SH BUGS +The special characters used by .I find -are also special characters to the shell programs. +are also special characters to many shell programs. In particular, the characters ``*'', ``['', ``]'', ``?'', ``('', ``)'', ``!'', ``\e'' and ``;'' may have to be escaped from the shell. diff --git a/usr/src/usr.bin/find/find.c b/usr/src/usr.bin/find/find.c index 0503386351..bc25d5b40b 100644 --- a/usr/src/usr.bin/find/find.c +++ b/usr/src/usr.bin/find/find.c @@ -15,7 +15,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)find.c 4.25 (Berkeley) %G%"; +static char sccsid[] = "@(#)find.c 4.26 (Berkeley) %G%"; #endif /* not lint */ #include @@ -30,6 +30,7 @@ FTS *tree; /* pointer to top of FTS hierarchy */ time_t now; /* time find was run */ dev_t curdev = (dev_t)-1; /* device number of current tree */ int ftsoptions; /* options passed to ftsopen() */ +int deprecated; /* old or new syntax */ int depth; /* set by -depth option */ int output_specified; /* one of -print, -ok or -exec was specified */ int xdev; /* set by -xdev option */ @@ -39,18 +40,32 @@ main(argc, argv) char **argv; { PLAN *plan; - char **paths, **find_getpaths(); + char **p, **paths; PLAN *find_formplan(); time_t time(); - (void)time(&now); /* initialize the time-of-day */ + (void)time(&now); /* initialize the time-of-day */ if (argc < 2) usage(); - + + paths = argv; ftsoptions = FTS_MULTIPLE|FTS_NOSTAT|FTS_PHYSICAL; - paths = find_getpaths(&argv); /* places to start search */ + /* + * if arguments start with an option, it's new syntax; otherwise, + * if has a "-option" anywhere it must be old syntax. + */ + if (argv[1][0] != '-') + for (p = argv + 1; *p; ++p) + if (**p == '-') { + deprecated = 1; + oldsyntax(&argv); + break; + } + if (!deprecated) + newsyntax(argc, &argv); + plan = find_formplan(argv); /* execution plan */ find_execute(plan, paths); } @@ -65,7 +80,6 @@ find_formplan(argv) char **argv; { PLAN *plan, *tail, *new; - int i; PLAN *c_print(), *find_create(), *find_squish_not(), *find_squish_or(); PLAN *find_squish_paren(); @@ -192,7 +206,7 @@ find_execute(plan, paths) /* always keep curdev up to date, -fstype uses it. */ if (xdev && curdev != entry->statb.st_dev && - ftsset(tree, entry, FTS_SKIP)) { + curdev != -1 && ftsset(tree, entry, FTS_SKIP)) { (void)fprintf(stderr, "find: %s: %s.\n", entry->path, strerror(errno)); exit(1); diff --git a/usr/src/usr.bin/find/misc.c b/usr/src/usr.bin/find/misc.c index 80f22b40e9..d697d1606f 100644 --- a/usr/src/usr.bin/find/misc.c +++ b/usr/src/usr.bin/find/misc.c @@ -9,7 +9,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)misc.c 5.1 (Berkeley) %G%"; +static char sccsid[] = "@(#)misc.c 5.2 (Berkeley) %G%"; #endif /* not lint */ #include @@ -17,45 +17,9 @@ static char sccsid[] = "@(#)misc.c 5.1 (Berkeley) %G%"; #include #include "find.h" -/* - * find_getpaths -- - * remove the path strings from the command line and returns them in - * another array. The find syntax assumes all command arguments up - * to the first one beginning with a '-', '(' or '!' are pathnames. - */ -char ** -find_getpaths(argvp) - char ***argvp; -{ - register char **argv; - char **start; - - /* - * find first '-', '(' or '!' to delimit paths; if no paths, it's - * an error. Shift the array back one at the same time, creating - * a separate array of pathnames. - */ - for (argv = *argvp + 1;; ++argv) { - argv[-1] = argv[0]; - if (!*argv || **argv == '-' || **argv == '!' || **argv == '(') - break; - } - - if (argv == *argvp + 1) - usage(); - - argv[-1] = NULL; - - start = *argvp; /* save beginning of path array */ - *argvp = argv; /* move argv value */ - return(start); /* return path array */ -} - /* * find_subst -- * Replace occurrences of {} in s1 with s2 and return the result string. - * Find_subst always returns a newly allocated string which should be - * freed by the caller. */ find_subst(orig, store, path, len) char *orig, **store, *path; @@ -63,7 +27,7 @@ find_subst(orig, store, path, len) { register int plen; register char ch, *p; - char *realloc(); + char *realloc(), *strerror(); plen = strlen(path); for (p = *store; ch = *orig; ++orig) @@ -120,7 +84,7 @@ char * emalloc(len) u_int len; { - char *p, *malloc(); + char *p, *malloc(), *strerror(); if (!(p = malloc(len))) { (void)fprintf(stderr, "find: %s.\n", strerror(errno)); @@ -131,6 +95,12 @@ emalloc(len) usage() { - (void)fprintf(stderr, "usage: find path-list expression\n"); + extern int deprecated; + + if (deprecated) + (void)fprintf(stderr, "usage: find path-list expression\n"); + else + (void)fprintf(stderr, + "usage: find [-dsx] -f path ... expression\n"); exit(1); } diff --git a/usr/src/usr.bin/find/option.c b/usr/src/usr.bin/find/option.c index 5a46e003b5..376d970906 100644 --- a/usr/src/usr.bin/find/option.c +++ b/usr/src/usr.bin/find/option.c @@ -9,7 +9,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)option.c 5.1 (Berkeley) %G%"; +static char sccsid[] = "@(#)option.c 5.2 (Berkeley) %G%"; #endif /* not lint */ #include @@ -26,13 +26,16 @@ typedef struct _option { #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 */ 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_ok(), *c_perm(), *c_print(), *c_prune(), *c_size(), *c_type(), + *c_perm(), *c_print(), *c_prune(), *c_size(), *c_type(), *c_user(), *c_xdev(), *c_openparen(), *c_closeparen(), *c_not(), *c_or(); @@ -40,31 +43,33 @@ OPTION options[] = { "!", T_NOT, c_not, O_ZERO, "(", T_OPENPAREN, c_openparen, O_ZERO, ")", T_CLOSEPAREN, c_closeparen, O_ZERO, - "-a", T_AND, (PLAN *(*)())-1,O_NONE, - "-atime", T_ATIME, c_atime, O_ARGV, - "-ctime", T_CTIME, c_ctime, O_ARGV, - "-depth", T_DEPTH, c_depth, O_ZERO, - "-exec", T_EXEC, c_exec, O_ARGVP, - "-follow", T_FOLLOW, c_follow, O_ZERO, - "-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, - "-ok", T_OK, c_exec, O_ARGVP, - "-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, + "a", T_AND, (PLAN *(*)())-1,O_NONE|O_OLD, + "and", T_AND, (PLAN *(*)())-1,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, { NULL }, }; @@ -80,19 +85,24 @@ PLAN * find_create(argvp) char ***argvp; { + extern int deprecated; register OPTION *p; OPTION tmp; PLAN *new; char **argv; - OPTION *find_typelookup(); int typecompare(); 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) { + if (!p || deprecated && p->flags&O_NEW || + !deprecated && p->flags&O_OLD) { (void)fprintf(stderr, "find: unknown option %s.\n", *--argv); exit(1); } @@ -102,7 +112,7 @@ find_create(argvp) exit(1); } - switch(p->flags) { + switch(p->flags&O_MASK) { case O_ZERO: new = (p->create)(); break; -- 2.20.1