diff options
| author | Ron Yorston <rmy@pobox.com> | 2025-05-19 08:34:32 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2025-05-19 08:34:32 +0100 |
| commit | 64bf69893bd99c305d13a956389f216e7d15c682 (patch) | |
| tree | 7fa7d449f0633c86c1248c0bb86363dd9f46da38 /miscutils | |
| parent | a807cdfa95cf4af2f84e207ed15887cc3514cb43 (diff) | |
| parent | 5f07327251c93184dfcfc8d978fc35705930ec53 (diff) | |
| download | busybox-w32-64bf69893bd99c305d13a956389f216e7d15c682.tar.gz busybox-w32-64bf69893bd99c305d13a956389f216e7d15c682.tar.bz2 busybox-w32-64bf69893bd99c305d13a956389f216e7d15c682.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/fbsplash.c | 2 | ||||
| -rw-r--r-- | miscutils/man.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c index 2934d8eb7..912a501a3 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c | |||
| @@ -382,7 +382,7 @@ static void fb_drawimage(void) | |||
| 382 | if (LONE_DASH(G.image_filename)) { | 382 | if (LONE_DASH(G.image_filename)) { |
| 383 | theme_file = stdin; | 383 | theme_file = stdin; |
| 384 | } else { | 384 | } else { |
| 385 | int fd = open_zipped(G.image_filename, /*fail_if_not_compressed:*/ 0); | 385 | int fd = open_zipped(G.image_filename, /*die_if_not_compressed:*/ 0); |
| 386 | if (fd < 0) | 386 | if (fd < 0) |
| 387 | bb_simple_perror_msg_and_die(G.image_filename); | 387 | bb_simple_perror_msg_and_die(G.image_filename); |
| 388 | theme_file = xfdopen_for_read(fd); | 388 | theme_file = xfdopen_for_read(fd); |
diff --git a/miscutils/man.c b/miscutils/man.c index 3954455b4..38c1b9aa3 100644 --- a/miscutils/man.c +++ b/miscutils/man.c | |||
| @@ -143,7 +143,7 @@ static int run_pipe(char *man_filename, int man, int level) | |||
| 143 | 143 | ||
| 144 | ordinary_manpage: | 144 | ordinary_manpage: |
| 145 | close(STDIN_FILENO); | 145 | close(STDIN_FILENO); |
| 146 | open_zipped(man_filename, /*fail_if_not_compressed:*/ 0); /* guaranteed to use fd 0 (STDIN_FILENO) */ | 146 | open_zipped(man_filename, /*die_if_not_compressed:*/ 0); /* guaranteed to use fd 0 (STDIN_FILENO) */ |
| 147 | if (man) { | 147 | if (man) { |
| 148 | int w = get_terminal_width(-1); | 148 | int w = get_terminal_width(-1); |
| 149 | if (w > 10) | 149 | if (w > 10) |
