restore creation of y.tab.c

[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 8e035f0..9b0a382 100644 (file)
--- a/usr/src/usr.bin/find/find.c
+++ b/usr/src/usr.bin/find/find.c
@@ -1,7 +1,7 @@
-static char *sccsid = "@(#)find.c      4.2 (Berkeley) %G%";
+static char *sccsid = "@(#)find.c      4.7 (Berkeley) %G%";

 /*     find    COMPILE:        cc -o find -s -O -i find.c -lS  */
 #include <stdio.h>
 /*     find    COMPILE:        cc -o find -s -O -i find.c -lS  */
 #include <stdio.h>

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

 #include <sys/dir.h>
 #include <sys/stat.h>
 #define A_DAY  86400L /* a day full of seconds */
 #include <sys/dir.h>
 #include <sys/stat.h>
 #define A_DAY  86400L /* a day full of seconds */


@@ -181,7 +181,7 @@ struct anode *e3() { /* parse parens and predicates */
                return(mk(ino, (struct anode *)atoi(b), (struct anode *)s));
        else if(EQ(a, "-group")) {
                if((i=getunum("/etc/group", b)) == -1) {
                return(mk(ino, (struct anode *)atoi(b), (struct anode *)s));
        else if(EQ(a, "-group")) {
                if((i=getunum("/etc/group", b)) == -1) {

-                       if(gmatch(b, "[0-9][0-9]*"))
+                       if(gmatch(b, "[0-9]*"))

                                return mk(group, (struct anode *)atoi(b), (struct anode *)s);
                        fprintf(stderr, "find: cannot find -group name\n");
                        exit(1);
                                return mk(group, (struct anode *)atoi(b), (struct anode *)s);
                        fprintf(stderr, "find: cannot find -group name\n");
                        exit(1);


@@ -203,7 +203,8 @@ struct anode *e3() { /* parse parens and predicates */
                i = s=='d' ? S_IFDIR :
                    s=='b' ? S_IFBLK :
                    s=='c' ? S_IFCHR :
                i = s=='d' ? S_IFDIR :
                    s=='b' ? S_IFBLK :
                    s=='c' ? S_IFCHR :

-                   s=='f' ? 0100000 :
+                   s=='f' ? S_IFREG :
+                   s=='l' ? S_IFLNK :

                    0;
                return(mk(type, (struct anode *)i, (struct anode *)0));
        }
                    0;
                return(mk(type, (struct anode *)i, (struct anode *)0));
        }


@@ -456,8 +457,14 @@ doex(com)
        }
        nargv[np] = 0;
        if (np==0) return(9);
        }
        nargv[np] = 0;
        if (np==0) return(9);

-       if(fork()) /*parent*/ wait(&ccode);
-       else { /*child*/
+       if(fork()) /*parent*/ {
+#include <signal.h>
+               int (*old)() = signal(SIGINT, SIG_IGN);
+               int (*oldq)() = signal(SIGQUIT, SIG_IGN);
+               wait(&ccode);
+               signal(SIGINT, old);
+               signal(SIGQUIT, oldq);
+       } else { /*child*/

                chdir(Home);
                execvp(nargv[0], nargv, np);
                exit(1);
                chdir(Home);
                execvp(nargv[0], nargv, np);
                exit(1);


@@ -498,22 +505,16 @@ getunum(f, s) char *f, *s; { /* find user/group name and return number */
 }
 
 descend(name, fname, exlist)
 }
 
 descend(name, fname, exlist)

-struct anode *exlist;
-char *name, *fname;
+       struct anode *exlist;
+       char *name, *fname;

 {
 {

-       int     dir = 0, /* open directory */
-               offset,
-               dsize,
-               entries,
-               dirsize;
-       struct direct dentry[BUFSIZ / sizeof (struct direct)];
+       DIR     *dir = NULL;

        register struct direct  *dp;
        register struct direct  *dp;

-       register char *c1, *c2;
-       int i;
+       register char *c1;

        int rv = 0;
        char *endofname;
 
        int rv = 0;
        char *endofname;
 

-       if(stat(fname, &Statb)<0) {
+       if (lstat(fname, &Statb)<0) {

                fprintf(stderr, "find: bad status < %s >\n", name);
                return(0);
        }
                fprintf(stderr, "find: bad status < %s >\n", name);
                return(0);
        }


@@ -521,74 +522,39 @@ char *name, *fname;
        if((Statb.st_mode&S_IFMT)!=S_IFDIR)
                return(1);
 
        if((Statb.st_mode&S_IFMT)!=S_IFDIR)
                return(1);
 

-       for(c1 = name; *c1; ++c1);
-       if(*(c1-1) == '/')
+       for (c1 = name; *c1; ++c1);
+       if (*(c1-1) == '/')

                --c1;
        endofname = c1;
                --c1;
        endofname = c1;

-       dirsize = Statb.st_size;

 
 

-       if(chdir(fname) == -1)
+       if (chdir(fname) == -1)

                return(0);
                return(0);

-       for(offset=0 ; offset < dirsize ; offset += BUFSIZ) { /* each block */
-               dsize = BUFSIZ<(dirsize-offset)? BUFSIZ: (dirsize-offset);
-               if(!dir) {
-                       if((dir=open(".", 0))<0) {
-                               fprintf(stderr, "find: cannot open < %s >\n",
-                                       name);
-                               rv = 0;
-                               goto ret;
-                       }
-                       if(offset) lseek(dir, (long)offset, 0);
-                       if(read(dir, (char *)dentry, dsize)<0) {
-                               fprintf(stderr, "find: cannot read < %s >\n",
-                                       name);
-                               rv = 0;
-                               goto ret;
-                       }
-                       if(dir > 10) {
-                               close(dir);
-                               dir = 0;
-                       }
-               } else 
-                       if(read(dir, (char *)dentry, dsize)<0) {
-                               fprintf(stderr, "find: cannot read < %s >\n",
-                                       name);
-                               rv = 0;
-                               goto ret;
-                       }
-               for(dp=dentry, entries=dsize>>4; entries; --entries, ++dp) { /* each directory entry */
-                       if(dp->d_ino==0
-                       || (dp->d_name[0]=='.' && dp->d_name[1]=='\0')
-                       || (dp->d_name[0]=='.' && dp->d_name[1]=='.' && dp->d_name[2]=='\0'))
-                               continue;
-                       c1 = endofname;
-                       *c1++ = '/';
-                       c2 = dp->d_name;
-                       for(i=0; i<14; ++i)
-                               if(*c2)
-                                       *c1++ = *c2++;
-                               else
-                                       break;
-                       *c1 = '\0';
-                       if(c1 == endofname) { /* ?? */
-                               rv = 0;
-                               goto ret;
-                       }
-                       Fname = endofname+1;
-                       if(!descend(name, Fname, exlist)) {
-                               *endofname = '\0';
-                               chdir(Home);
-                               if(chdir(Pathname) == -1) {
-                                       fprintf(stderr, "find: bad directory tree\n");
-                                       exit(1);
-                               }
+       if ((dir = opendir(".")) == NULL) {
+               fprintf(stderr, "find: cannot open < %s >\n", name);
+               rv = 0;
+               goto ret;
+       }
+       for (dp = readdir(dir); dp != NULL; dp = readdir(dir)) {
+               if ((dp->d_name[0]=='.' && dp->d_name[1]=='\0') ||
+                   (dp->d_name[0]=='.' && dp->d_name[1]=='.' && dp->d_name[2]=='\0'))
+                       continue;
+               c1 = endofname;
+               *c1++ = '/';
+               strcpy(c1, dp->d_name);
+               Fname = endofname+1;
+               if(!descend(name, Fname, exlist)) {
+                       *endofname = '\0';
+                       chdir(Home);
+                       if(chdir(Pathname) == -1) {
+                               fprintf(stderr, "find: bad directory tree\n");
+                               exit(1);

                        }
                }
        }
        rv = 1;
 ret:
        if(dir)
                        }
                }
        }
        rv = 1;
 ret:
        if(dir)

-               close(dir);
+               closedir(dir);

        if(chdir("..") == -1) {
                *endofname = '\0';
                fprintf(stderr, "find: bad directory <%s>\n", name);
        if(chdir("..") == -1) {
                *endofname = '\0';
                fprintf(stderr, "find: bad directory <%s>\n", name);