assert(out_fd > 0);
assert(fn);
- f = fopen(fn, "r");
+ f = fopen(fn, "re");
if (!f)
return -errno;
state = KEY;
last_key_whitespace = (size_t) -1;
- if (!greedy_realloc((void**) &key, &key_alloc, n_key+2)) {
+ if (!GREEDY_REALLOC(key, key_alloc, n_key+2)) {
r = -ENOMEM;
goto fail;
}
else if (last_key_whitespace == (size_t) -1)
last_key_whitespace = n_key;
- if (!greedy_realloc((void**) &key, &key_alloc, n_key+2)) {
+ if (!GREEDY_REALLOC(key, key_alloc, n_key+2)) {
r = -ENOMEM;
goto fail;
}
else if (!strchr(WHITESPACE, c)) {
state = VALUE;
- if (!greedy_realloc((void**) &value, &value_alloc, n_value+2)) {
+ if (!GREEDY_REALLOC(value, value_alloc, n_value+2)) {
r = -ENOMEM;
goto fail;
}
else if (last_value_whitespace == (size_t) -1)
last_value_whitespace = n_value;
- if (!greedy_realloc((void**) &value, &value_alloc, n_value+2)) {
+ if (!GREEDY_REALLOC(value, value_alloc, n_value+2)) {
r = -ENOMEM;
goto fail;
}
if (!strchr(newline, c)) {
/* Escaped newlines we eat up entirely */
- if (!greedy_realloc((void**) &value, &value_alloc, n_value+2)) {
+ if (!GREEDY_REALLOC(value, value_alloc, n_value+2)) {
r = -ENOMEM;
goto fail;
}
else if (c == '\\')
state = SINGLE_QUOTE_VALUE_ESCAPE;
else {
- if (!greedy_realloc((void**) &value, &value_alloc, n_value+2)) {
+ if (!GREEDY_REALLOC(value, value_alloc, n_value+2)) {
r = -ENOMEM;
goto fail;
}
state = SINGLE_QUOTE_VALUE;
if (!strchr(newline, c)) {
- if (!greedy_realloc((void**) &value, &value_alloc, n_value+2)) {
+ if (!GREEDY_REALLOC(value, value_alloc, n_value+2)) {
r = -ENOMEM;
goto fail;
}
else if (c == '\\')
state = DOUBLE_QUOTE_VALUE_ESCAPE;
else {
- if (!greedy_realloc((void**) &value, &value_alloc, n_value+2)) {
+ if (!GREEDY_REALLOC(value, value_alloc, n_value+2)) {
r = -ENOMEM;
goto fail;
}
state = DOUBLE_QUOTE_VALUE;
if (!strchr(newline, c)) {
- if (!greedy_realloc((void**) &value, &value_alloc, n_value+2)) {
+ if (!GREEDY_REALLOC(value, value_alloc, n_value+2)) {
r = -ENOMEM;
goto fail;
}
int r;
if (!utf8_is_valid(key)) {
+ _cleanup_free_ char *t = utf8_escape_invalid(key);
+
log_error("%s:%u: invalid UTF-8 for key '%s', ignoring.",
- filename, line, key);
+ filename, line, t);
return -EINVAL;
}
if (value && !utf8_is_valid(value)) {
- /* FIXME: filter UTF-8 */
+ _cleanup_free_ char *t = utf8_escape_invalid(value);
+
log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.",
- filename, line, key, value);
+ filename, line, key, t);
return -EINVAL;
}
if (!p)
return -ENOMEM;
- r = strv_push(m, p);
- if (r < 0) {
- free(p);
+ r = strv_consume(m, p);
+ if (r < 0)
return r;
- }
free(value);
return 0;