Get rid of E_INVALID_COMMAND.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 0913301386fefacfda2bcef9016cce9513983ebd..665185f6f02e2e85b96c315cb9f274fab0aa0709 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(int, char * const * const);
+COMMANDS
+#undef COMMAND
+#define COMMAND(x) if (conf.x ##_given) return com_ ##x(argc, argv);
+int call_command_handler(int argc, char * const * const argv)
+{
+       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,6 +409,11 @@ int wait_for_rm_process(pid_t pid)
        return 1;
 }
 
+int com_run(int argc, char * const * argv)
+{
+       return 42;
+}
+
 int com_prune(int argc, char * const * argv)
 {
        int ret, dry_run = 0;
@@ -688,12 +689,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 +706,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(conf.inputs_num, conf.inputs);
 out:
        if (ret < 0)
                log_err_msg(EMERG, -ret);