whitespace

[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 7a1af6dc1dfb29a28a07ce7b22a44ccf6b10922a..941f04c3a29b033c0034aeb686cdc2f34f1bf089 100644 (file)
--- a/libbb/get_terminal_width_height.c
+++ b/libbb/get_terminal_width_height.c
@@ -4,19 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <stdio.h>
@@ -26,41 +14,18 @@
 #include <unistd.h>
 #include <termios.h>
 #include <sys/ioctl.h>
-#include "busybox.h"
+#include "libbb.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;
-       }
-}
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+       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;
 
+       return ret;
+}