Module Name: src
Committed By: christos
Date: Thu Jun 9 21:23:30 UTC 2011
Modified Files:
src/sbin/fsck: fsutil.h
src/sbin/fsck_msdos: main.c
src/sbin/fsdb: fsdb.c
Log Message:
fix compilation.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sbin/fsck/fsutil.h
cvs rdiff -u -r1.22 -r1.23 src/sbin/fsck_msdos/main.c
cvs rdiff -u -r1.40 -r1.41 src/sbin/fsdb/fsdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck/fsutil.h
diff -u src/sbin/fsck/fsutil.h:1.16 src/sbin/fsck/fsutil.h:1.17
--- src/sbin/fsck/fsutil.h:1.16 Thu Jun 9 15:57:50 2011
+++ src/sbin/fsck/fsutil.h Thu Jun 9 17:23:29 2011
@@ -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)));
Index: src/sbin/fsck_msdos/main.c
diff -u src/sbin/fsck_msdos/main.c:1.22 src/sbin/fsck_msdos/main.c:1.23
--- src/sbin/fsck_msdos/main.c:1.22 Sun Apr 11 04:23:52 2010
+++ src/sbin/fsck_msdos/main.c Thu Jun 9 17:23:29 2011
@@ -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>
@@ -61,12 +61,6 @@
exit(FSCK_EXIT_USAGE);
}
-static void
-catch(int n)
-{
- exit(FSCK_EXIT_SIGNALLED);
-}
-
int
main(int argc, char **argv)
{
Index: src/sbin/fsdb/fsdb.c
diff -u src/sbin/fsdb/fsdb.c:1.40 src/sbin/fsdb/fsdb.c:1.41
--- src/sbin/fsdb/fsdb.c:1.40 Thu Jun 9 15:57:53 2011
+++ src/sbin/fsdb/fsdb.c Thu Jun 9 17:23:30 2011
@@ -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");
