From cebb7ac61b41edc4c053a99cf7c9c173bf9318a4 Mon Sep 17 00:00:00 2001 From: bde Date: Mon, 17 Feb 1997 13:07:40 +0000 Subject: Import Lite2's dumplfs. --- sbin/dumplfs/misc.c | 43 ++++++++----------------------------------- 1 file changed, 8 insertions(+), 35 deletions(-) (limited to 'sbin/dumplfs/misc.c') diff --git a/sbin/dumplfs/misc.c b/sbin/dumplfs/misc.c index 861d0fd..34c5982 100644 --- a/sbin/dumplfs/misc.c +++ b/sbin/dumplfs/misc.c @@ -32,15 +32,17 @@ */ #ifndef lint -static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/5/93"; +static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/28/95"; #endif /* not lint */ #include -#include + +#include #include -#include #include +#include #include +#include #include "extern.h" void @@ -53,38 +55,9 @@ get(fd, off, p, len) int rbytes; if (lseek(fd, off, SEEK_SET) < 0) - err("%s: %s", special, strerror(errno)); + err(1, "%s", special); if ((rbytes = read(fd, p, len)) < 0) - err("%s: %s", special, strerror(errno)); + err(1, "%s", special); if (rbytes != len) - err("%s: short read (%d, not %d)", special, rbytes, len); -} - -#if __STDC__ -#include -#else -#include -#endif - -void -#if __STDC__ -err(const char *fmt, ...) -#else -err(fmt, va_alist) - char *fmt; - va_dcl -#endif -{ - va_list ap; -#if __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif - (void)fprintf(stderr, "dumplfs: "); - (void)vfprintf(stderr, fmt, ap); - va_end(ap); - (void)fprintf(stderr, "\n"); - exit(1); - /* NOTREACHED */ + errx(1, "%s: short read (%d, not %d)", special, rbytes, len); } -- cgit v1.1