Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/more.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/util-linux/more.c (modified) (9 diffs)

branches/2.2.9/mindi-busybox/util-linux/more.c

@@ -12 +12 @@
  * Termios corrects by Vladimir Oleynik <dzo@simtreas.ru>
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
-#if ENABLE_FEATURE_USE_TERMIOS
-#include <termios.h>
-#endif /* FEATURE_USE_TERMIOS */
-
-
-#if ENABLE_FEATURE_USE_TERMIOS
+
+/* Support for FEATURE_USE_TERMIOS */
 
 struct globals {
@@ -27 +23 @@
     struct termios initial_settings;
     struct termios new_settings;
-};
+} FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
-//#define G (*ptr_to_globals)
 #define INIT_G() ((void)0)
-//#define INIT_G() PTR_TO_GLOBALS = xzalloc(sizeof(G))
 #define initial_settings (G.initial_settings)
 #define new_settings     (G.new_settings    )
 #define cin_fileno       (G.cin_fileno      )
 
-#define setTermSettings(fd, argp) tcsetattr(fd, TCSANOW, argp)
+#define setTermSettings(fd, argp) \
+do { \
+    if (ENABLE_FEATURE_USE_TERMIOS) \
+        tcsetattr(fd, TCSANOW, argp); \
+} while (0)
 #define getTermSettings(fd, argp) tcgetattr(fd, argp)
 
-static void gotsig(int sig)
+static void gotsig(int sig UNUSED_PARAM)
 {
-    putchar('\n');
+    /* bb_putchar_stderr doesn't use stdio buffering,
+     * therefore it is safe in signal handler */
+    bb_putchar_stderr('\n');
     setTermSettings(cin_fileno, &initial_settings);
-    exit(EXIT_FAILURE);
+    _exit(EXIT_FAILURE);
 }
 
-#else /* !FEATURE_USE_TERMIOS */
-#define INIT_G() ((void)0)
-#define setTermSettings(fd, argp) ((void)0)
-#endif /* FEATURE_USE_TERMIOS */
-
 #define CONVERTED_TAB_SIZE 8
 
-int more_main(int argc, char **argv);
-int more_main(int argc, char **argv)
+int more_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int more_main(int argc UNUSED_PARAM, char **argv)
 {
-    int c = c; /* for gcc */
+    int c = c; /* for compiler */
     int lines;
     int input = 0;
@@ -65 +60 @@
     FILE *cin;
     int len;
-    int terminal_width;
-    int terminal_height;
+    unsigned terminal_width;
+    unsigned terminal_height;
 
     INIT_G();
@@ -75 +70 @@
     if (!isatty(STDOUT_FILENO))
         return bb_cat(argv);
-    cin = fopen(CURRENT_TTY, "r");
+    cin = fopen_for_read(CURRENT_TTY);
     if (!cin)
         return bb_cat(argv);
 
-#if ENABLE_FEATURE_USE_TERMIOS
-    cin_fileno = fileno(cin);
-    getTermSettings(cin_fileno, &initial_settings);
-    new_settings = initial_settings;
-    new_settings.c_lflag &= ~ICANON;
-    new_settings.c_lflag &= ~ECHO;
-    new_settings.c_cc[VMIN] = 1;
-    new_settings.c_cc[VTIME] = 0;
-    setTermSettings(cin_fileno, &new_settings);
-    signal(SIGINT, gotsig);
-    signal(SIGQUIT, gotsig);
-    signal(SIGTERM, gotsig);
-#endif
+    if (ENABLE_FEATURE_USE_TERMIOS) {
+        cin_fileno = fileno(cin);
+        getTermSettings(cin_fileno, &initial_settings);
+        new_settings = initial_settings;
+        new_settings.c_lflag &= ~ICANON;
+        new_settings.c_lflag &= ~ECHO;
+        new_settings.c_cc[VMIN] = 1;
+        new_settings.c_cc[VTIME] = 0;
+        setTermSettings(cin_fileno, &new_settings);
+        bb_signals(0
+            + (1 << SIGINT)
+            + (1 << SIGQUIT)
+            + (1 << SIGTERM)
+            , gotsig);
+    }
 
     do {
@@ -118 +115 @@
                 len = printf("--More-- ");
                 if (st.st_size > 0) {
-                    len += printf("(%d%% of %"OFF_FMT"d bytes)",
+                    len += printf("(%u%% of %"OFF_FMT"u bytes)",
                         (int) (ftello(file)*100 / st.st_size),
                         st.st_size);
                 }
-                fflush(stdout);
+                fflush_all();
 
                 /*
@@ -131 +128 @@
                     input = getc(cin);
                     input = tolower(input);
-#if !ENABLE_FEATURE_USE_TERMIOS
-                    printf("\033[A"); /* up cursor */
-#endif
+                    if (!ENABLE_FEATURE_USE_TERMIOS)
+                        printf("\033[A"); /* cursor up */
                     /* Erase the last message */
                     printf("\r%*s\r", len, "");
@@ -155 +151 @@
                 /* The user may have resized the terminal.
                  * Re-read the dimensions. */
-#if ENABLE_FEATURE_USE_TERMIOS
-                get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height);
-                terminal_height -= 1;
-#endif
+                if (ENABLE_FEATURE_USE_TERMIOS) {
+                    get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height);
+                    terminal_height -= 1;
+                }
             }
 
@@ -166 +162 @@
                 spaces = CONVERTED_TAB_SIZE - 1;
                 c = ' ';
-            }
+            }
 
             /*
@@ -198 +194 @@
         }
         fclose(file);
-        fflush(stdout);
+        fflush_all();
     } while (*argv && *++argv);
  end: