Module Name: src
Committed By: bouyer
Date: Sat Nov 28 16:02:17 UTC 2009
Modified Files:
src/sbin/savecore [netbsd-5]: savecore.c
Log Message:
Pull up following revision(s) (requested by dogcow in ticket #1157):
sbin/savecore/savecore.c: revision 1.81
Instead of exiting with an obscure error message if -N /kernelname isn't
specified, blithely assume the kernel will consume around 20 megs.
To generate a diff of this commit:
cvs rdiff -u -r1.76.2.1 -r1.76.2.2 src/sbin/savecore/savecore.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/savecore/savecore.c
diff -u src/sbin/savecore/savecore.c:1.76.2.1 src/sbin/savecore/savecore.c:1.76.2.2
--- src/sbin/savecore/savecore.c:1.76.2.1 Tue Mar 24 20:46:43 2009
+++ src/sbin/savecore/savecore.c Sat Nov 28 16:02:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: savecore.c,v 1.76.2.1 2009/03/24 20:46:43 snj Exp $ */
+/* $NetBSD: savecore.c,v 1.76.2.2 2009/11/28 16:02:17 bouyer Exp $ */
/*-
* Copyright (c) 1986, 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)savecore.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: savecore.c,v 1.76.2.1 2009/03/24 20:46:43 snj Exp $");
+__RCSID("$NetBSD: savecore.c,v 1.76.2.2 2009/11/28 16:02:17 bouyer Exp $");
#endif
#endif /* not lint */
@@ -910,11 +910,9 @@
struct statvfs fsbuf;
char mbuf[100], path[MAXPATHLEN];
- if (stat(kernel, &st) < 0) {
- syslog(LOG_ERR, "%s: %m", kernel);
- exit(1);
- }
- kernelsize = st.st_blocks * S_BLKSIZE;
+ /* XXX assume a reasonable default, unless we find a kernel. */
+ kernelsize = 20 * 1024 * 1024;
+ if (!stat(kernel, &st)) kernelsize = st.st_blocks * S_BLKSIZE;
if (statvfs(dirname, &fsbuf) < 0) {
syslog(LOG_ERR, "%s: %m", dirname);
exit(1);
