tar: support -T - and -X -

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

diff --git a/miscutils/ttysize.c b/miscutils/ttysize.c
index 51d4ec76f15537ad664756ed7f73a8e454b200fa..f93a506a2f04a0a1bdbe167c2cfaef669ad6acde 100644 (file)
--- a/miscutils/ttysize.c
+++ b/miscutils/ttysize.c
@@ -7,16 +7,16 @@
  *
  * Copyright (C) 2007 by Denys Vlasenko <vda.linux@googlemail.com>
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * 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)) {
@@ -24,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;
@@ -39,6 +39,6 @@ int ttysize_main(int argc, char **argv)
                        fmt = "%u %u" + 2; /* " %u" */
                }
        }
-       putchar('\n');
+       bb_putchar('\n');
        return 0;
 }