Thu Jun 9 21:23:30 2011 UTC ()
fix compilation.


(christos)
diff -r1.16 -r1.17 src/sbin/fsck/fsutil.h
diff -r1.22 -r1.23 src/sbin/fsck_msdos/main.c
diff -r1.40 -r1.41 src/sbin/fsdb/fsdb.c

cvs diff -r1.16 -r1.17 src/sbin/fsck/fsutil.h (expand / switch to context diff)
--- src/sbin/fsck/fsutil.h 2011/06/09 19:57:50 1.16
+++ src/sbin/fsck/fsutil.h 2011/06/09 21:23:29 1.17
@@ -1,4 +1,4 @@
-/*	$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.
@@ -25,6 +25,7 @@
  */
 
 #include <stdarg.h>
+#include <signal.h>
 
 void errexit(const char *, ...)
     __attribute__((__noreturn__,__format__(__printf__,1,2)));  

cvs diff -r1.22 -r1.23 src/sbin/fsck_msdos/main.c (expand / switch to context diff)
--- src/sbin/fsck_msdos/main.c 2010/04/11 08:23:52 1.22
+++ src/sbin/fsck_msdos/main.c 2011/06/09 21:23:29 1.23
@@ -1,4 +1,4 @@
-/*	$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
@@ -28,7 +28,7 @@
 
 #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>
@@ -59,12 +59,6 @@
 	    "Usage: %s [-fnpy] [-x snap_backup] filesystem ... \n",
 	    getprogname());
 	exit(FSCK_EXIT_USAGE);
-}
-
-static void
-catch(int n)
-{
-	exit(FSCK_EXIT_SIGNALLED);
 }
 
 int

cvs diff -r1.40 -r1.41 src/sbin/fsdb/fsdb.c (expand / switch to context diff)
--- src/sbin/fsdb/fsdb.c 2011/06/09 19:57:53 1.40
+++ src/sbin/fsdb/fsdb.c 2011/06/09 21:23:30 1.41
@@ -1,4 +1,4 @@
-/*	$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.
@@ -31,7 +31,7 @@
 
 #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>
@@ -139,7 +139,7 @@
 	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");