]> git.tuebingen.mpg.de Git - dss.git/blobdiff - dss.c
Implement pre-create and post-create hooks.
[dss.git] / dss.c
diff --git a/dss.c b/dss.c
index 4ca1743a63aa9011348f579bebc78199c28bbaae..1bab9aef5f2dce9c92c5416e0d266a1bd1df35cc 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -32,7 +32,7 @@
 struct gengetopt_args_info conf;
 char *dss_error_txt = NULL;
 static FILE *logfile;
-int signal_pipe;
+static int signal_pipe;
 
 /** Process id of current rsync process. */
 static pid_t rsync_pid;
@@ -42,9 +42,26 @@ static int rsync_stopped;
 static pid_t rm_pid;
 /** When the next snapshot is due. */
 struct timeval next_snapshot_time;
+
+pid_t pre_create_hook_pid;
+pid_t post_create_hook_pid;
+
 /* Creation time of the snapshot currently being created. */
 int64_t current_snapshot_creation_time;
 
+static char *path_to_last_complete_snapshot;
+
+enum {
+       SCS_READY,
+       SCS_PRE_HOOK_RUNNING,
+       SCS_PRE_HOOK_SUCCESS,
+       SCS_RSYNC_RUNNING,
+       SCS_RSYNC_SUCCESS,
+       SCS_POST_HOOK_RUNNING,
+};
+
+static unsigned snapshot_creation_status;
+
 
 DEFINE_DSS_ERRLIST;
 
@@ -75,7 +92,9 @@ int call_command_handler(void)
  * incomplete, being deleted: 1204565370-incomplete.being_deleted
  */
 enum snapshot_status_flags {
+       /** The rsync process terminated successfully. */
        SS_COMPLETE = 1,
+       /** The rm process is running to remove this snapshot. */
        SS_BEING_DELETED = 2,
 };
 
@@ -149,6 +168,7 @@ unsigned num_snapshots(int interval)
        return 1 << n;
 }
 
+/* return: Whether dirname is a snapshot directory (0: no, 1: yes) */
 int is_snapshot(const char *dirname, int64_t now, struct snapshot *s)
 {
        int i, ret;
@@ -327,6 +347,22 @@ void get_snapshot_list(struct snapshot_list *sl)
                compare_snapshots);
 }
 
+void free_snapshot_list(struct snapshot_list *sl)
+{
+       int i;
+       struct snapshot *s;
+
+       FOR_EACH_SNAPSHOT(s, i, sl) {
+               free(s->name);
+               free(s);
+       }
+       free(sl->interval_count);
+       sl->interval_count = NULL;
+       free(sl->snapshots);
+       sl->snapshots = NULL;
+       sl->num_snapshots = 0;
+}
+
 void stop_rsync_process(void)
 {
        if (!rsync_pid || rsync_stopped)
@@ -343,19 +379,6 @@ void restart_rsync_process(void)
        rsync_stopped = 0;
 }
 
-void free_snapshot_list(struct snapshot_list *sl)
-{
-       int i;
-       struct snapshot *s;
-
-       FOR_EACH_SNAPSHOT(s, i, sl) {
-               free(s->name);
-               free(s);
-       }
-       free(sl->interval_count);
-       free(sl->snapshots);
-}
-
 /**
  * Print a log message about the exit status of a child.
  */
@@ -377,26 +400,32 @@ int wait_for_process(pid_t pid, int *status)
 
        DSS_DEBUG_LOG("Waiting for process %d to terminate\n", (int)pid);
        for (;;) {
-               pause();
-               ret = next_signal();
-               if  (ret < 0)
+               fd_set rfds;
+
+               FD_ZERO(&rfds);
+               FD_SET(signal_pipe, &rfds);
+               ret = dss_select(signal_pipe + 1, &rfds, NULL, NULL);
+               if (ret < 0)
                        break;
+               ret = next_signal();
                if (!ret)
                        continue;
                if (ret == SIGCHLD) {
                        ret = waitpid(pid, status, 0);
                        if (ret >= 0)
                                break;
-                       if (errno != EINTR) /* error */
+                       if (errno != EINTR) { /* error */
+                               ret = -ERRNO_TO_DSS_ERROR(errno);
                                break;
+                       }
                }
+               /* SIGINT or SIGTERM */
                DSS_WARNING_LOG("sending SIGTERM to pid %d\n", (int)pid);
                kill(pid, SIGTERM);
        }
-       if (ret < 0) {
-               ret = -ERRNO_TO_DSS_ERROR(errno);
+       if (ret < 0)
                make_err_msg("failed to wait for process %d", (int)pid);
-       else
+       else
                log_termination_msg(pid, *status);
        return ret;
 }
@@ -418,6 +447,7 @@ out:
        free(new_name);
        return ret;
 }
+
 /*
  * return: 0: no redundant snapshots, 1: rm process started, negative: error
  */
@@ -436,8 +466,8 @@ int remove_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);
+//             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 */
@@ -523,7 +553,6 @@ out:
        return ret;
 }
 
-
 int wait_for_rm_process(void)
 {
        int status, ret = wait_for_process(rm_pid, &status);
@@ -541,28 +570,154 @@ void kill_process(pid_t pid)
        kill(pid, SIGTERM);
 }
 
-void handle_sighup()
+int check_config(void)
+{
+       if (conf.unit_interval_arg <= 0) {
+               make_err_msg("bad unit interval: %i", 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) {
+               make_err_msg("bad number of intervals  %i", conf.num_intervals_arg);
+               return -E_INVALID_NUMBER;
+       }
+       DSS_DEBUG_LOG("number of intervals: %i\n", conf.num_intervals_arg);
+       return 1;
+}
+
+/* exits on errors */
+void parse_config_file(int override)
+{
+       int ret;
+       char *config_file;
+       struct stat statbuf;
+       char *old_logfile_arg = NULL;
+       int old_daemon_given = 0;
+
+       if (conf.config_file_given)
+               config_file = dss_strdup(conf.config_file_arg);
+       else {
+               char *home = get_homedir();
+               config_file = make_message("%s/.dssrc", home);
+               free(home);
+       }
+       if (override) { /* SIGHUP */
+               if (conf.logfile_given)
+                       old_logfile_arg = dss_strdup(conf.logfile_arg);
+               old_daemon_given = conf.daemon_given;
+       }
+
+       ret = stat(config_file, &statbuf);
+       if (ret && conf.config_file_given) {
+               ret = -ERRNO_TO_DSS_ERROR(errno);
+               make_err_msg("failed to stat config file %s", config_file);
+               goto out;
+       }
+       if (!ret) {
+               struct cmdline_parser_params params = {
+                       .override = override,
+                       .initialize = 0,
+                       .check_required = 1,
+                       .check_ambiguity = 0
+               };
+               cmdline_parser_config_file(config_file, &conf, &params);
+       }
+       ret = check_config();
+       if (ret < 0)
+               goto out;
+       if (override) {
+               /* don't change daemon mode on SIGHUP */
+               conf.daemon_given = old_daemon_given;
+               close_log(logfile);
+               logfile = NULL;
+               if (conf.logfile_given)
+                       free(old_logfile_arg);
+               else if (conf.daemon_given) { /* re-use old logfile */
+                       conf.logfile_arg = old_logfile_arg;
+                       conf.logfile_given = 1;
+               }
+       }
+       if (conf.logfile_given) {
+               logfile = open_log(conf.logfile_arg);
+               log_welcome(conf.loglevel_arg);
+       }
+       DSS_EMERG_LOG("loglevel: %d\n", conf.loglevel_arg);
+//     cmdline_parser_dump(logfile? logfile : stdout, &conf);
+       ret = dss_chdir(conf.dest_dir_arg);
+out:
+       free(config_file);
+       if (ret >= 0)
+               return;
+       log_err_msg(EMERG, -ret);
+       exit(EXIT_FAILURE);
+}
+
+void handle_sighup(void)
 {
-       DSS_INFO_LOG("FIXME: no sighup handling yet\n");
+       DSS_NOTICE_LOG("SIGHUP\n");
+       parse_config_file(1);
 }
 
 int rename_incomplete_snapshot(int64_t start)
 {
-       char *old_name, *new_name;
+       char *old_name;
        int ret;
 
-       ret = complete_name(start, get_current_time(), &new_name);
+       free(path_to_last_complete_snapshot);
+       ret = complete_name(start, get_current_time(),
+               &path_to_last_complete_snapshot);
        if (ret < 0)
                return ret;
        old_name = incomplete_name(start);
-       ret = dss_rename(old_name, new_name);
+       ret = dss_rename(old_name, path_to_last_complete_snapshot);
        if (ret >= 0)
-               DSS_NOTICE_LOG("%s -> %s\n", old_name, new_name);
+               DSS_NOTICE_LOG("%s -> %s\n", old_name,
+                       path_to_last_complete_snapshot);
        free(old_name);
-       free(new_name);
        return ret;
 }
 
+void compute_next_snapshot_time(void)
+{
+       struct timeval now, unit_interval = {.tv_sec = 24 * 3600 * conf.unit_interval_arg},
+               tmp, diff;
+       int64_t x = 0;
+       unsigned wanted = num_snapshots(0), num_complete_snapshots = 0;
+       int i, ret;
+       struct snapshot *s = NULL;
+       struct snapshot_list sl;
+
+       assert(snapshot_creation_status == SCS_READY);
+       current_snapshot_creation_time = 0;
+       get_snapshot_list(&sl);
+       FOR_EACH_SNAPSHOT(s, i, &sl) {
+               if (!(s->flags & SS_COMPLETE))
+                       continue;
+               num_complete_snapshots++;
+               x += s->completion_time - s->creation_time;
+       }
+       assert(x >= 0);
+       if (num_complete_snapshots)
+               x /= num_complete_snapshots; /* avg time to create one snapshot */
+       x *= wanted; /* time to create all snapshots in interval 0 */
+       tmp.tv_sec = x;
+       tmp.tv_usec = 0;
+       ret = tv_diff(&unit_interval, &tmp, &diff); /* total sleep time per unit interval */
+       gettimeofday(&now, NULL);
+       if (ret < 0 || !s)
+               goto min_sleep;
+       tv_divide(wanted, &diff, &tmp); /* sleep time betweeen two snapshots */
+       diff.tv_sec = s->completion_time;
+       diff.tv_usec = 0;
+       tv_add(&diff, &tmp, &next_snapshot_time);
+       if (tv_diff(&now, &next_snapshot_time, NULL) < 0)
+               goto out;
+min_sleep:
+       next_snapshot_time = now;
+       next_snapshot_time.tv_sec += 60;
+out:
+       free_snapshot_list(&sl);
+}
 
 int handle_rsync_exit(int status)
 {
@@ -571,23 +726,28 @@ int handle_rsync_exit(int status)
        if (!WIFEXITED(status)) {
                make_err_msg("rsync process %d died involuntary", (int)rsync_pid);
                ret = -E_INVOLUNTARY_EXIT;
+               snapshot_creation_status = SCS_READY;
+               compute_next_snapshot_time();
                goto out;
        }
        es = WEXITSTATUS(status);
        if (es != 0 && es != 23 && es != 24) {
                make_err_msg("rsync process %d returned %d", (int)rsync_pid, es);
                ret = -E_BAD_EXIT_CODE;
+               snapshot_creation_status = SCS_READY;
+               compute_next_snapshot_time();
                goto out;
        }
        ret = rename_incomplete_snapshot(current_snapshot_creation_time);
+       if (ret < 0)
+               goto out;
+       snapshot_creation_status = SCS_RSYNC_SUCCESS;
 out:
        rsync_pid = 0;
-       current_snapshot_creation_time = 0;
        rsync_stopped = 0;
        return ret;
 }
 
-
 int get_newest_complete(const char *dirname, void *private)
 {
        struct edge_snapshot_data *esd = private;
@@ -660,48 +820,110 @@ void free_rsync_argv(char **argv)
        free(argv);
 }
 
+int pre_create_hook(void)
+{
+       int ret, fds[3] = {0, 0, 0};
+
+       if (!conf.pre_create_hook_given) {
+               snapshot_creation_status = SCS_PRE_HOOK_SUCCESS;
+               return 0;
+       }
+       DSS_NOTICE_LOG("executing %s\n", conf.pre_create_hook_arg);
+       ret = dss_exec_cmdline_pid(&pre_create_hook_pid,
+               conf.pre_create_hook_arg, fds);
+       if (ret < 0)
+               return ret;
+       snapshot_creation_status = SCS_PRE_HOOK_RUNNING;
+       return ret;
+}
+
+int post_create_hook(void)
+{
+       int ret, fds[3] = {0, 0, 0};
+       char *cmd;
+
+       if (!conf.post_create_hook_given) {
+               snapshot_creation_status = SCS_READY;
+               compute_next_snapshot_time();
+               return 0;
+       }
+       cmd = make_message("%s %s", conf.post_create_hook_arg,
+               path_to_last_complete_snapshot);
+       DSS_NOTICE_LOG("executing %s\n", cmd);
+       ret = dss_exec_cmdline_pid(&post_create_hook_pid, cmd, fds);
+       free(cmd);
+       if (ret < 0)
+               return ret;
+       snapshot_creation_status = SCS_POST_HOOK_RUNNING;
+       return ret;
+}
+
 int create_snapshot(char **argv)
 {
-       int fds[3] = {0, 0, 0};
-       char *name = incomplete_name(current_snapshot_creation_time);
+       int ret, fds[3] = {0, 0, 0};
+       char *name;
 
+       name = incomplete_name(current_snapshot_creation_time);
        DSS_NOTICE_LOG("creating new snapshot %s\n", name);
        free(name);
-       return dss_exec(&rsync_pid, argv[0], argv, fds);
+       ret = dss_exec(&rsync_pid, argv[0], argv, fds);
+       if (ret < 0)
+               return ret;
+       snapshot_creation_status = SCS_RSYNC_RUNNING;
+       return ret;
 }
 
-void compute_next_snapshot_time(struct snapshot_list *sl)
+int handle_pre_create_hook_exit(int status)
 {
-       struct timeval now, unit_interval = {.tv_sec = 24 * 3600 * conf.unit_interval_arg},
-               tmp, diff;
-       int64_t x = 0;
-       unsigned wanted = num_snapshots(0), num_complete_snapshots = 0;
-       int i, ret;
-       struct snapshot *s;
+       int es, ret;
 
-       gettimeofday(&now, NULL);
-       FOR_EACH_SNAPSHOT(s, i, sl) {
-               if (!(s->flags & SS_COMPLETE))
-                       continue;
-               num_complete_snapshots++;
-               x += s->completion_time - s->creation_time;
+       if (!WIFEXITED(status)) {
+               make_err_msg("pre-create-hook %d died involuntary",
+                       (int)pre_create_hook_pid);
+               snapshot_creation_status = SCS_READY;
+               compute_next_snapshot_time();
+               ret = -E_INVOLUNTARY_EXIT;
+               goto out;
        }
-       assert(x >= 0);
-       if (num_complete_snapshots)
-               x /= num_complete_snapshots; /* avg time to create one snapshot */
-       x *= wanted; /* time to create all snapshots in interval 0 */
-       tmp.tv_sec = x;
-       tmp.tv_usec = 0;
-       ret = tv_diff(&unit_interval, &tmp, &diff); /* time between creation */
-       if (ret < 0) {
-               next_snapshot_time = now;
-               return;
+       es = WEXITSTATUS(status);
+       if (es) {
+               make_err_msg("pre-create-hook %d returned %d",
+                       (int)pre_create_hook_pid, es);
+               snapshot_creation_status = SCS_READY;
+               compute_next_snapshot_time();
+               ret = -E_BAD_EXIT_CODE;
+               goto out;
+       }
+       snapshot_creation_status = SCS_PRE_HOOK_SUCCESS;
+       ret = 1;
+out:
+       pre_create_hook_pid = 0;
+       return ret;
+}
+
+int handle_sigchld()
+{
+       pid_t pid;
+       int status, ret = reap_child(&pid, &status);
+
+       if (ret <= 0)
+               return ret;
+       if (pid == rsync_pid)
+               return handle_rsync_exit(status);
+       if (pid == rm_pid)
+               return handle_rm_exit(status);
+       if (pid == pre_create_hook_pid)
+               return handle_pre_create_hook_exit(status);
+       if (pid == post_create_hook_pid) {
+               snapshot_creation_status = SCS_READY;
+               compute_next_snapshot_time();
+               return 1;
        }
-       tv_divide(wanted, &diff, &tmp);
-       tv_add(&now, &tmp, &next_snapshot_time);
+       DSS_EMERG_LOG("BUG: unknown process %d died\n", (int)pid);
+       exit(EXIT_FAILURE);
 }
 
-void handle_signal(struct snapshot_list *sl)
+void handle_signal(void)
 {
        int sig, ret = next_signal();
 
@@ -709,8 +931,6 @@ void handle_signal(struct snapshot_list *sl)
                goto out;
        sig = ret;
        switch (sig) {
-               int status;
-               pid_t pid;
        case SIGINT:
        case SIGTERM:
                restart_rsync_process();
@@ -719,19 +939,11 @@ void handle_signal(struct snapshot_list *sl)
                exit(EXIT_FAILURE);
        case SIGHUP:
                handle_sighup();
+               ret = 1;
                break;
        case SIGCHLD:
-               ret = reap_child(&pid, &status);
-               if (ret <= 0)
-                       break;
-               assert(pid == rsync_pid || pid == rm_pid);
-               if (pid == rsync_pid)
-                       ret = handle_rsync_exit(status);
-               else
-                       ret = handle_rm_exit(status);
-               free_snapshot_list(sl);
-               get_snapshot_list(sl);
-               compute_next_snapshot_time(sl);
+               ret = handle_sigchld();
+               break;
        }
 out:
        if (ret < 0)
@@ -790,52 +1002,56 @@ int disk_space_low(void)
        return 0;
 }
 
-int try_to_free_disk_space(int low_disk_space, struct snapshot_list *sl)
+int try_to_free_disk_space(int low_disk_space)
 {
        int ret;
+       struct snapshot_list sl;
 
-       ret = remove_outdated_snapshot(sl);
+       get_snapshot_list(&sl);
+       ret = remove_outdated_snapshot(&sl);
        if (ret) /* error, or we are removing something */
-               return ret;
+               goto out;
        /* no outdated snapshot */
-       ret = remove_redundant_snapshot(sl);
+       ret = remove_redundant_snapshot(&sl);
        if (ret)
-               return ret;
+               goto out;
+       ret = 0;
        if (!low_disk_space)
-               return 0;
+               goto out;
        DSS_WARNING_LOG("disk space low and nothing obvious to remove\n");
        ret = remove_oldest_snapshot();
        if (ret)
-               return ret;
+               goto out;
        make_err_msg("uhuhu: not enough disk space for a single snapshot");
-       return  -ENOSPC;
+       ret= -ENOSPC;
+out:
+       free_snapshot_list(&sl);
+       return ret;
 }
 
 int select_loop(void)
 {
        int ret;
        struct timeval tv = {.tv_sec = 0, .tv_usec = 0};
-       struct snapshot_list sl = {.num_snapshots = 0};
 
-       get_snapshot_list(&sl);
-       compute_next_snapshot_time(&sl);
        for (;;) {
-               struct timeval now, *tvp = &tv;
                fd_set rfds;
                int low_disk_space;
                char **rsync_argv;
+               struct timeval now, *tvp = &tv;
 
-               FD_ZERO(&rfds);
-               FD_SET(signal_pipe, &rfds);
                if (rsync_pid)
-                       tv.tv_sec = 60;
+                       tv.tv_sec = 60; /* check every 60 seconds for free disk space */
                else if (rm_pid)
-                       tvp = NULL;
+                       tvp = NULL; /* sleep until rm process dies */
+               FD_ZERO(&rfds);
+               FD_SET(signal_pipe, &rfds);
+               DSS_DEBUG_LOG("tvp: %p, tv_sec: %lu\n", tvp, (long unsigned) tv.tv_sec);
                ret = dss_select(signal_pipe + 1, &rfds, NULL, tvp);
                if (ret < 0)
                        return ret;
                if (FD_ISSET(signal_pipe, &rfds))
-                       handle_signal(&sl);
+                       handle_signal();
                if (rm_pid)
                        continue;
                ret = disk_space_low();
@@ -844,26 +1060,42 @@ int select_loop(void)
                low_disk_space = ret;
                if (low_disk_space)
                        stop_rsync_process();
-               ret = try_to_free_disk_space(low_disk_space, &sl);
+               ret = try_to_free_disk_space(low_disk_space);
                if (ret < 0)
                        break;
                if (rm_pid)
                        continue;
-               if (rsync_pid) {
-                       restart_rsync_process();
-                       continue;
-               }
-               /* neither rsync nor rm are running. Start rsync? */
+               restart_rsync_process();
                gettimeofday(&now, NULL);
                if (tv_diff(&next_snapshot_time, &now, &tv) > 0)
                        continue;
-               create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
-               ret = create_snapshot(rsync_argv);
-               free_rsync_argv(rsync_argv);
-               if (ret < 0)
-                       break;
+               switch (snapshot_creation_status) {
+               case SCS_READY:
+                       ret = pre_create_hook();
+                       if (ret < 0)
+                               goto out;
+                       continue;
+               case SCS_PRE_HOOK_RUNNING:
+                       continue;
+               case SCS_PRE_HOOK_SUCCESS:
+                       create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
+                       ret = create_snapshot(rsync_argv);
+                       free_rsync_argv(rsync_argv);
+                       if (ret < 0)
+                               goto out;
+                       continue;
+               case SCS_RSYNC_RUNNING:
+                       continue;
+               case SCS_RSYNC_SUCCESS:
+                       ret = post_create_hook();
+                       if (ret < 0)
+                               goto out;
+                       continue;
+               case SCS_POST_HOOK_RUNNING:
+                       continue;
+               }
        }
-       free_snapshot_list(&sl);
+out:
        return ret;
 }
 
@@ -878,6 +1110,7 @@ int com_run(void)
        ret = install_sighandler(SIGHUP);
        if (ret < 0)
                return ret;
+       compute_next_snapshot_time();
        return select_loop();
 }
 
@@ -932,20 +1165,33 @@ int com_create(void)
        int ret, status;
        char **rsync_argv;
 
-       create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
        if (conf.dry_run_given) {
                int i;
                char *msg = NULL;
+               create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
                for (i = 0; rsync_argv[i]; i++) {
                        char *tmp = msg;
                        msg = make_message("%s%s%s", tmp? tmp : "",
                                tmp? " " : "", rsync_argv[i]);
                        free(tmp);
                }
+               free_rsync_argv(rsync_argv);
                dss_msg("%s\n", msg);
                free(msg);
                return 1;
        }
+       ret = pre_create_hook();
+       if (ret < 0)
+               return ret;
+       if (pre_create_hook_pid) {
+               ret = wait_for_process(pre_create_hook_pid, &status);
+               if (ret < 0)
+                       return ret;
+               ret = handle_pre_create_hook_exit(status);
+               if (ret < 0)
+                       return ret;
+       }
+       create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
        ret = create_snapshot(rsync_argv);
        if (ret < 0)
                goto out;
@@ -953,6 +1199,11 @@ int com_create(void)
        if (ret < 0)
                goto out;
        ret = handle_rsync_exit(status);
+       if (ret < 0)
+               goto out;
+       post_create_hook();
+       if (post_create_hook_pid)
+               ret = wait_for_process(post_create_hook_pid, &status);
 out:
        free_rsync_argv(rsync_argv);
        return ret;
@@ -970,68 +1221,11 @@ int com_ls(void)
        return 1;
 }
 
-/* TODO: Unlink pid file */
 __noreturn void clean_exit(int status)
 {
-       //kill(0, SIGTERM);
        free(dss_error_txt);
        exit(status);
 }
-
-int read_config_file(void)
-{
-       int ret;
-       char *config_file;
-       struct stat statbuf;
-
-       if (conf.config_file_given)
-               config_file = dss_strdup(conf.config_file_arg);
-       else {
-               char *home = get_homedir();
-               config_file = make_message("%s/.dssrc", home);
-               free(home);
-       }
-       ret = stat(config_file, &statbuf);
-       if (ret && conf.config_file_given) {
-               ret = -ERRNO_TO_DSS_ERROR(errno);
-               make_err_msg("failed to stat config file %s", config_file);
-               goto out;
-       }
-       if (!ret) {
-               struct cmdline_parser_params params = {
-                       .override = 0,
-                       .initialize = 0,
-                       .check_required = 0,
-                       .check_ambiguity = 0
-               };
-               cmdline_parser_config_file(config_file, &conf, &params);
-       }
-       if (!conf.source_dir_given || !conf.dest_dir_given) {
-               ret = -E_SYNTAX;
-               make_err_msg("you need to specify both source_dir and dest_dir");
-               goto out;
-       }
-       ret = 1;
-out:
-       free(config_file);
-       return ret;
-}
-
-int check_config(void)
-{
-       if (conf.unit_interval_arg <= 0) {
-               make_err_msg("bad unit interval: %i", 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) {
-               make_err_msg("bad number of intervals  %i", conf.num_intervals_arg);
-               return -E_INVALID_NUMBER;
-       }
-       DSS_DEBUG_LOG("number of intervals: %i\n", conf.num_intervals_arg);
-       return 1;
-}
-
 static void setup_signal_handling(void)
 {
        int ret;
@@ -1053,30 +1247,23 @@ err:
        exit(EXIT_FAILURE);
 }
 
-
 int main(int argc, char **argv)
 {
        int ret;
+       struct cmdline_parser_params params = {
+               .override = 0,
+               .initialize = 1,
+               .check_required = 0,
+               .check_ambiguity = 0
+       };
+
+       cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
+       parse_config_file(0);
 
-       cmdline_parser(argc, argv, &conf); /* aborts on errors */
-       ret = read_config_file();
-       if (ret < 0)
-               goto out;
-       ret = check_config();
-       if (ret < 0)
-               goto out;
-       if (conf.logfile_given) {
-               logfile = open_log(conf.logfile_arg);
-               log_welcome(conf.loglevel_arg);
-       }
-       ret = dss_chdir(conf.dest_dir_arg);
-       if (ret < 0)
-               goto out;
        if (conf.daemon_given)
                daemon_init();
        setup_signal_handling();
        ret = call_command_handler();
-out:
        if (ret < 0)
                log_err_msg(EMERG, -ret);
        clean_exit(ret >= 0? EXIT_SUCCESS : EXIT_FAILURE);