projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix silly indirect-through-zero bug
[unix-history] / usr / src / usr.sbin / mtree / verify.c
diff --git a/usr/src/usr.sbin/mtree/verify.c b/usr/src/usr.sbin/mtree/verify.c
index d267e31..1bb6e46 100644 (file)
--- a/usr/src/usr.sbin/mtree/verify.c
+++ b/usr/src/usr.sbin/mtree/verify.c
@@ -6,166 +6,156 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)verify.c   5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)verify.c   5.9 (Berkeley) %G%";
 #endif /* not lint */
 
 #endif /* not lint */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/stat.h>
-#include <errno.h>
 #include <dirent.h>
 #include <dirent.h>
+#include <fts.h>
+#include <unistd.h>
+#include <errno.h>
 #include <stdio.h>
 #include "mtree.h"
 
 #include <stdio.h>
 #include "mtree.h"
 
-extern ENTRY *root;
-extern char path[];
+extern NODE *root;
 
 
-static dev_t device;
+static char path[MAXPATHLEN];
 
 verify()
 {
 
 verify()
 {
-       extern int xflag;
-       struct stat sbuf;
-
-       if (xflag) {
-               if (lstat(".", &sbuf)) {
-                       (void)fprintf(stderr, "mtree: root: %s\n",
-                           strerror(errno));
-                       exit(1);
-               }
-               device = sbuf.st_dev;
-       }
-       vwalk(root, path + 1);
-       miss(root, path + 1);
+       vwalk();
+       miss(root, path);
 }
 
 }
 
-static
-vwalk(level, tail)
-       register ENTRY *level;
-       register char *tail;
+vwalk()
 {
 {
-       extern int dflag, eflag, rflag, xflag;
-       register ENTRY *ep;
-       register DIR *dirp;
-       register struct dirent *dp;
-       struct stat sbuf;
+       extern int ftsoptions, dflag, eflag, rflag;
+       register FTS *t;
+       register FTSENT *p;
+       register NODE *ep, *level;
+       char *argv[2];
+       int ftsdepth = 0, specdepth = 0;
 
 
-       if (!(dirp = opendir("."))) {
-               (void)fprintf(stderr, "mtree: %s: %s\n",
-                   level == root ? "root" : path, strerror(errno));
+       argv[0] = ".";
+       argv[1] = (char *)NULL;
+       if (!(t = fts_open(argv, ftsoptions, (int (*)())NULL))) {
+               (void)fprintf(stderr,
+                   "mtree: fts_open: %s.\n", strerror(errno));
                exit(1);
        }
                exit(1);
        }
-       *tail++ = '/';
-       while ((dp = readdir(dirp))) {
-               if (dp->d_name[0] == '.' &&
-                   (!dp->d_name[1] || dp->d_name[1] == '.' && !dp->d_name[2]))
+       level = root;
+       while (p = fts_read(t)) {
+               switch(p->fts_info) {
+               case FTS_D:
+                       if (!strcmp(p->fts_name, "."))
+                               continue;
+                       ftsdepth++; 
+                       break;
+               case FTS_DP:
+                       ftsdepth--; 
+                       if (specdepth > ftsdepth) {
+                               for (level = level->parent; level->prev;
+                                     level = level->prev);  
+                               specdepth--;
+                       }
                        continue;
                        continue;
-               bcopy(dp->d_name, tail, dp->d_namlen + 1);
-               for (ep = level; ep; ep = ep->next)
-                       if (!strcmp(ep->name, dp->d_name))
-                               break;
-               if (ep && ep->flags&F_IGN) {
-                       ep->flags |= F_VISIT;
+               case FTS_DNR:
+               case FTS_ERR:
+               case FTS_NS:
+                       (void)fprintf(stderr, "mtree: %s: %s.\n",
+                           RP(p), strerror(errno));
                        continue;
                        continue;
+               default:
+                       if (dflag)
+                               continue;
                }
                }
-               if (lstat(dp->d_name, &sbuf)) {
-                       (void)fprintf(stderr, "mtree: %s: %s\n",
-                           path + 2, strerror(errno));
-                       exit(1);
-               }
-               if (!dflag || S_ISDIR(sbuf.st_mode))
-                       if (ep) {
-                               compare(ep->name, &ep->info, &sbuf);
+
+               for (ep = level; ep; ep = ep->next)
+                       if (ep->flags & F_MAGIC && fnmatch(ep->name,
+                           p->fts_name, FNM_PATHNAME|FNM_QUOTE) ||
+                           !strcmp(ep->name, p->fts_name)) {
                                ep->flags |= F_VISIT;
                                ep->flags |= F_VISIT;
-                       } else if (!eflag) {
-                               (void)printf("extra: %s%s",
-                                   path + 2, rflag ? "" : "\n");
-                               if (rflag)
-                                       if (unlink(path))
-                                           (void)printf(", not removed: %s\n",
-                                               strerror(errno));
-                                       else
-                                           (void)printf(", removed\n");
-                       }
-               if (S_ISDIR(sbuf.st_mode) &&
-                   (!xflag || device == sbuf.st_dev)) {
-                       if (chdir(dp->d_name)) {
-                               (void)fprintf(stderr, "mtree: %s: %s\n",
-                                   path + 2, strerror(errno));
-                               exit(1);
+                               if (ep->flags & F_IGN) {
+                                       (void)fts_set(t, p, FTS_SKIP);
+                                       continue;
+                               }
+                               compare(ep->name, ep, p);
+                               if (ep->child && ep->type == F_DIR &&
+                                   p->fts_info == FTS_D) {
+                                       level = ep->child;
+                                       specdepth++;
+                               }
+                               break;
                        }
                        }
-                       vwalk(ep ? ep->child : ep, tail + dp->d_namlen);
-                       if (chdir("..")) {
-                               (void)fprintf(stderr, "mtree: ..: %s\n",
-                                   strerror(errno));
-                               exit(1);
+
+               if (ep)
+                       continue;
+               if (!eflag) {
+                       (void)printf("extra: %s", RP(p));
+                       if (rflag) {
+                               if (unlink(p->fts_accpath)) {
+                                       (void)printf(", not removed: %s",
+                                           strerror(errno));
+                               } else
+                                       (void)printf(", removed");
                        }
                        }
+                       (void)putchar('\n');
                }
                }
+               (void)fts_set(t, p, FTS_SKIP);
        }
        }
-       (void)closedir(dirp);
+       (void)fts_close(t);
 }
 
 }
 
-static
-miss(level, tail)
-       register ENTRY *level;
+miss(p, tail)
+       register NODE *p;
        register char *tail;
 {
        extern int dflag, uflag;
        register int create;
        register char *tail;
 {
        extern int dflag, uflag;
        register int create;
-       register char *p;
+       register char *tp;
 
 
-       for (*tail++ = '/'; level; level = level->next) {
-               if (level->info.type != F_DIR &&
-                       (dflag || level->flags&F_VISIT))
-                               continue;
-               (void)strcpy(tail, level->name);
-               if (!(level->flags&F_VISIT))
-                       (void)printf("missing: %s%s", path + 2,
-                           uflag ? "" : "\n");
-               if (level->info.type != F_DIR)
+       for (; p; p = p->next) {
+               if (p->type != F_DIR && (dflag || p->flags & F_VISIT))
                        continue;
                        continue;
+               (void)strcpy(tail, p->name);
+               if (!(p->flags & F_VISIT))
+                       (void)printf("missing: %s", path);
+               if (p->type != F_DIR) {
+                       putchar('\n');
+                       continue;
+               }
+
                create = 0;
                create = 0;
-               if (uflag)
-                       if (mkdir(path, 0777))
-                               (void)printf(" (not created: %s)\n",
+               if (!(p->flags & F_VISIT) && uflag)
+#define        MINBITS (F_GROUP|F_MODE|F_OWNER)
+                       if ((p->flags & MINBITS) != MINBITS)
+                               (void)printf(" (not created -- group, mode or owner not specified)");
+                       else if (mkdir(path, S_IRWXU))
+                               (void)printf(" (not created: %s)",
                                    strerror(errno));
                        else {
                                create = 1;
                                    strerror(errno));
                        else {
                                create = 1;
-                               (void)printf(" (created)\n");
+                               (void)printf(" (created)");
                        }
                        }
-               for (p = tail; *p; ++p);
-               miss(level->child, p);
-               if (create) {
-                       *p = '\0';
-                       dirset(&level->info);
-               }
-       }
-}
 
 
-static
-dirset(s1)
-       register INFO *s1;
-{
-       register struct stat *s2;
-       struct stat sbuf;
+               if (!(p->flags & F_VISIT))
+                       (void)putchar('\n');
 
 
-       if (stat(path, &sbuf)) {
-               (void)fprintf(stderr,
-                   "mtree: %s: %s\n", path, strerror(errno));
-               return;
-       }
-       s2 = &sbuf;
+               for (tp = tail; *tp; ++tp);
+               *tp = '/';
+               miss(p->child, tp + 1);
+               *tp = '\0';
 
 
-       if (s1->flags&F_MODE && s1->st_mode != (s2->st_mode&07777) &&
-           chmod(path, s1->st_mode))
-               (void)printf("%s: permissions not set: %s\n",
-                   path + 2, strerror(errno));
-       if (s1->flags&F_OWNER && s1->st_uid != s2->st_uid &&
-           chown(path, s1->st_uid, -1))
-               (void)printf("%s: owner not modified: %s\n",
-                   path + 2, strerror(errno));
-       if (s1->flags&F_GROUP && s1->st_gid != s2->st_gid &&
-           chown(path, -1, s1->st_gid))
-               (void)printf("%s: group not modified: %s\n",
-                   path + 2, strerror(errno));
+               if (!create)
+                       continue;
+               if (chown(path, p->st_uid, p->st_gid)) {
+                       (void)printf("%s: owner/group/mode not modified: %s\n",
+                           path, strerror(errno));
+                       continue;
+               }
+               if (chmod(path, p->st_mode))
+                       (void)printf("%s: permissions not set: %s\n",
+                           path, strerror(errno));
+       }
 }
 }
-
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.