X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Frandom-seed%2Frandom-seed.c;h=af79ecf2a927ae44cacd9593fa7f2c93479a2d99;hp=4776c071caca966ccc027f7a5a01d4816fb026b4;hb=952d97ed2b44f58b973a78c87d09b20c36f61460;hpb=ce1794704574e73efb813c6ed113554870f2e747

diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 4776c071c..af79ecf2a 100644
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
 
         r = mkdir_parents_label(RANDOM_SEED, 0755);
         if (r < 0) {
-                log_error("Failed to create parent directory of " RANDOM_SEED ": %s", strerror(-r));
+                log_error("Failed to create directory " RANDOM_SEED_DIR ": %s", strerror(-r));
                 goto finish;
         }
 
@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
                 if (seed_fd < 0) {
                         seed_fd = open(RANDOM_SEED, O_RDONLY|O_CLOEXEC|O_NOCTTY);
                         if (seed_fd < 0) {
-                                log_error("Failed to open random seed: %m");
+                                log_error("Failed to open " RANDOM_SEED ": %m");
                                 r = -errno;
                                 goto finish;
                         }
@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
                 if (k <= 0) {
 
                         if (r != 0)
-                                log_error("Failed to read seed file: %m");
+                                log_error("Failed to read seed from " RANDOM_SEED ": %m");
 
                         r = k == 0 ? -EIO : (int) k;
 
@@ -125,7 +125,7 @@ int main(int argc, char *argv[]) {
 
                 seed_fd = open(RANDOM_SEED, O_WRONLY|O_CLOEXEC|O_NOCTTY|O_CREAT, 0600);
                 if (seed_fd < 0) {
-                        log_error("Failed to open random seed: %m");
+                        log_error("Failed to open " RANDOM_SEED ": %m");
                         r = -errno;
                         goto finish;
                 }
@@ -157,7 +157,7 @@ int main(int argc, char *argv[]) {
                 r = loop_write(seed_fd, buf, (size_t) k, false);
                 if (r <= 0) {
                         log_error("Failed to write new random seed file: %s", r < 0 ? strerror(-r) : "short write");
-                        r = k == 0 ? -EIO : (int) k;
+                        r = r == 0 ? -EIO : r;
                 }
         }