X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=491b8aa791fdafc29589ec08eae878e9e67039be;hp=60c05916424e5336401abb6ee284049fdfb5dc04;hb=324d1364004376fa0b018afcb57cfe14aca7fcdb;hpb=faed24aec8859d232fe3c0da415265e0de099ce4

diff --git a/dss.c b/dss.c
index 60c0591..491b8aa 100644
--- a/dss.c
+++ b/dss.c
@@ -63,6 +63,8 @@ static struct lls_parse_result *cmdline_lpr, *lpr;
 
 /** Parsed subcommand options. */
 static struct lls_parse_result *cmdline_sublpr, *sublpr;
+/* The executing subcommand (NULL at startup). */
+static const struct lls_command *subcmd;
 /** Wether daemon_init() was called. */
 static bool daemonized;
 /** Non-NULL if we log to a file. */
@@ -242,16 +244,19 @@ __printf_1_2 void dss_log(const char* fmt,...)
 	if (loglevel < lpr_ll)
 		return;
 	outfd = logfile? logfile : stderr;
-	time(&t1);
-	tm = localtime(&t1);
-	strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
-	fprintf(outfd, "%s ", str);
-	if (lpr_ll <= INFO)
-		fprintf(outfd, "%i: ", loglevel);
+	if (subcmd == CMD_PTR(RUN)) {
+		time(&t1);
+		tm = localtime(&t1);
+		strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
+		fprintf(outfd, "%s ", str);
+		if (lpr_ll <= INFO)
+			fprintf(outfd, "%i: ", loglevel);
+	}
+	if (subcmd == CMD_PTR(RUN))
 #ifdef DSS_NO_FUNC_NAMES
-	fprintf(outfd, "%s:%d: ", location_file, location_line);
+		fprintf(outfd, "%s:%d: ", location_file, location_line);
 #else
-	fprintf(outfd, "%s: ", location_func);
+		fprintf(outfd, "%s: ", location_func);
 #endif
 	va_start(argp, fmt);
 	vfprintf(outfd, fmt, argp);
@@ -297,6 +302,7 @@ static int send_signal(int sig, bool wait)
 		dss_msg("%d\n", (int)pid);
 		return 0;
 	}
+	DSS_NOTICE_LOG(("sending signal %d to pid %d\n", sig, (int)pid));
 	ret = kill(pid, sig);
 	if (ret < 0)
 		return -ERRNO_TO_DSS_ERROR(errno);
@@ -534,7 +540,7 @@ static struct snapshot *find_orphaned_snapshot(struct snapshot_list *sl)
 	struct snapshot *s;
 	int i;
 
-	DSS_DEBUG_LOG(("looking for orphaned snapshots\n"));
+	DSS_DEBUG_LOG(("looking for old incomplete snapshots\n"));
 	FOR_EACH_SNAPSHOT(s, i, sl) {
 		if (snapshot_is_being_created(s))
 			continue;
@@ -748,6 +754,7 @@ static int try_to_free_disk_space(void)
 	if (!low_disk_space)
 		goto out;
 	DSS_WARNING_LOG(("disk space low and nothing obvious to remove\n"));
+	why = "oldest";
 	victim = find_oldest_removable_snapshot(&sl);
 	if (victim)
 		goto remove;
@@ -1072,20 +1079,39 @@ static int handle_sigchld(void)
 	return -E_BUG;
 }
 
+/* also checks if . is a mountpoint, if --mountpoint was given */
 static int change_to_dest_dir(void)
 {
 	int ret;
 	const char *dd = OPT_STRING_VAL(DSS, DEST_DIR);
+	struct stat dot, dotdot;
 
 	DSS_INFO_LOG(("changing cwd to %s\n", dd));
-	if (chdir(dd) >= 0)
-		return 1;
-	ret = -ERRNO_TO_DSS_ERROR(errno);
-	DSS_ERROR_LOG(("could not change cwd to %s\n", dd));
-	return ret;
+	if (chdir(dd) < 0) {
+		ret = -ERRNO_TO_DSS_ERROR(errno);
+		DSS_ERROR_LOG(("could not change cwd to %s\n", dd));
+		return ret;
+	}
+	if (!OPT_GIVEN(DSS, MOUNTPOINT))
+		return 0;
+	if (stat(".", &dot) < 0) {
+		ret = -ERRNO_TO_DSS_ERROR(errno);
+		DSS_ERROR_LOG(("could not stat .\n"));
+		return ret;
+	}
+	if (stat("..", &dotdot) < 0) {
+		ret = -ERRNO_TO_DSS_ERROR(errno);
+		DSS_ERROR_LOG(("could not stat ..\n"));
+		return ret;
+	}
+	if (dot.st_dev == dotdot.st_dev && dot.st_ino != dotdot.st_ino) {
+		DSS_ERROR_LOG(("mountpoint check failed for %s\n", dd));
+		return -E_MOUNTPOINT;
+	}
+	return 1;
 }
 
-static int check_config(const struct lls_command *cmd)
+static int check_config(void)
 {
 	int ret;
 	uint32_t unit_interval = OPT_UINT32_VAL(DSS, UNIT_INTERVAL);
@@ -1101,13 +1127,13 @@ static int check_config(const struct lls_command *cmd)
 		DSS_ERROR_LOG(("bad number of intervals: %i\n", num_intervals));
 		return -E_INVALID_NUMBER;
 	}
-	if (cmd == CMD_PTR(RUN) || cmd == CMD_PTR(CREATE))
+	if (subcmd == CMD_PTR(RUN) || subcmd == CMD_PTR(CREATE))
 		if (!OPT_GIVEN(DSS, SOURCE_DIR)) {
 			DSS_ERROR_LOG(("--source-dir required\n"));
 			return -E_SYNTAX;
 		}
-	if (cmd == CMD_PTR(RUN) || cmd == CMD_PTR(CREATE)
-			|| cmd == CMD_PTR(LS) || cmd == CMD_PTR(PRUNE)) {
+	if (subcmd == CMD_PTR(RUN) || subcmd == CMD_PTR(CREATE)
+			|| subcmd == CMD_PTR(LS) || subcmd == CMD_PTR(PRUNE)) {
 		if (!OPT_GIVEN(DSS, DEST_DIR)) {
 			DSS_ERROR_LOG(("--dest-dir required\n"));
 			return -E_SYNTAX;
@@ -1245,7 +1271,7 @@ static int handle_sighup(void)
 	ret = parse_config_file(true /* SIGHUP */, CMD_PTR(RUN));
 	if (ret < 0)
 		return ret;
-	ret = check_config(CMD_PTR(RUN));
+	ret = check_config();
 	if (ret < 0)
 		return ret;
 	close_log(logfile);
@@ -1519,15 +1545,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)
@@ -1704,19 +1733,30 @@ 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;
 }
 EXPORT_CMD_HANDLER(ls);
 
+static int com_configtest(void)
+{
+	printf("Syntax Ok\n");
+	return 0;
+}
+EXPORT_CMD_HANDLER(configtest);
+
 static int setup_signal_handling(void)
 {
 	int ret;
@@ -1758,7 +1798,7 @@ static void show_subcommand_summary(void)
 	for (i = 1; (cmd = lls_cmd(i, dss_suite)); i++) {
 		const char *name = lls_command_name(cmd);
 		const char *purpose = lls_purpose(cmd);
-		printf("%-10s%s\n", name, purpose);
+		printf("%-11s%s\n", name, purpose);
 	}
 	exit(EXIT_SUCCESS);
 }
@@ -1766,18 +1806,17 @@ static void show_subcommand_summary(void)
 int main(int argc, char **argv)
 {
 	int ret;
-	const struct lls_command *cmd = CMD_PTR(DSS);
 	char *errctx = NULL;
 	unsigned num_inputs;
-	const struct dss_user_data *ud = NULL;
+	const struct dss_user_data *ud;
 
-	ret = lls_parse(argc, argv, cmd, &cmdline_lpr, &errctx);
+	ret = lls_parse(argc, argv, CMD_PTR(DSS), &cmdline_lpr, &errctx);
 	if (ret < 0) {
 		ret = lopsub_error(ret, &errctx);
 		goto out;
 	}
 	lpr = cmdline_lpr;
-	ret = parse_config_file(false /* no SIGHUP */, cmd);
+	ret = parse_config_file(false /* no SIGHUP */, CMD_PTR(DSS));
 	if (ret < 0)
 		goto out;
 	handle_version_and_help();
@@ -1789,24 +1828,24 @@ int main(int argc, char **argv)
 		ret = lopsub_error(ret, &errctx);
 		goto out;
 	}
-	cmd = lls_cmd(ret, dss_suite);
-	ret = lls_parse(num_inputs, argv + argc - num_inputs, cmd,
+	subcmd = lls_cmd(ret, dss_suite);
+	ret = lls_parse(num_inputs, argv + argc - num_inputs, subcmd,
 		&cmdline_sublpr, &errctx);
 	if (ret < 0) {
 		ret = lopsub_error(ret, &errctx);
 		goto out;
 	}
 	sublpr = cmdline_sublpr;
-	ret = parse_config_file(false /* no SIGHUP */, cmd);
+	ret = parse_config_file(false /* no SIGHUP */, subcmd);
 	if (ret < 0)
 		goto out;
-	ret = check_config(cmd);
+	ret = check_config();
 	if (ret < 0)
 		goto out;
 	ret = setup_signal_handling();
 	if (ret < 0)
 		goto out;
-	ud = lls_user_data(cmd);
+	ud = lls_user_data(subcmd);
 	ret = ud->handler();
 	signal_shutdown();
 out:
@@ -1819,8 +1858,8 @@ out:
 	lls_free_parse_result(lpr, CMD_PTR(DSS));
 	if (lpr != cmdline_lpr)
 		lls_free_parse_result(cmdline_lpr, CMD_PTR(DSS));
-	lls_free_parse_result(sublpr, cmd);
+	lls_free_parse_result(sublpr, subcmd);
 	if (sublpr != cmdline_sublpr)
-		lls_free_parse_result(cmdline_sublpr, cmd);
+		lls_free_parse_result(cmdline_sublpr, subcmd);
 	exit(ret >= 0? EXIT_SUCCESS : EXIT_FAILURE);
 }