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. */
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)) {
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);
return ret;
}
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);
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;
return install_sighandler(SIGCHLD);
}
+const char *dss_version(void);
static void handle_version_and_help(void)
{
char *txt;
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);
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;
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);
- 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);
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);
}