new template

[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 cf40b90..2fc1a70 100644 (file)
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.6 (Berkeley) %G%";

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


@@ -262,31 +262,34 @@ blockcheck(name)
 
        hotroot = 0;
        if (stat("/", &stslash) < 0){
 
        hotroot = 0;
        if (stat("/", &stslash) < 0){

+               perror("/");

                printf("Can't stat root\n");
                return (0);
        }
 retry:
        if (stat(name, &stblock) < 0){
                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);
        }
                printf("Can't stat %s\n", name);
                return (0);
        }

-       if (stblock.st_mode & S_IFBLK) {
+       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){
                raw = rawname(name);
                if (stat(raw, &stchar) < 0){

+                       perror(raw);

                        printf("Can't stat %s\n", raw);
                        printf("Can't stat %s\n", raw);

-                       return (0);
+                       return (name);

                }
                }

-               if (stchar.st_mode & S_IFCHR) {
-                       if (stslash.st_dev == stblock.st_rdev) {
-                               hotroot++;
-                               raw = unrawname(name);
-                       }
+               if ((stchar.st_mode & S_IFMT) == S_IFCHR)

                        return (raw);
                        return (raw);

-               } else {
+               else {

                        printf("%s is not a character device\n", raw);
                        printf("%s is not a character device\n", raw);

-                       return (0);
+                       return (name);

                }
                }

-       } else if (stblock.st_mode & S_IFCHR) {
+       } else if ((stblock.st_mode & S_IFMT) == S_IFCHR) {

                if (looped) {
                        printf("Can't make sense out of name %s\n", name);
                        return (0);
                if (looped) {
                        printf("Can't make sense out of name %s\n", name);
                        return (0);