Merge topic branch t/misc into pu

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index f61f33597d7863e236a804d6c0541934e6ced8d5..7d906b2fa19552eb03087e9a4cfe64a39eceefa6 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;
 }
 
@@ -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)
@@ -1663,6 +1668,9 @@ static int com_prune(void)
        bool try_hard;
 
        lock_dss_or_die();
+       ret = change_to_dest_dir();
+       if (ret < 0)
+               return ret;
        switch (OPT_UINT32_VAL(PRUNE, DISK_SPACE)) {
        case FDS_LOW: try_hard = true; break;
        case FDS_HIGH: try_hard = false; break;
@@ -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;
@@ -1806,6 +1820,7 @@ static int setup_signal_handling(void)
        return install_sighandler(SIGCHLD);
 }
 
+const char *dss_version(void);
 static void handle_version_and_help(void)
 {
        char *txt;
@@ -1815,7 +1830,7 @@ static void handle_version_and_help(void)
        else if (OPT_GIVEN(DSS, HELP))
                txt = lls_short_help(CMD_PTR(DSS));
        else if (OPT_GIVEN(DSS, VERSION))
-               txt = make_message("%s\n", VERSION_STRING);
+               txt = make_message("%s\n", dss_version());
        else
                return;
        printf("%s", txt);
@@ -1823,20 +1838,58 @@ static void handle_version_and_help(void)
        exit(EXIT_SUCCESS);
 }
 
-static void show_subcommand_summary(void)
+static void show_subcommand_summary(bool verbose)
 {
        const struct lls_command *cmd;
        int i;
 
-       printf("Available subcommands:\n");
+       printf("Available subcommands: ");
+       if (!verbose) {
+               for (i = 1; (cmd = lls_cmd(i, dss_suite)); i++) {
+                       if (i > 1)
+                               printf(", ");
+                       printf("%s", lls_command_name(cmd));
+               }
+               printf("\n");
+               return;
+       }
+       printf("\n");
        for (i = 1; (cmd = lls_cmd(i, dss_suite)); i++) {
                const char *name = lls_command_name(cmd);
                const char *purpose = lls_purpose(cmd);
                printf("%-11s%s\n", name, purpose);
        }
-       exit(EXIT_SUCCESS);
 }
 
+static int com_help(void)
+{
+       int ret;
+       char *errctx, *help;
+       const char *arg;
+       const struct lls_command *cmd;
+
+       ret = lls_check_arg_count(sublpr, 0, 1, &errctx);
+       if (ret < 0)
+               return lopsub_error(ret, &errctx);
+       if (lls_num_inputs(sublpr) == 0) {
+               show_subcommand_summary(OPT_GIVEN(HELP, LONG));
+               return 0;
+       }
+       arg = lls_input(0, sublpr);
+       ret = lls_lookup_subcmd(arg, dss_suite, &errctx);
+       if (ret < 0)
+               return lopsub_error(ret, &errctx);
+       cmd = lls_cmd(ret, dss_suite);
+       if (OPT_GIVEN(HELP, LONG))
+               help = lls_long_help(cmd);
+       else
+               help = lls_short_help(cmd);
+       printf("%s\n", help);
+       free(help);
+       return 0;
+}
+EXPORT_CMD_HANDLER(help);
+
 int main(int argc, char **argv)
 {
        int ret;
@@ -1855,8 +1908,11 @@ int main(int argc, char **argv)
                goto out;
        handle_version_and_help();
        num_inputs = lls_num_inputs(lpr);
-       if (num_inputs == 0)
-               show_subcommand_summary();
+       if (num_inputs == 0) { /* show verbose summary */
+               show_subcommand_summary(true);
+               ret = 0;
+               goto out;
+       }
        ret = lls_lookup_subcmd(argv[argc - num_inputs], dss_suite, &errctx);
        if (ret < 0) {
                ret = lopsub_error(ret, &errctx);