From e0537f6194cf37651c6e7ac3033226f09dab7557 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 1 Sep 2005 02:57:45 +0000 Subject: Bernhard Fischer suggested that get_terminal_width_height() should return the result of the ioctl so callers can tell if we have a tty. (0 means we have a tty, nonzero means the ioctl couldn't find size info and we fake 80x24. Really we should fake 80x25, but oh well...) --- libbb/get_terminal_width_height.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'libbb') diff --git a/libbb/get_terminal_width_height.c b/libbb/get_terminal_width_height.c index 7a1af6dc1..ce3e83c0c 100644 --- a/libbb/get_terminal_width_height.c +++ b/libbb/get_terminal_width_height.c @@ -29,30 +29,15 @@ #include "busybox.h" /* It is perfectly ok to pass in a NULL for either width or for - * height, in which case that value will not be set. It is also - * perfectly ok to have CONFIG_FEATURE_AUTOWIDTH disabled, in - * which case you will always get 80x24 */ -void get_terminal_width_height(int fd, int *width, int *height) + * height, in which case that value will not be set. */ +int get_terminal_width_height(int fd, int *width, int *height) { struct winsize win = { 0, 0, 0, 0 }; -#ifdef CONFIG_FEATURE_AUTOWIDTH - if (ioctl(fd, TIOCGWINSZ, &win) != 0) { - win.ws_row = 24; - win.ws_col = 80; - } -#endif - if (win.ws_row <= 1) { - win.ws_row = 24; - } - if (win.ws_col <= 1) { - win.ws_col = 80; - } - if (height) { - *height = (int) win.ws_row; - } - if (width) { - *width = (int) win.ws_col; - } + int ret = ioctl(fd, TIOCGWINSZ, &win); + if (win.ws_row <= 1) win.ws_row = 24; + if (win.ws_col <= 1) win.ws_col = 80; + if (height) *height = (int) win.ws_row; + if (width) *width = (int) win.ws_col; } /* END CODE */ -- cgit v1.2.3