BSD 4_3_Reno 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 c100da8..e93fcb5 100644 (file)
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -2,7 +2,19 @@
  * Copyright (c) 1980, 1986 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980, 1986 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * 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 ``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
  */
 
 #ifndef lint


@@ -12,7 +24,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.27 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.26 (Berkeley) 7/20/90";

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


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

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

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


@@ -135,7 +147,7 @@ docheck(fsp)
  * Check the specified filesystem.
  */
 /* ARGSUSED */
  * Check the specified filesystem.
  */
 /* ARGSUSED */

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

        char *filesys, *mntpt;
        long auxdata;
 {
        char *filesys, *mntpt;
        long auxdata;
 {


@@ -143,8 +155,7 @@ checkfilesys(filesys, mntpt, auxdata, child)
        struct dups *dp;
        struct zlncnt *zlnp;
 
        struct dups *dp;
        struct zlncnt *zlnp;
 

-       if (preen && child)
-               (void)signal(SIGQUIT, voidquit);
+       (void)signal(SIGQUIT, voidquit);

        devname = filesys;
        if (debug && preen)
                pwarn("starting\n");
        devname = filesys;
        if (debug && preen)
                pwarn("starting\n");