Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/miscutils/less.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/miscutils/less.c (modified) (13 diffs)

branches/3.2/mindi-busybox/miscutils/less.c

@@ -22 +22 @@
  */
 
+//config:config LESS
+//config:   bool "less"
+//config:   default y
+//config:   help
+//config:     'less' is a pager, meaning that it displays text files. It possesses
+//config:     a wide array of features, and is an improvement over 'more'.
+//config:
+//config:config FEATURE_LESS_MAXLINES
+//config:   int "Max number of input lines less will try to eat"
+//config:   default 9999999
+//config:   depends on LESS
+//config:
+//config:config FEATURE_LESS_BRACKETS
+//config:   bool "Enable bracket searching"
+//config:   default y
+//config:   depends on LESS
+//config:   help
+//config:     This option adds the capability to search for matching left and right
+//config:     brackets, facilitating programming.
+//config:
+//config:config FEATURE_LESS_FLAGS
+//config:   bool "Enable -m/-M"
+//config:   default y
+//config:   depends on LESS
+//config:   help
+//config:     The -M/-m flag enables a more sophisticated status line.
+//config:
+//config:config FEATURE_LESS_MARKS
+//config:   bool "Enable marks"
+//config:   default y
+//config:   depends on LESS
+//config:   help
+//config:     Marks enable positions in a file to be stored for easy reference.
+//config:
+//config:config FEATURE_LESS_REGEXP
+//config:   bool "Enable regular expressions"
+//config:   default y
+//config:   depends on LESS
+//config:   help
+//config:     Enable regular expressions, allowing complex file searches.
+//config:
+//config:config FEATURE_LESS_WINCH
+//config:   bool "Enable automatic resizing on window size changes"
+//config:   default y
+//config:   depends on LESS
+//config:   help
+//config:     Makes less track window size changes.
+//config:
+//config:config FEATURE_LESS_ASK_TERMINAL
+//config:   bool "Use 'tell me cursor position' ESC sequence to measure window"
+//config:   default y
+//config:   depends on FEATURE_LESS_WINCH
+//config:   help
+//config:     Makes less track window size changes.
+//config:     If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+//config:     this option makes less perform a last-ditch effort to find it:
+//config:     position cursor to 999,999 and ask terminal to report real
+//config:     cursor position using "ESC [ 6 n" escape sequence, then read stdin.
+//config:
+//config:     This is not clean but helps a lot on serial lines and such.
+//config:
+//config:config FEATURE_LESS_DASHCMD
+//config:   bool "Enable flag changes ('-' command)"
+//config:   default y
+//config:   depends on LESS
+//config:   help
+//config:     This enables the ability to change command-line flags within
+//config:     less itself ('-' keyboard command).
+//config:
+//config:config FEATURE_LESS_LINENUMS
+//config:   bool "Enable dynamic switching of line numbers"
+//config:   default y
+//config:   depends on FEATURE_LESS_DASHCMD
+//config:   help
+//config:     Enables "-N" command.
+
+//usage:#define less_trivial_usage
+//usage:       "[-E" IF_FEATURE_LESS_FLAGS("Mm") "Nh~I?] [FILE]..."
+//usage:#define less_full_usage "\n\n"
+//usage:       "View FILE (or stdin) one screenful at a time\n"
+//usage:     "\n    -E  Quit once the end of a file is reached"
+//usage:    IF_FEATURE_LESS_FLAGS(
+//usage:     "\n    -M,-m   Display status line with line numbers"
+//usage:     "\n        and percentage through the file"
+//usage:    )
+//usage:     "\n    -N  Prefix line number to each line"
+//usage:     "\n    -I  Ignore case in all searches"
+//usage:     "\n    -~  Suppress ~s displayed past EOF"
+
 #include <sched.h>  /* sched_yield() */
 
@@ -97 +186 @@
     regex_t pattern;
     smallint pattern_valid;
+#endif
+#if ENABLE_FEATURE_LESS_ASK_TERMINAL
+    smallint winsize_err;
 #endif
     smallint terminated;
@@ -618 +710 @@
 
     /* Each part of the line that matches has the HIGHLIGHT
-       and NORMAL escape sequences placed around it.
-       NB: we regex against line, but insert text
-       from quarantined copy (buf[]) */
+     * and NORMAL escape sequences placed around it.
+     * NB: we regex against line, but insert text
+     * from quarantined copy (buf[]) */
     str = buf;
     growline = NULL;
@@ -629 +721 @@
         char *new = xasprintf("%s%.*s"HIGHLIGHT"%.*s"NORMAL,
                 growline ? growline : "",
-                match_structs.rm_so, str,
-                match_structs.rm_eo - match_structs.rm_so,
+                (int)match_structs.rm_so, str,
+                (int)(match_structs.rm_eo - match_structs.rm_so),
                         str + match_structs.rm_so);
         free(growline);
@@ -805 +897 @@
     max_lineno = 0;
     open_file_and_read_lines();
+#if ENABLE_FEATURE_LESS_ASK_TERMINAL
+    if (G.winsize_err)
+        printf("\033[999;999H" "\033[6n");
+#endif
     buffer_fill_and_print();
 }
 
-static int getch_nowait(void)
+static int64_t getch_nowait(void)
 {
     int rd;
+    int64_t key64;
     struct pollfd pfd[2];
 
@@ -858 +955 @@
     /* We have kbd_fd in O_NONBLOCK mode, read inside read_key()
      * would not block even if there is no input available */
-    rd = read_key(kbd_fd, kbd_input, /*timeout off:*/ -2);
-    if (rd == -1) {
+    key64 = read_key(kbd_fd, kbd_input, /*timeout off:*/ -2);
+    if ((int)key64 == -1) {
         if (errno == EAGAIN) {
             /* No keyboard input available. Since poll() did return,
@@ -871 +968 @@
     }
     set_tty_cooked();
-    return rd;
+    return key64;
 }
 
@@ -877 +974 @@
  * May return KEYCODE_xxx values.
  * Note that this function works best with raw input. */
-static int less_getch(int pos)
-{
-    int i;
+static int64_t less_getch(int pos)
+{
+    int64_t key64;
+    int key;
 
  again:
     less_gets_pos = pos;
-    i = getch_nowait();
+    key = key64 = getch_nowait();
     less_gets_pos = -1;
 
-    /* Discard Ctrl-something chars */
-    if (i >= 0 && i < ' ' && i != 0x0d && i != 8)
+    /* Discard Ctrl-something chars.
+     * (checking only lower 32 bits is a size optimization:
+     * upper 32 bits are used only by KEYCODE_CURSOR_POS)
+     */
+    if (key >= 0 && key < ' ' && key != 0x0d && key != 8)
         goto again;
-    return i;
+
+    return key64;
 }
 
@@ -1429 +1531 @@
 #endif
     case 'r': case 'R':
+        /* TODO: (1) also bind ^R, ^L to this?
+         * (2) re-measure window size?
+         */
         buffer_print();
         break;
@@ -1504 +1609 @@
 int less_main(int argc, char **argv)
 {
-    int keypress;
-
     INIT_G();
 
@@ -1548 +1651 @@
     term_less.c_cc[VTIME] = 0;
 
-    get_terminal_width_height(kbd_fd, &width, &max_displayed_line);
+    IF_FEATURE_LESS_ASK_TERMINAL(G.winsize_err =) get_terminal_width_height(kbd_fd, &width, &max_displayed_line);
     /* 20: two tabstops + 4 */
     if (width < 20 || max_displayed_line < 3)
@@ -1563 +1666 @@
     reinitialize();
     while (1) {
+        int64_t keypress;
+
 #if ENABLE_FEATURE_LESS_WINCH
         while (WINCH_COUNTER) {
  again:
             winch_counter--;
-            get_terminal_width_height(kbd_fd, &width, &max_displayed_line);
+            IF_FEATURE_LESS_ASK_TERMINAL(G.winsize_err =) get_terminal_width_height(kbd_fd, &width, &max_displayed_line);
+ IF_FEATURE_LESS_ASK_TERMINAL(got_size:)
             /* 20: two tabstops + 4 */
             if (width < 20)
@@ -1587 +1693 @@
              * were there another SIGWINCH? */
         }
-#endif
         keypress = less_getch(-1); /* -1: do not position cursor */
+# if ENABLE_FEATURE_LESS_ASK_TERMINAL
+        if ((int32_t)keypress == KEYCODE_CURSOR_POS) {
+            uint32_t rc = (keypress >> 32);
+            width = (rc & 0x7fff);
+            max_displayed_line = ((rc >> 16) & 0x7fff);
+            goto got_size;
+        }
+# endif
+#else
+        keypress = less_getch(-1); /* -1: do not position cursor */
+#endif
         keypress_process(keypress);
     }