add module-combine

[pulseaudio] / polyp / cmdline.c

diff --git a/polyp/cmdline.c b/polyp/cmdline.c
index 4e7cde48f41f7cdf2565a90b0d0161560e05791b..47685ca9c2be20fe9044054e599ecb5d3ded2fdb 100644 (file)
--- a/polyp/cmdline.c
+++ b/polyp/cmdline.c
@@ -44,7 +44,6 @@ enum {
     ARG_FAIL,
     ARG_VERBOSE,
     ARG_HIGH_PRIORITY,
-    ARG_STAY_ROOT,
     ARG_DISALLOW_MODULE_LOADING,
     ARG_EXIT_IDLE_TIME,
     ARG_MODULE_IDLE_TIME,
@@ -63,7 +62,6 @@ static struct option long_options[] = {
     {"fail",                        2, 0, ARG_FAIL},
     {"verbose",                     2, 0, ARG_VERBOSE},
     {"high-priority",               2, 0, ARG_HIGH_PRIORITY},
-    {"stay-root",                   2, 0, ARG_STAY_ROOT},
     {"disallow-module-loading",     2, 0, ARG_DISALLOW_MODULE_LOADING},
     {"exit-idle-time",              2, 0, ARG_EXIT_IDLE_TIME},
     {"module-idle-time",            2, 0, ARG_MODULE_IDLE_TIME},
@@ -93,7 +91,6 @@ void pa_cmdline_help(const char *argv0) {
            "      --fail[=BOOL]                     Quit when startup fails\n"
            "      --verbose[=BOOL]                  Be slightly more verbose\n"
            "      --high-priority[=BOOL]            Try to set high process priority (only available as root)\n"
-           "      --stay-root[=BOOL]                Don't drop root if SETUID root\n"
            "      --disallow-module-loading[=BOOL]  Disallow module loading after startup\n"
            "      --exit-idle-time=SECS             Terminate the daemon when idle and this time passed\n"
            "      --module-idle-time=SECS           Unload autoloaded modules when idle and this time passed\n"
@@ -113,7 +110,6 @@ int pa_cmdline_parse(struct pa_conf *conf, int argc, char *const argv [], int *d
     assert(conf && argc && argv);
 
     buf = pa_strbuf_new();
-    assert(buf);
 
     if (conf->script_commands)
         pa_strbuf_puts(buf, conf->script_commands);
@@ -122,19 +118,19 @@ int pa_cmdline_parse(struct pa_conf *conf, int argc, char *const argv [], int *d
         switch (c) {
             case ARG_HELP:
             case 'h':
-                conf->help = 1;
+                conf->cmd = PA_CMD_HELP;
                 break;
 
             case ARG_VERSION:
-                conf->version = 1;
+                conf->cmd = PA_CMD_VERSION;
                 break;
 
             case ARG_DUMP_CONF:
-                conf->dump_conf = 1;
+                conf->cmd = PA_CMD_DUMP_CONF;
                 break;
 
             case ARG_DUMP_MODULES:
-                conf->dump_modules = 1;
+                conf->cmd = PA_CMD_DUMP_MODULES;
                 break;
                 
             case ARG_LOAD:
@@ -180,13 +176,6 @@ int pa_cmdline_parse(struct pa_conf *conf, int argc, char *const argv [], int *d
                 }
                 break;
 
-            case ARG_STAY_ROOT:
-                if ((conf->stay_root = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
-                    pa_log(__FILE__": --stay-root expects boolean argument\n");
-                    goto fail;
-                }
-                break;
-
             case ARG_DISALLOW_MODULE_LOADING:
                 if ((conf->disallow_module_loading = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
                     pa_log(__FILE__": --disallow-module-loading expects boolean argument\n");