2 files changed, 5 insertions, 15 deletions

diff --git a/procps/powertop.c b/procps/powertop.c
index ce85f4191..ee806161f 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -683,7 +683,6 @@ int powertop_main(int UNUSED_PARAM argc, char UNUSED_PARAM **argv)
         ullong cur_duration[MAX_CSTATE_COUNT];
         char cstate_lines[MAX_CSTATE_COUNT + 2][64];
 #if ENABLE_FEATURE_USE_TERMIOS
-        struct termios new_settings;
         struct pollfd pfd[1];
 
         pfd[0].fd = 0;
@@ -707,14 +706,11 @@ int powertop_main(int UNUSED_PARAM argc, char UNUSED_PARAM **argv)
         puts("Collecting data for "DEFAULT_SLEEP_STR" seconds");
 
 #if ENABLE_FEATURE_USE_TERMIOS
-        tcgetattr(0, (void *)&G.init_settings);
-        memcpy(&new_settings, &G.init_settings, sizeof(new_settings));
-        /* Turn on unbuffered input, turn off echoing */
-        new_settings.c_lflag &= ~(ISIG | ICANON | ECHO | ECHONL);
+        /* Turn on unbuffered input; turn off echoing, ^C ^Z etc */
+        set_termios_to_raw(STDIN_FILENO, &G.init_settings, TERMIOS_CLEAR_ISIG);
+        bb_signals(BB_FATAL_SIGS, sig_handler);
         /* So we don't forget to reset term settings */
         atexit(reset_term);
-        bb_signals(BB_FATAL_SIGS, sig_handler);
-        tcsetattr_stdin_TCSANOW(&new_settings);
 #endif
 
         /* Collect initial data */
diff --git a/procps/top.c b/procps/top.c
index 491acb574..91bb8a883 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -1089,9 +1089,6 @@ int top_main(int argc UNUSED_PARAM, char **argv)
         unsigned interval;
         char *str_interval, *str_iterations;
         unsigned scan_mask = TOP_MASK;
-#if ENABLE_FEATURE_USE_TERMIOS
-        struct termios new_settings;
-#endif
 
         INIT_G();
 
@@ -1141,11 +1138,8 @@ int top_main(int argc UNUSED_PARAM, char **argv)
         }
 #if ENABLE_FEATURE_USE_TERMIOS
         else {
-                tcgetattr(0, (void *) &initial_settings);
-                memcpy(&new_settings, &initial_settings, sizeof(new_settings));
-                /* unbuffered input, turn off echo */
-                new_settings.c_lflag &= ~(ISIG | ICANON | ECHO | ECHONL);
-                tcsetattr_stdin_TCSANOW(&new_settings);
+                /* Turn on unbuffered input; turn off echoing, ^C ^Z etc */
+                set_termios_to_raw(STDIN_FILENO, &initial_settings, TERMIOS_CLEAR_ISIG);
         }
 
         bb_signals(BB_FATAL_SIGS, sig_catcher);