Merge topic branch t/realpath into pu

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 7d906b2fa19552eb03087e9a4cfe64a39eceefa6..f7919c0dfd267f21bad649845642f5003e0a3c83 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -65,6 +65,8 @@ static const struct lls_command *subcmd;
 static bool daemonized;
 /** Non-NULL if we log to a file. */
 static FILE *logfile;
+/* Realpath of the config file. */
+static char *config_file;
 /** 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 +273,37 @@ static __printf_1_2 void dss_msg(const char* fmt,...)
        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));
 }
 
 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);
        unsigned ms = 32;
        struct timespec ts;
 
-       free(config_file);
        if (ret < 0)
                return ret;
        if (OPT_GIVEN(DSS, DRY_RUN)) {
@@ -1166,7 +1178,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;
-       char *config_file = get_config_file_name();
        struct stat statbuf;
        void *map;
        size_t sz;
@@ -1258,7 +1269,6 @@ close_fd:
        if (fd >= 0)
                close(fd);
 out:
-       free(config_file);
        return ret;
 }
 
@@ -1589,10 +1599,8 @@ static void exit_hook(int exit_code)
 
 static void lock_dss_or_die(void)
 {
-       char *config_file = get_config_file_name();
        int ret = lock_dss(config_file);
 
-       free(config_file);
        if (ret < 0) {
                DSS_EMERG_LOG(("failed to lock: %s\n", dss_strerror(-ret)));
                exit(EXIT_FAILURE);
@@ -1602,16 +1610,13 @@ static void lock_dss_or_die(void)
 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;
        }
-       config_file = get_config_file_name();
        ret = get_dss_pid(config_file, &pid);
-       free(config_file);
        if (ret >= 0) {
                DSS_ERROR_LOG(("pid %d\n", (int)pid));
                return -E_ALREADY_RUNNING;
@@ -1903,6 +1908,7 @@ int main(int argc, char **argv)
                goto out;
        }
        lpr = cmdline_lpr;
+       set_config_file_name();
        ret = parse_config_file(false /* no SIGHUP */, CMD_PTR(DSS));
        if (ret < 0)
                goto out;
@@ -1951,5 +1957,6 @@ out:
        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);
 }