Module Name: src
Committed By: dholland
Date: Sun Jul 13 02:44:21 UTC 2014
Modified Files:
src/sbin/fsck_lfs: lfs.c lfs_user.h main.c
Log Message:
Revert previous; it doesn't work because all the lfs tools
promiscuously .PATH in each other's source files, and I haven't the
time or patience to deal with it tonight.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/fsck_lfs/lfs_user.h
cvs rdiff -u -r1.47 -r1.48 src/sbin/fsck_lfs/main.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_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.42 src/sbin/fsck_lfs/lfs.c:1.43
--- src/sbin/fsck_lfs/lfs.c:1.42 Sat Jul 12 19:44:00 2014
+++ src/sbin/fsck_lfs/lfs.c Sun Jul 13 02:44:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.42 2014/07/12 19:44:00 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.43 2014/07/13 02:44:21 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -85,7 +85,6 @@
#include <unistd.h>
#include <util.h>
-#include "fsutil.h"
#include "bufcache.h"
#include "vnode.h"
#include "lfs_user.h"
@@ -108,6 +107,7 @@ static int
lfs_fragextend(struct uvnode *, int, int, daddr_t, struct ubuf **);
int fsdirty = 0;
+void (*panic_func)(int, const char *, va_list) = my_vpanic;
/*
* LFS buffer and uvnode operations
@@ -835,12 +835,19 @@ check_summary(struct lfs *fs, SEGSUM *sp
/* print message and exit */
void
+my_vpanic(int fatal, const char *fmt, va_list ap)
+{
+ (void) vprintf(fmt, ap);
+ exit(8);
+}
+
+void
call_panic(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- vmsg(1, fmt, ap);
+ panic_func(1, fmt, ap);
va_end(ap);
}
Index: src/sbin/fsck_lfs/lfs_user.h
diff -u src/sbin/fsck_lfs/lfs_user.h:1.6 src/sbin/fsck_lfs/lfs_user.h:1.7
--- src/sbin/fsck_lfs/lfs_user.h:1.6 Sat Jul 12 19:48:24 2014
+++ src/sbin/fsck_lfs/lfs_user.h Sun Jul 13 02:44:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_user.h,v 1.6 2014/07/12 19:48:24 dholland Exp $ */
+/* $NetBSD: lfs_user.h,v 1.7 2014/07/13 02:44:21 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -89,6 +89,7 @@ int check_summary(struct lfs *, struct s
ulfs_daddr_t try_verify(struct lfs *, struct uvnode *, ulfs_daddr_t, int);
struct ulfs1_dinode *lfs_ifind(struct lfs *, ino_t, struct ubuf *);
void call_panic(const char *, ...);
+void my_vpanic(int, const char *, va_list);
int extend_ifile(struct lfs *);
struct uvnode *lfs_valloc(struct lfs *, ino_t);
int lfs_balloc(struct uvnode *, off_t, int, struct ubuf **);
Index: src/sbin/fsck_lfs/main.c
diff -u src/sbin/fsck_lfs/main.c:1.47 src/sbin/fsck_lfs/main.c:1.48
--- src/sbin/fsck_lfs/main.c:1.47 Sat Jul 12 19:44:00 2014
+++ src/sbin/fsck_lfs/main.c Sun Jul 13 02:44:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.47 2014/07/12 19:44:00 dholland Exp $ */
+/* $NetBSD: main.c,v 1.48 2014/07/13 02:44:21 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -57,6 +57,7 @@ static int argtoi(int, const char *, con
static int checkfilesys(const char *, char *, long, int);
static void usage(void);
static void efun(int, const char *, ...);
+extern void (*panic_func)(int, const char *, va_list);
static void
efun(int eval, const char *fmt, ...)
@@ -80,6 +81,7 @@ main(int argc, char **argv)
skipclean = 1;
exitonfail = 0;
idaddr = 0x0;
+ panic_func = vmsg;
esetfunc(efun);
while ((ch = getopt(argc, argv, optstring)) != -1) {
switch (ch) {
