ps: conditionally enable -T on non-DESKTOP build too

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

diff --git a/procps/watch.c b/procps/watch.c
index 5b774e8084adb040d7f4c5560431444ab45be6c1..5fd051072fb9e4163c26e997a134a8093175303c 100644 (file)
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -24,11 +24,11 @@
 // (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;
-       int width, new_width;
+       unsigned width, new_width;
        char *header;
        char *cmd;
 
@@ -43,19 +43,19 @@ int watch_main(int argc ATTRIBUTE_UNUSED, char **argv)
        while (*++argv)
                cmd = xasprintf("%s %s", cmd, *argv); // leaks cmd
 
-       width = -1; // make sure first time new_width != width
+       width = (unsigned)-1; // make sure first time new_width != width
        header = NULL;
        while (1) {
                printf("\033[H\033[J");
                if (!(opt & 0x2)) { // no -t
-                       const int time_len = sizeof("1234-67-90 23:56:89");
+                       const unsigned time_len = sizeof("1234-67-90 23:56:89");
                        time_t t;
 
                        get_terminal_width_height(STDIN_FILENO, &new_width, NULL);
                        if (new_width != width) {
                                width = new_width;
                                free(header);
-                               header = xasprintf("Every %us: %-*s", period, width, cmd);
+                               header = xasprintf("Every %us: %-*s", period, (int)width, cmd);
                        }
                        time(&t);
                        if (time_len < width)