sf_usage support print other options

src/sf_util.c

@@ -93,27 +93,49 @@ int sf_printbuffer(char* buffer,int32_t len)
     return(0);
 }
 
-void sf_usage(const char *program)
+void sf_usage_ex1(const char *program, const str_ptr_array_t *other_options)
-{
-    fprintf(stderr, "Usage: %s [options] <config_file> "
-            "[start | stop | restart]\n\noptions:\n"
-            "\t[--without-daemon | --no-daemon]: run in foreground\n"
-            "\t[-V | --version]: show version info\n"
-            "\t[-h | --help]: for this usage\n\n", program);
-}
-
-const char *sf_parse_daemon_mode_and_action_ex(int argc, char *argv[],
-        const Version *version, bool *daemon_mode, char **action,
-        const char *default_action)
 {
     int i;
+
+    fprintf(stderr, "Usage: %s [options] <config_file> "
+            "[start | stop | restart]\n\noptions:\n", program);
+
+    if (other_options != NULL) {
+        for (i=0; i<other_options->count; i++) {
+            fprintf(stderr, "\t%s\n", other_options->strs[i]);
+        }
+    }
+
+    fprintf(stderr, "\t--without-daemon | --no-daemon: run in foreground\n"
+            "\t-V | --version: show version info\n"
+            "\t-h | --help: for this usage\n\n");
+}
+
+const char *sf_parse_daemon_mode_and_action_ex1(int argc, char *argv[],
+        const Version *version, bool *daemon_mode, char **action,
+        const char *default_action, const str_ptr_array_t *other_options)
+{
+#define CMD_NORMAL_ARG_COUNT 2
+    int i;
+    struct {
+        int argc;
+        char *argv[CMD_NORMAL_ARG_COUNT];
+    } normal;
     const char *config_filepath;
 
+    normal.argc = 0;
     *daemon_mode = true;
     for (i=1; i<argc; i++) {
         if (argv[i][0] != '-') {
+            if (normal.argc == CMD_NORMAL_ARG_COUNT) {
+                fprintf(stderr, "too many arguments!\n\n");
+                sf_usage_ex1(argv[0], other_options);
+                return NULL;
+            }
+            normal.argv[normal.argc++] = argv[i];
             continue;
         }
+
         if (strcmp(argv[i], "--without-daemon") == 0 ||
                 strcmp(argv[i], "--no-daemon") == 0)
         {
@@ -137,32 +159,19 @@ const char *sf_parse_daemon_mode_and_action_ex(int argc, char *argv[],
         if (strcmp(argv[i], "-h") == 0 ||
                 strcmp(argv[i], "--help") == 0)
         {
-            sf_usage(argv[0]);
+            sf_usage_ex1(argv[0], other_options);
             return NULL;
         }
     }
 
-    if (*daemon_mode) {
+    if (normal.argc == 0) {
-        config_filepath = argv[1];
+        sf_usage_ex1(argv[0], other_options);
-    } else {
+        return NULL;
-        if (argc == 2) {
-            sf_usage(argv[0]);
-            return NULL;
-        }
-
-        config_filepath = (i == 1) ? argv[2] : argv[1];
     }
 
-    if (argc - (*daemon_mode ? 0 : 1) > 2) {
+    config_filepath = normal.argv[0];
-        int last_index;
+    if (normal.argc > 1) {
-        last_index = argc - 1;
+        *action = normal.argv[1];
-        if (*daemon_mode) {
-            *action = argv[last_index];
-        } else {
-            *action = (i == last_index) ?
-                argv[last_index - 1] :
-                argv[last_index];
-        }
     } else {
         *action = (char *)default_action;
     }

src/sf_util.h

@@ -58,26 +58,54 @@ __FILE__, eln, eres, emsg, strerror(eres))
 
 #define dszoffset(cls, mem) ((char*)&((cls*)0)->mem -  ((char*)0))
 
+#define sf_usage(program) sf_usage_ex1(program, NULL)
+
 #define sf_parse_daemon_mode_and_action(argc, argv, \
         version, daemon_mode, action) \
-    sf_parse_daemon_mode_and_action_ex(argc, argv, \
+    sf_parse_daemon_mode_and_action_ex1(argc, argv, \
-            version, daemon_mode, action, "start")
+            version, daemon_mode, action, "start", NULL)
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int64_t getticks() ;
+int64_t getticks();
 
-void log_plus(const int priority, const char* file, int line, const char* fmt, ...);
+void log_plus(const int priority, const char *file,
+        int line, const char *fmt, ...);
 
-int sf_printbuffer(char* buffer,int32_t len);
+int sf_printbuffer(char *buffer,int32_t len);
 
-void sf_usage(const char *program);
+void sf_usage_ex1(const char *program, const str_ptr_array_t *other_options);
 
-const char *sf_parse_daemon_mode_and_action_ex(int argc, char *argv[],
+static inline void sf_usage_ex(const char *program, const char *other_option)
+{
+    const char *strs[1];
+    str_ptr_array_t options;
+
+    strs[0] = other_option;
+    options.count = 1;
+    options.strs = (char **)strs;
+    sf_usage_ex1(program, &options);
+}
+
+const char *sf_parse_daemon_mode_and_action_ex1(int argc, char *argv[],
         const Version *version, bool *daemon_mode, char **action,
-        const char *default_action);
+        const char *default_action, const str_ptr_array_t *other_options);
+
+static inline const char *sf_parse_daemon_mode_and_action_ex(int argc,
+        char *argv[], const Version *version, bool *daemon_mode,
+        char **action, const char *default_action, const char *other_option)
+{
+    const char *strs[1];
+    str_ptr_array_t options;
+
+    strs[0] = other_option;
+    options.count = 1;
+    options.strs = (char **)strs;
+    return sf_parse_daemon_mode_and_action_ex1(argc, argv, version,
+            daemon_mode, action, default_action, &options);
+}
 
 int sf_logger_init(LogContext *pContext, const char *filename_prefix);