Reviewed by: rwatson, bp

Approved by:	rwatson
Obtained from:	NetBSD-current source tree

The beginnings of the fsck wrappers stuff from NetBSD. This particular commit
brings a newly repo-copied sbin/fsck_ffs/ (from sbin/fsck/) into fsck wrappers
mode.

A quick overview (the code reflects this):

* Documentation changed to reflect fsck_ffs instead of fsck
* Simply acts on a single filesystem, doesn't try to do any multiple filesystem
  magic - this is done by the fsck wrappers now

And then specific to fsck_ffs:

* link to /sbin/fsck_4.2bsd and /sbin/fsck_ufs. This is because right now
  the filesystem is of type ufs not ffs, and that during autodetection the
  labeltype rather than the VFS type is used - this is because when doing
  an autodetection of filesystem type in the fsck wrapper program, it does
  not have any link between label type (4.2bsd, vinum, etc) and VFS string.

Note that this shouldn't break a build since the required buildworld Makefile
magic and import of the fsck wrapper code into src/sbin/fsck/ will happen
in a seperate commit.

1 files changed, 52 insertions, 1 deletions

diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 0ccd9bb..0e4bde5 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -40,13 +40,21 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
 
 #include <err.h>
+#include <errno.h>
 #include <string.h>
+#include <ctype.h>
+#include <fstab.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include "fsck.h"
 
@@ -561,7 +569,7 @@ dofix(idesc, msg)
 		if (idesc->id_type == DATA)
 			direrror(idesc->id_number, msg);
 		else
-			pwarn("%s", msg);
+			pwarn(msg);
 		if (preen) {
 			printf(" (SALVAGED)\n");
 			idesc->id_fix = FIX;
@@ -681,3 +689,46 @@ panic(fmt, va_alist)
 	va_end(ap);
 	exit(EEXIT);
 }
+
+char *
+blockcheck(origname)
+	char *origname;
+{
+	struct stat stslash, stblock, stchar;
+	char *newname, *raw;
+	struct fstab *fsinfo;
+	int retried = 0, len;
+
+	newname = origname;
+retry:
+	if (stat(newname, &stblock) < 0) {
+		printf("Can't stat %s: %s\n", newname, strerror(errno));
+		return (origname);
+	}
+	switch(stblock.st_mode & S_IFMT) {
+	case S_IFCHR:
+	case S_IFBLK:
+		return(newname);
+	case S_IFDIR:
+		if (retried)
+			break;
+		
+		len = strlen(origname) - 1;
+		if (len > 0 && origname[len] == '/')
+			/* remove trailing slash */
+			origname[len] = '\0';
+		if ((fsinfo = getfsfile(origname)) == NULL) {
+			printf("Can't resolve %s to character special device",
+			    origname);
+			return (0);
+		}
+		newname = fsinfo->fs_spec;
+		retried++;
+		goto retry;
+	}
+	/*
+	 * Not a block or character device, just return name and
+	 * let the user decide whether to use it.
+	 */
+	return (origname);
+}