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 /libbb/appletlib.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 'libbb/appletlib.c')
| -rw-r--r-- | libbb/appletlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 6c0be4a83..a8b82e729 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
| @@ -671,7 +671,7 @@ static void check_suid(int applet_no) | |||
| 671 | # if ENABLE_FEATURE_INSTALLER | 671 | # if ENABLE_FEATURE_INSTALLER |
| 672 | static const char usr_bin [] ALIGN1 = "/usr/bin/"; | 672 | static const char usr_bin [] ALIGN1 = "/usr/bin/"; |
| 673 | static const char usr_sbin[] ALIGN1 = "/usr/sbin/"; | 673 | static const char usr_sbin[] ALIGN1 = "/usr/sbin/"; |
| 674 | static const char *const install_dir[] = { | 674 | static const char *const install_dir[] ALIGN_PTR = { |
| 675 | &usr_bin [8], /* "/" */ | 675 | &usr_bin [8], /* "/" */ |
| 676 | &usr_bin [4], /* "/bin/" */ | 676 | &usr_bin [4], /* "/bin/" */ |
| 677 | &usr_sbin[4] /* "/sbin/" */ | 677 | &usr_sbin[4] /* "/sbin/" */ |