Mercurial > illumos > illumos-gate

changeset 10909:11fc80bc5cb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6896294 savecore dumps core - segmentation fault
author Dave Plauger <Dave.Plauger@Sun.COM>
date Thu, 29 Oct 2009 18:18:00 -0400
parents 20912677f009
children 951a65b3846b
files usr/src/cmd/savecore/savecore.c
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/savecore/savecore.c	Thu Oct 29 13:12:37 2009 -0700
+++ b/usr/src/cmd/savecore/savecore.c	Thu Oct 29 18:18:00 2009 -0400
@@ -1362,7 +1362,7 @@
 	Stat_t st;
 	struct rlimit rl;
 	long filebounds = -1;
-	char namelist[30], corefile[30], boundstr[30], metricsname[PATH_MAX];
+	char namelist[30], corefile[30], boundstr[30];
 
 	startts = gethrtime();
 
@@ -1373,8 +1373,9 @@
 	openlog(progname, LOG_ODELAY, LOG_AUTH);
 
 	(void) defopen("/etc/dumpadm.conf");
-	savedir = strdup(defread("DUMPADM_SAVDIR="));
-	sprintf(metricsname, "%s/%s", savedir, METRICSFILE);
+	savedir = defread("DUMPADM_SAVDIR=");
+	if (savedir != NULL)
+		savedir = strdup(savedir);
 
 	while ((c = getopt(argc, argv, "Lvdmf:")) != EOF) {
 		switch (c) {
@@ -1502,7 +1503,7 @@
 
 		if (metrics_size > 0) {
 			int sec = (gethrtime() - startts) / 1000 / 1000 / 1000;
-			FILE *mfile = fopen(metricsname, "a");
+			FILE *mfile = fopen(METRICSFILE, "a");
 			char *metrics = Zalloc(metrics_size + 1);
 
 			Pread(dumpfd, metrics, metrics_size, endoff +
@@ -1511,7 +1512,7 @@
 			if (mfile == NULL) {
 				logprint(LOG_WARNING, 1, -1,
 				    "Can't create %s:\n%s",
-				    metricsname, metrics);
+				    METRICSFILE, metrics);
 			} else {
 				fprintf(mfile, "[[[[,,,");
 				for (i = 0; i < argc; i++)
@@ -1561,9 +1562,9 @@
 
 		build_corefile(namelist, corefile);
 
-		if (access(metricsname, F_OK) == 0) {
+		if (access(METRICSFILE, F_OK) == 0) {
 			int sec = (gethrtime() - startts) / 1000 / 1000 / 1000;
-			FILE *mfile = fopen(metricsname, "a");
+			FILE *mfile = fopen(METRICSFILE, "a");
 
 			fprintf(mfile, "[[[[,,,");
 			for (i = 0; i < argc; i++)