aboutsummaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2022-02-09 09:03:18 +0000
committerRon Yorston <rmy@pobox.com>2022-02-09 09:05:39 +0000
commit492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch)
tree4f5764a5c2250c031ea05e9aeacbb40d7971f493 /console-tools
parent4734416a21312488a5099a297907783bee4ccc22 (diff)
parentcaa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff)
downloadbusybox-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 'console-tools')
-rw-r--r--console-tools/reset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/console-tools/reset.c b/console-tools/reset.c
index e0d228d50..151bc47d1 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -40,7 +40,7 @@ int reset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
40int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) 40int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
41{ 41{
42#if !ENABLE_PLATFORM_MINGW32 42#if !ENABLE_PLATFORM_MINGW32
43 static const char *const args[] = { 43 static const char *const args[] ALIGN_PTR = {
44 "stty", "sane", NULL 44 "stty", "sane", NULL
45 }; 45 };
46 46