Merge topic branch t/misc into pu

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 0992ec6fd18651f85c2bab2c7d8d45603b3a786c..477df6f1a5f3e8f356af352e400a0ee73dcdf6ac 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -65,6 +65,10 @@ static const struct lls_command *subcmd;
 static bool daemonized;
 /** Non-NULL if we log to a file. */
 static FILE *logfile;
 static bool daemonized;
 /** Non-NULL if we log to a file. */
 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. */
 /** The read end of the signal pipe */
 static int signal_pipe;
 /** Process id of current pre-create-hook/rsync/post-create-hook process. */


@@ -271,27 +275,39 @@ static __printf_1_2 void dss_msg(const char* fmt,...)
        va_end(argp);
 }
 
        va_end(argp);
 }
 

-static char *get_config_file_name(void)
+static void set_config_file_name(void)

 {
 {

-       char *home, *config_file;

 
 

-       if (OPT_GIVEN(DSS, CONFIG_FILE))
-               return dss_strdup(OPT_STRING_VAL(DSS, CONFIG_FILE));
-       home = get_homedir();
-       config_file = make_message("%s/.dssrc", home);
-       free(home);
-       return config_file;
+       if (OPT_GIVEN(DSS, CONFIG_FILE)) {
+               const char *arg = OPT_STRING_VAL(DSS, CONFIG_FILE);
+               config_file = realpath(arg, NULL);
+               if (!config_file) {
+                       DSS_EMERG_LOG(("could not resolve path %s: %s\n", arg,
+                               strerror(errno)));
+                       exit(EXIT_FAILURE);
+               }
+       } else {
+               char *home = get_homedir();
+               char *arg = make_message("%s/.dssrc", home);
+               free(home);
+               config_file = realpath(arg, NULL);
+               if (config_file)
+                       free(arg);
+               else /* not fatal */
+                       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;
 }
 
 static int send_signal(int sig, bool wait)
 {
        pid_t pid;

-       char *config_file = get_config_file_name();
-       int ret = get_dss_pid(config_file, &pid);
+       int ret = get_dss_pid(ipc_key, &pid);

        unsigned ms = 32;
        struct timespec ts;
 
        unsigned ms = 32;
        struct timespec ts;
 

-       free(config_file);

        if (ret < 0)
                return ret;
        if (OPT_GIVEN(DSS, DRY_RUN)) {
        if (ret < 0)
                return ret;
        if (OPT_GIVEN(DSS, DRY_RUN)) {


@@ -1166,7 +1182,6 @@ static int lopsub_error(int lopsub_ret, char **errctx)
 static int parse_config_file(bool sighup, const struct lls_command *cmd)
 {
        int ret, fd = -1;
 static int parse_config_file(bool sighup, const struct lls_command *cmd)
 {
        int ret, fd = -1;

-       char *config_file = get_config_file_name();

        struct stat statbuf;
        void *map;
        size_t sz;
        struct stat statbuf;
        void *map;
        size_t sz;


@@ -1258,7 +1273,6 @@ close_fd:
        if (fd >= 0)
                close(fd);
 out:
        if (fd >= 0)
                close(fd);
 out:

-       free(config_file);

        return ret;
 }
 
        return ret;
 }
 


@@ -1589,10 +1603,8 @@ static void exit_hook(int exit_code)
 
 static void lock_dss_or_die(void)
 {
 
 static void lock_dss_or_die(void)
 {

-       char *config_file = get_config_file_name();
-       int ret = lock_dss(config_file);
+       int ret = lock_dss(ipc_key);

 
 

-       free(config_file);

        if (ret < 0) {
                DSS_EMERG_LOG(("failed to lock: %s\n", dss_strerror(-ret)));
                exit(EXIT_FAILURE);
        if (ret < 0) {
                DSS_EMERG_LOG(("failed to lock: %s\n", dss_strerror(-ret)));
                exit(EXIT_FAILURE);


@@ -1602,16 +1614,13 @@ static void lock_dss_or_die(void)
 static int com_run(void)
 {
        int ret, fd = -1;
 static int com_run(void)
 {
        int ret, fd = -1;

-       char *config_file;

        pid_t pid;
 
        if (OPT_GIVEN(DSS, DRY_RUN)) {
                DSS_ERROR_LOG(("dry run not supported by this command\n"));
                return -E_SYNTAX;
        }
        pid_t pid;
 
        if (OPT_GIVEN(DSS, DRY_RUN)) {
                DSS_ERROR_LOG(("dry run not supported by this command\n"));
                return -E_SYNTAX;
        }

-       config_file = get_config_file_name();
-       ret = get_dss_pid(config_file, &pid);
-       free(config_file);
+       ret = get_dss_pid(ipc_key, &pid);

        if (ret >= 0) {
                DSS_ERROR_LOG(("pid %d\n", (int)pid));
                return -E_ALREADY_RUNNING;
        if (ret >= 0) {
                DSS_ERROR_LOG(("pid %d\n", (int)pid));
                return -E_ALREADY_RUNNING;


@@ -1820,19 +1829,23 @@ static int setup_signal_handling(void)
        return install_sighandler(SIGCHLD);
 }
 
        return install_sighandler(SIGCHLD);
 }
 

+const char *dss_version(void);

 static void handle_version_and_help(void)
 {
        char *txt;
 
 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));
        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);
        else
                return;
        printf("%s", txt);

+       printf("\nRun dss help for help on subcommands.\n");

        free(txt);
        exit(EXIT_SUCCESS);
 }
        free(txt);
        exit(EXIT_SUCCESS);
 }


@@ -1848,8 +1861,39 @@ static void show_subcommand_summary(void)
                const char *purpose = lls_purpose(cmd);
                printf("%-11s%s\n", name, purpose);
        }
                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)
 {
 
 int main(int argc, char **argv)
 {


@@ -1864,13 +1908,17 @@ int main(int argc, char **argv)
                goto out;
        }
        lpr = cmdline_lpr;
                goto out;
        }
        lpr = cmdline_lpr;

+       set_config_file_name();

        ret = parse_config_file(false /* no SIGHUP */, CMD_PTR(DSS));
        if (ret < 0)
                goto out;
        handle_version_and_help();
        num_inputs = lls_num_inputs(lpr);
        ret = parse_config_file(false /* no SIGHUP */, CMD_PTR(DSS));
        if (ret < 0)
                goto out;
        handle_version_and_help();
        num_inputs = lls_num_inputs(lpr);

-       if (num_inputs == 0)
+       if (num_inputs == 0) {

                show_subcommand_summary();
                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);
        ret = lls_lookup_subcmd(argv[argc - num_inputs], dss_suite, &errctx);
        if (ret < 0) {
                ret = lopsub_error(ret, &errctx);


@@ -1909,5 +1957,6 @@ out:
        lls_free_parse_result(sublpr, subcmd);
        if (sublpr != cmdline_sublpr)
                lls_free_parse_result(cmdline_sublpr, subcmd);
        lls_free_parse_result(sublpr, subcmd);
        if (sublpr != cmdline_sublpr)
                lls_free_parse_result(cmdline_sublpr, subcmd);

+       free(config_file);

        exit(ret >= 0? EXIT_SUCCESS : EXIT_FAILURE);
 }
        exit(ret >= 0? EXIT_SUCCESS : EXIT_FAILURE);
 }