Reviewed by: rwatson, bp

Approved by:	rwatson
Obtained from:	NetBSD source tree

Second part of the fsck wrappers commit. This commit enables the new fsck
code (removing the fsck/* code and replacing it with the netbsd fsck
wrapper code), and enabling some FFS-based utilities to compile.

Details:

* quotacheck, fsdb required modification to use the fsck_ffs/ code rather
  than fsck/ . This might change later since quotacheck requires preen.c
  which should exist in fsck/ rather than fsck_ffs/

* src/Makefile has fsck_ffs added to it so it it built as part of the tree
  now

* share/doc/smm/03.fsck/ uses the SMM.doc/ stuff from fsck_ffs, not fsck.

I've tested this, and it shouldn't require any changes on your machine.
The fsck wrapper reads /etc/fsck and is command-line-compatible enough
to not require rc changes (well, most changes unless you want to do
anything nifty by specifying the fs types explicityly, read the man page
if you want further details on what it can do.)

This now allows us to support multiple filesystem types during bootup.

1 files changed, 0 insertions, 332 deletions

diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
deleted file mode 100644
index e43aada8d10d..000000000000
--- a/sbin/fsck/preen.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)preen.c	8.5 (Berkeley) 4/28/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <ufs/ufs/dinode.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fstab.h>
-#include <string.h>
-
-#include "fsck.h"
-
-struct part {
-	struct	part *next;		/* forward link of partitions on disk */
-	char	*name;			/* device name */
-	char	*fsname;		/* mounted filesystem name */
-	long	auxdata;		/* auxillary data for application */
-} *badlist, **badnext = &badlist;
-
-struct disk {
-	char	*name;			/* disk base name */
-	struct	disk *next;		/* forward link for list of disks */
-	struct	part *part;		/* head of list of partitions on disk */
-	int	pid;			/* If != 0, pid of proc working on */
-} *disks;
-
-int	nrun, ndisks;
-
-static void addpart __P((char *name, char *fsname, long auxdata));
-static struct disk *finddisk __P((char *name));
-static int startdisk __P((struct disk *dk,
-		int (*checkit)(char *, char *, long, int)));
-
-int
-checkfstab(preen, maxrun, docheck, chkit)
-	int preen;
-	int maxrun;
-	int (*docheck)(struct fstab *);
-	int (*chkit)(char *, char *, long, int);
-{
-	register struct fstab *fsp;
-	register struct disk *dk, *nextdisk;
-	register struct part *pt;
-	int ret, pid, retcode, passno, sumstatus, status;
-	long auxdata;
-	char *name;
-
-	sumstatus = 0;
-	for (passno = 1; passno <= 2; passno++) {
-		if (setfsent() == 0) {
-			fprintf(stderr, "Can't open checklist file: %s\n",
-			    _PATH_FSTAB);
-			return (8);
-		}
-		while ((fsp = getfsent()) != 0) {
-			if ((auxdata = (*docheck)(fsp)) == 0)
-				continue;
-			if (preen == 0 ||
-			    (passno == 1 && fsp->fs_passno == 1)) {
-				if ((name = blockcheck(fsp->fs_spec)) != 0) {
-					if ((sumstatus = (*chkit)(name,
-					    fsp->fs_file, auxdata, 0)) != 0)
-						return (sumstatus);
-				} else if (preen)
-					return (8);
-			} else if (passno == 2 && fsp->fs_passno > 1) {
-				if ((name = blockcheck(fsp->fs_spec)) == NULL) {
-					fprintf(stderr, "BAD DISK NAME %s\n",
-						fsp->fs_spec);
-					sumstatus |= 8;
-					continue;
-				}
-				addpart(name, fsp->fs_file, auxdata);
-			}
-		}
-		if (preen == 0)
-			return (0);
-	}
-	if (preen) {
-		if (maxrun == 0)
-			maxrun = ndisks;
-		if (maxrun > ndisks)
-			maxrun = ndisks;
-		nextdisk = disks;
-		for (passno = 0; passno < maxrun; ++passno) {
-			while ((ret = startdisk(nextdisk, chkit)) && nrun > 0)
-				sleep(10);
-			if (ret)
-				return (ret);
-			nextdisk = nextdisk->next;
-		}
-		while ((pid = wait(&status)) != -1) {
-			for (dk = disks; dk; dk = dk->next)
-				if (dk->pid == pid)
-					break;
-			if (dk == 0) {
-				printf("Unknown pid %d\n", pid);
-				continue;
-			}
-			if (WIFEXITED(status))
-				retcode = WEXITSTATUS(status);
-			else
-				retcode = 0;
-			if (WIFSIGNALED(status)) {
-				printf("%s (%s): EXITED WITH SIGNAL %d\n",
-					dk->part->name, dk->part->fsname,
-					WTERMSIG(status));
-				retcode = 8;
-			}
-			if (retcode != 0) {
-				sumstatus |= retcode;
-				*badnext = dk->part;
-				badnext = &dk->part->next;
-				dk->part = dk->part->next;
-				*badnext = NULL;
-			} else
-				dk->part = dk->part->next;
-			dk->pid = 0;
-			nrun--;
-			if (dk->part == NULL)
-				ndisks--;
-
-			if (nextdisk == NULL) {
-				if (dk->part) {
-					while ((ret = startdisk(dk, chkit)) &&
-					    nrun > 0)
-						sleep(10);
-					if (ret)
-						return (ret);
-				}
-			} else if (nrun < maxrun && nrun < ndisks) {
-				for ( ;; ) {
-					if ((nextdisk = nextdisk->next) == NULL)
-						nextdisk = disks;
-					if (nextdisk->part != NULL &&
-					    nextdisk->pid == 0)
-						break;
-				}
-				while ((ret = startdisk(nextdisk, chkit)) &&
-				    nrun > 0)
-					sleep(10);
-				if (ret)
-					return (ret);
-			}
-		}
-	}
-	if (sumstatus) {
-		if (badlist == 0)
-			return (sumstatus);
-		fprintf(stderr, "THE FOLLOWING FILE SYSTEM%s HAD AN %s\n\t",
-			badlist->next ? "S" : "", "UNEXPECTED INCONSISTENCY:");
-		for (pt = badlist; pt; pt = pt->next)
-			fprintf(stderr, "%s (%s)%s", pt->name, pt->fsname,
-			    pt->next ? ", " : "\n");
-		return (sumstatus);
-	}
-	(void)endfsent();
-	return (0);
-}
-
-static struct disk *
-finddisk(name)
-	char *name;
-{
-	register struct disk *dk, **dkp;
-	register char *p;
-	size_t len;
-
-	p = strrchr(name, '/');
-	p = p == NULL ? name : p + 1;
-	while (*p != '\0' && !isdigit((u_char)*p))
-		p++;
-	while (isdigit((u_char)*p))
-		p++;
-	len = (size_t)(p - name);
-	for (dk = disks, dkp = &disks; dk; dkp = &dk->next, dk = dk->next) {
-		if (strncmp(dk->name, name, len) == 0 &&
-		    dk->name[len] == 0)
-			return (dk);
-	}
-	if ((*dkp = (struct disk *)malloc(sizeof(struct disk))) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	dk = *dkp;
-	if ((dk->name = malloc(len + 1)) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	(void)strncpy(dk->name, name, len);
-	dk->name[len] = '\0';
-	dk->part = NULL;
-	dk->next = NULL;
-	dk->pid = 0;
-	ndisks++;
-	return (dk);
-}
-
-static void
-addpart(name, fsname, auxdata)
-	char *name, *fsname;
-	long auxdata;
-{
-	struct disk *dk = finddisk(name);
-	register struct part *pt, **ppt = &dk->part;
-
-	for (pt = dk->part; pt; ppt = &pt->next, pt = pt->next)
-		if (strcmp(pt->name, name) == 0) {
-			printf("%s in fstab more than once!\n", name);
-			return;
-		}
-	if ((*ppt = (struct part *)malloc(sizeof(struct part))) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	pt = *ppt;
-	if ((pt->name = malloc(strlen(name) + 1)) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	(void)strcpy(pt->name, name);
-	if ((pt->fsname = malloc(strlen(fsname) + 1)) == NULL) {
-		fprintf(stderr, "out of memory");
-		exit (8);
-	}
-	(void)strcpy(pt->fsname, fsname);
-	pt->next = NULL;
-	pt->auxdata = auxdata;
-}
-
-static int
-startdisk(dk, checkit)
-	register struct disk *dk;
-	int (*checkit)(char *, char *, long, int);
-{
-	register struct part *pt = dk->part;
-
-	dk->pid = fork();
-	if (dk->pid < 0) {
-		perror("fork");
-		return (8);
-	}
-	if (dk->pid == 0)
-		exit((*checkit)(pt->name, pt->fsname, pt->auxdata, 1));
-	nrun++;
-	return (0);
-}
-
-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);
-}