Avoid duplicate error message.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index e2ee7dd66e511199c42821cbc32cf0a8ddf727ad..84b6751a70b9d0a20002a30d47155b937118114f 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -1263,8 +1263,6 @@ close_fd:
                close(fd);
 out:
        free(config_file);
-       if (ret < 0)
-               DSS_EMERG_LOG(("%s\n", dss_strerror(-ret)));
        return ret;
 }
 
@@ -1458,7 +1456,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 +1579,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 *));
@@ -1660,14 +1658,21 @@ static int com_prune(void)
        struct snapshot *victim;
        struct disk_space ds;
        char *why;
+       bool try_hard;
 
        lock_dss_or_die();
-       ret = get_disk_space(".", &ds);
-       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);
-       victim = find_removable_snapshot(&sl, disk_space_low(&ds), &why);
+       victim = find_removable_snapshot(&sl, try_hard, &why);
        if (!victim) {
                dss_msg("nothing to prune\n");
                ret = 0;