do not need to check for root device as blockcheck has done so already;

[unix-history] / usr / src / sbin / fsck / main.c

diff --git a/usr/src/sbin/fsck/main.c b/usr/src/sbin/fsck/main.c
index 2fc1a70..0b600f1 100644 (file)
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -1,153 +1,157 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980, 1986 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980, 1986 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.6 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)main.c     5.22 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <sys/param.h>
 
 #include <sys/param.h>

-#include <sys/inode.h>
-#include <sys/fs.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
+#include <ufs/dinode.h>
+#include <ufs/fs.h>

 #include <fstab.h>
 #include <strings.h>
 #include <fstab.h>
 #include <strings.h>

+#include <ctype.h>
+#include <stdio.h>

 #include "fsck.h"
 
 #include "fsck.h"
 

-char   *rawname(), *unrawname(), *blockcheck();
-int    catch(), catchquit(), voidquit();
+void   catch(), catchquit(), voidquit();

 int    returntosingle;
 int    returntosingle;

-int    (*signal())();

 
 main(argc, argv)
        int     argc;
        char    *argv[];
 {
 
 main(argc, argv)
        int     argc;
        char    *argv[];
 {

-       struct fstab *fsp;
-       int pid, passno, anygtr, sumstatus;
-       char *name;
+       char ch;
+       int ret, maxrun = 0;
+       extern int docheck(), checkfilesys();
+       extern char *optarg;
+       extern int optind;

 
        sync();
 
        sync();

-       while (--argc > 0 && **++argv == '-') {
-               switch (*++*argv) {
-
+       while ((ch = getopt(argc, argv, "cdpnNyYb:l:m:")) != EOF) {
+               switch (ch) {

                case 'p':
                        preen++;
                        break;
 
                case 'b':
                case 'p':
                        preen++;
                        break;
 
                case 'b':

-                       if (argv[0][1] != '\0') {
-                               bflag = atoi(argv[0]+1);
-                       } else {
-                               bflag = atoi(*++argv);
-                               argc--;
-                       }
+                       if (!isdigit(*optarg))
+                               errexit("-b flag requires a number\n");
+                       bflag = atoi(optarg);

                        printf("Alternate super block location: %d\n", bflag);
                        break;
 
                        printf("Alternate super block location: %d\n", bflag);
                        break;
 

+               case 'c':
+                       cvtflag++;
+                       break;
+

                case 'd':
                        debug++;
                        break;
 
                case 'd':
                        debug++;
                        break;
 

-               case 'n':       /* default no answer flag */
+               case 'l':
+                       if (!isdigit(*optarg))
+                               errexit("-l flag requires a number\n");
+                       maxrun = atoi(optarg);
+                       break;
+
+               case 'm':
+                       if (!isdigit(*optarg))
+                               errexit("-m flag requires a mode\n");
+                       sscanf(optarg, "%o", &lfmode);
+                       if (lfmode &~ 07777)
+                               errexit("bad mode to -m: %o\n", lfmode);
+                       printf("** lost+found creation mode %o\n", lfmode);
+                       break;
+
+               case 'n':

                case 'N':
                        nflag++;
                        yflag = 0;
                        break;
 
                case 'N':
                        nflag++;
                        yflag = 0;
                        break;
 

-               case 'y':       /* default yes answer flag */
+               case 'y':

                case 'Y':
                        yflag++;
                        nflag = 0;
                        break;
 
                default:
                case 'Y':
                        yflag++;
                        nflag = 0;
                        break;
 
                default:

-                       errexit("%c option?\n", **argv);
+                       errexit("%c option?\n", ch);

                }
        }
                }
        }

+       argc -= optind;
+       argv += optind;

        if (signal(SIGINT, SIG_IGN) != SIG_IGN)
                (void)signal(SIGINT, catch);
        if (preen)
                (void)signal(SIGQUIT, catchquit);
        if (argc) {
        if (signal(SIGINT, SIG_IGN) != SIG_IGN)
                (void)signal(SIGINT, catch);
        if (preen)
                (void)signal(SIGQUIT, catchquit);
        if (argc) {

-               while (argc-- > 0) {
-                       hotroot = 0;
+               while (argc-- > 0)

                        checkfilesys(*argv++);
                        checkfilesys(*argv++);

-               }

                exit(0);
        }
                exit(0);
        }

-       sumstatus = 0;
-       passno = 1;
-       do {
-               anygtr = 0;
-               if (setfsent() == 0)
-                       errexit("Can't open checklist file: %s\n", FSTAB);
-               while ((fsp = getfsent()) != 0) {
-                       if (strcmp(fsp->fs_type, FSTAB_RW) &&
-                           strcmp(fsp->fs_type, FSTAB_RO) &&
-                           strcmp(fsp->fs_type, FSTAB_RQ))
-                               continue;
-                       if (preen == 0 ||
-                           passno == 1 && fsp->fs_passno == passno) {
-                               name = blockcheck(fsp->fs_spec);
-                               if (name != NULL)
-                                       checkfilesys(name);
-                               else if (preen)
-                                       exit(8);
-                       } else if (fsp->fs_passno > passno) {
-                               anygtr = 1;
-                       } else if (fsp->fs_passno == passno) {
-                               pid = fork();
-                               if (pid < 0) {
-                                       perror("fork");
-                                       exit(8);
-                               }
-                               if (pid == 0) {
-                                       (void)signal(SIGQUIT, voidquit);
-                                       name = blockcheck(fsp->fs_spec);
-                                       if (name == NULL)
-                                               exit(8);
-                                       checkfilesys(name);
-                                       exit(0);
-                               }
-                       }
-               }
-               if (preen) {
-                       union wait status;
-                       while (wait(&status) != -1)
-                               sumstatus |= status.w_retcode;
-               }
-               passno++;
-       } while (anygtr);
-       if (sumstatus)
-               exit(8);
-       (void)endfsent();
+       ret = checkfstab(preen, maxrun, docheck, checkfilesys);

        if (returntosingle)
                exit(2);
        if (returntosingle)
                exit(2);

-       exit(0);
+       exit(ret);
+}
+
+/*
+ * Determine whether a filesystem should be checked.
+ */
+docheck(fsp)
+       register struct fstab *fsp;
+{
+
+       if (strcmp(fsp->fs_vfstype, "ufs") ||
+           (strcmp(fsp->fs_type, FSTAB_RW) &&
+            strcmp(fsp->fs_type, FSTAB_RO)) ||
+           fsp->fs_passno == 0)
+               return (0);
+       return (1);

 }
 
 }
 

-checkfilesys(filesys)
-       char *filesys;
+/*
+ * Check the specified filesystem.
+ */
+/* ARGSUSED */
+checkfilesys(filesys, mntpt, auxdata)
+       char *filesys, *mntpt;
+       long auxdata;

 {
        daddr_t n_ffree, n_bfree;
        struct dups *dp;
        struct zlncnt *zlnp;
 
 {
        daddr_t n_ffree, n_bfree;
        struct dups *dp;
        struct zlncnt *zlnp;
 

+       (void)signal(SIGQUIT, voidquit);

        devname = filesys;
        devname = filesys;

+       if (debug && preen)
+               pwarn("starting\n");

        if (setup(filesys) == 0) {
                if (preen)
                        pfatal("CAN'T CHECK FILE SYSTEM.");
        if (setup(filesys) == 0) {
                if (preen)
                        pfatal("CAN'T CHECK FILE SYSTEM.");

-               return;
+               return (0);

        }
        /*
         * 1: scan inodes tallying blocks used
        }
        /*
         * 1: scan inodes tallying blocks used


@@ -207,14 +211,15 @@ checkfilesys(filesys)
            n_files, n_blks, n_ffree + sblock.fs_frag * n_bfree);
        printf("(%d frags, %d blocks, %.1f%% fragmentation)\n",
            n_ffree, n_bfree, (float)(n_ffree * 100) / sblock.fs_dsize);
            n_files, n_blks, n_ffree + sblock.fs_frag * n_bfree);
        printf("(%d frags, %d blocks, %.1f%% fragmentation)\n",
            n_ffree, n_bfree, (float)(n_ffree * 100) / sblock.fs_dsize);

-       if (debug && (n_files -= imax - ROOTINO - sblock.fs_cstotal.cs_nifree))
+       if (debug &&
+           (n_files -= maxino - ROOTINO - sblock.fs_cstotal.cs_nifree))

                printf("%d files missing\n", n_files);
        if (debug) {
                n_blks += sblock.fs_ncg *
                        (cgdmin(&sblock, 0) - cgsblock(&sblock, 0));
                n_blks += cgsblock(&sblock, 0) - cgbase(&sblock, 0);
                n_blks += howmany(sblock.fs_cssize, sblock.fs_fsize);
                printf("%d files missing\n", n_files);
        if (debug) {
                n_blks += sblock.fs_ncg *
                        (cgdmin(&sblock, 0) - cgsblock(&sblock, 0));
                n_blks += cgsblock(&sblock, 0) - cgbase(&sblock, 0);
                n_blks += howmany(sblock.fs_cssize, sblock.fs_fsize);

-               if (n_blks -= fmax - (n_ffree + sblock.fs_frag * n_bfree))
+               if (n_blks -= maxfsblock - (n_ffree + sblock.fs_frag * n_bfree))

                        printf("%d blocks missing\n", n_blks);
                if (duplist != NULL) {
                        printf("The following duplicate blocks remain:");
                        printf("%d blocks missing\n", n_blks);
                if (duplist != NULL) {
                        printf("The following duplicate blocks remain:");


@@ -231,7 +236,8 @@ checkfilesys(filesys)
        }
        zlnhead = (struct zlncnt *)0;
        duplist = (struct dups *)0;
        }
        zlnhead = (struct zlncnt *)0;
        duplist = (struct dups *)0;

-       if (dfile.mod) {
+       inocleanup();
+       if (fsmodified) {

                (void)time(&sblock.fs_time);
                sbdirty();
        }
                (void)time(&sblock.fs_time);
                sbdirty();
        }


@@ -239,8 +245,8 @@ checkfilesys(filesys)
        free(blockmap);
        free(statemap);
        free((char *)lncntp);
        free(blockmap);
        free(statemap);
        free((char *)lncntp);

-       if (!dfile.mod)
-               return;
+       if (!fsmodified)
+               return (0);

        if (!preen) {
                printf("\n***** FILE SYSTEM WAS MODIFIED *****\n");
                if (hotroot)
        if (!preen) {
                printf("\n***** FILE SYSTEM WAS MODIFIED *****\n");
                if (hotroot)


@@ -248,92 +254,7 @@ checkfilesys(filesys)
        }
        if (hotroot) {
                sync();
        }
        if (hotroot) {
                sync();

-               exit(4);
+               return (4);

        }
        }

-}
-
-char *
-blockcheck(name)
-       char *name;
-{
-       struct stat stslash, stblock, stchar;
-       char *raw;
-       int looped = 0;
-
-       hotroot = 0;
-       if (stat("/", &stslash) < 0){
-               perror("/");
-               printf("Can't stat root\n");
-               return (0);
-       }
-retry:
-       if (stat(name, &stblock) < 0){
-               perror(name);
-               printf("Can't stat %s\n", name);
-               return (0);
-       }
-       if ((stblock.st_mode & S_IFMT) == S_IFBLK) {
-               if (stslash.st_dev == stblock.st_rdev) {
-                       hotroot++;
-                       return (name);
-               }
-               raw = rawname(name);
-               if (stat(raw, &stchar) < 0){
-                       perror(raw);
-                       printf("Can't stat %s\n", raw);
-                       return (name);
-               }
-               if ((stchar.st_mode & S_IFMT) == S_IFCHR)
-                       return (raw);
-               else {
-                       printf("%s is not a character device\n", raw);
-                       return (name);
-               }
-       } else if ((stblock.st_mode & S_IFMT) == S_IFCHR) {
-               if (looped) {
-                       printf("Can't make sense out of name %s\n", name);
-                       return (0);
-               }
-               name = unrawname(name);
-               looped++;
-               goto retry;
-       }
-       printf("Can't make sense out of name %s\n", name);

        return (0);
 }
        return (0);
 }

-
-char *
-unrawname(cp)
-       char *cp;
-{
-       char *dp = rindex(cp, '/');
-       struct stat stb;
-
-       if (dp == 0)
-               return (cp);
-       if (stat(cp, &stb) < 0)
-               return (cp);
-       if ((stb.st_mode&S_IFMT) != S_IFCHR)
-               return (cp);
-       if (*(dp+1) != 'r')
-               return (cp);
-       (void)strcpy(dp+1, dp+2);
-       return (cp);
-}
-
-char *
-rawname(cp)
-       char *cp;
-{
-       static char rawbuf[32];
-       char *dp = rindex(cp, '/');
-
-       if (dp == 0)
-               return (0);
-       *dp = 0;
-       (void)strcpy(rawbuf, cp);
-       *dp = '/';
-       (void)strcat(rawbuf, "/r");
-       (void)strcat(rawbuf, dp+1);
-       return (rawbuf);
-}