void *userdata) {
unsigned line = 0;
- char *section = NULL;
+ char _cleanup_free_ *section = NULL, *continuation = NULL;
+ FILE _cleanup_fclose_ *ours = NULL;
int r;
- bool ours = false;
- char *continuation = NULL;
assert(filename);
assert(lookup);
if (!f) {
- f = fopen(filename, "re");
+ f = ours = fopen(filename, "re");
if (!f) {
- r = -errno;
- log_error("Failed to open configuration file '%s': %s", filename, strerror(-r));
- goto finish;
+ log_error("Failed to open configuration file '%s': %m", filename);
+ return -errno;
}
-
- ours = true;
}
while (!feof(f)) {
if (feof(f))
break;
- r = -errno;
- log_error("Failed to read configuration file '%s': %s", filename, strerror(-r));
- goto finish;
+ log_error("Failed to read configuration file '%s': %m", filename);
+ return -errno;
}
truncate_nl(l);
if (continuation) {
c = strappend(continuation, l);
- if (!c) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!c)
+ return -ENOMEM;
free(continuation);
continuation = NULL;
continuation = c;
else {
continuation = strdup(l);
- if (!continuation) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!continuation)
+ return -ENOMEM;
}
continue;
free(c);
if (r < 0)
- goto finish;
+ return r;
}
- r = 0;
-
-finish:
- free(section);
- free(continuation);
-
- if (f && ours)
- fclose(f);
-
- return r;
+ return 0;
}
int config_parse_int(
assert(rvalue);
assert(data);
- if ((r = safe_atoi(rvalue, i)) < 0) {
+ r = safe_atoi(rvalue, i);
+ if (r < 0) {
log_error("[%s:%u] Failed to parse numeric value, ingoring: %s", filename, line, rvalue);
return 0;
}
assert(rvalue);
assert(data);
- if ((r = safe_atoli(rvalue, i)) < 0) {
+ r = safe_atoli(rvalue, i);
+ if (r < 0) {
log_error("[%s:%u] Failed to parse numeric value, ignoring: %s", filename, line, rvalue);
return 0;
}
assert(rvalue);
assert(data);
- if ((r = safe_atou64(rvalue, u)) < 0) {
+ r = safe_atou64(rvalue, u);
+ if (r < 0) {
log_error("[%s:%u] Failed to parse numeric value, ignoring: %s", filename, line, rvalue);
return 0;
}
assert(rvalue);
assert(data);
- if ((r = safe_atou(rvalue, u)) < 0) {
+ r = safe_atou(rvalue, u);
+ if (r < 0) {
+ log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
+ return r;
+ }
+
+ return 0;
+}
+
+int config_parse_double(
+ const char *filename,
+ unsigned line,
+ const char *section,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ double *d = data;
+ int r;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ r = safe_atod(rvalue, d);
+ if (r < 0) {
log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
return r;
}
assert(rvalue);
assert(data);
- n = cunescape(rvalue);
+ n = strdup(rvalue);
if (!n)
- return -ENOMEM;
+ return log_oom();
if (!utf8_is_valid(n)) {
log_error("[%s:%u] String is not UTF-8 clean, ignoring assignment: %s", filename, line, rvalue);
n = strdup(rvalue);
if (!n)
- return -ENOMEM;
+ return log_oom();
path_kill_slashes(n);
void *data,
void *userdata) {
- char*** sv = data;
- char **n;
- char *w;
- unsigned k;
+ char *** sv = data, *w, *state;
size_t l;
- char *state;
int r;
assert(filename);
assert(rvalue);
assert(data);
- k = strv_length(*sv);
- FOREACH_WORD_QUOTED(w, l, rvalue, state)
- k++;
+ if (isempty(rvalue)) {
+ char **empty;
- n = new(char*, k+1);
- if (!n)
- return -ENOMEM;
+ /* Empty assignment resets the list. As a special rule
+ * we actually fill in a real empty array here rather
+ * than NULL, since some code wants to know if
+ * something was set at all... */
+ empty = strv_new(NULL, NULL);
+ if (!empty)
+ return log_oom();
- if (*sv)
- for (k = 0; (*sv)[k]; k++)
- n[k] = (*sv)[k];
- else
- k = 0;
+ strv_free(*sv);
+ *sv = empty;
+ return 0;
+ }
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
- n[k] = cunescape_length(w, l);
- if (!n[k]) {
- r = -ENOMEM;
- goto fail;
- }
+ _cleanup_free_ char *n;
- if (!utf8_is_valid(n[k])) {
- log_error("[%s:%u] String is not UTF-8 clean, ignoring assignment: %s", filename, line, rvalue);
- free(n[k]);
+ n = cunescape_length(w, l);
+ if (!n)
+ return log_oom();
+
+ if (!utf8_is_valid(n)) {
+ log_error("[%s:%u] String is not UTF-8 clean, ignoring: %s", filename, line, rvalue);
continue;
}
- k++;
+ r = strv_extend(sv, n);
+ if (r < 0)
+ return log_oom();
}
- n[k] = NULL;
- free(*sv);
- *sv = n;
-
return 0;
-
-fail:
- for (; k > 0; k--)
- free(n[k-1]);
- free(n);
-
- return r;
}
int config_parse_path_strv(
void *data,
void *userdata) {
- char*** sv = data;
- char **n;
- char *w;
- unsigned k;
+ char*** sv = data, *w, *state;
size_t l;
- char *state;
int r;
assert(filename);
assert(rvalue);
assert(data);
- k = strv_length(*sv);
- FOREACH_WORD_QUOTED(w, l, rvalue, state)
- k++;
-
- n = new(char*, k+1);
- if (!n)
- return -ENOMEM;
-
- k = 0;
- if (*sv)
- for (; (*sv)[k]; k++)
- n[k] = (*sv)[k];
+ if (isempty(rvalue)) {
+ /* Empty assignment resets the list */
+ strv_free(*sv);
+ *sv = NULL;
+ return 0;
+ }
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
- n[k] = strndup(w, l);
- if (!n[k]) {
- r = -ENOMEM;
- goto fail;
- }
+ _cleanup_free_ char *n;
+
+ n = strndup(w, l);
+ if (!n)
+ return log_oom();
- if (!utf8_is_valid(n[k])) {
+ if (!utf8_is_valid(n)) {
log_error("[%s:%u] Path is not UTF-8 clean, ignoring assignment: %s", filename, line, rvalue);
- free(n[k]);
continue;
}
- if (!path_is_absolute(n[k])) {
+ if (!path_is_absolute(n)) {
log_error("[%s:%u] Not an absolute path, ignoring: %s", filename, line, rvalue);
- free(n[k]);
continue;
}
- path_kill_slashes(n[k]);
- k++;
+ path_kill_slashes(n);
+ r = strv_extend(sv, n);
+ if (r < 0)
+ return log_oom();
}
- n[k] = NULL;
- free(*sv);
- *sv = n;
-
return 0;
-
-fail:
- for (; k > 0; k--)
- free(n[k-1]);
- free(n);
-
- return r;
}
-int config_parse_usec(
+int config_parse_sec(
const char *filename,
unsigned line,
const char *section,
assert(rvalue);
assert(data);
- if (parse_usec(rvalue, usec) < 0) {
+ if (parse_sec(rvalue, usec) < 0) {
log_error("[%s:%u] Failed to parse time value, ignoring: %s", filename, line, rvalue);
return 0;
}
errno = 0;
l = strtol(rvalue, &x, 8);
- if (!x || *x || errno) {
+ if (!x || x == rvalue || *x || errno) {
log_error("[%s:%u] Failed to parse mode value, ignoring: %s", filename, line, rvalue);
return 0;
}
assert(rvalue);
assert(data);
+ if (isempty(rvalue)) {
+ /* Empty assignment resets the list */
+
+ set_free(status_set->signal);
+ set_free(status_set->code);
+
+ status_set->signal = status_set->code = NULL;
+ return 0;
+ }
+
FOREACH_WORD(w, l, rvalue, state) {
int val;
char *temp;
return r;
}
} else {
- log_error("[%s:%u] Failed to parse value: %s", filename, line, w);
- return r;
+ log_error("[%s:%u] Failed to parse value, ignoring: %s", filename, line, w);
+ return 0;
}
} else {
free(temp);
}
}
}
-
}
+
return 0;
}
~ianmdlvl / elogind.git / blobdiff