X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=dss.c;h=d60f00b1cc08f44ac29ae383c71b376f9e9ef49d;hb=ffce5ac0f8d17dad30fa0c2fee32aef9eadecf27;hp=bd9e577e3f6a6df2b94c6f48dddb9ffdeff96d39;hpb=c9fd9f2239319b95c46e49b1b7040e1a898cdcf7;p=dss.git

diff --git a/dss.c b/dss.c
index bd9e577..d60f00b 100644
--- a/dss.c
+++ b/dss.c
@@ -1526,15 +1526,18 @@ out:
 
 static void exit_hook(int exit_code)
 {
-	const char *argv[3];
 	pid_t pid;
-
-	argv[0] = OPT_STRING_VAL(DSS, EXIT_HOOK);
-	argv[1] = dss_strerror(-exit_code);
-	argv[2] = NULL;
-
-	DSS_NOTICE_LOG(("executing %s %s\n", argv[0], argv[1]));
-	dss_exec(&pid, argv[0], (char **)argv);
+	char **argv, *tmp = dss_strdup(OPT_STRING_VAL(DSS, EXIT_HOOK));
+	unsigned n = split_args(tmp, &argv, " \t");
+
+	n++;
+	argv = dss_realloc(argv, (n + 1) * sizeof(char *));
+	argv[n - 1] = dss_strdup(dss_strerror(-exit_code));
+	argv[n] = NULL;
+	dss_exec(&pid, argv[0], argv);
+	free(argv[n - 1]);
+	free(argv);
+	free(tmp);
 }
 
 static void lock_dss_or_die(void)
@@ -1709,13 +1712,17 @@ static int com_ls(void)
 	int i;
 	struct snapshot_list sl;
 	struct snapshot *s;
+	int64_t now = get_current_time();
 
 	dss_get_snapshot_list(&sl);
 	FOR_EACH_SNAPSHOT(s, i, &sl) {
-		int64_t d = 0;
+		int64_t d;
 		if (s->flags & SS_COMPLETE)
 			d = (s->completion_time - s->creation_time) / 60;
-		dss_msg("%u\t%s\t%3" PRId64 ":%02" PRId64 "\n", s->interval, s->name, d/60, d%60);
+		else
+			d = (now - s->creation_time) / 60;
+		dss_msg("%u\t%s\t%3" PRId64 ":%02" PRId64 "\n", s->interval,
+			s->name, d / 60, d % 60);
 	}
 	free_snapshot_list(&sl);
 	return 1;