tar: support -T - and -X -

[oweals/busybox.git] / miscutils / ttysize.c

diff --git a/miscutils/ttysize.c b/miscutils/ttysize.c
index c1b702c2cabfbe5234e5282176c1914f6a7cd40e..f93a506a2f04a0a1bdbe167c2cfaef669ad6acde 100644 (file)
--- a/miscutils/ttysize.c
+++ b/miscutils/ttysize.c
@@ -1,17 +1,22 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Replacement for "stty size", which is awkward for shell script use.
  * - Allows to request width, height, or both, in any order.
- * - Does not complain on error, but returns default 80x24.
+ * - Does not complain on error, but returns width 80, height 24.
  * - Size: less than 200 bytes
+ *
+ * Copyright (C) 2007 by Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
 
-int ttysize_main(int argc, char **argv);
-int ttysize_main(int argc, char **argv)
+int ttysize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ttysize_main(int argc UNUSED_PARAM, char **argv)
 {
-       unsigned w,h;
+       unsigned w, h;
        struct winsize wsz;
-    
+
        w = 80;
        h = 24;
        if (!ioctl(0, TIOCGWINSZ, &wsz)) {
@@ -19,7 +24,7 @@ int ttysize_main(int argc, char **argv)
                h = wsz.ws_row;
        }
 
-       if (argc == 1) {
+       if (!argv[1]) {
                printf("%u %u", w, h);
        } else {
                const char *fmt, *arg;
@@ -34,6 +39,6 @@ int ttysize_main(int argc, char **argv)
                        fmt = "%u %u" + 2; /* " %u" */
                }
        }
-       putchar('\n');
+       bb_putchar('\n');
        return 0;
 }