watch: fix warning

getty: fix breakage; fix excessive stack usage

1 files changed, 3 insertions, 1 deletions

diff --git a/coreutils/watch.c b/coreutils/watch.c
index e3e9e06bb..b188b4176 100644
--- a/coreutils/watch.c
+++ b/coreutils/watch.c
@@ -58,8 +58,9 @@ int watch_main(int argc, char **argv)
                         time_t t;
 
                         get_terminal_width_height(STDOUT_FILENO, &width, 0);
+                        if (width < 1) width = 1; // paranoia
                         header = xrealloc(header, width--);
-                        // We pad with spaces entire length
+                        // '%-*s' pads header with spaces to the full width
                         snprintf(header, width, "Every %ds: %-*s", period, width, cmd);
                         time(&t);
                         thyme = ctime(&t);
@@ -75,4 +76,5 @@ int watch_main(int argc, char **argv)
                 system(cmd);
                 sleep(period);
         }
+        return 0; // gcc thinks we can reach this :)
 }