ifupdown: save some 100+ bytes of code in addstr()

[oweals/busybox.git] / util-linux / more.c

diff --git a/util-linux/more.c b/util-linux/more.c
index beba64282f0866f87d2f57c68855731a7b4a0ca7..85209ce61b362c17c7a568abe3b0c22c8e05076d 100644 (file)
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -11,28 +11,9 @@
  *
  * Termios corrects by Vladimir Oleynik <dzo@simtreas.ru>
  *
- * 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>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
 #include "busybox.h"
 
 
@@ -67,9 +48,6 @@ int more_main(int argc, char **argv)
        int len, page_height;
        int terminal_width;
        int terminal_height;
-#ifndef CONFIG_FEATURE_USE_TERMIOS
-       int cin_fileno;
-#endif
 
        argc--;
        argv++;
@@ -79,10 +57,10 @@ int more_main(int argc, char **argv)
        if(isatty(STDOUT_FILENO)) {
                cin = fopen(CURRENT_TTY, "r");
                if (!cin)
-                       cin = bb_xfopen(CONSOLE_DEV, "r");
-               cin_fileno = fileno(cin);
+                       cin = xfopen(CONSOLE_DEV, "r");
                please_display_more_prompt = 2;
 #ifdef CONFIG_FEATURE_USE_TERMIOS
+               cin_fileno = fileno(cin);
                getTermSettings(cin_fileno, &initial_settings);
                new_settings = initial_settings;
                new_settings.c_lflag &= ~ICANON;
@@ -103,7 +81,7 @@ int more_main(int argc, char **argv)
                if (argc == 0) {
                        file = stdin;
                } else
-                       file = bb_wfopen(*argv, "r");
+                       file = fopen_or_warn(*argv, "r");
                if(file==0)
                        goto loop;
 
@@ -112,7 +90,7 @@ int more_main(int argc, char **argv)
 
                please_display_more_prompt &= ~1;
 
-               get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height);
+               get_terminal_width_height(fileno(cin), &terminal_width, &terminal_height);
                if (terminal_height > 4)
                        terminal_height -= 2;
                if (terminal_width > 0)