diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-12-01 20:43:19 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-12-09 21:36:08 -0500 |
| commit | 553acb7b6b8d4f16a4747b1f978e8b7888fbfb2c (patch) | |
| tree | b9a473c853c616b256ed3ea1dc5f8e9c7838b289 /src/core/machine-id-setup.c | |
| parent | cb01aedc3b4ba70859267159fe716253e3551ec6 (diff) | |
treewide: sanitize loop_write
loop_write() didn't follow the usual systemd rules and returned status
partially in errno and required extensive checks from callers. Some of
the callers dealt with this properly, but many did not, treating
partial writes as successful. Simplify things by conforming to usual rules.
Diffstat (limited to 'src/core/machine-id-setup.c')
| -rw-r--r-- | src/core/machine-id-setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index 74582a5dcd..d91a02cf15 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -182,7 +182,7 @@ static int write_machine_id(int fd, char id[34]) { assert(id); lseek(fd, 0, SEEK_SET); - if (loop_write(fd, id, 33, false) == 33) + if (loop_write(fd, id, 33, false) == 0) return 0; return -errno; @@ -329,10 +329,9 @@ int machine_id_setup(const char *root) { if (r < 0) return r; - if (S_ISREG(st.st_mode) && writable) { + if (S_ISREG(st.st_mode) && writable) if (write_machine_id(fd, id) == 0) return 0; - } fd = safe_close(fd); |