chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: move async.[ch] to src/shared
[elogind.git]
/
src
/
shared
/
fileio.c
diff --git
a/src/shared/fileio.c
b/src/shared/fileio.c
index ac1b409a1c7efa1c4aaf274055922a0d7508cd88..c7b2cd85b94b8cc0eacc452fb70c5e4ed4f3e0df 100644
(file)
--- a/
src/shared/fileio.c
+++ b/
src/shared/fileio.c
@@
-130,7
+130,7
@@
ssize_t sendfile_full(int out_fd, const char *fn) {
assert(out_fd > 0);
assert(fn);
assert(out_fd > 0);
assert(fn);
- f = fopen(fn, "r");
+ f = fopen(fn, "r
e
");
if (!f)
return -errno;
if (!f)
return -errno;
@@
-240,6
+240,7
@@
int read_full_file(const char *fn, char **contents, size_t *size) {
buf[l] = 0;
*contents = buf;
buf[l] = 0;
*contents = buf;
+ buf = NULL; /* do not free */
if (size)
*size = l;
if (size)
*size = l;
@@
-293,7
+294,7
@@
static int parse_env_file_internal(
state = KEY;
last_key_whitespace = (size_t) -1;
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;
}
r = -ENOMEM;
goto fail;
}
@@
-316,7
+317,7
@@
static int parse_env_file_internal(
else if (last_key_whitespace == (size_t) -1)
last_key_whitespace = n_key;
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;
}
r = -ENOMEM;
goto fail;
}
@@
-356,7
+357,7
@@
static int parse_env_file_internal(
else if (!strchr(WHITESPACE, c)) {
state = VALUE;
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;
}
r = -ENOMEM;
goto fail;
}
@@
-401,7
+402,7
@@
static int parse_env_file_internal(
else if (last_value_whitespace == (size_t) -1)
last_value_whitespace = n_value;
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;
}
r = -ENOMEM;
goto fail;
}
@@
-416,7
+417,7
@@
static int parse_env_file_internal(
if (!strchr(newline, c)) {
/* Escaped newlines we eat up entirely */
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;
}
r = -ENOMEM;
goto fail;
}
@@
-431,7
+432,7
@@
static int parse_env_file_internal(
else if (c == '\\')
state = SINGLE_QUOTE_VALUE_ESCAPE;
else {
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;
}
r = -ENOMEM;
goto fail;
}
@@
-445,7
+446,7
@@
static int parse_env_file_internal(
state = SINGLE_QUOTE_VALUE;
if (!strchr(newline, c)) {
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;
}
r = -ENOMEM;
goto fail;
}
@@
-460,7
+461,7
@@
static int parse_env_file_internal(
else if (c == '\\')
state = DOUBLE_QUOTE_VALUE_ESCAPE;
else {
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;
}
r = -ENOMEM;
goto fail;
}
@@
-474,7
+475,7
@@
static int parse_env_file_internal(
state = DOUBLE_QUOTE_VALUE;
if (!strchr(newline, c)) {
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;
}
r = -ENOMEM;
goto fail;
}
@@
-533,35
+534,42
@@
fail:
static int parse_env_file_push(const char *filename, unsigned line,
const char *key, char *value, void *userdata) {
static int parse_env_file_push(const char *filename, unsigned line,
const char *key, char *value, void *userdata) {
- assert(utf8_is_valid(key));
- if (value && !utf8_is_valid(value))
- /* FIXME: filter UTF-8 */
- log_error("%s:%u: invalid UTF-8 for key %s: '%s', ignoring.",
- filename, line, key, value);
- else {
- const char *k;
- va_list* ap = (va_list*) userdata;
- va_list aq;
+ const char *k;
+ va_list aq, *ap = userdata;
- va_copy(aq, *ap);
+ if (!utf8_is_valid(key)) {
+ _cleanup_free_ char *p = utf8_escape_invalid(key);
- while ((k = va_arg(aq, const char *))) {
- char **v;
+ log_error("%s:%u: invalid UTF-8 in key '%s', ignoring.",
+ filename, line, p);
+ return -EINVAL;
+ }
- v = va_arg(aq, char **);
+ if (value && !utf8_is_valid(value)) {
+ _cleanup_free_ char *p = utf8_escape_invalid(value);
- if (streq(key, k)) {
- va_end(aq);
- free(*v);
- *v = value;
- return 1;
- }
- }
+ log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.",
+ filename, line, key, p);
+ return -EINVAL;
+ }
- va_end(aq);
+ va_copy(aq, *ap);
+
+ while ((k = va_arg(aq, const char *))) {
+ char **v;
+
+ v = va_arg(aq, char **);
+
+ if (streq(key, k)) {
+ va_end(aq);
+ free(*v);
+ *v = value;
+ return 1;
+ }
}
}
+ va_end(aq);
free(value);
return 0;
}
free(value);
return 0;
}
@@
-585,28
+593,34
@@
int parse_env_file(
static int load_env_file_push(const char *filename, unsigned line,
const char *key, char *value, void *userdata) {
static int load_env_file_push(const char *filename, unsigned line,
const char *key, char *value, void *userdata) {
- assert(utf8_is_valid(key));
+ char ***m = userdata;
+ char *p;
+ int r;
- if (value && !utf8_is_valid(value))
- /* FIXME: filter UTF-8 */
- log_error("%s:%u: invalid UTF-8 for key %s: '%s', ignoring.",
- filename, line, key, value);
- else {
- char ***m = userdata;
- char *p;
- int r;
+ if (!utf8_is_valid(key)) {
+ _cleanup_free_ char *t = utf8_escape_invalid(key);
- p = strjoin(key, "=", strempty(value), NULL);
- if (!p)
- return -ENOMEM;
+ log_error("%s:%u: invalid UTF-8 for key '%s', ignoring.",
+ filename, line, t);
+ return -EINVAL;
+ }
- r = strv_push(m, p);
- if (r < 0) {
- free(p);
- return r;
- }
+ if (value && !utf8_is_valid(value)) {
+ _cleanup_free_ char *t = utf8_escape_invalid(value);
+
+ log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.",
+ filename, line, key, t);
+ return -EINVAL;
}
}
+ p = strjoin(key, "=", strempty(value), NULL);
+ if (!p)
+ return -ENOMEM;
+
+ r = strv_consume(m, p);
+ if (r < 0)
+ return r;
+
free(value);
return 0;
}
free(value);
return 0;
}