summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-31 00:52:42 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-31 00:52:42 +0000
commit02811bfc0fff316dada8c543326720dbabe0904a (patch)
tree3f33e0e74d76d8aa0aae937919aff7239e5fe5aa
parenta1322269d5e1ea76eae07cd62ea0b70ff384e9c5 (diff)
make sure that we make include paths absolute before calling chdir()
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1739 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/daemon/cmdline.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index 705115ec..384dde36 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -199,9 +199,12 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
break;
case ARG_FILE:
- case 'F':
- pa_strbuf_printf(buf, ".include %s\n", optarg);
+ case 'F': {
+ char *p;
+ pa_strbuf_printf(buf, ".include %s\n", p = pa_make_path_absolute(optarg));
+ pa_xfree(p);
break;
+ }
case 'C':
pa_strbuf_puts(buf, "load-module module-cli exit_on_eof=1\n");