Add support for the -F flag which determines whether a specified

filesystem needs foreground checking (usually at boot time) or
can defer to background checking (after the system is up and running).
See the manual page, fsck_ffs(8), for details on the -F and -B options.
These options are primarily intended for use by the fsck front end.

All output is directed to stdout so that the output is coherent
when redirected to a file or a pipe. Unify the code with the fsck
front end that allows either a device or a mount point to be
specified as the argument to be checked.

1 files changed, 12 insertions, 2 deletions

diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 81b96e6..e584c8f 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -52,6 +52,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <ctype.h>
 #include <fstab.h>
+#include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -64,11 +65,20 @@ blockcheck(origname)
 	char *origname;
 {
 	struct stat stslash, stblock, stchar;
-	char *newname, *raw;
+	char *newname, *raw, *cp;
 	struct fstab *fsinfo;
 	int retried = 0, len;
+	static char device[MAXPATHLEN];
 
 	newname = origname;
+	if (stat(newname, &stblock) < 0) {
+		cp = strrchr(newname, '/');
+		if (cp == 0) {
+			(void)snprintf(device, sizeof(device), "%s%s",
+				_PATH_DEV, newname);
+			newname = device;
+		}
+	}
 retry:
 	if (stat(newname, &stblock) < 0) {
 		printf("Can't stat %s: %s\n", newname, strerror(errno));
@@ -90,7 +100,7 @@ retry:
 			printf(
 			    "Can't resolve %s to character special device.\n",
 			    origname);
-			return (0);
+			return (origname);
 		}
 		newname = fsinfo->fs_spec;
 		retried++;