X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fconf-parser.c;h=0b1af6c577f6d65ca0a918a9f3b46a81247cb4c3;hp=158e9efd4cecb260bb15426379fa468e9c8dfe7b;hb=769d324c99aab129148bd25f5f663ef441287d86;hpb=000f6e5667eb4f73e137cbd0d7395a9f9db7728a diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 158e9efd4..0b1af6c57 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -27,6 +27,7 @@ #include #include "conf-parser.h" +#include "conf-files.h" #include "util.h" #include "macro.h" #include "strv.h" @@ -37,10 +38,16 @@ #include "exit-status.h" #include "sd-messages.h" -int log_syntax_internal(const char *unit, int level, - const char *file, unsigned line, const char *func, - const char *config_file, unsigned config_line, - int error, const char *format, ...) { +int log_syntax_internal( + const char *unit, + int level, + const char *file, + int line, + const char *func, + const char *config_file, + unsigned config_line, + int error, + const char *format, ...) { _cleanup_free_ char *msg = NULL; int r; @@ -54,29 +61,29 @@ int log_syntax_internal(const char *unit, int level, if (unit) r = log_struct_internal(level, + error, file, line, func, getpid() == 1 ? "UNIT=%s" : "USER_UNIT=%s", unit, - MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR), + LOG_MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR), "CONFIG_FILE=%s", config_file, "CONFIG_LINE=%u", config_line, - "ERRNO=%d", error > 0 ? error : EINVAL, - "MESSAGE=[%s:%u] %s", config_file, config_line, msg, + LOG_MESSAGE("[%s:%u] %s", config_file, config_line, msg), NULL); else r = log_struct_internal(level, + error, file, line, func, - MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR), + LOG_MESSAGE_ID(SD_MESSAGE_CONFIG_ERROR), "CONFIG_FILE=%s", config_file, "CONFIG_LINE=%u", config_line, - "ERRNO=%d", error > 0 ? error : EINVAL, - "MESSAGE=[%s:%u] %s", config_file, config_line, msg, + LOG_MESSAGE("[%s:%u] %s", config_file, config_line, msg), NULL); return r; } int config_item_table_lookup( - void *table, + const void *table, const char *section, const char *lvalue, ConfigParserCallback *func, @@ -84,7 +91,7 @@ int config_item_table_lookup( void **data, void *userdata) { - ConfigTableItem *t; + const ConfigTableItem *t; assert(table); assert(lvalue); @@ -110,7 +117,7 @@ int config_item_table_lookup( } int config_item_perf_lookup( - void *table, + const void *table, const char *section, const char *lvalue, ConfigParserCallback *func, @@ -154,7 +161,7 @@ static int next_assignment(const char *unit, const char *filename, unsigned line, ConfigItemLookup lookup, - void *table, + const void *table, const char *section, unsigned section_line, const char *lvalue, @@ -199,7 +206,7 @@ static int parse_line(const char* unit, unsigned line, const char *sections, ConfigItemLookup lookup, - void *table, + const void *table, bool relaxed, bool allow_include, char **section, @@ -245,7 +252,7 @@ static int parse_line(const char* unit, if (!fn) return -ENOMEM; - return config_parse(unit, fn, NULL, sections, lookup, table, relaxed, false, userdata); + return config_parse(unit, fn, NULL, sections, lookup, table, relaxed, false, false, userdata); } if (*l == '[') { @@ -323,9 +330,10 @@ int config_parse(const char *unit, FILE *f, const char *sections, ConfigItemLookup lookup, - void *table, + const void *table, bool relaxed, bool allow_include, + bool warn, void *userdata) { _cleanup_free_ char *section = NULL, *continuation = NULL; @@ -340,7 +348,11 @@ int config_parse(const char *unit, if (!f) { f = ours = fopen(filename, "re"); if (!f) { - log_full(errno == ENOENT ? LOG_DEBUG : LOG_ERR, "Failed to open configuration file '%s': %m", filename); + /* Only log on request, except for ENOENT, + * since we return 0 to the caller. */ + if (warn || errno == ENOENT) + log_full(errno == ENOENT ? LOG_DEBUG : LOG_ERR, + "Failed to open configuration file '%s': %m", filename); return errno == ENOENT ? 0 : -errno; } } @@ -355,7 +367,7 @@ int config_parse(const char *unit, if (feof(f)) break; - log_error("Failed to read configuration file '%s': %m", filename); + log_error_errno(errno, "Failed to read configuration file '%s': %m", filename); return -errno; } @@ -363,8 +375,11 @@ int config_parse(const char *unit, if (continuation) { c = strappend(continuation, l); - if (!c) + if (!c) { + if (warn) + log_oom(); return -ENOMEM; + } free(continuation); continuation = NULL; @@ -386,8 +401,11 @@ int config_parse(const char *unit, continuation = c; else { continuation = strdup(l); - if (!continuation) + if (!continuation) { + if (warn) + log_oom(); return -ENOMEM; + } } continue; @@ -408,6 +426,41 @@ int config_parse(const char *unit, userdata); free(c); + if (r < 0) { + if (warn) + log_warning_errno(r, "Failed to parse file '%s': %m", + filename); + return r; + } + } + + return 0; +} + +/* Parse each config file in the specified directories. */ +int config_parse_many(const char *conf_file, + const char *conf_file_dirs, + const char *sections, + ConfigItemLookup lookup, + const void *table, + bool relaxed, + void *userdata) { + _cleanup_strv_free_ char **files = NULL; + char **fn; + int r; + + r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); + if (r < 0) + return r; + + if (conf_file) { + r = config_parse(NULL, conf_file, NULL, sections, lookup, table, relaxed, false, true, userdata); + if (r < 0) + return r; + } + + STRV_FOREACH(fn, files) { + r = config_parse(NULL, *fn, NULL, sections, lookup, table, relaxed, false, true, userdata); if (r < 0) return r; } @@ -660,7 +713,8 @@ int config_parse_strv(const char *unit, void *data, void *userdata) { - char *** sv = data, *w, *state; + char ***sv = data; + const char *word, *state; size_t l; int r; @@ -685,15 +739,16 @@ int config_parse_strv(const char *unit, return 0; } - FOREACH_WORD_QUOTED(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(word, l, rvalue, state) { char *n; - n = strndup(w, l); + n = strndup(word, l); if (!n) return log_oom(); if (!utf8_is_valid(n)) { log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue); + free(n); continue; } @@ -701,6 +756,9 @@ int config_parse_strv(const char *unit, if (r < 0) return log_oom(); } + if (!isempty(state)) + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Trailing garbage, ignoring."); return 0; } @@ -765,8 +823,7 @@ int config_parse_log_facility( x = log_facility_unshifted_from_string(rvalue); if (x < 0) { - log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Failed to parse log facility, ignoring: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Failed to parse log facility, ignoring: %s", rvalue); return 0; } @@ -797,8 +854,7 @@ int config_parse_log_level( x = log_level_from_string(rvalue); if (x < 0) { - log_syntax(unit, LOG_ERR, filename, line, EINVAL, - "Failed to parse log level, ignoring: %s", rvalue); + log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Failed to parse log level, ignoring: %s", rvalue); return 0; }