-/* $Id$ */
-
/***
This file is part of PulseAudio.
+ Copyright 2004-2006 Lennart Poettering
+
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
#include <config.h>
#endif
-#include <assert.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <pulsecore/core-error.h>
#include <pulsecore/log.h>
#include <pulsecore/core-util.h>
+#include <pulsecore/macro.h>
#include "conf-parser.h"
#define COMMENTS "#;\n"
/* Run the user supplied parser for an assignment */
-static int next_assignment(const char *filename, unsigned line, const pa_config_item *t, const char *lvalue, const char *rvalue, void *userdata) {
- assert(filename && t && lvalue && rvalue);
-
+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 (!strcmp(lvalue, t->lvalue))
- return t->parse(filename, line, lvalue, rvalue, t->data, userdata);
+ 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));
- pa_log(__FILE__": [%s:%u] Unknown lvalue '%s'.", filename, line, lvalue);
-
return -1;
}
/* Returns non-zero when c is contained in s */
static int in_string(char c, const char *s) {
- assert(s);
-
+ pa_assert(s);
+
for (; *s; s++)
if (*s == c)
return 1;
-
+
return 0;
}
}
/* Parse a variable assignment line */
-static int parse_line(const char *filename, unsigned line, const pa_config_item *t, char *l, void *userdata) {
- char *e, *c, *b = l+strspn(l, WHITESPACE);
+static int parse_line(const char *filename, unsigned line, char **section, const pa_config_item *t, char *l, void *userdata) {
+ char *e, *c, *b;
+
+ b = l+strspn(l, WHITESPACE);
if ((c = strpbrk(b, COMMENTS)))
*c = 0;
-
+
if (!*b)
return 0;
+ if (*b == '[') {
+ size_t k;
+
+ k = strlen(b);
+ pa_assert(k > 0);
+
+ if (b[k-1] != ']') {
+ pa_log("[%s:%u] Invalid section header.", filename, line);
+ return -1;
+ }
+
+ pa_xfree(*section);
+ *section = pa_xstrndup(b+1, k-2);
+ return 0;
+ }
+
if (!(e = strchr(b, '='))) {
- pa_log(__FILE__": [%s:%u] Missing '='.", filename, line);
+ pa_log("[%s:%u] Missing '='.", filename, line);
return -1;
}
*e = 0;
e++;
- return next_assignment(filename, line, t, strip(b), strip(e), userdata);
+ return next_assignment(filename, line, *section, t, strip(b), strip(e), userdata);
}
/* Go through the file and parse each line */
int pa_config_parse(const char *filename, FILE *f, const pa_config_item *t, void *userdata) {
int r = -1;
unsigned line = 0;
- int do_close = !f;
- assert(filename && t);
-
+ pa_bool_t do_close = !f;
+ char *section = NULL;
+
+ pa_assert(filename);
+ pa_assert(t);
+
if (!f && !(f = fopen(filename, "r"))) {
if (errno == ENOENT) {
r = 0;
goto finish;
}
-
- pa_log_warn(__FILE__": WARNING: failed to open configuration file '%s': %s",
- filename, pa_cstrerror(errno));
+
+ pa_log_warn("Failed to open configuration file '%s': %s", filename, pa_cstrerror(errno));
goto finish;
}
while (!feof(f)) {
- char l[256];
+ char l[4096];
+
if (!fgets(l, sizeof(l), f)) {
if (feof(f))
break;
-
- pa_log_warn(__FILE__": WARNING: failed to read configuration file '%s': %s",
- filename, pa_cstrerror(errno));
+
+ pa_log_warn("Failed to read configuration file '%s': %s", filename, pa_cstrerror(errno));
goto finish;
}
-
- if (parse_line(filename, ++line, t, l, userdata) < 0)
+
+ if (parse_line(filename, ++line, §ion, t, l, userdata) < 0)
goto finish;
}
-
+
r = 0;
-
+
finish:
+ pa_xfree(section);
if (do_close && f)
fclose(f);
-
+
return r;
}
-int pa_config_parse_int(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, PA_GCC_UNUSED void *userdata) {
+int pa_config_parse_int(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
int *i = data;
int32_t k;
- assert(filename && lvalue && rvalue && data);
+
+ pa_assert(filename);
+ pa_assert(lvalue);
+ pa_assert(rvalue);
+ pa_assert(data);
if (pa_atoi(rvalue, &k) < 0) {
- pa_log(__FILE__": [%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
+ pa_log("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
return -1;
}
-
+
*i = (int) k;
- return 0;
+ return 0;
+}
+
+int pa_config_parse_unsigned(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
+ unsigned *u = data;
+ uint32_t k;
+
+ pa_assert(filename);
+ pa_assert(lvalue);
+ pa_assert(rvalue);
+ pa_assert(data);
+
+ if (pa_atou(rvalue, &k) < 0) {
+ pa_log("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
+ return -1;
+ }
+
+ *u = (unsigned) k;
+ return 0;
+}
+
+int pa_config_parse_size(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
+ size_t *i = data;
+ uint32_t k;
+
+ pa_assert(filename);
+ pa_assert(lvalue);
+ pa_assert(rvalue);
+ pa_assert(data);
+
+ if (pa_atou(rvalue, &k) < 0) {
+ pa_log("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
+ return -1;
+ }
+
+ *i = (size_t) k;
+ return 0;
}
-int pa_config_parse_bool(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, PA_GCC_UNUSED void *userdata) {
- int *b = data, k;
- assert(filename && lvalue && rvalue && data);
-
+int pa_config_parse_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(__FILE__": [%s:%u] Failed to parse boolean value: %s", filename, line, rvalue);
+ pa_log("[%s:%u] Failed to parse boolean value: %s", filename, line, rvalue);
return -1;
}
-
- *b = k;
-
+
+ *b = !!k;
+
return 0;
}
-int pa_config_parse_string(const char *filename, PA_GCC_UNUSED unsigned line, const char *lvalue, const char *rvalue, void *data, PA_GCC_UNUSED void *userdata) {
+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;
- assert(filename && lvalue && rvalue && data);
+
+ pa_assert(filename);
+ pa_assert(lvalue);
+ pa_assert(rvalue);
+ pa_assert(data);
pa_xfree(*s);
*s = *rvalue ? pa_xstrdup(rvalue) : NULL;