From b655413ed632e6b00667274be5b7f095ea97f557 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 24 Sep 1998 06:24:21 +0000 Subject: Back out gzip changes, they will not make 2.4 --- sbin/savecore/Makefile | 8 ++------ sbin/savecore/savecore.c | 15 +-------------- sbin/savecore/savecore_old.c | 17 ++--------------- 3 files changed, 5 insertions(+), 35 deletions(-) (limited to 'sbin') diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile index e86f7659ce9..7cfced77ff2 100644 --- a/sbin/savecore/Makefile +++ b/sbin/savecore/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 1998/09/17 01:16:14 millert Exp $ +# $OpenBSD: Makefile,v 1.13 1998/09/24 06:24:20 millert Exp $ PROG= savecore @@ -10,12 +10,8 @@ SRCS= savecore.c LDADD= -lkvm DPADD= ${LIBKVM} .endif -SRCS+= zopen.c nlist.c -#CFLAGS+=-D_NLIST_DO_GZIP -#LDADD+= -lz -#DPADD+= ${LIBZ} +SRCS+= zopen.c MAN= savecore.8 .PATH: ${.CURDIR}/../../usr.bin/compress -.PATH: ${.CURDIR}/../../lib/libc/gen .include diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index 5e324dfef34..872387e174b 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: savecore.c,v 1.14 1998/09/05 16:33:25 millert Exp $ */ +/* $OpenBSD: savecore.c,v 1.15 1998/09/24 06:24:20 millert Exp $ */ /* $NetBSD: savecore.c,v 1.26 1996/03/18 21:16:05 leo Exp $ */ /*- @@ -214,7 +214,6 @@ kmem_setup() kvm_t *kd_kern; char errbuf[_POSIX2_LINE_MAX]; int i, hdrsz; - struct stat st; /* * Some names we need for the currently running system, others for @@ -266,18 +265,6 @@ kmem_setup() dump_sys = kernel ? kernel : _PATH_UNIX; - /* If no dumpsys, check for dumpsys.gz */ - if (stat(dump_sys, &st) == -1) { - char *gzpath; - - asprintf(&gzpath, "%s.gz", dump_sys); - if (stat(gzpath, &st) == -1) { - syslog(LOG_ERR, "%s: %m", dump_sys); - exit(1); - } - kernel = dump_sys = gzpath; - } - kd_dump = kvm_openfiles(dump_sys, ddname, NULL, O_RDWR, errbuf); if (kd_dump == NULL) { syslog(LOG_ERR, "%s: kvm_openfiles: %s", dump_sys, errbuf); diff --git a/sbin/savecore/savecore_old.c b/sbin/savecore/savecore_old.c index 4c9c636216b..5a060a5e718 100644 --- a/sbin/savecore/savecore_old.c +++ b/sbin/savecore/savecore_old.c @@ -1,4 +1,4 @@ -/* $OpenBSD: savecore_old.c,v 1.10 1998/09/05 16:33:25 millert Exp $ */ +/* $OpenBSD: savecore_old.c,v 1.11 1998/09/24 06:24:20 millert Exp $ */ /* $NetBSD: savecore_old.c,v 1.1.1.1 1996/03/16 10:25:11 leo Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)savecore.c 8.3 (Berkeley) 1/2/94"; #else -static char rcsid[] = "$OpenBSD: savecore_old.c,v 1.10 1998/09/05 16:33:25 millert Exp $"; +static char rcsid[] = "$OpenBSD: savecore_old.c,v 1.11 1998/09/24 06:24:20 millert Exp $"; #endif #endif /* not lint */ @@ -209,7 +209,6 @@ kmem_setup() FILE *fp; int kmem, i; char *dump_sys, *current_sys; - struct stat st; /* * Some names we need for the currently running system, others for @@ -236,18 +235,6 @@ kmem_setup() dump_sys = kernel ? kernel : _PATH_UNIX; - /* If no dumpsys, check for dumpsys.gz */ - if (stat(dump_sys, &st) == -1) { - char *gzpath; - - asprintf(&gzpath, "%s.gz", dump_sys); - if (stat(gzpath, &st) == -1) { - syslog(LOG_ERR, "%s: %m", dump_sys); - exit(1); - } - kernel = dump_sys = gzpath; - } - if ((nlist(dump_sys, dump_nl)) == -1) syslog(LOG_ERR, "%s: nlist: %s", dump_sys, strerror(errno)); for (i = 0; dumpsyms[i] != -1; i++) -- cgit v1.2.3