BSD 4_4 release

[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 bbeb6cc..e44a86d 100644 (file)
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -1,34 +1,53 @@
 /*
 /*

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

-char copyright[] =
-"@(#) Copyright (c) 1980, 1986 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1980, 1986, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <sys/time.h>
+#include <sys/mount.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>

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

+#include <stdlib.h>

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


@@ -41,44 +60,38 @@ main(argc, argv)
        int     argc;
        char    *argv[];
 {
        int     argc;
        char    *argv[];
 {

-       char ch;
+       int ch;

        int ret, maxrun = 0;
        extern int docheck(), checkfilesys();
        int ret, maxrun = 0;
        extern int docheck(), checkfilesys();

-       extern char *optarg;
+       extern char *optarg, *blockcheck();

        extern int optind;
 
        sync();
        extern int optind;
 
        sync();

-       while ((ch = getopt(argc, argv, "cdpnNyYb:l:m:")) != EOF) {
+       while ((ch = getopt(argc, argv, "dpnNyYb:c:l:m:")) != EOF) {

                switch (ch) {
                case 'p':
                        preen++;
                        break;
 
                case 'b':
                switch (ch) {
                case 'p':
                        preen++;
                        break;
 
                case 'b':

-                       if (!isdigit(*optarg))
-                               errexit("-b flag requires a number\n");
-                       bflag = atoi(optarg);
+                       bflag = argtoi('b', "number", optarg, 10);

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

-                       cvtflag++;
+                       cvtlevel = argtoi('c', "conversion level", optarg, 10);

                        break;
                        break;

-
+               

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

-                       if (!isdigit(*optarg))
-                               errexit("-l flag requires a number\n");
-                       maxrun = atoi(optarg);
+                       maxrun = argtoi('l', "number", optarg, 10);

                        break;
 
                case 'm':
                        break;
 
                case 'm':

-                       if (!isdigit(*optarg))
-                               errexit("-m flag requires a mode\n");
-                       sscanf(optarg, "%o", &lfmode);
+                       lfmode = argtoi('m', "mode", optarg, 8);

                        if (lfmode &~ 07777)
                                errexit("bad mode to -m: %o\n", lfmode);
                        printf("** lost+found creation mode %o\n", lfmode);
                        if (lfmode &~ 07777)
                                errexit("bad mode to -m: %o\n", lfmode);
                        printf("** lost+found creation mode %o\n", lfmode);


@@ -108,7 +121,7 @@ main(argc, argv)
                (void)signal(SIGQUIT, catchquit);
        if (argc) {
                while (argc-- > 0)
                (void)signal(SIGQUIT, catchquit);
        if (argc) {
                while (argc-- > 0)

-                       checkfilesys(*argv++);
+                       (void)checkfilesys(blockcheck(*argv++), 0, 0L, 0);

                exit(0);
        }
        ret = checkfstab(preen, maxrun, docheck, checkfilesys);
                exit(0);
        }
        ret = checkfstab(preen, maxrun, docheck, checkfilesys);


@@ -117,6 +130,20 @@ main(argc, argv)
        exit(ret);
 }
 
        exit(ret);
 }
 

+argtoi(flag, req, str, base)
+       int flag;
+       char *req, *str;
+       int base;
+{
+       char *cp;
+       int ret;
+
+       ret = (int)strtol(str, &cp, base);
+       if (cp == str || *cp)
+               errexit("-%c flag requires a %s\n", flag, req);
+       return (ret);
+}
+

 /*
  * Determine whether a filesystem should be checked.
  */
 /*
  * Determine whether a filesystem should be checked.
  */


@@ -136,16 +163,18 @@ docheck(fsp)
  * Check the specified filesystem.
  */
 /* ARGSUSED */
  * Check the specified filesystem.
  */
 /* ARGSUSED */

-checkfilesys(filesys, mntpt, auxdata)
+checkfilesys(filesys, mntpt, auxdata, child)

        char *filesys, *mntpt;
        long auxdata;
 {
        daddr_t n_ffree, n_bfree;
        struct dups *dp;
        struct zlncnt *zlnp;
        char *filesys, *mntpt;
        long auxdata;
 {
        daddr_t n_ffree, n_bfree;
        struct dups *dp;
        struct zlncnt *zlnp;

+       int cylno;

 
 

-       (void)signal(SIGQUIT, voidquit);
-       devname = filesys;
+       if (preen && child)
+               (void)signal(SIGQUIT, voidquit);
+       cdevname = filesys;

        if (debug && preen)
                pwarn("starting\n");
        if (setup(filesys) == 0) {
        if (debug && preen)
                pwarn("starting\n");
        if (setup(filesys) == 0) {


@@ -207,52 +236,81 @@ checkfilesys(filesys, mntpt, auxdata)
         */
        n_ffree = sblock.fs_cstotal.cs_nffree;
        n_bfree = sblock.fs_cstotal.cs_nbfree;
         */
        n_ffree = sblock.fs_cstotal.cs_nffree;
        n_bfree = sblock.fs_cstotal.cs_nbfree;

-       pwarn("%d files, %d used, %d free ",
+       pwarn("%ld files, %ld used, %ld free ",

            n_files, n_blks, n_ffree + sblock.fs_frag * n_bfree);
            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);
+       printf("(%ld frags, %ld blocks, %d.%d%% fragmentation)\n",
+           n_ffree, n_bfree, (n_ffree * 100) / sblock.fs_dsize,
+           ((n_ffree * 1000 + sblock.fs_dsize / 2) / sblock.fs_dsize) % 10);

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

-               printf("%d files missing\n", n_files);
+               printf("%ld 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 -= maxfsblock - (n_ffree + sblock.fs_frag * n_bfree))
        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 -= maxfsblock - (n_ffree + sblock.fs_frag * n_bfree))

-                       printf("%d blocks missing\n", n_blks);
+                       printf("%ld blocks missing\n", n_blks);

                if (duplist != NULL) {
                        printf("The following duplicate blocks remain:");
                        for (dp = duplist; dp; dp = dp->next)
                if (duplist != NULL) {
                        printf("The following duplicate blocks remain:");
                        for (dp = duplist; dp; dp = dp->next)

-                               printf(" %d,", dp->dup);
+                               printf(" %ld,", dp->dup);

                        printf("\n");
                }
                if (zlnhead != NULL) {
                        printf("The following zero link count inodes remain:");
                        for (zlnp = zlnhead; zlnp; zlnp = zlnp->next)
                        printf("\n");
                }
                if (zlnhead != NULL) {
                        printf("The following zero link count inodes remain:");
                        for (zlnp = zlnhead; zlnp; zlnp = zlnp->next)

-                               printf(" %d,", zlnp->zlncnt);
+                               printf(" %lu,", zlnp->zlncnt);

                        printf("\n");
                }
        }
        zlnhead = (struct zlncnt *)0;
        duplist = (struct dups *)0;
                        printf("\n");
                }
        }
        zlnhead = (struct zlncnt *)0;
        duplist = (struct dups *)0;

+       muldup = (struct dups *)0;

        inocleanup();
        if (fsmodified) {
                (void)time(&sblock.fs_time);
                sbdirty();
        }
        inocleanup();
        if (fsmodified) {
                (void)time(&sblock.fs_time);
                sbdirty();
        }

+       if (cvtlevel && sblk.b_dirty) {
+               /* 
+                * Write out the duplicate super blocks
+                */
+               for (cylno = 0; cylno < sblock.fs_ncg; cylno++)
+                       bwrite(fswritefd, (char *)&sblock,
+                           fsbtodb(&sblock, cgsblock(&sblock, cylno)), SBSIZE);
+       }

        ckfini();
        free(blockmap);
        free(statemap);
        free((char *)lncntp);
        if (!fsmodified)
                return (0);
        ckfini();
        free(blockmap);
        free(statemap);
        free((char *)lncntp);
        if (!fsmodified)
                return (0);

-       if (!preen) {
+       if (!preen)

                printf("\n***** FILE SYSTEM WAS MODIFIED *****\n");
                printf("\n***** FILE SYSTEM WAS MODIFIED *****\n");

-               if (hotroot)
-                       printf("\n***** REBOOT UNIX *****\n");
-       }

        if (hotroot) {
        if (hotroot) {

+               struct statfs stfs_buf;
+               /*
+                * We modified the root.  Do a mount update on
+                * it, unless it is read-write, so we can continue.
+                */
+               if (statfs("/", &stfs_buf) == 0) {
+                       long flags = stfs_buf.f_flags;
+                       struct ufs_args args;
+                       int ret;
+
+                       if (flags & MNT_RDONLY) {
+                               args.fspec = 0;
+                               args.exflags = 0;
+                               args.exroot = 0;
+                               flags |= MNT_UPDATE | MNT_RELOAD;
+                               ret = mount(MOUNT_UFS, "/", flags, &args);
+                               if (ret == 0)
+                                       return(0);
+                       }
+               }
+               if (!preen)
+                       printf("\n***** REBOOT NOW *****\n");

                sync();
                return (4);
        }
                sync();
                return (4);
        }