Command handlers don't need to take any arguments.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 0913301386fefacfda2bcef9016cce9513983ebd..bda603e5419b079f4709044a3c04ab0e5901ddf1 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -29,29 +29,25 @@ char *dss_error_txt = NULL;
 
 DEFINE_DSS_ERRLIST;
 
-/** Defines one dss command. */
-struct server_command {
-       /** The name of the command. */
-       const char *name;
-       /** Pointer to the function that handles the command. */
-       int (*handler)(int, char * const * const);
-};
 
 /* a litte cpp magic helps to DRY */
-#define SERVER_COMMANDS \
-       SERVER_COMMAND(ls) \
-       SERVER_COMMAND(create) \
-       SERVER_COMMAND(prune) \
-       SERVER_COMMAND(daemon)
-#define SERVER_COMMAND(x) int com_ ##x(int, char * const * const);
-SERVER_COMMANDS
-#undef SERVER_COMMAND
-#define SERVER_COMMAND(x) {.name = #x, .handler = com_ ## x},
-static struct server_command command_list[] = {
-       SERVER_COMMANDS
-       {.name = NULL, .handler = NULL}
-};
-#undef SERVER_COMMAND
+#define COMMANDS \
+       COMMAND(ls) \
+       COMMAND(create) \
+       COMMAND(prune) \
+       COMMAND(run)
+#define COMMAND(x) int com_ ##x(void);
+COMMANDS
+#undef COMMAND
+#define COMMAND(x) if (conf.x ##_given) return com_ ##x();
+int call_command_handler(void)
+{
+       COMMANDS
+       DSS_EMERG_LOG("BUG: did not find command handler\n");
+       exit(EXIT_FAILURE);
+}
+#undef COMMAND
+#undef COMMANDS
 
 /*
  * complete, not being deleted: 1204565370-1204565371.Sun_Mar_02_2008_14_33-Sun_Mar_02_2008_14_43
@@ -413,23 +409,17 @@ int wait_for_rm_process(pid_t pid)
        return 1;
 }
 
-int com_prune(int argc, char * const * argv)
+int com_run(void)
+{
+       return 42;
+}
+
+int com_prune(void)
 {
        int ret, dry_run = 0;
        struct snapshot_list sl;
        pid_t pid;
 
-       if (argc > 2) {
-               make_err_msg("too many arguments");
-               return -E_SYNTAX;
-       }
-       if (argc == 2) {
-               if (strcmp(argv[1], "-d")) {
-                       make_err_msg("%s", argv[1]);
-                       return -E_SYNTAX;
-               }
-               dry_run = 1;
-       }
        for (;;) {
                get_snapshot_list(&sl);
                ret = remove_old_snapshot(&sl, dry_run, &pid);
@@ -560,18 +550,13 @@ int rename_incomplete_snapshot(int64_t start)
        return ret;
 }
 
-int com_create(int argc, __a_unused char * const * argv)
+int com_create(void)
 {
        int ret, status, es;
        char **rsync_argv;
        int64_t snapshot_num;
        pid_t pid;
 
-       if (argc != 1) {
-               ret = -E_SYNTAX;
-               make_err_msg("create: no args expected, %d given", argc - 1);
-               return ret;
-       }
        create_rsync_argv(&rsync_argv, &snapshot_num);
        DSS_NOTICE_LOG("creating snapshot %lli\n", (long long)snapshot_num);
        ret = create_snapshot(rsync_argv, &pid);
@@ -597,16 +582,11 @@ out:
        return ret;
 }
 
-int com_ls(int argc, __a_unused char * const * argv)
+int com_ls(void)
 {
-       int i, ret;
+       int i;
        struct snapshot_list sl;
        struct snapshot *s;
-       if (argc != 1) {
-               ret = -E_SYNTAX;
-               make_err_msg("ls: no args expected, %d given", argc - 1);
-               return ret;
-       }
        get_snapshot_list(&sl);
        FOR_EACH_SNAPSHOT(s, i, &sl)
                printf("%u\t%s\n", s->interval, s->name);
@@ -688,12 +668,12 @@ int check_config(void)
 
 int main(int argc, char **argv)
 {
-       int i, ret;
+       int ret;
 
        cmdline_parser(argc, argv, &conf); /* aborts on errors */
-       if (!conf.inputs_num) {
+       if (conf.inputs_num) {
                ret = -E_SYNTAX;
-               make_err_msg("no command given");
+               make_err_msg("additional non-options given");
                goto out;
        }
        ret = read_config_file();
@@ -705,14 +685,7 @@ int main(int argc, char **argv)
        ret = dss_chdir(conf.dest_dir_arg);
        if (ret < 0)
                goto out;
-       for (i = 0; command_list[i].name; i++) {
-               if (strcmp(command_list[i].name, conf.inputs[0]))
-                       continue;
-               ret = command_list[i].handler(conf.inputs_num, conf.inputs);
-               goto out;
-       }
-       ret = -E_INVALID_COMMAND;
-       make_err_msg("%s", conf.inputs[0]);
+       ret = call_command_handler();
 out:
        if (ret < 0)
                log_err_msg(EMERG, -ret);