 @@ -1,40 +1,41 @@
-/*	$NetBSD: fsutil.h,v 1.16 2011/06/09 19:57:50 christos Exp $	*/
+/*	$NetBSD: fsutil.h,v 1.17 2011/06/09 21:23:29 christos Exp $	*/
 /*
  * Copyright (c) 1996 Christos Zoulas.  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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
  */
 #include <stdarg.h>
 #include <signal.h>
 void errexit(const char *, ...)
     __attribute__((__noreturn__,__format__(__printf__,1,2)));
 void pfatal(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void pwarn(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void perr(const char *, ...)
     __attribute__((__format__(__printf__,1,2)));
 void panic(const char *, ...)
     __attribute__((__noreturn__,__format__(__printf__,1,2)));
 void vmsg(int, const char *, va_list)
      __attribute__((__format__(__printf__,2,0)));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.22 2010/04/11 08:23:52 hannken Exp $	*/
+/*	$NetBSD: main.c,v 1.23 2011/06/09 21:23:29 christos Exp $	*/
 /*
  * Copyright (C) 1995 Wolfgang Solfrank
  * Copyright (c) 1995 Martin Husemann
+ *
  * 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.
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHORS 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.22 2010/04/11 08:23:52 hannken Exp $");
+__RCSID("$NetBSD: main.c,v 1.23 2011/06/09 21:23:29 christos Exp $");
 #endif /* not lint */
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <err.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <signal.h>
 #include "fsutil.h"
 #include "snapshot.h"
 @@ -51,32 +51,26 @@ int preen;		/* set when preening */
 int rdonly;		/* device is opened read only (supersedes above) */
 static void usage(void) __dead;
 static void
 usage(void)
+{
     	(void)fprintf(stderr,
 	    "Usage: %s [-fnpy] [-x snap_backup] filesystem ... \n",
 	    getprogname());
 	exit(FSCK_EXIT_USAGE);
+}
 static void
 catch(int n)
 	exit(FSCK_EXIT_SIGNALLED);
 int
 main(int argc, char **argv)
+{
 	int ret = FSCK_EXIT_OK, erg;
 	int ch, snapfd;
 	char *snap_backup = NULL, *snap_dev;
 	while ((ch = getopt(argc, argv, "pPqynfx:")) != -1) {
 		switch (ch) {
 		case 'f':
 			/*
 			 * We are always forced, since we don't
 			 * have a clean flag

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fsdb.c,v 1.40 2011/06/09 19:57:53 christos Exp $	*/
+/*	$NetBSD: fsdb.c,v 1.41 2011/06/09 21:23:30 christos Exp $	*/
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by John T. Kohl.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fsdb.c,v 1.40 2011/06/09 19:57:53 christos Exp $");
+__RCSID("$NetBSD: fsdb.c,v 1.41 2011/06/09 21:23:30 christos Exp $");
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/mount.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <histedit.h>
 #include <limits.h>
 #include <pwd.h>
 @@ -129,27 +129,27 @@ main(int argc, char *argv[])
 	if (fsys == NULL)
 		usage();
 	endian = 0;
 	if (setup(fsys, fsys) <= 0)
 		errx(1, "cannot set up file system `%s'", fsys);
 	printf("Editing file system `%s'\nLast Mounted on %s\n", fsys,
 	    sblock->fs_fsmnt);
 	rval = cmdloop();
 	if (nflag)
 		exit(rval);
 	sblock->fs_clean = 0;	/* mark it dirty */
 	sbdirty();
 	markclean = 0;
-	ckfini();
+	ckfini(1);
 	printf("*** FILE SYSTEM MARKED DIRTY\n");
 	printf("*** BE SURE TO RUN FSCK TO CLEAN UP ANY DAMAGE\n");
 	printf("*** IF IT WAS MOUNTED, RE-MOUNT WITH -u -o reload\n");
 	exit(rval);
+}
 #define CMDFUNC(func) static int func (int argc, char *argv[])
 #define CMDFUNCSTART(func) static int func(argc, argv)		\
 				int argc;			\
 				char *argv[];
 CMDFUNC(helpfn);
 CMDFUNC(focus);			/* focus on inode */