summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-11-27 20:02:27 +0000
committerphk <phk@FreeBSD.org>1999-11-27 20:02:27 +0000
commit44eb44a9e89f713e7927093b25547d6532b4b728 (patch)
tree31508c495c89229d2593305b119b325ce4b6716c /sbin
parent9fc872877e2cdc38e087f03f84b5fd16fa9fe726 (diff)
downloadFreeBSD-src-44eb44a9e89f713e7927093b25547d6532b4b728.zip
FreeBSD-src-44eb44a9e89f713e7927093b25547d6532b4b728.tar.gz
Make fsck even more char/blk dev tolerant.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/fsck/preen.c24
-rw-r--r--sbin/fsck/setup.c5
-rw-r--r--sbin/fsck_ffs/preen.c24
-rw-r--r--sbin/fsck_ffs/setup.c5
-rw-r--r--sbin/fsck_ifs/preen.c24
-rw-r--r--sbin/fsck_ifs/setup.c5
-rw-r--r--sbin/quotacheck/preen.c24
7 files changed, 41 insertions, 70 deletions
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index aedb592..fc6dd23 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -309,24 +309,16 @@ retry:
printf("Can't stat %s: %s\n", newname, strerror(errno));
return (origname);
}
- if ((stblock.st_mode & S_IFMT) == S_IFBLK ||
- (stblock.st_mode & S_IFMT) == S_IFCHR) {
+ switch(stblock.st_mode & S_IFMT) {
+ case S_IFCHR:
+ case S_IFBLK:
if (stslash.st_dev == stblock.st_rdev)
hotroot++;
- raw = newname;
- if (stat(raw, &stchar) < 0) {
- printf("Can't stat %s: %s\n", raw, strerror(errno));
- return (origname);
- }
- if ((stchar.st_mode & S_IFMT) == S_IFCHR) {
- if (stslash.st_dev == stchar.st_rdev)
- hotroot++;
- return (raw);
- } else {
- printf("%s is not a character device\n", raw);
- return (origname);
- }
- } else if ((stblock.st_mode & S_IFMT) == S_IFDIR && !retried) {
+ return(newname);
+ case S_IFDIR:
+ if (retried)
+ break;
+
len = strlen(origname) - 1;
if (len > 0 && origname[len] == '/')
/* remove trailing slash */
diff --git a/sbin/fsck/setup.c b/sbin/fsck/setup.c
index 7444d375..0df8e98 100644
--- a/sbin/fsck/setup.c
+++ b/sbin/fsck/setup.c
@@ -87,8 +87,9 @@ setup(dev)
printf("Can't stat %s: %s\n", dev, strerror(errno));
return (0);
}
- if ((statb.st_mode & S_IFMT) != S_IFCHR) {
- pfatal("%s is not a character device", dev);
+ if ((statb.st_mode & S_IFMT) != S_IFCHR &&
+ (statb.st_mode & S_IFMT) != S_IFBLK) {
+ pfatal("%s is not a disk device", dev);
if (reply("CONTINUE") == 0)
return (0);
}
diff --git a/sbin/fsck_ffs/preen.c b/sbin/fsck_ffs/preen.c
index aedb592..fc6dd23 100644
--- a/sbin/fsck_ffs/preen.c
+++ b/sbin/fsck_ffs/preen.c
@@ -309,24 +309,16 @@ retry:
printf("Can't stat %s: %s\n", newname, strerror(errno));
return (origname);
}
- if ((stblock.st_mode & S_IFMT) == S_IFBLK ||
- (stblock.st_mode & S_IFMT) == S_IFCHR) {
+ switch(stblock.st_mode & S_IFMT) {
+ case S_IFCHR:
+ case S_IFBLK:
if (stslash.st_dev == stblock.st_rdev)
hotroot++;
- raw = newname;
- if (stat(raw, &stchar) < 0) {
- printf("Can't stat %s: %s\n", raw, strerror(errno));
- return (origname);
- }
- if ((stchar.st_mode & S_IFMT) == S_IFCHR) {
- if (stslash.st_dev == stchar.st_rdev)
- hotroot++;
- return (raw);
- } else {
- printf("%s is not a character device\n", raw);
- return (origname);
- }
- } else if ((stblock.st_mode & S_IFMT) == S_IFDIR && !retried) {
+ return(newname);
+ case S_IFDIR:
+ if (retried)
+ break;
+
len = strlen(origname) - 1;
if (len > 0 && origname[len] == '/')
/* remove trailing slash */
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 7444d375..0df8e98 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -87,8 +87,9 @@ setup(dev)
printf("Can't stat %s: %s\n", dev, strerror(errno));
return (0);
}
- if ((statb.st_mode & S_IFMT) != S_IFCHR) {
- pfatal("%s is not a character device", dev);
+ if ((statb.st_mode & S_IFMT) != S_IFCHR &&
+ (statb.st_mode & S_IFMT) != S_IFBLK) {
+ pfatal("%s is not a disk device", dev);
if (reply("CONTINUE") == 0)
return (0);
}
diff --git a/sbin/fsck_ifs/preen.c b/sbin/fsck_ifs/preen.c
index aedb592..fc6dd23 100644
--- a/sbin/fsck_ifs/preen.c
+++ b/sbin/fsck_ifs/preen.c
@@ -309,24 +309,16 @@ retry:
printf("Can't stat %s: %s\n", newname, strerror(errno));
return (origname);
}
- if ((stblock.st_mode & S_IFMT) == S_IFBLK ||
- (stblock.st_mode & S_IFMT) == S_IFCHR) {
+ switch(stblock.st_mode & S_IFMT) {
+ case S_IFCHR:
+ case S_IFBLK:
if (stslash.st_dev == stblock.st_rdev)
hotroot++;
- raw = newname;
- if (stat(raw, &stchar) < 0) {
- printf("Can't stat %s: %s\n", raw, strerror(errno));
- return (origname);
- }
- if ((stchar.st_mode & S_IFMT) == S_IFCHR) {
- if (stslash.st_dev == stchar.st_rdev)
- hotroot++;
- return (raw);
- } else {
- printf("%s is not a character device\n", raw);
- return (origname);
- }
- } else if ((stblock.st_mode & S_IFMT) == S_IFDIR && !retried) {
+ return(newname);
+ case S_IFDIR:
+ if (retried)
+ break;
+
len = strlen(origname) - 1;
if (len > 0 && origname[len] == '/')
/* remove trailing slash */
diff --git a/sbin/fsck_ifs/setup.c b/sbin/fsck_ifs/setup.c
index 7444d375..0df8e98 100644
--- a/sbin/fsck_ifs/setup.c
+++ b/sbin/fsck_ifs/setup.c
@@ -87,8 +87,9 @@ setup(dev)
printf("Can't stat %s: %s\n", dev, strerror(errno));
return (0);
}
- if ((statb.st_mode & S_IFMT) != S_IFCHR) {
- pfatal("%s is not a character device", dev);
+ if ((statb.st_mode & S_IFMT) != S_IFCHR &&
+ (statb.st_mode & S_IFMT) != S_IFBLK) {
+ pfatal("%s is not a disk device", dev);
if (reply("CONTINUE") == 0)
return (0);
}
diff --git a/sbin/quotacheck/preen.c b/sbin/quotacheck/preen.c
index aedb592..fc6dd23 100644
--- a/sbin/quotacheck/preen.c
+++ b/sbin/quotacheck/preen.c
@@ -309,24 +309,16 @@ retry:
printf("Can't stat %s: %s\n", newname, strerror(errno));
return (origname);
}
- if ((stblock.st_mode & S_IFMT) == S_IFBLK ||
- (stblock.st_mode & S_IFMT) == S_IFCHR) {
+ switch(stblock.st_mode & S_IFMT) {
+ case S_IFCHR:
+ case S_IFBLK:
if (stslash.st_dev == stblock.st_rdev)
hotroot++;
- raw = newname;
- if (stat(raw, &stchar) < 0) {
- printf("Can't stat %s: %s\n", raw, strerror(errno));
- return (origname);
- }
- if ((stchar.st_mode & S_IFMT) == S_IFCHR) {
- if (stslash.st_dev == stchar.st_rdev)
- hotroot++;
- return (raw);
- } else {
- printf("%s is not a character device\n", raw);
- return (origname);
- }
- } else if ((stblock.st_mode & S_IFMT) == S_IFDIR && !retried) {
+ return(newname);
+ case S_IFDIR:
+ if (retried)
+ break;
+
len = strlen(origname) - 1;
if (len > 0 && origname[len] == '/')
/* remove trailing slash */
OpenPOWER on IntegriCloud