echo-cancel: Add alternative echo-cancellation implementation

[pulseaudio] / src / pulsecore / conf-parser.c

diff --git a/src/pulsecore/conf-parser.c b/src/pulsecore/conf-parser.c
index a6eb581c41ec3ce02e758995c9895cc621bf5cf0..71529557dd7f788ce5a5a714ec53040e05480c1f 100644 (file)
--- a/src/pulsecore/conf-parser.c
+++ b/src/pulsecore/conf-parser.c
@@ -40,48 +40,37 @@
 #define COMMENTS "#;\n"
 
 /* Run the user supplied parser for an assignment */
-static int next_assignment(const char *filename, unsigned line, const char *section, const pa_config_item *t, const char *lvalue, const char *rvalue, void *userdata) {
+static int next_assignment(
+        const char *filename,
+        unsigned line,
+        const char *section,
+        const pa_config_item *t,
+        const char *lvalue,
+        const char *rvalue,
+        void *userdata) {
+
     pa_assert(filename);
     pa_assert(t);
     pa_assert(lvalue);
     pa_assert(rvalue);
 
-    for (; t->parse; t++)
-        if (!t->lvalue ||
-            (pa_streq(lvalue, t->lvalue) &&
-             ((!section && !t->section) || pa_streq(section, t->section))))
-            return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata);
-
-    pa_log("[%s:%u] Unknown lvalue '%s' in section '%s'.", filename, line, lvalue, pa_strnull(section));
-
-    return -1;
-}
-
-/* Returns non-zero when c is contained in s */
-static int in_string(char c, const char *s) {
-    pa_assert(s);
+    for (; t->parse; t++) {
 
-    for (; *s; s++)
-        if (*s == c)
-            return 1;
+        if (t->lvalue && !pa_streq(lvalue, t->lvalue))
+            continue;
 
-    return 0;
-}
+        if (t->section && !section)
+            continue;
 
-/* Remove all whitepsapce from the beginning and the end of *s. *s may
- * be modified. */
-static char *strip(char *s) {
-    char *b = s+strspn(s, WHITESPACE);
-    char *e, *l = NULL;
+        if (t->section && !pa_streq(section, t->section))
+            continue;
 
-    for (e = b; *e; e++)
-        if (!in_string(*e, WHITESPACE))
-            l = e;
+        return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata);
+    }
 
-    if (l)
-        *(l+1) = 0;
+    pa_log("[%s:%u] Unknown lvalue '%s' in section '%s'.", filename, line, lvalue, pa_strna(section));
 
-    return b;
+    return -1;
 }
 
 /* Parse a variable assignment line */
@@ -96,6 +85,25 @@ static int parse_line(const char *filename, unsigned line, char **section, const
     if (!*b)
         return 0;
 
+    if (pa_startswith(b, ".include ")) {
+        char *path = NULL, *fn;
+        int r;
+
+        fn = pa_strip(b+9);
+        if (!pa_is_path_absolute(fn)) {
+            const char *k;
+            if ((k = strrchr(filename, '/'))) {
+                char *dir = pa_xstrndup(filename, k-filename);
+                fn = path = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", dir, fn);
+                pa_xfree(dir);
+            }
+        }
+
+        r = pa_config_parse(fn, NULL, t, userdata);
+        pa_xfree(path);
+        return r;
+    }
+
     if (*b == '[') {
         size_t k;
 
@@ -120,7 +128,7 @@ static int parse_line(const char *filename, unsigned line, char **section, const
     *e = 0;
     e++;
 
-    return next_assignment(filename, line, *section, t, strip(b), strip(e), userdata);
+    return next_assignment(filename, line, *section, t, pa_strip(b), pa_strip(e), userdata);
 }
 
 /* Go through the file and parse each line */
@@ -133,8 +141,9 @@ int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, void
     pa_assert(filename);
     pa_assert(t);
 
-    if (!f && !(f = fopen(filename, "r"))) {
+    if (!f && !(f = pa_fopen_cloexec(filename, "r"))) {
         if (errno == ENOENT) {
+            pa_log_debug("Failed to open configuration file '%s': %s", filename, pa_cstrerror(errno));
             r = 0;
             goto finish;
         }
@@ -242,6 +251,30 @@ int pa_config_parse_bool(const char *filename, unsigned line, const char *sectio
     return 0;
 }
 
+int pa_config_parse_not_bool(
+        const char *filename, unsigned line,
+        const char *section,
+        const char *lvalue, const char *rvalue,
+        void *data, void *userdata) {
+
+    int k;
+    pa_bool_t *b = data;
+
+    pa_assert(filename);
+    pa_assert(lvalue);
+    pa_assert(rvalue);
+    pa_assert(data);
+
+    if ((k = pa_parse_boolean(rvalue)) < 0) {
+        pa_log("[%s:%u] Failed to parse boolean value: %s", filename, line, rvalue);
+        return -1;
+    }
+
+    *b = !k;
+
+    return 0;
+}
+
 int pa_config_parse_string(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
     char **s = data;