use C99-compliant format strings for consistency reasons

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 7a46eed23531dd2f3dfa657bce877414ee5b2a0c..86e83827f50991fc9460eb44c71b45211b7fc1a8 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -498,6 +498,13 @@ static int handle_rsync_exit(int status)
                goto out;
        }
        es = WEXITSTATUS(status);
+       if (es == 13) { /* Errors with program diagnostics */
+               DSS_WARNING_LOG("rsync process %d returned %d -- restarting\n",
+                       (int)rsync_pid, es);
+               snapshot_creation_status = SCS_RSYNC_NEEDS_RESTART;
+               ret = 1;
+               goto out;
+       }
        if (es != 0 && es != 23 && es != 24) {
                DSS_ERROR_LOG("rsync process %d returned %d\n", (int)rsync_pid, es);
                ret = -E_BAD_EXIT_CODE;
@@ -726,6 +733,9 @@ static void create_rsync_argv(char ***argv, int64_t *num)
 static void free_rsync_argv(char **argv)
 {
        int i;
+
+       if (!argv)
+               return;
        for (i = 0; argv[i]; i++)
                free(argv[i]);
        free(argv);
@@ -751,11 +761,11 @@ static int select_loop(void)
        int ret;
        /* check every 60 seconds for free disk space */
        struct timeval tv;
+       char **rsync_argv = NULL;
 
        for (;;) {
                fd_set rfds;
                int low_disk_space;
-               char **rsync_argv;
                struct timeval now, *tvp;
 
                if (rm_pid)
@@ -801,10 +811,15 @@ static int select_loop(void)
                        continue;
                case SCS_PRE_HOOK_RUNNING:
                        continue;
+               case SCS_RSYNC_NEEDS_RESTART:
+                       ret = create_snapshot(rsync_argv);
+                       if (ret < 0)
+                               goto out;
+                       continue;
                case SCS_PRE_HOOK_SUCCESS:
+                       free_rsync_argv(rsync_argv);
                        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;
@@ -949,8 +964,12 @@ static int com_ls(void)
        struct snapshot *s;
 
        dss_get_snapshot_list(&sl);
-       FOR_EACH_SNAPSHOT(s, i, &sl)
-               dss_msg("%u\t%s\n", s->interval, s->name);
+       FOR_EACH_SNAPSHOT(s, i, &sl) {
+               int64_t d = 0;
+               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;
 }