Module Name: src
Committed By: christos
Date: Thu Jun 9 19:57:53 UTC 2011
Modified Files:
src/sbin/fsck: fsutil.c fsutil.h
src/sbin/fsck_ext2fs: extern.h main.c utilities.c
src/sbin/fsck_ffs: extern.h main.c pass1.c pass2.c setup.c utilities.c
src/sbin/fsck_lfs: extern.h main.c utilities.c
src/sbin/fsdb: fsdb.c
Log Message:
share more code.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/fsck/fsutil.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/fsck/fsutil.h
cvs rdiff -u -r1.6 -r1.7 src/sbin/fsck_ext2fs/extern.h
cvs rdiff -u -r1.36 -r1.37 src/sbin/fsck_ext2fs/main.c
cvs rdiff -u -r1.21 -r1.22 src/sbin/fsck_ext2fs/utilities.c
cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck_ffs/extern.h
cvs rdiff -u -r1.78 -r1.79 src/sbin/fsck_ffs/main.c
cvs rdiff -u -r1.47 -r1.48 src/sbin/fsck_ffs/pass1.c
cvs rdiff -u -r1.46 -r1.47 src/sbin/fsck_ffs/pass2.c
cvs rdiff -u -r1.92 -r1.93 src/sbin/fsck_ffs/setup.c
cvs rdiff -u -r1.59 -r1.60 src/sbin/fsck_ffs/utilities.c
cvs rdiff -u -r1.8 -r1.9 src/sbin/fsck_lfs/extern.h
cvs rdiff -u -r1.42 -r1.43 src/sbin/fsck_lfs/main.c
cvs rdiff -u -r1.30 -r1.31 src/sbin/fsck_lfs/utilities.c
cvs rdiff -u -r1.39 -r1.40 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.c
diff -u src/sbin/fsck/fsutil.c:1.19 src/sbin/fsck/fsutil.c:1.20
--- src/sbin/fsck/fsutil.c:1.19 Thu Feb 4 18:55:42 2010
+++ src/sbin/fsck/fsutil.c Thu Jun 9 15:57:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fsutil.c,v 1.19 2010/02/04 23:55:42 christos Exp $ */
+/* $NetBSD: fsutil.c,v 1.20 2011/06/09 19:57:50 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fsutil.c,v 1.19 2010/02/04 23:55:42 christos Exp $");
+__RCSID("$NetBSD: fsutil.c,v 1.20 2011/06/09 19:57:50 christos Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -42,6 +42,8 @@
#include <stdarg.h>
#include <errno.h>
#include <fstab.h>
+#include <fcntl.h>
+#include <unistd.h>
#include <err.h>
#include <sys/types.h>
@@ -256,3 +258,44 @@
(void)snprintf(b, sizeof(b), "%lld ", (long long)t);
return b;
}
+
+
+void
+catch(int n)
+{
+ if (ckfinish) (*ckfinish)(0);
+ _exit(FSCK_EXIT_SIGNALLED);
+}
+
+/*
+ * When preening, allow a single quit to signal
+ * a special exit after filesystem checks complete
+ * so that reboot sequence may be interrupted.
+ */
+void
+catchquit(int n)
+{
+ static const char msg[] =
+ "returning to single-user after filesystem check\n";
+ int serrno = errno;
+
+ (void)write(STDOUT_FILENO, msg, sizeof(msg) - 1);
+ returntosingle = 1;
+ (void)signal(SIGQUIT, SIG_DFL);
+ errno = serrno;
+}
+
+/*
+ * Ignore a single quit signal; wait and flush just in case.
+ * Used by child processes in preen.
+ */
+void
+voidquit(int n)
+{
+ int serrno = errno;
+
+ sleep(1);
+ (void)signal(SIGQUIT, SIG_IGN);
+ (void)signal(SIGQUIT, SIG_DFL);
+ errno = serrno;
+}
Index: src/sbin/fsck/fsutil.h
diff -u src/sbin/fsck/fsutil.h:1.15 src/sbin/fsck/fsutil.h:1.16
--- src/sbin/fsck/fsutil.h:1.15 Thu Feb 4 18:55:42 2010
+++ src/sbin/fsck/fsutil.h Thu Jun 9 15:57:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fsutil.h,v 1.15 2010/02/04 23:55:42 christos Exp $ */
+/* $NetBSD: fsutil.h,v 1.16 2011/06/09 19:57:50 christos Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -56,3 +56,9 @@
struct fstab;
int checkfstab(int, int, void *(*)(struct fstab *),
int (*) (const char *, const char *, const char *, void *, pid_t *));
+
+void (*ckfinish)(int);
+volatile sig_atomic_t returntosingle;
+void catch(int);
+void catchquit(int);
+void voidquit(int);
Index: src/sbin/fsck_ext2fs/extern.h
diff -u src/sbin/fsck_ext2fs/extern.h:1.6 src/sbin/fsck_ext2fs/extern.h:1.7
--- src/sbin/fsck_ext2fs/extern.h:1.6 Sun Jun 26 19:01:39 2005
+++ src/sbin/fsck_ext2fs/extern.h Thu Jun 9 15:57:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.6 2005/06/26 23:01:39 christos Exp $ */
+/* $NetBSD: extern.h,v 1.7 2011/06/09 19:57:50 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@@ -71,6 +71,3 @@
void resetinodebuf(void);
int setup(const char *);
struct ext2fs_dinode * getnextinode(ino_t);
-void catch(int);
-void catchquit(int);
-void voidquit(int);
Index: src/sbin/fsck_ext2fs/main.c
diff -u src/sbin/fsck_ext2fs/main.c:1.36 src/sbin/fsck_ext2fs/main.c:1.37
--- src/sbin/fsck_ext2fs/main.c:1.36 Wed Jan 6 20:39:56 2010
+++ src/sbin/fsck_ext2fs/main.c Thu Jun 9 15:57:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.36 2010/01/07 01:39:56 christos Exp $ */
+/* $NetBSD: main.c,v 1.37 2011/06/09 19:57:51 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -63,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94";
#else
-__RCSID("$NetBSD: main.c,v 1.36 2010/01/07 01:39:56 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.37 2011/06/09 19:57:51 christos Exp $");
#endif
#endif /* not lint */
@@ -100,6 +100,7 @@
int ch;
int ret = FSCK_EXIT_OK;
+ ckfinish = ckfini;
sync();
skipclean = 1;
while ((ch = getopt(argc, argv, "b:dfm:npPqUy")) != -1) {
Index: src/sbin/fsck_ext2fs/utilities.c
diff -u src/sbin/fsck_ext2fs/utilities.c:1.21 src/sbin/fsck_ext2fs/utilities.c:1.22
--- src/sbin/fsck_ext2fs/utilities.c:1.21 Wed Jan 6 20:39:56 2010
+++ src/sbin/fsck_ext2fs/utilities.c Thu Jun 9 15:57:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: utilities.c,v 1.21 2010/01/07 01:39:56 christos Exp $ */
+/* $NetBSD: utilities.c,v 1.22 2011/06/09 19:57:51 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
#if 0
static char sccsid[] = "@(#)utilities.c 8.1 (Berkeley) 6/5/93";
#else
-__RCSID("$NetBSD: utilities.c,v 1.21 2010/01/07 01:39:56 christos Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.22 2011/06/09 19:57:51 christos Exp $");
#endif
#endif /* not lint */
@@ -85,8 +85,6 @@
static void rwerror(const char *, daddr_t);
-extern volatile sig_atomic_t returntosingle;
-
int
ftypeok(struct ext2fs_dinode *dp)
{
@@ -461,46 +459,6 @@
memcpy(namebuf, cp, (size_t)(&namebuf[MAXPATHLEN] - cp));
}
-void
-catch(int n)
-{
- ckfini(0);
- _exit(FSCK_EXIT_SIGNALLED);
-}
-
-/*
- * When preening, allow a single quit to signal
- * a special exit after filesystem checks complete
- * so that reboot sequence may be interrupted.
- */
-void
-catchquit(int n)
-{
- static const char msg[] =
- "returning to single-user after filesystem check\n";
- int serrno = errno;
-
- (void)write(STDOUT_FILENO, msg, sizeof(msg) - 1);
- returntosingle = 1;
- (void)signal(SIGQUIT, SIG_DFL);
- errno = serrno;
-}
-
-/*
- * Ignore a single quit signal; wait and flush just in case.
- * Used by child processes in preen.
- */
-void
-voidquit(int n)
-{
- int serrno = errno;
-
- sleep(1);
- (void)signal(SIGQUIT, SIG_IGN);
- (void)signal(SIGQUIT, SIG_DFL);
- errno = serrno;
-}
-
/*
* determine whether an inode should be fixed.
*/
Index: src/sbin/fsck_ffs/extern.h
diff -u src/sbin/fsck_ffs/extern.h:1.26 src/sbin/fsck_ffs/extern.h:1.27
--- src/sbin/fsck_ffs/extern.h:1.26 Sun Mar 6 12:08:16 2011
+++ src/sbin/fsck_ffs/extern.h Thu Jun 9 15:57:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.26 2011/03/06 17:08:16 bouyer Exp $ */
+/* $NetBSD: extern.h,v 1.27 2011/06/09 19:57:52 christos Exp $ */
/*
* Copyright (c) 1994 James A. Jegers
@@ -33,11 +33,9 @@
void bufinit(void);
void bwrite(int, char *, daddr_t, long);
void cacheino(union dinode *, ino_t);
-void catch(int);
-void catchquit(int);
int changeino(ino_t, const char *, ino_t);
int chkrange(daddr_t, int);
-void ckfini(void);
+void ckfini(int);
int ckinode(union dinode *, struct inodesc *);
int clearentry(struct inodesc *);
void clri(struct inodesc *, const char *, int);
@@ -81,7 +79,6 @@
int reply(const char *);
void setinodebuf(ino_t);
int setup(const char *, const char *);
-void voidquit(int);
ssize_t readblk(union dinode *, off_t, struct bufarea **);
struct bufarea *expandfile(union dinode *);
Index: src/sbin/fsck_ffs/main.c
diff -u src/sbin/fsck_ffs/main.c:1.78 src/sbin/fsck_ffs/main.c:1.79
--- src/sbin/fsck_ffs/main.c:1.78 Sun Mar 6 12:08:16 2011
+++ src/sbin/fsck_ffs/main.c Thu Jun 9 15:57:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.78 2011/03/06 17:08:16 bouyer Exp $ */
+/* $NetBSD: main.c,v 1.79 2011/06/09 19:57:52 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14/95";
#else
-__RCSID("$NetBSD: main.c,v 1.78 2011/03/06 17:08:16 bouyer Exp $");
+__RCSID("$NetBSD: main.c,v 1.79 2011/06/09 19:57:52 christos Exp $");
#endif
#endif /* not lint */
@@ -86,6 +86,8 @@
char *snap_backup = NULL;
int snap_internal = 0;
+ ckfinish = ckfini;
+
if (getrlimit(RLIMIT_DATA, &r) == 0) {
r.rlim_cur = r.rlim_max;
(void) setrlimit(RLIMIT_DATA, &r);
@@ -445,7 +447,7 @@
markclean = 0;
#if LITE2BORKEN
if (!hotroot()) {
- ckfini();
+ ckfini(1);
} else {
struct statvfs stfs_buf;
/*
@@ -457,10 +459,10 @@
flags = 0;
if (markclean)
markclean = flags & MNT_RDONLY;
- ckfini();
+ ckfini(1);
}
#else
- ckfini();
+ ckfini(1);
#endif
for (cylno = 0; cylno < sblock->fs_ncg; cylno++)
if (inostathead[cylno].il_stat != NULL)
Index: src/sbin/fsck_ffs/pass1.c
diff -u src/sbin/fsck_ffs/pass1.c:1.47 src/sbin/fsck_ffs/pass1.c:1.48
--- src/sbin/fsck_ffs/pass1.c:1.47 Sun Mar 6 12:08:16 2011
+++ src/sbin/fsck_ffs/pass1.c Thu Jun 9 15:57:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.47 2011/03/06 17:08:16 bouyer Exp $ */
+/* $NetBSD: pass1.c,v 1.48 2011/06/09 19:57:52 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: pass1.c,v 1.47 2011/03/06 17:08:16 bouyer Exp $");
+__RCSID("$NetBSD: pass1.c,v 1.48 2011/06/09 19:57:52 christos Exp $");
#endif
#endif /* not lint */
@@ -385,7 +385,7 @@
markclean = 0;
pfatal("LINK COUNT TABLE OVERFLOW");
if (reply("CONTINUE") == 0) {
- ckfini();
+ ckfini(1);
exit(FSCK_EXIT_CHECK_FAILED);
}
} else {
@@ -504,7 +504,7 @@
printf(" (SKIPPING)\n");
else if (reply("CONTINUE") == 0) {
markclean = 0;
- ckfini();
+ ckfini(1);
exit(FSCK_EXIT_CHECK_FAILED);
}
return (STOP);
@@ -525,7 +525,7 @@
printf(" (SKIPPING)\n");
else if (reply("CONTINUE") == 0) {
markclean = 0;
- ckfini();
+ ckfini(1);
exit(FSCK_EXIT_CHECK_FAILED);
}
return (STOP);
@@ -536,7 +536,7 @@
pfatal("DUP TABLE OVERFLOW.");
if (reply("CONTINUE") == 0) {
markclean = 0;
- ckfini();
+ ckfini(1);
exit(FSCK_EXIT_CHECK_FAILED);
}
return (STOP);
Index: src/sbin/fsck_ffs/pass2.c
diff -u src/sbin/fsck_ffs/pass2.c:1.46 src/sbin/fsck_ffs/pass2.c:1.47
--- src/sbin/fsck_ffs/pass2.c:1.46 Sun Mar 6 12:08:16 2011
+++ src/sbin/fsck_ffs/pass2.c Thu Jun 9 15:57:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pass2.c,v 1.46 2011/03/06 17:08:16 bouyer Exp $ */
+/* $NetBSD: pass2.c,v 1.47 2011/06/09 19:57:52 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: pass2.c,v 1.46 2011/03/06 17:08:16 bouyer Exp $");
+__RCSID("$NetBSD: pass2.c,v 1.47 2011/06/09 19:57:52 christos Exp $");
#endif
#endif /* not lint */
@@ -79,7 +79,7 @@
pfatal("ROOT INODE UNALLOCATED");
if (reply("ALLOCATE") == 0) {
markclean = 0;
- ckfini();
+ ckfini(1);
exit(FSCK_EXIT_CHECK_FAILED);
}
if (allocdir(ROOTINO, ROOTINO, 0755) != ROOTINO)
@@ -96,7 +96,7 @@
}
markclean = 0;
if (reply("CONTINUE") == 0) {
- ckfini();
+ ckfini(1);
exit(FSCK_EXIT_CHECK_FAILED);
}
break;
@@ -112,7 +112,7 @@
}
if (reply("FIX") == 0) {
markclean = 0;
- ckfini();
+ ckfini(1);
exit(FSCK_EXIT_CHECK_FAILED);
}
dp = ginode(ROOTINO);
Index: src/sbin/fsck_ffs/setup.c
diff -u src/sbin/fsck_ffs/setup.c:1.92 src/sbin/fsck_ffs/setup.c:1.93
--- src/sbin/fsck_ffs/setup.c:1.92 Sun Mar 20 07:41:24 2011
+++ src/sbin/fsck_ffs/setup.c Thu Jun 9 15:57:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.92 2011/03/20 11:41:24 bouyer Exp $ */
+/* $NetBSD: setup.c,v 1.93 2011/06/09 19:57:52 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95";
#else
-__RCSID("$NetBSD: setup.c,v 1.92 2011/03/20 11:41:24 bouyer Exp $");
+__RCSID("$NetBSD: setup.c,v 1.93 2011/06/09 19:57:52 christos Exp $");
#endif
#endif /* not lint */
@@ -577,7 +577,7 @@
return (1);
badsblabel:
markclean=0;
- ckfini();
+ ckfini(1);
return (0);
}
Index: src/sbin/fsck_ffs/utilities.c
diff -u src/sbin/fsck_ffs/utilities.c:1.59 src/sbin/fsck_ffs/utilities.c:1.60
--- src/sbin/fsck_ffs/utilities.c:1.59 Sun Mar 6 12:08:16 2011
+++ src/sbin/fsck_ffs/utilities.c Thu Jun 9 15:57:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: utilities.c,v 1.59 2011/03/06 17:08:16 bouyer Exp $ */
+/* $NetBSD: utilities.c,v 1.60 2011/06/09 19:57:52 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95";
#else
-__RCSID("$NetBSD: utilities.c,v 1.59 2011/03/06 17:08:16 bouyer Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.60 2011/06/09 19:57:52 christos Exp $");
#endif
#endif /* not lint */
@@ -66,8 +66,6 @@
static void rwerror(const char *, daddr_t);
-extern volatile sig_atomic_t returntosingle;
-
int
ftypeok(union dinode *dp)
{
@@ -262,11 +260,17 @@
}
void
-ckfini(void)
+ckfini(int noint)
{
struct bufarea *bp, *nbp;
int ofsmodified, cnt = 0;
+ if (!noint) {
+ if (doinglevel2)
+ return;
+ markclean = 0;
+ }
+
if (fswritefd < 0) {
(void)close(fsreadfd);
return;
@@ -511,49 +515,6 @@
memmove(namebuf, cp, (size_t)(&namebuf[MAXPATHLEN] - cp));
}
-void
-catch(int sig)
-{
- if (!doinglevel2) {
- markclean = 0;
- ckfini();
- }
- _exit(FSCK_EXIT_SIGNALLED);
-}
-
-/*
- * When preening, allow a single quit to signal
- * a special exit after filesystem checks complete
- * so that reboot sequence may be interrupted.
- */
-void
-catchquit(int sig)
-{
- static const char msg[] =
- "returning to single-user after file system check\n";
- int serrno = errno;
-
- (void)write(STDOUT_FILENO, msg, sizeof(msg) - 1);
- returntosingle = 1;
- (void)signal(SIGQUIT, SIG_DFL);
- errno = serrno;
-}
-
-/*
- * Ignore a single quit signal; wait and flush just in case.
- * Used by child processes in preen.
- */
-void
-voidquit(int sig)
-{
- int serrno = errno;
-
- sleep(1);
- (void)signal(SIGQUIT, SIG_IGN);
- (void)signal(SIGQUIT, SIG_DFL);
- errno = serrno;
-}
-
/*
* determine whether an inode should be fixed.
*/
Index: src/sbin/fsck_lfs/extern.h
diff -u src/sbin/fsck_lfs/extern.h:1.8 src/sbin/fsck_lfs/extern.h:1.9
--- src/sbin/fsck_lfs/extern.h:1.8 Sun Jun 26 22:48:28 2005
+++ src/sbin/fsck_lfs/extern.h Thu Jun 9 15:57:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.8 2005/06/27 02:48:28 christos Exp $ */
+/* $NetBSD: extern.h,v 1.9 2011/06/09 19:57:53 christos Exp $ */
/*
* Copyright (c) 1994 James A. Jegers
@@ -69,6 +69,3 @@
int reply(const char *);
void resetinodebuf(void);
int setup(const char *);
-void catch(int);
-void catchquit(int);
-void voidquit(int);
Index: src/sbin/fsck_lfs/main.c
diff -u src/sbin/fsck_lfs/main.c:1.42 src/sbin/fsck_lfs/main.c:1.43
--- src/sbin/fsck_lfs/main.c:1.42 Wed Jan 6 20:39:56 2010
+++ src/sbin/fsck_lfs/main.c Thu Jun 9 15:57:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.42 2010/01/07 01:39:56 christos Exp $ */
+/* $NetBSD: main.c,v 1.43 2011/06/09 19:57:53 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -76,6 +76,7 @@
int ret = FSCK_EXIT_OK;
const char *optstring = "b:dfi:m:npPqUy";
+ ckfinish = ckfini;
skipclean = 1;
exitonfail = 0;
idaddr = 0x0;
Index: src/sbin/fsck_lfs/utilities.c
diff -u src/sbin/fsck_lfs/utilities.c:1.30 src/sbin/fsck_lfs/utilities.c:1.31
--- src/sbin/fsck_lfs/utilities.c:1.30 Wed Jan 6 23:21:28 2010
+++ src/sbin/fsck_lfs/utilities.c Thu Jun 9 15:57:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: utilities.c,v 1.30 2010/01/07 04:21:28 christos Exp $ */
+/* $NetBSD: utilities.c,v 1.31 2011/06/09 19:57:53 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -61,7 +61,6 @@
long diskreads, totalreads; /* Disk cache statistics */
-extern volatile sig_atomic_t returntosingle;
extern off_t locked_queue_bytes;
int
@@ -243,43 +242,6 @@
memcpy(namebuf, cp, (size_t) (&namebuf[MAXPATHLEN] - cp));
}
-void
-catch(int n)
-{
- ckfini(0);
- _exit(FSCK_EXIT_SIGNALLED);
-}
-/*
- * When preening, allow a single quit to signal
- * a special exit after filesystem checks complete
- * so that reboot sequence may be interrupted.
- */
-void
-catchquit(int n)
-{
- static const char msg[] =
- "returning to single-user after filesystem check\n";
- int serrno = errno;
-
- (void)write(STDOUT_FILENO, msg, sizeof(msg) - 1);
- returntosingle = 1;
- (void) signal(SIGQUIT, SIG_DFL);
- serrno = errno;
-}
-/*
- * Ignore a single quit signal; wait and flush just in case.
- * Used by child processes in preen.
- */
-void
-voidquit(int n)
-{
- int serrno = errno;
-
- sleep(1);
- (void) signal(SIGQUIT, SIG_IGN);
- (void) signal(SIGQUIT, SIG_DFL);
- errno = serrno;
-}
/*
* determine whether an inode should be fixed.
*/
Index: src/sbin/fsdb/fsdb.c
diff -u src/sbin/fsdb/fsdb.c:1.39 src/sbin/fsdb/fsdb.c:1.40
--- src/sbin/fsdb/fsdb.c:1.39 Sat Apr 11 02:53:53 2009
+++ src/sbin/fsdb/fsdb.c Thu Jun 9 15:57:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fsdb.c,v 1.39 2009/04/11 06:53:53 lukem Exp $ */
+/* $NetBSD: fsdb.c,v 1.40 2011/06/09 19:57:53 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.39 2009/04/11 06:53:53 lukem Exp $");
+__RCSID("$NetBSD: fsdb.c,v 1.40 2011/06/09 19:57:53 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -85,7 +85,6 @@
static int find_indirblks64(uint64_t blk, int ind_level,
uint64_t *blknum);
-int returntosingle = 0;
union dinode *curinode;
ino_t curinum;
