Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/more.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/more.c (modified) (5 diffs)

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

@@ -14 +14 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define more_trivial_usage
+//usage:       "[FILE]..."
+//usage:#define more_full_usage "\n\n"
+//usage:       "View FILE (or stdin) one screenful at a time"
+//usage:
+//usage:#define more_example_usage
+//usage:       "$ dmesg | more\n"
 
 #include "libbb.h"
@@ -78 +86 @@
         getTermSettings(cin_fileno, &initial_settings);
         new_settings = initial_settings;
-        new_settings.c_lflag &= ~ICANON;
-        new_settings.c_lflag &= ~ECHO;
+        new_settings.c_lflag &= ~(ICANON | ECHO);
         new_settings.c_cc[VMIN] = 1;
         new_settings.c_cc[VTIME] = 0;
@@ -114 +121 @@
             if (input != 'r' && please_display_more_prompt) {
                 len = printf("--More-- ");
-                if (st.st_size > 0) {
+                if (st.st_size != 0) {
+                    uoff_t d = (uoff_t)st.st_size / 100;
+                    if (d == 0)
+                        d = 1;
                     len += printf("(%u%% of %"OFF_FMT"u bytes)",
-                        (int) (ftello(file)*100 / st.st_size),
+                        (int) ((uoff_t)ftello(file) / d),
                         st.st_size);
                 }
@@ -160 +170 @@
              * a bajillion times easier to deal with. */
             if (c == '\t') {
-                spaces = CONVERTED_TAB_SIZE - 1;
+                spaces = ((unsigned)~len) % CONVERTED_TAB_SIZE;
                 c = ' ';
             }
@@ -192 +202 @@
             /* My small mind cannot fathom backspaces and UTF-8 */
             putchar(c);
+            die_if_ferror_stdout(); /* if tty was destroyed (closed xterm, etc) */
         }
         fclose(file);