diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /miscutils/man.c | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'miscutils/man.c')
| -rw-r--r-- | miscutils/man.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miscutils/man.c b/miscutils/man.c index be3b2a000..c3efe4484 100644 --- a/miscutils/man.c +++ b/miscutils/man.c | |||
| @@ -328,7 +328,7 @@ int man_main(int argc UNUSED_PARAM, char **argv) | |||
| 328 | } | 328 | } |
| 329 | #else | 329 | #else |
| 330 | if (!man_path_list) { | 330 | if (!man_path_list) { |
| 331 | static const char *const mpl[] = { "/usr/man", "/usr/share/man", NULL }; | 331 | static const char *const mpl[] ALIGN_PTR = { "/usr/man", "/usr/share/man", NULL }; |
| 332 | man_path_list = (char**)mpl; | 332 | man_path_list = (char**)mpl; |
| 333 | /*count_mp = 2; - not used below anyway */ | 333 | /*count_mp = 2; - not used below anyway */ |
| 334 | } | 334 | } |