From 574d5f2dfc25226afc718aa5ba1a145fe5cad221 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 2 Apr 2013 20:31:42 +0200 Subject: [PATCH] util: rename write_one_line_file() to write_string_file() You can write much more than just one line with this call (and we frequently do), so let's correct the naming. --- src/binfmt/binfmt.c | 6 +++--- src/core/cgroup-attr.c | 2 +- src/core/execute.c | 2 +- src/core/machine-id-setup.c | 2 +- src/core/unit.c | 2 +- src/hostname/hostnamed.c | 2 +- src/login/logind-dbus.c | 4 ++-- src/login/user-sessions.c | 2 +- src/nspawn/nspawn.c | 2 +- src/readahead/readahead-common.c | 4 ++-- src/shared/capability.c | 2 +- src/shared/cgroup-util.c | 22 ++++++++-------------- src/shared/fileio-label.c | 4 ++-- src/shared/fileio-label.h | 2 +- src/shared/fileio.c | 4 ++-- src/shared/fileio.h | 4 ++-- src/shutdownd/shutdownd.c | 2 +- src/sleep/sleep.c | 10 +++++----- src/sysctl/sysctl.c | 2 +- src/timedate/timedated.c | 2 +- src/udev/udevd.c | 4 ++-- src/vconsole/vconsole-setup.c | 4 ++-- 22 files changed, 42 insertions(+), 48 deletions(-) diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index 909eef732..9ca1e604c 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -62,7 +62,7 @@ static int delete_rule(const char *rule) { if (!fn) return log_oom(); - return write_one_line_file(fn, "-1"); + return write_string_file(fn, "-1"); } static int apply_rule(const char *rule) { @@ -70,7 +70,7 @@ static int apply_rule(const char *rule) { delete_rule(rule); - r = write_one_line_file("/proc/sys/fs/binfmt_misc/register", rule); + r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule); if (r < 0) { log_error("Failed to add binary format: %s", strerror(-r)); return r; @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) { } /* Flush out all rules */ - write_one_line_file("/proc/sys/fs/binfmt_misc/status", "-1"); + write_string_file("/proc/sys/fs/binfmt_misc/status", "-1"); STRV_FOREACH(f, files) { k = apply_file(*f, true); diff --git a/src/core/cgroup-attr.c b/src/core/cgroup-attr.c index 2ab4d4623..7e3e08eab 100644 --- a/src/core/cgroup-attr.c +++ b/src/core/cgroup-attr.c @@ -44,7 +44,7 @@ int cgroup_attribute_apply(CGroupAttribute *a, CGroupBonding *b) { if (r < 0) return r; - r = write_one_line_file(path, v ? v : a->value); + r = write_string_file(path, v ? v : a->value); if (r < 0) log_warning("Failed to write '%s' to %s: %s", v ? v : a->value, path, strerror(-r)); diff --git a/src/core/execute.c b/src/core/execute.c index f7353579e..91815b838 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1195,7 +1195,7 @@ int exec_spawn(ExecCommand *command, snprintf(t, sizeof(t), "%i", context->oom_score_adjust); char_array_0(t); - if (write_one_line_file("/proc/self/oom_score_adj", t) < 0) { + if (write_string_file("/proc/self/oom_score_adj", t) < 0) { err = -errno; r = EXIT_OOM_ADJUST; goto fail_child; diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index 146c5653c..51074fea4 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -216,7 +216,7 @@ int machine_id_setup(void) { * /run/machine-id as a replacement */ m = umask(0022); - r = write_one_line_file("/run/machine-id", id); + r = write_string_file("/run/machine-id", id); umask(m); if (r < 0) { diff --git a/src/core/unit.c b/src/core/unit.c index 91a00edf7..a0d36569a 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2910,7 +2910,7 @@ int unit_write_drop_in(Unit *u, bool runtime, const char *name, const char *data return r; mkdir_p(p, 0755); - return write_one_line_file_atomic_label(q, data); + return write_string_file_atomic_label(q, data); } int unit_remove_drop_in(Unit *u, bool runtime, const char *name) { diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 859b5a078..b4d6d5140 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -289,7 +289,7 @@ static int write_data_static_hostname(void) { return 0; } - return write_one_line_file_atomic_label("/etc/hostname", data[PROP_STATIC_HOSTNAME]); + return write_string_file_atomic_label("/etc/hostname", data[PROP_STATIC_HOSTNAME]); } static int write_data_other(void) { diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 4ae836221..aa212d1fe 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -886,7 +886,7 @@ static int trigger_device(Manager *m, struct udev_device *d) { goto finish; } - write_one_line_file(t, "change"); + write_string_file(t, "change"); free(t); } @@ -936,7 +936,7 @@ static int attach_device(Manager *m, const char *seat, const char *sysfs) { mkdir_p_label("/etc/udev/rules.d", 0755); label_init("/etc"); - r = write_one_line_file_atomic_label(file, rule); + r = write_string_file_atomic_label(file, rule); if (r < 0) goto finish; diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c index c6f8fa79e..41d32044e 100644 --- a/src/login/user-sessions.c +++ b/src/login/user-sessions.c @@ -70,7 +70,7 @@ int main(int argc, char*argv[]) { int r, q; char *cgroup_user_tree = NULL; - r = write_one_line_file_atomic("/run/nologin", "System is going down."); + r = write_string_file_atomic("/run/nologin", "System is going down."); if (r < 0) log_error("Failed to create /run/nologin: %s", strerror(-r)); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index b8b692b47..01ef12bf6 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -528,7 +528,7 @@ static int setup_boot_id(const char *dest) { SD_ID128_FORMAT_VAL(rnd)); char_array_0(as_uuid); - r = write_one_line_file(from, as_uuid); + r = write_string_file(from, as_uuid); if (r < 0) { log_error("Failed to write boot id: %s", strerror(-r)); return r; diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c index 81bb16c7a..ed81c14d8 100644 --- a/src/readahead/readahead-common.c +++ b/src/readahead/readahead-common.c @@ -316,7 +316,7 @@ int block_bump_request_nr(const char *p) { goto finish; } - r = write_one_line_file(ap, line); + r = write_string_file(ap, line); if (r < 0) goto finish; @@ -399,7 +399,7 @@ int block_set_readahead(const char *p, uint64_t bytes) { goto finish; } - r = write_one_line_file(ap, line); + r = write_string_file(ap, line); if (r < 0) goto finish; diff --git a/src/shared/capability.c b/src/shared/capability.c index cad718d74..321952067 100644 --- a/src/shared/capability.c +++ b/src/shared/capability.c @@ -204,7 +204,7 @@ static int drop_from_file(const char *fn, uint64_t drop) { if (asprintf(&p, "%u %u", lo, hi) < 0) return -ENOMEM; - r = write_one_line_file(fn, p); + r = write_string_file(fn, p); free(p); return r; diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index be00b40fa..15e1b7c05 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -677,9 +677,9 @@ int cg_delete(const char *controller, const char *path) { } int cg_attach(const char *controller, const char *path, pid_t pid) { - char *fs; + _cleanup_free_ char *fs = NULL; + char c[DECIMAL_STR_MAX(pid_t) + 2]; int r; - char c[32]; assert(controller); assert(path); @@ -693,16 +693,12 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { pid = getpid(); snprintf(c, sizeof(c), "%lu\n", (unsigned long) pid); - char_array_0(c); - - r = write_one_line_file(fs, c); - free(fs); - return r; + return write_string_file(fs, c); } int cg_set_group_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid) { - char *fs; + _cleanup_free_ char *fs = NULL; int r; assert(controller); @@ -715,10 +711,7 @@ int cg_set_group_access(const char *controller, const char *path, mode_t mode, u if (r < 0) return r; - r = chmod_and_chown(fs, mode, uid, gid); - free(fs); - - return r; + return chmod_and_chown(fs, mode, uid, gid); } int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid, int sticky) { @@ -857,7 +850,8 @@ int cg_install_release_agent(const char *controller, const char *agent) { goto finish; } - if ((r = write_one_line_file(fs, line)) < 0) + r = write_string_file(fs, line); + if (r < 0) goto finish; } else if (!streq(sc, agent)) { @@ -878,7 +872,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { - if ((r = write_one_line_file(fs, "1\n")) < 0) + if ((r = write_string_file(fs, "1\n")) < 0) goto finish; r = 1; diff --git a/src/shared/fileio-label.c b/src/shared/fileio-label.c index 5bf127bcf..0711826e8 100644 --- a/src/shared/fileio-label.c +++ b/src/shared/fileio-label.c @@ -26,14 +26,14 @@ #include "fileio-label.h" #include "label.h" -int write_one_line_file_atomic_label(const char *fn, const char *line) { +int write_string_file_atomic_label(const char *fn, const char *line) { int r; r = label_context_set(fn, S_IFREG); if (r < 0) return r; - write_one_line_file_atomic(fn, line); + write_string_file_atomic(fn, line); label_context_clear(); diff --git a/src/shared/fileio-label.h b/src/shared/fileio-label.h index cc5ce3470..fce4fe0d7 100644 --- a/src/shared/fileio-label.h +++ b/src/shared/fileio-label.h @@ -25,5 +25,5 @@ #include #include "fileio.h" -int write_one_line_file_atomic_label(const char *fn, const char *line); +int write_string_file_atomic_label(const char *fn, const char *line); int write_env_file_label(const char *fname, char **l); diff --git a/src/shared/fileio.c b/src/shared/fileio.c index 1c7d48513..5b8be5ce2 100644 --- a/src/shared/fileio.c +++ b/src/shared/fileio.c @@ -24,7 +24,7 @@ #include "util.h" #include "strv.h" -int write_one_line_file(const char *fn, const char *line) { +int write_string_file(const char *fn, const char *line) { _cleanup_fclose_ FILE *f = NULL; assert(fn); @@ -49,7 +49,7 @@ int write_one_line_file(const char *fn, const char *line) { return 0; } -int write_one_line_file_atomic(const char *fn, const char *line) { +int write_string_file_atomic(const char *fn, const char *line) { _cleanup_fclose_ FILE *f = NULL; _cleanup_free_ char *p = NULL; int r; diff --git a/src/shared/fileio.h b/src/shared/fileio.h index 0023204a7..612968b93 100644 --- a/src/shared/fileio.h +++ b/src/shared/fileio.h @@ -23,8 +23,8 @@ #include #include "macro.h" -int write_one_line_file(const char *fn, const char *line); -int write_one_line_file_atomic(const char *fn, const char *line); +int write_string_file(const char *fn, const char *line); +int write_string_file_atomic(const char *fn, const char *line); int read_one_line_file(const char *fn, char **line); int read_full_file(const char *fn, char **contents, size_t *size); diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c index 119385d67..ee2a328b4 100644 --- a/src/shutdownd/shutdownd.c +++ b/src/shutdownd/shutdownd.c @@ -421,7 +421,7 @@ int main(int argc, char *argv[]) { log_info("Creating /run/nologin, blocking further logins..."); - e = write_one_line_file_atomic("/run/nologin", "System is going down."); + e = write_string_file_atomic("/run/nologin", "System is going down."); if (e < 0) log_error("Failed to create /run/nologin: %s", strerror(-e)); else diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 070762546..f5e78c13c 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -57,12 +57,12 @@ int main(int argc, char *argv[]) { /* Configure the hibernation mode */ if (streq(argv[1], "hibernate")) { - if (write_one_line_file("/sys/power/disk", "platform") < 0) - write_one_line_file("/sys/power/disk", "shutdown"); + if (write_string_file("/sys/power/disk", "platform") < 0) + write_string_file("/sys/power/disk", "shutdown"); } else if (streq(argv[1], "hybrid-sleep")) { - if (write_one_line_file("/sys/power/disk", "suspend") < 0) - if (write_one_line_file("/sys/power/disk", "platform") < 0) - write_one_line_file("/sys/power/disk", "shutdown"); + if (write_string_file("/sys/power/disk", "suspend") < 0) + if (write_string_file("/sys/power/disk", "platform") < 0) + write_string_file("/sys/power/disk", "shutdown"); } f = fopen("/sys/power/state", "we"); diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c index 79f3f7767..e0ba78a2f 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -88,7 +88,7 @@ static int apply_sysctl(const char *property, const char *value) { } } - k = write_one_line_file(p, value); + k = write_string_file(p, value); if (k < 0) { log_full(k == -ENOENT ? LOG_DEBUG : LOG_WARNING, "Failed to write '%s' to '%s': %s", value, p, strerror(-k)); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 1d4d73911..e06872490 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -275,7 +275,7 @@ static int write_data_local_rtc(void) { } } label_init("/etc"); - r = write_one_line_file_atomic_label("/etc/adjtime", w); + r = write_string_file_atomic_label("/etc/adjtime", w); free(w); return r; diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 42cf994b0..2d9093d74 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -267,7 +267,7 @@ static void worker_new(struct event *event) prctl(PR_SET_PDEATHSIG, SIGTERM); /* reset OOM score, we only protect the main daemon */ - write_one_line_file("/proc/self/oom_score_adj", "0"); + write_string_file("/proc/self/oom_score_adj", "0"); for (;;) { struct udev_event *udev_event; @@ -1168,7 +1168,7 @@ int main(int argc, char *argv[]) setsid(); - write_one_line_file("/proc/self/oom_score_adj", "-1000"); + write_string_file("/proc/self/oom_score_adj", "-1000"); } else { sd_notify(1, "READY=1"); } diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index e11fd589c..84d7c5cba 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -57,7 +57,7 @@ static int disable_utf8(int fd) { if (loop_write(fd, "\033%@", 3, false) < 0) r = -errno; - k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "0"); + k = write_string_file("/sys/module/vt/parameters/default_utf8", "0"); if (k < 0) r = k; @@ -89,7 +89,7 @@ static int enable_utf8(int fd) { if (loop_write(fd, "\033%G", 3, false) < 0) r = -errno; - k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1"); + k = write_string_file("/sys/module/vt/parameters/default_utf8", "1"); if (k < 0) r = k; -- 2.30.2