***/
#include <unistd.h>
+#include <sys/sendfile.h>
#include "fileio.h"
#include "util.h"
#include "strv.h"
#include "utf8.h"
+#include "ctype.h"
int write_string_to_file(FILE *f, const char *line) {
errno = 0;
return 0;
}
+ssize_t sendfile_full(int out_fd, const char *fn) {
+ _cleanup_fclose_ FILE *f;
+ struct stat st;
+ int r;
+ ssize_t s;
+
+ size_t n, l;
+ _cleanup_free_ char *buf = NULL;
+
+ assert(out_fd > 0);
+ assert(fn);
+
+ f = fopen(fn, "re");
+ if (!f)
+ return -errno;
+
+ r = fstat(fileno(f), &st);
+ if (r < 0)
+ return -errno;
+
+ s = sendfile(out_fd, fileno(f), NULL, st.st_size);
+ if (s < 0)
+ if (errno == EINVAL || errno == ENOSYS) {
+ /* continue below */
+ } else
+ return -errno;
+ else
+ return s;
+
+ /* sendfile() failed, fall back to read/write */
+
+ /* Safety check */
+ if (st.st_size > 4*1024*1024)
+ return -E2BIG;
+
+ n = st.st_size > 0 ? st.st_size : LINE_MAX;
+ l = 0;
+
+ while (true) {
+ char *t;
+ size_t k;
+
+ t = realloc(buf, n);
+ if (!t)
+ return -ENOMEM;
+
+ buf = t;
+ k = fread(buf + l, 1, n - l, f);
+
+ if (k <= 0) {
+ if (ferror(f))
+ return -errno;
+
+ break;
+ }
+
+ l += k;
+ n *= 2;
+
+ /* Safety check */
+ if (n > 4*1024*1024)
+ return -E2BIG;
+ }
+
+ r = write(out_fd, buf, l);
+ if (r < 0)
+ return -errno;
+
+ return (ssize_t) l;
+}
+
int read_full_file(const char *fn, char **contents, size_t *size) {
_cleanup_fclose_ FILE *f = NULL;
size_t n, l;
buf[l] = 0;
*contents = buf;
- buf = NULL;
+ buf = NULL; /* do not free */
if (size)
*size = l;
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;
}
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;
+
+ if (!utf8_is_valid(key)) {
+ _cleanup_free_ char *p = utf8_escape_invalid(key);
- va_copy(aq, *ap);
+ log_error("%s:%u: invalid UTF-8 in key '%s', ignoring.",
+ filename, line, p);
+ return -EINVAL;
+ }
- while ((k = va_arg(aq, const char *))) {
- char **v;
+ if (value && !utf8_is_valid(value)) {
+ _cleanup_free_ char *p = utf8_escape_invalid(value);
- v = va_arg(aq, char **);
+ log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.",
+ filename, line, key, p);
+ return -EINVAL;
+ }
- if (streq(key, k)) {
- va_end(aq);
- free(*v);
- *v = value;
- return 1;
- }
- }
+ va_copy(aq, *ap);
+
+ while ((k = va_arg(aq, const char *))) {
+ char **v;
- va_end(aq);
+ 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;
}
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;
}
int r;
assert(filename);
+ assert(pattern);
assert(field);
r = read_full_file(filename, &status, NULL);
return -ENOENT;
t += strlen(pattern);
- /* Also skip zeros, because when this is used for capabilities,
- * we don't want the zeros. This way the same cabality set
- * always maps to the same string, irrespective of the total
- * capability set size. For other numbers it shouldn't matter.
- */
if (*t) {
- t += strspn(t, WHITESPACE "0");
+ t += strspn(t, " \t");
+
+ /* Also skip zeros, because when this is used for
+ * capabilities, we don't want the zeros. This way the
+ * same capability set always maps to the same string,
+ * irrespective of the total capability set size. For
+ * other numbers it shouldn't matter. */
+ t += strspn(t, "0");
/* Back off one char if there's nothing but whitespace
and zeros */
- if (!*t)
+ if (!*t || isspace(*t))
t --;
}