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. */
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;
- 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;
- free(config_file);
if (ret < 0)
return ret;
if (OPT_GIVEN(DSS, DRY_RUN)) {
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);
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;
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;
if (fd >= 0)
close(fd);
out:
- free(config_file);
- if (ret < 0)
- DSS_EMERG_LOG(("%s\n", dss_strerror(-ret)));
return ret;
}
OPT_STRING_VAL(DSS, REMOTE_USER) : logname,
OPT_STRING_VAL(DSS, REMOTE_HOST),
lls_string_val(j, OPT_RESULT(DSS, SOURCE_DIR)),
- N == 1? "/" : ""
+ OPT_GIVEN(DSS, SOURCE_DIR) == 1? "/" : ""
);
}
}
{
pid_t pid;
char **argv, *tmp = dss_strdup(OPT_STRING_VAL(DSS, EXIT_HOOK));
- unsigned n = split_args(tmp, &argv, " \t");
+ unsigned n = split_args(tmp, &argv);
n++;
argv = dss_realloc(argv, (n + 1) * sizeof(char *));
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);
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);
+ ret = get_dss_pid(ipc_key, &pid);
if (ret >= 0) {
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)
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;
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;
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;
goto out;
}
lpr = cmdline_lpr;
+ set_config_file_name();
ret = parse_config_file(false /* no SIGHUP */, CMD_PTR(DSS));
if (ret < 0)
goto 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);
}