Fixes so "make allnoconfig" works again.

[oweals/busybox.git] / libbb / get_terminal_width_height.c

diff --git a/libbb/get_terminal_width_height.c b/libbb/get_terminal_width_height.c
index 69f6a17e509500b278bcf24bd07169ebbbd34775..ce3e83c0c392b44ec6eff9678cd3a6b595987b76 100644 (file)
--- a/libbb/get_terminal_width_height.c
+++ b/libbb/get_terminal_width_height.c
@@ -2,7 +2,7 @@
 /*
  * Determine the width and height of the terminal.
  *
- * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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(0, 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 */