X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=9f39324500ffa915af5e0c593ae7d56d40eb5062;hp=01f1bc71648157cf4de5ad085bc945887b81c376;hb=b76728084d7b36d55e08764c9de42ad59fd6f6fd;hpb=dd42f745333f7273a1ef1e81b090705473de8079

diff --git a/dss.c b/dss.c
index 01f1bc7..9f39324 100644
--- a/dss.c
+++ b/dss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -24,14 +24,14 @@
 #include "gcc-compat.h"
 #include "cmdline.h"
 #include "log.h"
-#include "string.h"
-#include "error.h"
-#include "fd.h"
+#include "str.h"
+#include "err.h"
+#include "file.h"
 #include "exec.h"
 #include "daemon.h"
-#include "signal.h"
+#include "sig.h"
 #include "df.h"
-#include "time.h"
+#include "tv.h"
 #include "snap.h"
 #include "ipc.h"
 
@@ -65,7 +65,7 @@ enum hook_status snapshot_removal_status;
 
 
 DEFINE_DSS_ERRLIST;
-static const char const *hook_status_description[] = {HOOK_STATUS_ARRAY};
+static const char *hook_status_description[] = {HOOK_STATUS_ARRAY};
 
 /* may be called with ds == NULL. */
 static int disk_space_low(struct disk_space *ds)
@@ -105,12 +105,12 @@ static void dump_dss_config(const char *msg)
 	fprintf(log, "\n*** disk space ***\n\n");
 	ret = get_disk_space(".", &ds);
 	if (ret >= 0) {
-		DSS_INFO_LOG("disk space low: %s\n", disk_space_low(&ds)?
-			"yes" : "no");
+		DSS_INFO_LOG(("disk space low: %s\n", disk_space_low(&ds)?
+			"yes" : "no"));
 		log_disk_space(&ds);
 	} else
-		DSS_ERROR_LOG("can not get free disk space: %s\n",
-			dss_strerror(-ret));
+		DSS_ERROR_LOG(("can not get free disk space: %s\n",
+			dss_strerror(-ret)));
 
 	/* we continue on errors from get_disk_space */
 
@@ -171,7 +171,10 @@ static void dump_dss_config(const char *msg)
 	COMMAND(ls) \
 	COMMAND(create) \
 	COMMAND(prune) \
-	COMMAND(run)
+	COMMAND(run) \
+	COMMAND(kill) \
+	COMMAND(reload) \
+
 #define COMMAND(x) static int com_ ##x(void);
 COMMANDS
 #undef COMMAND
@@ -179,12 +182,25 @@ COMMANDS
 static int call_command_handler(void)
 {
 	COMMANDS
-	DSS_EMERG_LOG("BUG: did not find command handler\n");
+	DSS_EMERG_LOG(("BUG: did not find command handler\n"));
 	return -E_BUG;
 }
 #undef COMMAND
 #undef COMMANDS
 
+static int loglevel = -1;
+static const char *location_file = NULL;
+static int         location_line = -1;
+static const char *location_func = NULL;
+
+void dss_log_set_params(int ll, const char *file, int line, const char *func)
+{
+	loglevel = ll;
+	location_file = file;
+	location_line = line;
+	location_func = func;
+}
+
 /**
  * The log function of dss.
  *
@@ -193,7 +209,7 @@ static int call_command_handler(void)
  *
  * All DSS_XXX_LOG() macros use this function.
  */
-__printf_2_3 void dss_log(int ll, const char* fmt,...)
+__printf_1_2 void dss_log(const char* fmt,...)
 {
 	va_list argp;
 	FILE *outfd;
@@ -201,7 +217,7 @@ __printf_2_3 void dss_log(int ll, const char* fmt,...)
 	time_t t1;
 	char str[255] = "";
 
-	if (ll < conf.loglevel_arg)
+	if (loglevel < conf.loglevel_arg)
 		return;
 	outfd = logfile? logfile : stderr;
 	time(&t1);
@@ -209,7 +225,12 @@ __printf_2_3 void dss_log(int ll, const char* fmt,...)
 	strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
 	fprintf(outfd, "%s ", str);
 	if (conf.loglevel_arg <= INFO)
-		fprintf(outfd, "%i: ", ll);
+		fprintf(outfd, "%i: ", loglevel);
+#ifdef DSS_NO_FUNC_NAMES
+	fprintf(outfd, "%s:%d: ", location_file, location_line);
+#else
+	fprintf(outfd, "%s: ", location_func);
+#endif
 	va_start(argp, fmt);
 	vfprintf(outfd, fmt, argp);
 	va_end(argp);
@@ -239,6 +260,35 @@ static char *get_config_file_name(void)
 	return config_file;
 }
 
+static int send_signal(int sig)
+{
+	pid_t pid;
+	char *config_file = get_config_file_name();
+	int ret = get_dss_pid(config_file, &pid);
+
+	free(config_file);
+	if (ret < 0)
+		return ret;
+	if (conf.dry_run_given) {
+		dss_msg("%d\n", (int)pid);
+		return 0;
+	}
+	ret = kill(pid, sig);
+	if (ret < 0)
+		return -ERRNO_TO_DSS_ERROR(errno);
+	return 1;
+}
+
+static int com_kill(void)
+{
+	return send_signal(SIGTERM);
+}
+
+static int com_reload(void)
+{
+	return send_signal(SIGHUP);
+}
+
 static void dss_get_snapshot_list(struct snapshot_list *sl)
 {
 	get_snapshot_list(sl, conf.unit_interval_arg, conf.num_intervals_arg);
@@ -292,38 +342,31 @@ static int next_snapshot_is_due(void)
 	if (!next_snapshot_time_is_valid())
 		next_snapshot_time = compute_next_snapshot_time();
 	if (next_snapshot_time <= now) {
-		DSS_DEBUG_LOG("next snapshot: now\n");
+		DSS_DEBUG_LOG(("next snapshot: now\n"));
 		return 1;
 	}
-	DSS_DEBUG_LOG("next snapshot due in %" PRId64 " seconds\n",
-		next_snapshot_time - now);
+	DSS_DEBUG_LOG(("next snapshot due in %" PRId64 " seconds\n",
+		next_snapshot_time - now));
 	return 0;
 }
 
-static int pre_create_hook(void)
+static void pre_create_hook(void)
 {
-	int ret, fds[3] = {0, 0, 0};
-
 	assert(snapshot_creation_status == HS_READY);
 	/* make sure that the next snapshot time will be recomputed */
 	invalidate_next_snapshot_time();
-	DSS_DEBUG_LOG("executing %s\n", conf.pre_create_hook_arg);
-	ret = dss_exec_cmdline_pid(&create_pid,
-		conf.pre_create_hook_arg, fds);
-	if (ret < 0)
-		return ret;
+	DSS_DEBUG_LOG(("executing %s\n", conf.pre_create_hook_arg));
+	dss_exec_cmdline_pid(&create_pid, conf.pre_create_hook_arg);
 	snapshot_creation_status = HS_PRE_RUNNING;
-	return ret;
 }
 
-static int pre_remove_hook(struct snapshot *s, const char *why)
+static void pre_remove_hook(struct snapshot *s, const char *why)
 {
-	int ret, fds[3] = {0, 0, 0};
 	char *cmd;
 
 	if (!s)
-		return 0;
-	DSS_DEBUG_LOG("%s snapshot %s\n", why, s->name);
+		return;
+	DSS_DEBUG_LOG(("%s snapshot %s\n", why, s->name));
 	assert(snapshot_removal_status == HS_READY);
 	assert(remove_pid == 0);
 	assert(!snapshot_currently_being_removed);
@@ -334,33 +377,32 @@ static int pre_remove_hook(struct snapshot *s, const char *why)
 
 	cmd = make_message("%s %s/%s", conf.pre_remove_hook_arg,
 		conf.dest_dir_arg, s->name);
-	DSS_DEBUG_LOG("executing %s\n", cmd);
-	ret = dss_exec_cmdline_pid(&remove_pid, cmd, fds);
+	DSS_DEBUG_LOG(("executing %s\n", cmd));
+	dss_exec_cmdline_pid(&remove_pid, cmd);
 	free(cmd);
-	if (ret < 0)
-		return ret;
 	snapshot_removal_status = HS_PRE_RUNNING;
-	return ret;
 }
 
 static int exec_rm(void)
 {
 	struct snapshot *s = snapshot_currently_being_removed;
-	int fds[3] = {0, 0, 0};
 	char *new_name = being_deleted_name(s);
-	char *argv[] = {"rm", "-rf", new_name, NULL};
+	char *argv[4];
 	int ret;
 
+	argv[0] = "rm";
+	argv[1] = "-rf";
+	argv[2] = new_name;
+	argv[3] = NULL;
+
 	assert(snapshot_removal_status == HS_PRE_SUCCESS);
 	assert(remove_pid == 0);
 
-	DSS_NOTICE_LOG("removing %s (interval = %i)\n", s->name, s->interval);
+	DSS_NOTICE_LOG(("removing %s (interval = %i)\n", s->name, s->interval));
 	ret = dss_rename(s->name, new_name);
 	if (ret < 0)
 		goto out;
-	ret = dss_exec(&remove_pid, argv[0], argv, fds);
-	if (ret < 0)
-		goto out;
+	dss_exec(&remove_pid, argv[0], argv);
 	snapshot_removal_status = HS_RUNNING;
 out:
 	free(new_name);
@@ -377,7 +419,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 orphaned snapshots\n"));
 	FOR_EACH_SNAPSHOT(s, i, sl) {
 		if (snapshot_is_being_created(s))
 			continue;
@@ -422,7 +464,7 @@ static struct snapshot *find_redundant_snapshot(struct snapshot_list *sl)
 	struct snapshot *s;
 	unsigned missing = 0;
 
-	DSS_DEBUG_LOG("looking for intervals containing too many snapshots\n");
+	DSS_DEBUG_LOG(("looking for intervals containing too many snapshots\n"));
 	for (interval = conf.num_intervals_arg - 1; interval >= 0; interval--) {
 		unsigned keep = desired_number_of_snapshots(interval, conf.num_intervals_arg);
 		unsigned num = sl->interval_count[interval];
@@ -431,8 +473,6 @@ static struct snapshot *find_redundant_snapshot(struct snapshot_list *sl)
 
 		if (keep >= num)
 			missing += keep - num;
-//		DSS_DEBUG_LOG("interval %i: keep: %u, have: %u, missing: %u\n",
-//			interval, keep, num, missing);
 		if (keep + missing >= num)
 			continue;
 		/* redundant snapshot in this interval, pick snapshot with lowest score */
@@ -443,7 +483,6 @@ static struct snapshot *find_redundant_snapshot(struct snapshot_list *sl)
 				continue;
 			if (is_reference_snapshot(s))
 				continue;
-			//DSS_DEBUG_LOG("checking %s\n", s->name);
 			if (s->interval > interval) {
 				prev = s;
 				continue;
@@ -459,7 +498,6 @@ static struct snapshot *find_redundant_snapshot(struct snapshot_list *sl)
 			/* check if s is a better victim */
 			this_score = s->creation_time - prev->creation_time;
 			assert(this_score >= 0);
-			//DSS_DEBUG_LOG("%s: score %lli\n", s->name, (long long)score);
 			if (this_score < score) {
 				score = this_score;
 				victim = s;
@@ -477,8 +515,8 @@ static struct snapshot *find_outdated_snapshot(struct snapshot_list *sl)
 	int i;
 	struct snapshot *s;
 
-	DSS_DEBUG_LOG("looking for snapshots belonging to intervals >= %d\n",
-		conf.num_intervals_arg);
+	DSS_DEBUG_LOG(("looking for snapshots belonging to intervals >= %d\n",
+		conf.num_intervals_arg));
 	FOR_EACH_SNAPSHOT(s, i, sl) {
 		if (snapshot_is_being_created(s))
 			continue;
@@ -491,36 +529,51 @@ static struct snapshot *find_outdated_snapshot(struct snapshot_list *sl)
 	return NULL;
 }
 
-struct snapshot *find_oldest_removable_snapshot(struct snapshot_list *sl)
+static struct snapshot *find_oldest_removable_snapshot(struct snapshot_list *sl)
 {
-	int i;
-	struct snapshot *s;
+	int i, num_complete;
+	struct snapshot *s, *ref = NULL;
+
+	num_complete = num_complete_snapshots(sl);
+	if (num_complete <= conf.min_complete_arg)
+		return NULL;
 	FOR_EACH_SNAPSHOT(s, i, sl) {
 		if (snapshot_is_being_created(s))
 			continue;
-		if (is_reference_snapshot(s))
+		if (is_reference_snapshot(s)) { /* avoid this one */
+			ref = s;
 			continue;
-		DSS_INFO_LOG("oldest removable snapshot: %s\n", s->name);
+		}
+		DSS_INFO_LOG(("oldest removable snapshot: %s\n", s->name));
 		return s;
 	}
-	return NULL;
+	assert(ref);
+	DSS_WARNING_LOG(("removing reference snapshot %s\n", ref->name));
+	return ref;
 }
 
 static int rename_incomplete_snapshot(int64_t start)
 {
 	char *old_name;
 	int ret;
+	int64_t now;
 
+	/*
+	 * We don't want the dss_rename() below to fail with EEXIST because the
+	 * last complete snapshot was created (and completed) in the same
+	 * second as this one.
+	 */
+	while ((now = get_current_time()) == start)
+		sleep(1);
 	free(path_to_last_complete_snapshot);
-	ret = complete_name(start, get_current_time(),
-		&path_to_last_complete_snapshot);
+	ret = complete_name(start, now, &path_to_last_complete_snapshot);
 	if (ret < 0)
 		return ret;
 	old_name = incomplete_name(start);
 	ret = dss_rename(old_name, path_to_last_complete_snapshot);
 	if (ret >= 0)
-		DSS_NOTICE_LOG("%s -> %s\n", old_name,
-			path_to_last_complete_snapshot);
+		DSS_NOTICE_LOG(("%s -> %s\n", old_name,
+			path_to_last_complete_snapshot));
 	free(old_name);
 	return ret;
 }
@@ -568,39 +621,32 @@ static int try_to_free_disk_space(void)
 	victim = find_orphaned_snapshot(&sl);
 	if (victim)
 		goto remove;
-	DSS_WARNING_LOG("disk space low and nothing obvious to remove\n");
+	DSS_WARNING_LOG(("disk space low and nothing obvious to remove\n"));
 	victim = find_oldest_removable_snapshot(&sl);
 	if (victim)
 		goto remove;
-	DSS_CRIT_LOG("uhuhu: disk space low and nothing to remove\n");
+	DSS_CRIT_LOG(("uhuhu: disk space low and nothing to remove\n"));
 	ret = -ERRNO_TO_DSS_ERROR(ENOSPC);
 	goto out;
 remove:
-	ret = pre_remove_hook(victim, why);
+	pre_remove_hook(victim, why);
 out:
 	free_snapshot_list(&sl);
 	return ret;
 }
 
-static int post_create_hook(void)
+static void post_create_hook(void)
 {
-	int ret, fds[3] = {0, 0, 0};
-	char *cmd;
-
-	cmd = make_message("%s %s/%s", conf.post_create_hook_arg,
+	char *cmd = make_message("%s %s/%s", conf.post_create_hook_arg,
 		conf.dest_dir_arg, path_to_last_complete_snapshot);
-	DSS_NOTICE_LOG("executing %s\n", cmd);
-	ret = dss_exec_cmdline_pid(&create_pid, cmd, fds);
+	DSS_NOTICE_LOG(("executing %s\n", cmd));
+	dss_exec_cmdline_pid(&create_pid, cmd);
 	free(cmd);
-	if (ret < 0)
-		return ret;
 	snapshot_creation_status = HS_POST_RUNNING;
-	return ret;
 }
 
-static int post_remove_hook(void)
+static void post_remove_hook(void)
 {
-	int ret, fds[3] = {0, 0, 0};
 	char *cmd;
 	struct snapshot *s = snapshot_currently_being_removed;
 
@@ -608,13 +654,10 @@ static int post_remove_hook(void)
 
 	cmd = make_message("%s %s/%s", conf.post_remove_hook_arg,
 		conf.dest_dir_arg, s->name);
-	DSS_NOTICE_LOG("executing %s\n", cmd);
-	ret = dss_exec_cmdline_pid(&remove_pid, cmd, fds);
+	DSS_NOTICE_LOG(("executing %s\n", cmd));
+	dss_exec_cmdline_pid(&remove_pid, cmd);
 	free(cmd);
-	if (ret < 0)
-		return ret;
 	snapshot_removal_status = HS_POST_RUNNING;
-	return ret;
 }
 
 static void dss_kill(pid_t pid, int sig, const char *msg)
@@ -637,13 +680,13 @@ static void dss_kill(pid_t pid, int sig, const char *msg)
 	else process_name = "??????";
 
 	if (msg)
-		DSS_INFO_LOG("%s\n", msg);
-	DSS_DEBUG_LOG("sending signal %d (%s) to pid %d (%s process)\n",
-		sig, signame, (int)pid, process_name);
+		DSS_INFO_LOG(("%s\n", msg));
+	DSS_DEBUG_LOG(("sending signal %d (%s) to pid %d (%s process)\n",
+		sig, signame, (int)pid, process_name));
 	if (kill(pid, sig) >= 0)
 		return;
-	DSS_INFO_LOG("failed to send signal %d (%s) to pid %d (%s process)\n",
-		sig, signame, (int)pid, process_name);
+	DSS_INFO_LOG(("failed to send signal %d (%s) to pid %d (%s process)\n",
+		sig, signame, (int)pid, process_name));
 }
 
 static void stop_create_process(void)
@@ -668,20 +711,20 @@ static void restart_create_process(void)
 static void log_termination_msg(pid_t pid, int status)
 {
 	if (WIFEXITED(status))
-		DSS_INFO_LOG("child %i exited. Exit status: %i\n", (int)pid,
-			WEXITSTATUS(status));
+		DSS_INFO_LOG(("child %i exited. Exit status: %i\n", (int)pid,
+			WEXITSTATUS(status)));
 	else if (WIFSIGNALED(status))
-		DSS_NOTICE_LOG("child %i was killed by signal %i\n", (int)pid,
-			WTERMSIG(status));
+		DSS_NOTICE_LOG(("child %i was killed by signal %i\n", (int)pid,
+			WTERMSIG(status)));
 	else
-		DSS_WARNING_LOG("child %i terminated abormally\n", (int)pid);
+		DSS_WARNING_LOG(("child %i terminated abormally\n", (int)pid));
 }
 
 static int wait_for_process(pid_t pid, int *status)
 {
 	int ret;
 
-	DSS_DEBUG_LOG("Waiting for process %d to terminate\n", (int)pid);
+	DSS_DEBUG_LOG(("Waiting for process %d to terminate\n", (int)pid));
 	for (;;) {
 		fd_set rfds;
 
@@ -706,7 +749,7 @@ static int wait_for_process(pid_t pid, int *status)
 		dss_kill(pid, SIGTERM, "killing child process");
 	}
 	if (ret < 0)
-		DSS_ERROR_LOG("failed to wait for process %d\n", (int)pid);
+		DSS_ERROR_LOG(("failed to wait for process %d\n", (int)pid));
 	else
 		log_termination_msg(pid, *status);
 	return ret;
@@ -793,7 +836,7 @@ static int handle_rsync_exit(int status)
 	int es, ret;
 
 	if (!WIFEXITED(status)) {
-		DSS_ERROR_LOG("rsync process %d died involuntary\n", (int)create_pid);
+		DSS_ERROR_LOG(("rsync process %d died involuntary\n", (int)create_pid));
 		ret = -E_INVOLUNTARY_EXIT;
 		snapshot_creation_status = HS_READY;
 		goto out;
@@ -805,15 +848,15 @@ static int handle_rsync_exit(int status)
 	 * 13: Errors with program diagnostics
 	 */
 	if (es == 12 || es == 13) {
-		DSS_WARNING_LOG("rsync process %d returned %d -- restarting\n",
-			(int)create_pid, es);
+		DSS_WARNING_LOG(("rsync process %d returned %d -- restarting\n",
+			(int)create_pid, es));
 		snapshot_creation_status = HS_NEEDS_RESTART;
 		next_snapshot_time = get_current_time() + 60;
 		ret = 1;
 		goto out;
 	}
 	if (es != 0 && es != 23 && es != 24) {
-		DSS_ERROR_LOG("rsync process %d returned %d\n", (int)create_pid, es);
+		DSS_ERROR_LOG(("rsync process %d returned %d\n", (int)create_pid, es));
 		ret = -E_BAD_EXIT_CODE;
 		snapshot_creation_status = HS_READY;
 		goto out;
@@ -842,9 +885,9 @@ static int handle_pre_create_hook_exit(int status)
 	es = WEXITSTATUS(status);
 	if (es) {
 		if (!warn_count--) {
-			DSS_NOTICE_LOG("pre_create_hook %s returned %d\n",
-				conf.pre_create_hook_arg, es);
-			DSS_NOTICE_LOG("deferring snapshot creation...\n");
+			DSS_NOTICE_LOG(("pre_create_hook %s returned %d\n",
+				conf.pre_create_hook_arg, es));
+			DSS_NOTICE_LOG(("deferring snapshot creation...\n"));
 			warn_count = 60; /* warn only once per hour */
 		}
 		next_snapshot_time = get_current_time() + 60;
@@ -880,8 +923,8 @@ static int handle_sigchld(void)
 			ret = 1;
 			break;
 		default:
-			DSS_EMERG_LOG("BUG: create can't die in status %d\n",
-				snapshot_creation_status);
+			DSS_EMERG_LOG(("BUG: create can't die in status %d\n",
+				snapshot_creation_status));
 			return -E_BUG;
 		}
 		create_pid = 0;
@@ -893,22 +936,23 @@ static int handle_sigchld(void)
 			return ret;
 		return ret;
 	}
-	DSS_EMERG_LOG("BUG: unknown process %d died\n", (int)pid);
+	DSS_EMERG_LOG(("BUG: unknown process %d died\n", (int)pid));
 	return -E_BUG;
 }
 
 static int check_config(void)
 {
 	if (conf.unit_interval_arg <= 0) {
-		DSS_ERROR_LOG("bad unit interval: %i\n", conf.unit_interval_arg);
+		DSS_ERROR_LOG(("bad unit interval: %i\n", conf.unit_interval_arg));
 		return -E_INVALID_NUMBER;
 	}
-	DSS_DEBUG_LOG("unit interval: %i day(s)\n", conf.unit_interval_arg);
-	if (conf.num_intervals_arg <= 0) {
-		DSS_ERROR_LOG("bad number of intervals  %i\n", conf.num_intervals_arg);
+	DSS_DEBUG_LOG(("unit interval: %i day(s)\n", conf.unit_interval_arg));
+	if (conf.num_intervals_arg <= 0 || conf.num_intervals_arg > 30) {
+		DSS_ERROR_LOG(("bad number of intervals: %i\n",
+			conf.num_intervals_arg));
 		return -E_INVALID_NUMBER;
 	}
-	DSS_DEBUG_LOG("number of intervals: %i\n", conf.num_intervals_arg);
+	DSS_DEBUG_LOG(("number of intervals: %i\n", conf.num_intervals_arg));
 	return 1;
 }
 
@@ -933,17 +977,16 @@ static int parse_config_file(int override)
 	config_file_exists = !stat(config_file, &statbuf);
 	if (!config_file_exists && conf.config_file_given) {
 		ret = -ERRNO_TO_DSS_ERROR(errno);
-		DSS_ERROR_LOG("failed to stat config file %s\n", config_file);
+		DSS_ERROR_LOG(("failed to stat config file %s\n", config_file));
 		goto out;
 	}
 	if (config_file_exists) {
-		struct cmdline_parser_params params = {
-			.override = override,
-			.initialize = 0,
-			.check_required = 1,
-			.check_ambiguity = 0,
-			.print_errors = 1
-		};
+		struct cmdline_parser_params params;
+		params.override = override;
+		params.initialize = 0;
+		params.check_required = 1;
+		params.check_ambiguity = 0;
+		params.print_errors = 1;
 		if (override) { /* invalidate all rsync options */
 			int i;
 
@@ -974,18 +1017,18 @@ static int parse_config_file(int override)
 		logfile = open_log(conf.logfile_arg);
 		log_welcome(conf.loglevel_arg);
 	}
-	DSS_DEBUG_LOG("loglevel: %d\n", conf.loglevel_arg);
+	DSS_DEBUG_LOG(("loglevel: %d\n", conf.loglevel_arg));
 	ret = config_file_exists;
 out:
 	free(config_file);
 	if (ret < 0)
-		DSS_EMERG_LOG("%s\n", dss_strerror(-ret));
+		DSS_EMERG_LOG(("%s\n", dss_strerror(-ret)));
 	return ret;
 }
 
 static int change_to_dest_dir(void)
 {
-	DSS_INFO_LOG("changing cwd to %s\n", conf.dest_dir_arg);
+	DSS_INFO_LOG(("changing cwd to %s\n", conf.dest_dir_arg));
 	return dss_chdir(conf.dest_dir_arg);
 }
 
@@ -993,7 +1036,7 @@ static int handle_sighup(void)
 {
 	int ret;
 
-	DSS_NOTICE_LOG("SIGHUP, re-reading config\n");
+	DSS_NOTICE_LOG(("SIGHUP, re-reading config\n"));
 	dump_dss_config("old");
 	ret = parse_config_file(1);
 	if (ret < 0)
@@ -1003,6 +1046,13 @@ static int handle_sighup(void)
 	return change_to_dest_dir();
 }
 
+static void kill_children(void)
+{
+	restart_create_process();
+	dss_kill(create_pid, SIGTERM, NULL);
+	dss_kill(remove_pid, SIGTERM, NULL);
+}
+
 static int handle_signal(void)
 {
 	int sig, ret = next_signal();
@@ -1013,9 +1063,7 @@ static int handle_signal(void)
 	switch (sig) {
 	case SIGINT:
 	case SIGTERM:
-		restart_create_process();
-		dss_kill(create_pid, SIGTERM, NULL);
-		dss_kill(remove_pid, SIGTERM, NULL);
+		kill_children();
 		ret = -E_SIGNAL;
 		break;
 	case SIGHUP:
@@ -1027,7 +1075,7 @@ static int handle_signal(void)
 	}
 out:
 	if (ret < 0)
-		DSS_ERROR_LOG("%s\n", dss_strerror(-ret));
+		DSS_ERROR_LOG(("%s\n", dss_strerror(-ret)));
 	return ret;
 }
 
@@ -1048,12 +1096,14 @@ static int use_rsync_locally(char *logname)
 
 static int rename_resume_snap(int64_t creation_time)
 {
-	struct snapshot_list sl = {.num_snapshots = 0};
+	struct snapshot_list sl;
 	struct snapshot *s = NULL;
 	char *new_name = incomplete_name(creation_time);
 	int ret;
 	const char *why;
 
+	sl.num_snapshots = 0;
+
 	ret = 0;
 	if (conf.no_resume_given)
 		goto out;
@@ -1088,11 +1138,11 @@ static int rename_resume_snap(int64_t creation_time)
 	s = find_orphaned_snapshot(&sl);
 out:
 	if (s) {
-		DSS_INFO_LOG("reusing %s snapshot %s\n", why, s->name);
+		DSS_INFO_LOG(("reusing %s snapshot %s\n", why, s->name));
 		ret = dss_rename(s->name, new_name);
 	}
 	if (ret >= 0)
-		DSS_NOTICE_LOG("creating new snapshot %s\n", new_name);
+		DSS_NOTICE_LOG(("creating new snapshot %s\n", new_name));
 	free(new_name);
 	free_snapshot_list(&sl);
 	return ret;
@@ -1111,16 +1161,16 @@ static void create_rsync_argv(char ***argv, int64_t *num)
 
 	*argv = dss_malloc((15 + conf.rsync_option_given) * sizeof(char *));
 	(*argv)[i++] = dss_strdup("rsync");
-	(*argv)[i++] = dss_strdup("-aq");
+	(*argv)[i++] = dss_strdup("-a");
 	(*argv)[i++] = dss_strdup("--delete");
 	for (j = 0; j < conf.rsync_option_given; j++)
 		(*argv)[i++] = dss_strdup(conf.rsync_option_arg[j]);
 	if (name_of_reference_snapshot) {
-		DSS_INFO_LOG("using %s as reference\n", name_of_reference_snapshot);
+		DSS_INFO_LOG(("using %s as reference\n", name_of_reference_snapshot));
 		(*argv)[i++] = make_message("--link-dest=../%s",
 			name_of_reference_snapshot);
 	} else
-		DSS_INFO_LOG("no suitable reference snapshot found\n");
+		DSS_INFO_LOG(("no suitable reference snapshot found\n"));
 	logname = dss_logname();
 	if (use_rsync_locally(logname))
 		(*argv)[i++] = dss_strdup(conf.source_dir_arg);
@@ -1133,7 +1183,7 @@ static void create_rsync_argv(char ***argv, int64_t *num)
 	(*argv)[i++] = incomplete_name(*num);
 	(*argv)[i++] = NULL;
 	for (j = 0; j < i; j++)
-		DSS_DEBUG_LOG("argv[%d] = %s\n", j, (*argv)[j]);
+		DSS_DEBUG_LOG(("argv[%d] = %s\n", j, (*argv)[j]));
 }
 
 static void free_rsync_argv(char **argv)
@@ -1149,14 +1199,12 @@ static void free_rsync_argv(char **argv)
 
 static int create_snapshot(char **argv)
 {
-	int ret, fds[3] = {0, 0, 0};
+	int ret;
 
 	ret = rename_resume_snap(current_snapshot_creation_time);
 	if (ret < 0)
 		return ret;
-	ret = dss_exec(&create_pid, argv[0], argv, fds);
-	if (ret < 0)
-		return ret;
+	dss_exec(&create_pid, argv[0], argv);
 	snapshot_creation_status = HS_RUNNING;
 	return ret;
 }
@@ -1198,9 +1246,7 @@ static int select_loop(void)
 			continue;
 		}
 		if (snapshot_removal_status == HS_SUCCESS) {
-			ret = post_remove_hook();
-			if (ret < 0)
-				goto out;
+			post_remove_hook();
 			continue;
 		}
 		ret = try_to_free_disk_space();
@@ -1215,9 +1261,7 @@ static int select_loop(void)
 		case HS_READY:
 			if (!next_snapshot_is_due())
 				continue;
-			ret = pre_create_hook();
-			if (ret < 0)
-				goto out;
+			pre_create_hook();
 			continue;
 		case HS_PRE_RUNNING:
 		case HS_RUNNING:
@@ -1240,9 +1284,7 @@ static int select_loop(void)
 				goto out;
 			continue;
 		case HS_SUCCESS:
-			ret = post_create_hook();
-			if (ret < 0)
-				goto out;
+			post_create_hook();
 			continue;
 		}
 	}
@@ -1252,12 +1294,15 @@ out:
 
 static void exit_hook(int exit_code)
 {
-	int fds[3] = {0, 0, 0};
-	char *argv[] = {conf.exit_hook_arg, dss_strerror(-exit_code), NULL};
+	char *argv[3];
 	pid_t pid;
 
-	DSS_NOTICE_LOG("executing %s %s\n", argv[0], argv[1]);
-	dss_exec(&pid, conf.exit_hook_arg, argv, fds);
+	argv[0] = conf.exit_hook_arg;
+	argv[1] = dss_strerror(-exit_code);
+	argv[2] = NULL;
+
+	DSS_NOTICE_LOG(("executing %s %s\n", argv[0], argv[1]));
+	dss_exec(&pid, conf.exit_hook_arg, argv);
 }
 
 static void lock_dss_or_die(void)
@@ -1267,7 +1312,7 @@ static void lock_dss_or_die(void)
 
 	free(config_file);
 	if (ret < 0) {
-		DSS_EMERG_LOG("failed to lock: %s\n", dss_strerror(-ret));
+		DSS_EMERG_LOG(("failed to lock: %s\n", dss_strerror(-ret)));
 		exit(EXIT_FAILURE);
 	}
 }
@@ -1278,7 +1323,7 @@ static int com_run(void)
 
 	lock_dss_or_die();
 	if (conf.dry_run_given) {
-		DSS_ERROR_LOG("dry_run not supported by this command\n");
+		DSS_ERROR_LOG(("dry_run not supported by this command\n"));
 		return -E_SYNTAX;
 	}
 	ret = install_sighandler(SIGHUP);
@@ -1287,6 +1332,7 @@ static int com_run(void)
 	ret = select_loop();
 	if (ret >= 0) /* impossible */
 		ret = -E_BUG;
+	kill_children();
 	exit_hook(ret);
 	return ret;
 }
@@ -1322,9 +1368,7 @@ rm:
 		ret = 0;
 		goto out;
 	}
-	ret = pre_remove_hook(victim, why);
-	if (ret < 0)
-		goto out;
+	pre_remove_hook(victim, why);
 	if (snapshot_removal_status == HS_PRE_RUNNING) {
 		ret = wait_for_remove_process();
 		if (ret < 0)
@@ -1340,9 +1384,7 @@ rm:
 		goto out;
 	if (snapshot_removal_status != HS_SUCCESS)
 		goto out;
-	ret = post_remove_hook();
-	if (ret < 0)
-		goto out;
+	post_remove_hook();
 	if (snapshot_removal_status != HS_POST_RUNNING)
 		goto out;
 	ret = wait_for_remove_process();
@@ -1375,9 +1417,7 @@ static int com_create(void)
 		free(msg);
 		return 1;
 	}
-	ret = pre_create_hook();
-	if (ret < 0)
-		return ret;
+	pre_create_hook();
 	if (create_pid) {
 		ret = wait_for_process(create_pid, &status);
 		if (ret < 0)
@@ -1416,7 +1456,7 @@ static int com_ls(void)
 		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);
-	};
+	}
 	free_snapshot_list(&sl);
 	return 1;
 }
@@ -1425,7 +1465,7 @@ static int setup_signal_handling(void)
 {
 	int ret;
 
-	DSS_INFO_LOG("setting up signal handlers\n");
+	DSS_INFO_LOG(("setting up signal handlers\n"));
 	signal_pipe = signal_init(); /* always successful */
 	ret = install_sighandler(SIGINT);
 	if (ret < 0)
@@ -1445,13 +1485,13 @@ static int setup_signal_handling(void)
 int main(int argc, char **argv)
 {
 	int ret;
-	struct cmdline_parser_params params = {
-		.override = 0,
-		.initialize = 1,
-		.check_required = 0,
-		.check_ambiguity = 0,
-		.print_errors = 1
-	};
+	struct cmdline_parser_params params;
+
+	params.override = 0;
+	params.initialize = 1;
+	params.check_required = 0;
+	params.check_ambiguity = 0;
+	params.print_errors = 1;
 
 	cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
 	ret = parse_config_file(0);
@@ -1462,13 +1502,12 @@ int main(int argc, char **argv)
 		 * Parse the command line options again, but this time check
 		 * that all required options are given.
 		 */
-		params = (struct cmdline_parser_params) {
-			.override = 1,
-			.initialize = 1,
-			.check_required = 1,
-			.check_ambiguity = 1,
-			.print_errors = 1
-		};
+		struct cmdline_parser_params params;
+		params.override = 1;
+		params.initialize = 1;
+		params.check_required = 1;
+		params.check_ambiguity = 1;
+		params.print_errors = 1;
 		cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
 	}
 	if (conf.daemon_given)
@@ -1483,6 +1522,6 @@ int main(int argc, char **argv)
 	ret = call_command_handler();
 out:
 	if (ret < 0)
-		DSS_EMERG_LOG("%s\n", dss_strerror(-ret));
+		DSS_EMERG_LOG(("%s\n", dss_strerror(-ret)));
 	exit(ret >= 0? EXIT_SUCCESS : EXIT_FAILURE);
 }