More backports:

10957 start-stop-daemon -q
10981, 10982, 10994, 10996, 10997: dumpkmap cleanup
10983: top tweak
11000 traceroute

1 files changed, 13 insertions, 10 deletions

diff --git a/busybox/procps/top.c b/busybox/procps/top.c
index 5963c3554..6a129efcf 100644
--- a/busybox/procps/top.c
+++ b/busybox/procps/top.c
@@ -52,11 +52,12 @@ typedef int (*cmp_t)(procps_status_t *P, procps_status_t *Q);
 static procps_status_t *top;   /* Hehe */
 static int ntop;
 
-
+#ifdef CONFIG_FEATURE_USE_TERMIOS
 static int pid_sort (procps_status_t *P, procps_status_t *Q)
 {
     return (Q->pid - P->pid);
 }
+#endif
 
 static int mem_sort (procps_status_t *P, procps_status_t *Q)
 {
@@ -410,7 +411,7 @@ static void clearmems(void)
         ntop = 0;
 }
 
-#if defined CONFIG_FEATURE_USE_TERMIOS
+#ifdef CONFIG_FEATURE_USE_TERMIOS
 #include <termios.h>
 #include <sys/time.h>
 #include <signal.h>
@@ -439,7 +440,7 @@ static void sig_catcher (int sig)
 int top_main(int argc, char **argv)
 {
         int opt, interval, lines, col;
-#if defined CONFIG_FEATURE_USE_TERMIOS
+#ifdef CONFIG_FEATURE_USE_TERMIOS
         struct termios new_settings;
         struct timeval tv;
         fd_set readfds;
@@ -473,7 +474,7 @@ int top_main(int argc, char **argv)
         if (chdir("/proc") < 0) {
                 bb_perror_msg_and_die("chdir('/proc')");
         }
-#if defined CONFIG_FEATURE_USE_TERMIOS
+#ifdef CONFIG_FEATURE_USE_TERMIOS
         tcgetattr(0, (void *) &initial_settings);
         memcpy(&new_settings, &initial_settings, sizeof(struct termios));
         new_settings.c_lflag &= ~(ISIG | ICANON); /* unbuffered input */
@@ -499,13 +500,15 @@ int top_main(int argc, char **argv)
 #endif
         }
 #endif /* CONFIG_FEATURE_USE_TERMIOS */
+
 #ifdef FEATURE_CPU_USAGE_PERCENTAGE
         sort_function[0] = pcpu_sort;
         sort_function[1] = mem_sort;
         sort_function[2] = time_sort;
 #else
         sort_function = mem_sort;
-#endif
+#endif /* FEATURE_CPU_USAGE_PERCENTAGE */
+
         while (1) {
                 /* read process IDs & status for all the processes */
                 procps_status_t * p;
@@ -534,14 +537,14 @@ int top_main(int argc, char **argv)
                 do_stats();
 #else
                 qsort(top, ntop, sizeof(procps_status_t), (void*)sort_function);
-#endif
+#endif /* FEATURE_CPU_USAGE_PERCENTAGE */
                 opt = lines;
                 if (opt > ntop) {
                         opt = ntop;
                 }
                 /* show status for each of the processes */
                 display_status(opt, col);
-#if defined CONFIG_FEATURE_USE_TERMIOS
+#ifdef CONFIG_FEATURE_USE_TERMIOS
                 tv.tv_sec = interval;
                 tv.tv_usec = 0;
                 FD_ZERO (&readfds);
@@ -549,8 +552,8 @@ int top_main(int argc, char **argv)
                 select (1, &readfds, NULL, NULL, &tv);
                 if (FD_ISSET (0, &readfds)) {
                         if (read (0, &c, 1) <= 0) {   /* signal */
-                return EXIT_FAILURE;
-        }
+                                return EXIT_FAILURE;
+                        }
                         if(c == 'q' || c == initial_settings.c_cc[VINTR])
                                 return EXIT_SUCCESS;
                         if(c == 'M') {
@@ -584,7 +587,7 @@ int top_main(int argc, char **argv)
                 }
 #else
                 sleep(interval);
-#endif                                  /* CONFIG_FEATURE_USE_TERMIOS */
+#endif /* CONFIG_FEATURE_USE_TERMIOS */
                 clearmems();
         }