projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flash_eraseall: implement -N
[oweals/busybox.git]
/
miscutils
/
ttysize.c
diff --git
a/miscutils/ttysize.c
b/miscutils/ttysize.c
index 05455543df959b7962608f4e7c2b68b01843e322..d2d48d0a9acef985eb4845227ba5186f95da55a2 100644
(file)
--- a/
miscutils/ttysize.c
+++ b/
miscutils/ttysize.c
@@
-7,12
+7,18
@@
*
* Copyright (C) 2007 by Denys Vlasenko <vda.linux@googlemail.com>
*
*
* 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
.
*/
*/
+
+//usage:#define ttysize_trivial_usage
+//usage: "[w] [h]"
+//usage:#define ttysize_full_usage "\n\n"
+//usage: "Print dimension(s) of stdin's terminal, on error return 80x25"
+
#include "libbb.h"
int ttysize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
#include "libbb.h"
int ttysize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ttysize_main(int argc, char **argv)
+int ttysize_main(int argc
UNUSED_PARAM
, char **argv)
{
unsigned w, h;
struct winsize wsz;
{
unsigned w, h;
struct winsize wsz;
@@
-24,7
+30,7
@@
int ttysize_main(int argc, char **argv)
h = wsz.ws_row;
}
h = wsz.ws_row;
}
- if (
argc == 1
) {
+ if (
!argv[1]
) {
printf("%u %u", w, h);
} else {
const char *fmt, *arg;
printf("%u %u", w, h);
} else {
const char *fmt, *arg;