chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemd: raise level of message about lookup paths
[elogind.git]
/
src
/
shared
/
conf-parser.c
diff --git
a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
index 595bb51a27151c8a7e5380a6260c1a5ddc4426d5..7f286096d234c591860d30aebf83826239b11bc0 100644
(file)
--- a/
src/shared/conf-parser.c
+++ b/
src/shared/conf-parser.c
@@
-377,7
+377,8
@@
int config_parse_int(
assert(rvalue);
assert(data);
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;
}
log_error("[%s:%u] Failed to parse numeric value, ingoring: %s", filename, line, rvalue);
return 0;
}
@@
-403,7
+404,8
@@
int config_parse_long(
assert(rvalue);
assert(data);
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;
}
log_error("[%s:%u] Failed to parse numeric value, ignoring: %s", filename, line, rvalue);
return 0;
}
@@
-429,7
+431,8
@@
int config_parse_uint64(
assert(rvalue);
assert(data);
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;
}
log_error("[%s:%u] Failed to parse numeric value, ignoring: %s", filename, line, rvalue);
return 0;
}
@@
-455,7
+458,8
@@
int config_parse_unsigned(
assert(rvalue);
assert(data);
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;
}
log_error("[%s:%u] Failed to parse numeric value: %s", filename, line, rvalue);
return r;
}
@@
-593,9
+597,9
@@
int config_parse_string(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
- n =
cunescape
(rvalue);
+ n =
strdup
(rvalue);
if (!n)
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);
if (!utf8_is_valid(n)) {
log_error("[%s:%u] String is not UTF-8 clean, ignoring assignment: %s", filename, line, rvalue);
@@
-644,7
+648,7
@@
int config_parse_path(
n = strdup(rvalue);
if (!n)
n = strdup(rvalue);
if (!n)
- return
-ENOMEM
;
+ return
log_oom()
;
path_kill_slashes(n);
path_kill_slashes(n);
@@
-677,13
+681,19
@@
int config_parse_strv(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
+ if (isempty(rvalue)) {
+ /* Empty assignment resets the list */
+ strv_free(*sv);
+ *sv = NULL;
+ }
+
k = strv_length(*sv);
FOREACH_WORD_QUOTED(w, l, rvalue, state)
k++;
n = new(char*, k+1);
if (!n)
k = strv_length(*sv);
FOREACH_WORD_QUOTED(w, l, rvalue, state)
k++;
n = new(char*, k+1);
if (!n)
- return
-ENOMEM
;
+ return
log_oom()
;
if (*sv)
for (k = 0; (*sv)[k]; k++)
if (*sv)
for (k = 0; (*sv)[k]; k++)
@@
-694,7
+704,7
@@
int config_parse_strv(
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
n[k] = cunescape_length(w, l);
if (!n[k]) {
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
n[k] = cunescape_length(w, l);
if (!n[k]) {
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto fail;
}
goto fail;
}
@@
-744,13
+754,19
@@
int config_parse_path_strv(
assert(rvalue);
assert(data);
assert(rvalue);
assert(data);
+ if (isempty(rvalue)) {
+ /* Empty assignment resets the list */
+ strv_free(*sv);
+ *sv = NULL;
+ }
+
k = strv_length(*sv);
FOREACH_WORD_QUOTED(w, l, rvalue, state)
k++;
n = new(char*, k+1);
if (!n)
k = strv_length(*sv);
FOREACH_WORD_QUOTED(w, l, rvalue, state)
k++;
n = new(char*, k+1);
if (!n)
- return
-ENOMEM
;
+ return
log_oom()
;
k = 0;
if (*sv)
k = 0;
if (*sv)
@@
-760,7
+776,7
@@
int config_parse_path_strv(
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
n[k] = strndup(w, l);
if (!n[k]) {
FOREACH_WORD_QUOTED(w, l, rvalue, state) {
n[k] = strndup(w, l);
if (!n[k]) {
- r =
-ENOMEM
;
+ r =
log_oom()
;
goto fail;
}
goto fail;
}
@@
-865,7
+881,7
@@
int config_parse_mode(
errno = 0;
l = strtol(rvalue, &x, 8);
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;
}
log_error("[%s:%u] Failed to parse mode value, ignoring: %s", filename, line, rvalue);
return 0;
}
@@
-957,9
+973,21
@@
int config_parse_set_status(
assert(rvalue);
assert(data);
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;
FOREACH_WORD(w, l, rvalue, state) {
int val;
- char *temp = strndup(w, l);
+ char *temp;
+
+ temp = strndup(w, l);
if (!temp)
return log_oom();
if (!temp)
return log_oom();
@@
-967,31
+995,31
@@
int config_parse_set_status(
if (r < 0) {
val = signal_from_string_try_harder(temp);
free(temp);
if (r < 0) {
val = signal_from_string_try_harder(temp);
free(temp);
+
if (val > 0) {
if (val > 0) {
- if (!status_set->signal) {
- status_set->signal = set_new(trivial_hash_func, trivial_compare_func);
- if (!status_set->signal)
- return log_oom();
- }
+ r = set_ensure_allocated(&status_set->signal, trivial_hash_func, trivial_compare_func);
+ if (r < 0)
+ return log_oom();
+
r = set_put(status_set->signal, INT_TO_PTR(val));
if (r < 0) {
log_error("[%s:%u] Unable to store: %s", filename, line, w);
return r;
}
} else {
r = set_put(status_set->signal, INT_TO_PTR(val));
if (r < 0) {
log_error("[%s:%u] Unable to store: %s", filename, line, w);
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);
}
} else {
free(temp);
- if(val < 0 || val > 255)
+
+ if (val < 0 || val > 255)
log_warning("[%s:%u] Value %d is outside range 0-255, ignoring", filename, line, val);
else {
log_warning("[%s:%u] Value %d is outside range 0-255, ignoring", filename, line, val);
else {
- if (!status_set->code) {
- status_set->code = set_new(trivial_hash_func, trivial_compare_func);
- if (!status_set->code)
- return log_oom();
- }
+ r = set_ensure_allocated(&status_set->code, trivial_hash_func, trivial_compare_func);
+ if (r < 0)
+ return log_oom();
+
r = set_put(status_set->code, INT_TO_PTR(val));
if (r < 0) {
log_error("[%s:%u] Unable to store: %s", filename, line, w);
r = set_put(status_set->code, INT_TO_PTR(val));
if (r < 0) {
log_error("[%s:%u] Unable to store: %s", filename, line, w);
@@
-999,7
+1027,7
@@
int config_parse_set_status(
}
}
}
}
}
}
-
}
}
+
return 0;
}
return 0;
}