emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

seedrng: include fiel/dir names in error messages

Browse Source 
function                                             old     new   delta
.rodata                                           104898  104900      +2
seedrng_main                                        1011    1003      -8
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 2/-8)               Total: -6 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2022-04-30 15:50:45 +02:00
parent d49da38aa3
commit 267178c628
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util-linux/seedrng.c
View File

@ -136,7 +136,7 @@ static void seed_from_file_if_exists(const char *filename, bool credit, sha256_c
seed_len = open_read_close(filename, seed, sizeof(seed)); seed_len = open_read_close(filename, seed, sizeof(seed));
if (seed_len < 0) { if (seed_len < 0) {
if (errno != ENOENT) if (errno != ENOENT)
bb_perror_msg_and_die("can't%s seed", " read"); bb_perror_msg_and_die("can't read '%s'", filename);
return; return;
} }
xunlink(filename); xunlink(filename);
@ -178,10 +178,10 @@ int seedrng_main(int argc UNUSED_PARAM, char *argv[])
bb_simple_error_msg_and_die(bb_msg_you_must_be_root); bb_simple_error_msg_and_die(bb_msg_you_must_be_root);
if (mkdir(seed_dir, 0700) < 0 && errno != EEXIST) if (mkdir(seed_dir, 0700) < 0 && errno != EEXIST)
bb_perror_msg_and_die("can't %s seed directory", "create"); bb_perror_msg_and_die("can't create directory '%s'", seed_dir);
dfd = xopen(seed_dir, O_DIRECTORY | O_RDONLY); dfd = xopen(seed_dir, O_DIRECTORY | O_RDONLY);
if (flock(dfd, LOCK_EX) < 0) if (flock(dfd, LOCK_EX) < 0)
bb_perror_msg_and_die("can't %s seed directory", "lock"); bb_perror_msg_and_die("can't lock seed directory");
xfchdir(dfd); xfchdir(dfd);
sha256_begin(&hash); sha256_begin(&hash);