Fix --config-file for relative paths.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index b09fc961f28328eb9c7c6e95726fffa3b706de32..0992ec6fd18651f85c2bab2c7d8d45603b3a786c 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -1122,7 +1122,6 @@ static int change_to_dest_dir(void)
 
 static int check_config(void)
 {
-       int ret;
        uint32_t unit_interval = OPT_UINT32_VAL(DSS, UNIT_INTERVAL);
        uint32_t num_intervals = OPT_UINT32_VAL(DSS, NUM_INTERVALS);
 
@@ -1147,9 +1146,6 @@ static int check_config(void)
                        DSS_ERROR_LOG(("--dest-dir required\n"));
                        return -E_SYNTAX;
                }
-               ret = change_to_dest_dir();
-               if (ret < 0)
-                       return ret;
        }
        DSS_DEBUG_LOG(("number of intervals: %i\n", num_intervals));
        return 1;
@@ -1263,8 +1259,6 @@ close_fd:
                close(fd);
 out:
        free(config_file);
-       if (ret < 0)
-               DSS_EMERG_LOG(("%s\n", dss_strerror(-ret)));
        return ret;
 }
 
@@ -1458,7 +1452,7 @@ static void create_rsync_argv(char ***argv, int64_t *num)
                                        OPT_STRING_VAL(DSS, REMOTE_USER) : logname,
                                OPT_STRING_VAL(DSS, REMOTE_HOST),
                                lls_string_val(j, OPT_RESULT(DSS, SOURCE_DIR)),
-                               N == 1? "/" : ""
+                               OPT_GIVEN(DSS, SOURCE_DIR) == 1? "/" : ""
                        );
                }
        }
@@ -1581,7 +1575,7 @@ static void exit_hook(int exit_code)
 {
        pid_t pid;
        char **argv, *tmp = dss_strdup(OPT_STRING_VAL(DSS, EXIT_HOOK));
-       unsigned n = split_args(tmp, &argv, " \t");
+       unsigned n = split_args(tmp, &argv);
 
        n++;
        argv = dss_realloc(argv, (n + 1) * sizeof(char *));
@@ -1622,12 +1616,23 @@ static int com_run(void)
                DSS_ERROR_LOG(("pid %d\n", (int)pid));
                return -E_ALREADY_RUNNING;
        }
+       /*
+        * Order is important here: Since daemon_init() forks, it would drop
+        * the lock if it had been acquired already. Changing the cwd before
+        * grabbing the lock causes stat(2) to fail in case a relative config
+        * file path was given, which results in a different key ID for
+        * locking. Therefore we must first daemonize, then lock, then change
+        * the cwd.
+        */
        if (OPT_GIVEN(RUN, DAEMON)) {
                fd = daemon_init();
                daemonized = true;
                logfile = open_log(OPT_STRING_VAL(RUN, LOGFILE));
        }
        lock_dss_or_die();
+       ret = change_to_dest_dir();
+       if (ret < 0)
+               return ret;
        dump_dss_config("startup");
        ret = install_sighandler(SIGHUP);
        if (ret < 0)
@@ -1659,55 +1664,58 @@ static int com_prune(void)
        struct snapshot_list sl;
        struct snapshot *victim;
        struct disk_space ds;
-       const char *why;
+       char *why;
+       bool try_hard;
 
        lock_dss_or_die();
-       ret = get_disk_space(".", &ds);
+       ret = change_to_dest_dir();
        if (ret < 0)
                return ret;
-       log_disk_space(&ds);
+       switch (OPT_UINT32_VAL(PRUNE, DISK_SPACE)) {
+       case FDS_LOW: try_hard = true; break;
+       case FDS_HIGH: try_hard = false; break;
+       default:
+               ret = get_disk_space(".", &ds);
+               if (ret < 0)
+                       return ret;
+               log_disk_space(&ds);
+               try_hard = disk_space_low(&ds);
+       }
        dss_get_snapshot_list(&sl);
-       why = "outdated";
-       victim = find_outdated_snapshot(&sl);
-       if (victim)
-               goto rm;
-       why = "redundant";
-       victim = find_redundant_snapshot(&sl);
-       if (victim)
-               goto rm;
-       dss_msg("nothing to prune\n");
-       ret = 0;
-       goto out;
-rm:
+       victim = find_removable_snapshot(&sl, try_hard, &why);
+       if (!victim) {
+               dss_msg("nothing to prune\n");
+               ret = 0;
+               goto free_sl;
+       }
        if (OPT_GIVEN(DSS, DRY_RUN)) {
-               dss_msg("%s snapshot %s (interval = %i)\n",
+               dss_msg("picking %s snapshot %s (interval = %i)\n",
                        why, victim->name, victim->interval);
                ret = 0;
-               goto out;
+               goto free_why;
        }
        pre_remove_hook(victim, why);
        if (snapshot_removal_status == HS_PRE_RUNNING) {
                ret = wait_for_remove_process();
                if (ret < 0)
-                       goto out;
+                       goto free_why;
                ret = -E_HOOK_FAILED;
                if (snapshot_removal_status != HS_PRE_SUCCESS)
-                       goto out;
+                       goto free_why;
        }
        ret = exec_rm();
        if (ret < 0)
-               goto out;
+               goto free_why;
        ret = wait_for_remove_process();
        if (ret < 0)
-               goto out;
+               goto free_why;
        assert(snapshot_removal_status == HS_SUCCESS);
        post_remove_hook();
        assert(snapshot_removal_status == HS_POST_RUNNING);
        ret = wait_for_remove_process();
-       if (ret < 0)
-               goto out;
-       ret = 1;
-out:
+free_why:
+       free(why);
+free_sl:
        free_snapshot_list(&sl);
        return ret;
 }
@@ -1719,6 +1727,9 @@ static int com_create(void)
        char **rsync_argv;
 
        lock_dss_or_die();
+       ret = change_to_dest_dir();
+       if (ret < 0)
+               return ret;
        if (OPT_GIVEN(DSS, DRY_RUN)) {
                int i;
                char *msg = NULL;
@@ -1764,11 +1775,14 @@ EXPORT_CMD_HANDLER(create);
 
 static int com_ls(void)
 {
-       int i;
+       int i, ret;
        struct snapshot_list sl;
        struct snapshot *s;
        int64_t now = get_current_time();
 
+       ret = change_to_dest_dir();
+       if (ret < 0)
+               return ret;
        dss_get_snapshot_list(&sl);
        FOR_EACH_SNAPSHOT(s, i, &sl) {
                int64_t d;