powertop: new applet

[oweals/busybox.git] / procps / watch.c

diff --git a/procps/watch.c b/procps/watch.c
index 7d8e0de1f75e26a5f8006a190936ae460e2703df..36f71c469ad59fdef21f62b1b7b8c40546491e3b 100644 (file)
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2001 by Michael Habermann <mhabermann@gmx.de>
  * Copyrigjt (C) Mar 16, 2003 Manuel Novoa III   (mjn3@codepoet.org)
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 N/A */
@@ -24,7 +24,7 @@
 // (procps 3.x and procps 2.x are forks, not newer/older versions of the same)
 
 int watch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int watch_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int watch_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned opt;
        unsigned period = 2;
@@ -32,13 +32,19 @@ int watch_main(int argc ATTRIBUTE_UNUSED, char **argv)
        char *header;
        char *cmd;
 
+#if 0 // maybe ENABLE_DESKTOP?
+       // procps3 compat - "echo TEST | watch cat" doesn't show TEST:
+       close(STDIN_FILENO);
+       xopen("/dev/null", O_RDONLY);
+#endif
+
        opt_complementary = "-1:n+"; // at least one param; -n NUM
        // "+": stop at first non-option (procps 3.x only)
        opt = getopt32(argv, "+dtn:", &period);
        argv += optind;
 
        // watch from both procps 2.x and 3.x does concatenation. Example:
-       // watch ls -l "a /tmp" "2>&1" -- ls won't see "a /tmp" as one param
+       // watch ls -l "a /tmp" "2>&1" - ls won't see "a /tmp" as one param
        cmd = *argv;
        while (*++argv)
                cmd = xasprintf("%s %s", cmd, *argv); // leaks cmd
@@ -46,12 +52,15 @@ int watch_main(int argc ATTRIBUTE_UNUSED, char **argv)
        width = (unsigned)-1; // make sure first time new_width != width
        header = NULL;
        while (1) {
-               printf("\033[H\033[J");
+               /* home; clear to the end of screen */
+               printf("\033[H""\033[J");
                if (!(opt & 0x2)) { // no -t
                        const unsigned time_len = sizeof("1234-67-90 23:56:89");
                        time_t t;
 
-                       get_terminal_width_height(STDIN_FILENO, &new_width, NULL);
+                       // STDERR_FILENO is procps3 compat:
+                       // "watch ls 2>/dev/null" does not detect tty size
+                       get_terminal_width_height(STDERR_FILENO, &new_width, NULL);
                        if (new_width != width) {
                                width = new_width;
                                free(header);
@@ -62,9 +71,10 @@ int watch_main(int argc ATTRIBUTE_UNUSED, char **argv)
                                strftime(header + width - time_len, time_len,
                                        "%Y-%m-%d %H:%M:%S", localtime(&t));
 
-                       puts(header);
+                       // compat: empty line between header and cmd output
+                       printf("%s\n\n", header);
                }
-               fflush(stdout);
+               fflush_all();
                // TODO: 'real' watch pipes cmd's output to itself
                // and does not allow it to overflow the screen
                // (taking into account linewrap!)