diff options
author | charnier <charnier@FreeBSD.org> | 1998-06-08 06:44:05 +0000 |
---|---|---|
committer | charnier <charnier@FreeBSD.org> | 1998-06-08 06:44:05 +0000 |
commit | 12c0eabbe1dd532dadbb70846bbb86b0f2f0b97d (patch) | |
tree | 6d0829ba6b2fb6ca6bf64d91aa55e45726cbcd07 /sbin/dset | |
parent | 350780df4914732fb841800b1029ac60db8c6921 (diff) | |
download | FreeBSD-src-12c0eabbe1dd532dadbb70846bbb86b0f2f0b97d.zip FreeBSD-src-12c0eabbe1dd532dadbb70846bbb86b0f2f0b97d.tar.gz |
Add rcsid, remove unused #includes. Use err(3).
Diffstat (limited to 'sbin/dset')
-rw-r--r-- | sbin/dset/dset.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sbin/dset/dset.c b/sbin/dset/dset.c index 2428289..7a1c58d 100644 --- a/sbin/dset/dset.c +++ b/sbin/dset/dset.c @@ -13,21 +13,23 @@ * Device configuration to kernel image saving utility. */ -#include <stdio.h> -#include <nlist.h> -#include <paths.h> -#include <unistd.h> +#ifndef lint +static const char rcsid[] = + "$Id$"; +#endif /* not lint */ + +#include <err.h> #include <fcntl.h> -#include <a.out.h> #include <kvm.h> +#include <a.out.h> #include <limits.h> +#include <paths.h> +#include <stdio.h> +#include <string.h> #include <unistd.h> -#include <stdlib.h> #include <sys/stat.h> #include <sys/types.h> -#include <sys/uio.h> #include <sys/param.h> -#include <machine/param.h> #include "i386/isa/isa_device.h" #include "i386/isa/pnp.h" @@ -37,8 +39,6 @@ struct pnp_cinfo old_ov[MAX_PNP_LDN]; #define TRUE 1 #define FALSE 0 -extern int errno; - struct nlist nl[] = { #define N_TABTTY 0 {"_isa_devtab_tty"}, @@ -48,13 +48,13 @@ struct nlist nl[] = { {"_isa_devtab_net"}, #define N_TABNULL 3 {"_isa_devtab_null"}, - "", + {""}, }; #define N_TABLAST N_TABNULL struct nlist nlk[] = { {"_isa_devlist"}, - "", + {""}, }; struct nlist nlaux[] = { @@ -81,10 +81,9 @@ fatal(name, str) if (quiet) exit(1); if (str) - fprintf(stderr, "%s : %s\n", name, str); + errx(1, "%s: %s", name, str); else - perror(name); - exit(1); + errx(1, "%s", name); } void @@ -94,17 +93,19 @@ error(name, str) if (quiet) return; if (str) - fprintf(stderr, "%s : %s\n", name, str); + warnx("%s: %s", name, str); else - perror(name); + warnx("%s", name); } void -usage(char *title) +usage() { - fprintf(stderr, "usage: %s [-qtv]\n", title); + fprintf(stderr, "usage: dset [-qtv]\n"); + exit(1); } +int main(ac, av) int ac; char **av; @@ -123,7 +124,6 @@ main(ac, av) static char errb[_POSIX2_LINE_MAX]; const char *kernel = NULL; - extern char *optarg; char ch; int testonly = FALSE; int verbose = FALSE; @@ -143,8 +143,7 @@ main(ac, av) case '?': default: - usage(av[0]); - exit(1); + usage(); } @@ -428,4 +427,5 @@ main(ac, av) kvm_close(kd); close(f); + return(0); } |