***/
#include <unistd.h>
-#include <sys/sendfile.h>
-#include "fileio.h"
+
#include "util.h"
#include "strv.h"
#include "utf8.h"
#include "ctype.h"
+#include "fileio.h"
-int write_string_stream(FILE *f, const char *line) {
+int write_string_stream(FILE *f, const char *line, bool enforce_newline) {
assert(f);
assert(line);
errno = 0;
fputs(line, f);
- if (!endswith(line, "\n"))
+ if (enforce_newline && !endswith(line, "\n"))
fputc('\n', f);
fflush(f);
return 0;
}
-int write_string_file(const char *fn, const char *line) {
+static int write_string_file_atomic(const char *fn, const char *line, bool enforce_newline) {
_cleanup_fclose_ FILE *f = NULL;
+ _cleanup_free_ char *p = NULL;
+ int r;
assert(fn);
assert(line);
- f = fopen(fn, "we");
- if (!f)
- return -errno;
-
- return write_string_stream(f, line);
-}
-
-int write_string_file_no_create(const char *fn, const char *line) {
- _cleanup_fclose_ FILE *f = NULL;
- int fd;
-
- assert(fn);
- assert(line);
+ r = fopen_temporary(fn, &f, &p);
+ if (r < 0)
+ return r;
- /* We manually build our own version of fopen(..., "we") that
- * without O_CREAT */
- fd = open(fn, O_WRONLY|O_CLOEXEC|O_NOCTTY);
- if (fd < 0)
- return -errno;
+ fchmod_umask(fileno(f), 0644);
- f = fdopen(fd, "we");
- if (!f) {
- safe_close(fd);
- return -errno;
+ r = write_string_stream(f, line, enforce_newline);
+ if (r >= 0) {
+ if (rename(p, fn) < 0)
+ r = -errno;
}
- return write_string_stream(f, line);
+ if (r < 0)
+ unlink(p);
+
+ return r;
}
-int write_string_file_atomic(const char *fn, const char *line) {
+int write_string_file(const char *fn, const char *line, WriteStringFileFlags flags) {
_cleanup_fclose_ FILE *f = NULL;
- _cleanup_free_ char *p = NULL;
- int r;
assert(fn);
assert(line);
- r = fopen_temporary(fn, &f, &p);
- if (r < 0)
- return r;
+ if (flags & WRITE_STRING_FILE_ATOMIC) {
+ assert(flags & WRITE_STRING_FILE_CREATE);
- fchmod_umask(fileno(f), 0644);
+ return write_string_file_atomic(fn, line, !(flags & WRITE_STRING_FILE_AVOID_NEWLINE));
+ }
- errno = 0;
- fputs(line, f);
- if (!endswith(line, "\n"))
- fputc('\n', f);
+ if (flags & WRITE_STRING_FILE_CREATE) {
+ f = fopen(fn, "we");
+ if (!f)
+ return -errno;
+ } else {
+ int fd;
- fflush(f);
+ /* We manually build our own version of fopen(..., "we") that
+ * works without O_CREAT */
+ fd = open(fn, O_WRONLY|O_CLOEXEC|O_NOCTTY);
+ if (fd < 0)
+ return -errno;
- if (ferror(f))
- r = errno ? -errno : -EIO;
- else {
- if (rename(p, fn) < 0)
- r = -errno;
- else
- r = 0;
+ f = fdopen(fd, "we");
+ if (!f) {
+ safe_close(fd);
+ return -errno;
+ }
}
- if (r < 0)
- unlink(p);
-
- return r;
+ return write_string_stream(f, line, !(flags & WRITE_STRING_FILE_AVOID_NEWLINE));
}
int read_one_line_file(const char *fn, char **line) {
return 0;
}
-ssize_t sendfile_full(int out_fd, const char *fn) {
- _cleanup_fclose_ FILE *f;
- struct stat st;
+int verify_one_line_file(const char *fn, const char *line) {
+ _cleanup_free_ char *value = NULL;
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);
+ r = read_one_line_file(fn, &value);
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 r;
- return (ssize_t) l;
+ return streq(value, line);
}
int read_full_stream(FILE *f, char **contents, size_t *size) {
const char *fname,
const char *newline,
int (*push) (const char *filename, unsigned line,
- const char *key, char *value, void *userdata),
- void *userdata) {
+ const char *key, char *value, void *userdata, int *n_pushed),
+ void *userdata,
+ int *n_pushed) {
_cleanup_free_ char *contents = NULL, *key = NULL;
size_t key_alloc = 0, n_key = 0, value_alloc = 0, n_value = 0, last_value_whitespace = (size_t) -1, last_key_whitespace = (size_t) -1;
if (last_key_whitespace != (size_t) -1)
key[last_key_whitespace] = 0;
- r = push(fname, line, key, value, userdata);
+ r = push(fname, line, key, value, userdata, n_pushed);
if (r < 0)
goto fail;
if (last_key_whitespace != (size_t) -1)
key[last_key_whitespace] = 0;
- r = push(fname, line, key, value, userdata);
+ r = push(fname, line, key, value, userdata, n_pushed);
if (r < 0)
goto fail;
if (last_key_whitespace != (size_t) -1)
key[last_key_whitespace] = 0;
- r = push(fname, line, key, value, userdata);
+ r = push(fname, line, key, value, userdata, n_pushed);
if (r < 0)
goto fail;
}
static int parse_env_file_push(
const char *filename, unsigned line,
const char *key, char *value,
- void *userdata) {
+ void *userdata,
+ int *n_pushed) {
const char *k;
va_list aq, *ap = userdata;
va_end(aq);
free(*v);
*v = value;
+
+ if (n_pushed)
+ (*n_pushed)++;
+
return 1;
}
}
const char *newline, ...) {
va_list ap;
- int r;
+ int r, n_pushed = 0;
if (!newline)
newline = NEWLINE;
va_start(ap, newline);
- r = parse_env_file_internal(NULL, fname, newline, parse_env_file_push, &ap);
+ r = parse_env_file_internal(NULL, fname, newline, parse_env_file_push, &ap, &n_pushed);
va_end(ap);
- return r;
+ return r < 0 ? r : n_pushed;
}
static int load_env_file_push(
const char *filename, unsigned line,
const char *key, char *value,
- void *userdata) {
+ void *userdata,
+ int *n_pushed) {
char ***m = userdata;
char *p;
int r;
if (r < 0)
return r;
+ if (n_pushed)
+ (*n_pushed)++;
+
free(value);
return 0;
}
if (!newline)
newline = NEWLINE;
- r = parse_env_file_internal(f, fname, newline, load_env_file_push, &m);
+ r = parse_env_file_internal(f, fname, newline, load_env_file_push, &m, NULL);
if (r < 0) {
strv_free(m);
return r;
static int load_env_file_push_pairs(
const char *filename, unsigned line,
const char *key, char *value,
- void *userdata) {
+ void *userdata,
+ int *n_pushed) {
char ***m = userdata;
int r;
return r;
}
+ if (n_pushed)
+ (*n_pushed)++;
+
return 0;
}
if (!newline)
newline = NEWLINE;
- r = parse_env_file_internal(f, fname, newline, load_env_file_push_pairs, &m);
+ r = parse_env_file_internal(f, fname, newline, load_env_file_push_pairs, &m, NULL);
if (r < 0) {
strv_free(m);
return r;
~ianmdlvl / elogind.git / blobdiff