#include "util.h"
#include "macro.h"
#include "strv.h"
+#include "log.h"
-#define WHITESPACE " \t\n"
#define COMMENTS "#;\n"
#define LINE_MAX 4096
return t->parse(filename, line, section, lvalue, rvalue, t->data, userdata);
}
- fprintf(stderr, "[%s:%u] Unknown lvalue '%s' in section '%s'.\n", filename, line, lvalue, strna(section));
+ log_error("[%s:%u] Unknown lvalue '%s' in section '%s'.", filename, line, lvalue, strna(section));
return -EBADMSG;
}
assert(k > 0);
if (b[k-1] != ']') {
- fprintf(stderr, "[%s:%u] Invalid section header.\n", filename, line);
+ log_error("[%s:%u] Invalid section header.", filename, line);
return -EBADMSG;
}
}
if (!(e = strchr(b, '='))) {
- fprintf(stderr, "[%s:%u] Missing '='.\n", filename, line);
+ log_error("[%s:%u] Missing '='.", filename, line);
return -EBADMSG;
}
if (!(f = fopen(filename, "re"))) {
r = -errno;
- fprintf(stderr, "Failed to open configuration file '%s': %s\n", filename, strerror(-r));
+ log_error("Failed to open configuration file '%s': %s", filename, strerror(-r));
goto finish;
}
break;
r = -errno;
- fprintf(stderr, "Failed to read configuration file '%s': %s\n", filename, strerror(-r));
+ log_error("Failed to read configuration file '%s': %s", filename, strerror(-r));
goto finish;
}
assert(data);
if ((r = safe_atoi(rvalue, i)) < 0) {
- fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s\n", filename, line, rvalue);
+ log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
return r;
}
assert(data);
if ((r = safe_atou(rvalue, u)) < 0) {
- fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s\n", filename, line, rvalue);
+ log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
return r;
}
assert(data);
if ((r = safe_atou(rvalue, &u)) < 0) {
- fprintf(stderr, "[%s:%u] Failed to parse numeric value: %s\n", filename, line, rvalue);
+ log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
return r;
}
assert(data);
if ((k = parse_boolean(rvalue)) < 0) {
- fprintf(stderr, "[%s:%u] Failed to parse boolean value: %s\n", filename, line, rvalue);
+ log_error("[%s:%u] Failed to parse boolean value: %s", filename, line, rvalue);
return k;
}
return 0;
}
+int config_parse_path(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ char **s = data;
+ char *n;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ if (*rvalue != '/') {
+ log_error("[%s:%u] Not an absolute path: %s", filename, line, rvalue);
+ return -EINVAL;
+ }
+
+ if (!(n = strdup(rvalue)))
+ return -ENOMEM;
+
+ free(*s);
+ *s = n;
+
+ return 0;
+}
int config_parse_strv(
const char *filename,
assert(data);
k = strv_length(*sv);
- FOREACH_WORD(w, &l, rvalue, state)
+ FOREACH_WORD_QUOTED(w, l, rvalue, state)
k++;
if (!(n = new(char*, k+1)))
for (k = 0; (*sv)[k]; k++)
n[k] = (*sv)[k];
- FOREACH_WORD(w, &l, rvalue, state)
+ FOREACH_WORD_QUOTED(w, l, rvalue, state)
if (!(n[k++] = strndup(w, l)))
goto fail;
fail:
for (; k > 0; k--)
free(n[k-1]);
+ free(n);
return -ENOMEM;
}