mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add module-combine

Browse source 
remove option "stay-root"
clean up pa_conf


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@199 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-09-14 17:52:11 +00:00
parent 829656c5fc
commit 8c6593dabf
21 changed files with 469 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

57
polyp/main.c
View file

@ -124,6 +124,11 @@ int main(int argc, char *argv[]) {
pa_log_set_target(conf->auto_log_target ? PA_LOG_STDERR : conf->log_target, NULL);
if (conf->high_priority && conf->cmd == PA_CMD_DAEMON)
pa_raise_priority();
drop_root();
if (conf->dl_search_path)
lt_dlsetsearchpath(conf->dl_search_path);
#ifdef DLSEARCHPATH
@ -131,37 +136,33 @@ int main(int argc, char *argv[]) {
lt_dlsetsearchpath(DLSEARCHPATH);
#endif
if (conf->dump_modules) {
pa_dump_modules(conf, argc-d, argv+d);
retval = 0;
goto finish;
}
if (conf->dump_conf) {
char *s = pa_conf_dump(conf);
fputs(s, stdout);
pa_xfree(s);
retval = 0;
goto finish;
}
switch (conf->cmd) {
case PA_CMD_DUMP_MODULES:
pa_dump_modules(conf, argc-d, argv+d);
retval = 0;
goto finish;
if (conf->help) {
pa_cmdline_help(argv[0]);
retval = 0;
goto finish;
}
case PA_CMD_DUMP_CONF: {
char *s = pa_conf_dump(conf);
fputs(s, stdout);
pa_xfree(s);
retval = 0;
goto finish;
}
if (conf->version) {
printf(PACKAGE_NAME" "PACKAGE_VERSION"\n");
retval = 0;
goto finish;
}
case PA_CMD_HELP :
pa_cmdline_help(argv[0]);
retval = 0;
goto finish;
if (conf->high_priority)
pa_raise_priority();
if (!conf->stay_root)
drop_root();
case PA_CMD_VERSION :
printf(PACKAGE_NAME" "PACKAGE_VERSION"\n");
retval = 0;
goto finish;
default:
assert(conf->cmd == PA_CMD_DAEMON);
}
if (conf->daemonize) {
pid_t child;