Merge topic branch t/realpath into pu

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index e709d34e0d7a0d6b12a3d74b3c0f0d7eaa901c2d..477df6f1a5f3e8f356af352e400a0ee73dcdf6ac 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -67,6 +67,8 @@ static bool daemonized;
 static FILE *logfile;
 /* Realpath of the config file. */
 static char *config_file;
+/* derived from config file path */
+uint32_t ipc_key;
 /** The read end of the signal pipe */
 static int signal_pipe;
 /** Process id of current pre-create-hook/rsync/post-create-hook process. */
@@ -295,12 +297,14 @@ static void set_config_file_name(void)
                        config_file = arg;
        }
        DSS_DEBUG_LOG(("config file: %s\n", config_file));
+       ipc_key = super_fast_hash((uint8_t *)config_file,
+               strlen(config_file), 0) >> 1;
 }
 
 static int send_signal(int sig, bool wait)
 {
        pid_t pid;
-       int ret = get_dss_pid(config_file, &pid);
+       int ret = get_dss_pid(ipc_key, &pid);
        unsigned ms = 32;
        struct timespec ts;
 
@@ -1599,7 +1603,7 @@ static void exit_hook(int exit_code)
 
 static void lock_dss_or_die(void)
 {
-       int ret = lock_dss(config_file);
+       int ret = lock_dss(ipc_key);
 
        if (ret < 0) {
                DSS_EMERG_LOG(("failed to lock: %s\n", dss_strerror(-ret)));
@@ -1616,7 +1620,7 @@ static int com_run(void)
                DSS_ERROR_LOG(("dry run not supported by this command\n"));
                return -E_SYNTAX;
        }
-       ret = get_dss_pid(config_file, &pid);
+       ret = get_dss_pid(ipc_key, &pid);
        if (ret >= 0) {
                DSS_ERROR_LOG(("pid %d\n", (int)pid));
                return -E_ALREADY_RUNNING;
@@ -1825,19 +1829,23 @@ static int setup_signal_handling(void)
        return install_sighandler(SIGCHLD);
 }
 
+const char *dss_version(void);
 static void handle_version_and_help(void)
 {
        char *txt;
 
+       if (OPT_GIVEN(DSS, VERSION)) {
+               printf("%s\n", dss_version());
+               exit(EXIT_SUCCESS);
+       }
        if (OPT_GIVEN(DSS, DETAILED_HELP))
                txt = lls_long_help(CMD_PTR(DSS));
        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);
        else
                return;
        printf("%s", txt);
+       printf("\nRun dss help for help on subcommands.\n");
        free(txt);
        exit(EXIT_SUCCESS);
 }
@@ -1853,8 +1861,39 @@ static void show_subcommand_summary(void)
                const char *purpose = lls_purpose(cmd);
                printf("%-11s%s\n", name, purpose);
        }
-       exit(EXIT_SUCCESS);
+       printf("\nRun dss help <subcmd> for help on <subcmd>.\n");
+}
+
+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();
+               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", help);
+       free(help);
+       if (!OPT_GIVEN(HELP, LONG))
+               printf("\nRun dss -- help -l %s for long help.\n", arg);
+       return 0;
 }
+EXPORT_CMD_HANDLER(help);
 
 int main(int argc, char **argv)
 {
@@ -1875,8 +1914,11 @@ int main(int argc, char **argv)
                goto out;
        handle_version_and_help();
        num_inputs = lls_num_inputs(lpr);
-       if (num_inputs == 0)
+       if (num_inputs == 0) {
                show_subcommand_summary();
+               ret = 0;
+               goto out;
+       }
        ret = lls_lookup_subcmd(argv[argc - num_inputs], dss_suite, &errctx);
        if (ret < 0) {
                ret = lopsub_error(ret, &errctx);