Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/lineedit.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/lineedit.c (modified) (25 diffs)

branches/3.3/mindi-busybox/libbb/lineedit.c

@@ -39 +39 @@
  *
  * PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+ *
+ * Unicode in PS1 is not fully supported: prompt length calulation is wrong,
+ * resulting in line wrap problems with long (multi-line) input.
+ *
+ * Multi-line PS1 (e.g. PS1="\n[\w]\n$ ") has problems with history
+ * browsing: up/down arrows result in scrolling.
+ * It stems from simplistic "cmdedit_y = cmdedit_prmt_len / cmdedit_termw"
+ * calculation of how many lines the prompt takes.
  */
-#include "libbb.h"
+#include "busybox.h"
+#include "NUM_APPLETS.h"
 #include "unicode.h"
 #ifndef _POSIX_VDISABLE
@@ -134 +143 @@
 
     const char *cmdedit_prompt;
-#if ENABLE_FEATURE_EDITING_FANCY_PROMPT
-    int num_ok_lines; /* = 1; */
-#endif
 
 #if ENABLE_USERNAME_OR_HOMEDIR
@@ -173 +179 @@
 #define command_ps       (S.command_ps      )
 #define cmdedit_prompt   (S.cmdedit_prompt  )
-#define num_ok_lines     (S.num_ok_lines    )
 #define user_buf         (S.user_buf        )
 #define home_pwd_buf     (S.home_pwd_buf    )
@@ -186 +191 @@
     barrier(); \
     cmdedit_termw = 80; \
-    IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
     IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
+    IF_FEATURE_EDITING_VI(delptr = delbuf;) \
 } while (0)
 
@@ -669 +674 @@
 static NOINLINE unsigned complete_username(const char *ud)
 {
-    /* Using _r function to avoid pulling in static buffers */
-    char line_buff[256];
-    struct passwd pwd;
-    struct passwd *result;
+    struct passwd *pw;
     unsigned userlen;
 
@@ -679 +681 @@
 
     setpwent();
-    while (!getpwent_r(&pwd, line_buff, sizeof(line_buff), &result)) {
+    while ((pw = getpwent()) != NULL) {
         /* Null usernames should result in all users as possible completions. */
-        if (/*!userlen || */ strncmp(ud, pwd.pw_name, userlen) == 0) {
-            add_match(xasprintf("~%s/", pwd.pw_name));
-        }
-    }
-    endpwent();
+        if (/* !ud[0] || */ is_prefixed_with(pw->pw_name, ud)) {
+            add_match(xasprintf("~%s/", pw->pw_name));
+        }
+    }
+    endpwent(); /* don't keep password file open */
 
     return 1 + userlen;
@@ -774 +776 @@
     pf_len = strlen(pfind);
 
+#if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
+    if (type == FIND_EXE_ONLY) {
+        const char *p = applet_names;
+
+        while (*p) {
+            if (strncmp(pfind, p, pf_len) == 0)
+                add_match(xstrdup(p));
+            while (*p++ != '\0')
+                continue;
+        }
+    }
+#endif
+
     for (i = 0; i < npaths; i++) {
         DIR *dir;
@@ -792 +807 @@
                 continue;
             /* match? */
-            if (strncmp(name_found, pfind, pf_len) != 0)
+            if (!is_prefixed_with(name_found, pfind))
                 continue; /* no */
 
@@ -1252 +1267 @@
     line_input_t *n = xzalloc(sizeof(*n));
     n->flags = flags;
+#if MAX_HISTORY > 0
     n->max_history = MAX_HISTORY;
+#endif
     return n;
 }
@@ -1259 +1276 @@
 #if MAX_HISTORY > 0
 
-unsigned size_from_HISTFILESIZE(const char *hp)
+unsigned FAST_FUNC size_from_HISTFILESIZE(const char *hp)
 {
     int size = MAX_HISTORY;
@@ -1312 +1329 @@
     beep();
     return 0;
+}
+
+/* Lists command history. Used by shell 'history' builtins */
+void FAST_FUNC show_history(const line_input_t *st)
+{
+    int i;
+
+    if (!st)
+        return;
+    for (i = 0; i < st->cnt_history; i++)
+        printf("%4d %s\n", i, st->history[i]);
 }
 
@@ -1532 +1560 @@
     save_history(str);
 # endif
-    IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;)
 }
 
@@ -1754 +1781 @@
 #endif
 
+/* Called just once at read_line_input() init time */
 #if !ENABLE_FEATURE_EDITING_FANCY_PROMPT
 static void parse_and_put_prompt(const char *prmt_ptr)
 {
+    const char *p;
     cmdedit_prompt = prmt_ptr;
-    cmdedit_prmt_len = strlen(prmt_ptr);
+    p = strrchr(prmt_ptr, '\n');
+    cmdedit_prmt_len = unicode_strwidth(p ? p+1 : prmt_ptr);
     put_prompt();
 }
@@ -1764 +1794 @@
 static void parse_and_put_prompt(const char *prmt_ptr)
 {
-    int prmt_len = 0;
-    size_t cur_prmt_len = 0;
+    int prmt_size = 0;
+    char *prmt_mem_ptr = xzalloc(1);
+# if ENABLE_USERNAME_OR_HOMEDIR
+    char *cwd_buf = NULL;
+# endif
     char flg_not_length = '[';
-    char *prmt_mem_ptr = xzalloc(1);
-    char *cwd_buf = xrealloc_getcwd_or_warn(NULL);
     char cbuf[2];
-    char c;
-    char *pbuf;
-
-    cmdedit_prmt_len = 0;
-
-    if (!cwd_buf) {
-        cwd_buf = (char *)bb_msg_unknown;
-    }
+
+    /*cmdedit_prmt_len = 0; - already is */
 
     cbuf[1] = '\0'; /* never changes */
 
     while (*prmt_ptr) {
+        char timebuf[sizeof("HH:MM:SS")];
         char *free_me = NULL;
+        char *pbuf;
+        char c;
 
         pbuf = cbuf;
         c = *prmt_ptr++;
         if (c == '\\') {
-            const char *cp = prmt_ptr;
+            const char *cp;
             int l;
-
-            c = bb_process_escape_sequence(&prmt_ptr);
+/*
+ * Supported via bb_process_escape_sequence:
+ * \a   ASCII bell character (07)
+ * \e   ASCII escape character (033)
+ * \n   newline
+ * \r   carriage return
+ * \\   backslash
+ * \nnn char with octal code nnn
+ * Supported:
+ * \$   if the effective UID is 0, a #, otherwise a $
+ * \w   current working directory, with $HOME abbreviated with a tilde
+ *  Note: we do not support $PROMPT_DIRTRIM=n feature
+ * \W   basename of the current working directory, with $HOME abbreviated with a tilde
+ * \h   hostname up to the first '.'
+ * \H   hostname
+ * \u   username
+ * \[   begin a sequence of non-printing characters
+ * \]   end a sequence of non-printing characters
+ * \T   current time in 12-hour HH:MM:SS format
+ * \@   current time in 12-hour am/pm format
+ * \A   current time in 24-hour HH:MM format
+ * \t   current time in 24-hour HH:MM:SS format
+ *  (all of the above work as \A)
+ * Not supported:
+ * \!   history number of this command
+ * \#   command number of this command
+ * \j   number of jobs currently managed by the shell
+ * \l   basename of the shell's terminal device name
+ * \s   name of the shell, the basename of $0 (the portion following the final slash)
+ * \V   release of bash, version + patch level (e.g., 2.00.0)
+ * \d   date in "Weekday Month Date" format (e.g., "Tue May 26")
+ * \D{format}
+ *  format is passed to strftime(3).
+ *  An empty format results in a locale-specific time representation.
+ *  The braces are required.
+ * Mishandled by bb_process_escape_sequence:
+ * \v   version of bash (e.g., 2.00)
+ */
+            cp = prmt_ptr;
+            c = *cp;
+            if (c != 't') /* don't treat \t as tab */
+                c = bb_process_escape_sequence(&prmt_ptr);
             if (prmt_ptr == cp) {
                 if (*cp == '\0')
@@ -1802 +1870 @@
                     break;
 # endif
+                case 'H':
                 case 'h':
                     pbuf = free_me = safe_gethostname();
-                    *strchrnul(pbuf, '.') = '\0';
+                    if (c == 'h')
+                        strchrnul(pbuf, '.')[0] = '\0';
                     break;
                 case '$':
                     c = (geteuid() == 0 ? '#' : '$');
                     break;
+                case 'T': /* 12-hour HH:MM:SS format */
+                case '@': /* 12-hour am/pm format */
+                case 'A': /* 24-hour HH:MM format */
+                case 't': /* 24-hour HH:MM:SS format */
+                    /* We show all of them as 24-hour HH:MM */
+                    strftime_HHMMSS(timebuf, sizeof(timebuf), NULL)[-3] = '\0';
+                    pbuf = timebuf;
+                    break;
 # if ENABLE_USERNAME_OR_HOMEDIR
-                case 'w':
-                    /* /home/user[/something] -> ~[/something] */
+                case 'w': /* current dir */
+                case 'W': /* basename of cur dir */
+                    if (!cwd_buf) {
+                        cwd_buf = xrealloc_getcwd_or_warn(NULL);
+                        if (!cwd_buf)
+                            cwd_buf = (char *)bb_msg_unknown;
+                        else if (home_pwd_buf[0]) {
+                            char *after_home_user;
+
+                            /* /home/user[/something] -> ~[/something] */
+                            after_home_user = is_prefixed_with(cwd_buf, home_pwd_buf);
+                            if (after_home_user
+                             && (*after_home_user == '/' || *after_home_user == '\0')
+                            ) {
+                                cwd_buf[0] = '~';
+                                overlapping_strcpy(cwd_buf + 1, after_home_user);
+                            }
+                        }
+                    }
                     pbuf = cwd_buf;
-                    l = strlen(home_pwd_buf);
-                    if (l != 0
-                     && strncmp(home_pwd_buf, cwd_buf, l) == 0
-                     && (cwd_buf[l]=='/' || cwd_buf[l]=='\0')
-                     && strlen(cwd_buf + l) < PATH_MAX
-                    ) {
-                        pbuf = free_me = xasprintf("~%s", cwd_buf + l);
-                    }
+                    if (c == 'w')
+                        break;
+                    cp = strrchr(pbuf, '/');
+                    if (cp)
+                        pbuf = (char*)cp + 1;
                     break;
 # endif
-                case 'W':
-                    pbuf = cwd_buf;
-                    cp = strrchr(pbuf, '/');
-                    if (cp != NULL && cp != pbuf)
-                        pbuf += (cp-pbuf) + 1;
-                    break;
-                case '!':
-                    pbuf = free_me = xasprintf("%d", num_ok_lines);
-                    break;
-                case 'e': case 'E':     /* \e \E = \033 */
-                    c = '\033';
-                    break;
+// bb_process_escape_sequence does this now:
+//              case 'e': case 'E':     /* \e \E = \033 */
+//                  c = '\033';
+//                  break;
                 case 'x': case 'X': {
                     char buf2[4];
@@ -1856 +1940 @@
                 case '[': case ']':
                     if (c == flg_not_length) {
-                        flg_not_length = (flg_not_length == '[' ? ']' : '[');
+                        /* Toggle '['/']' hex 5b/5d */
+                        flg_not_length ^= 6;
                         continue;
                     }
@@ -1864 +1949 @@
         } /* if */
         cbuf[0] = c;
-        cur_prmt_len = strlen(pbuf);
-        prmt_len += cur_prmt_len;
-        if (flg_not_length != ']')
-            cmdedit_prmt_len += cur_prmt_len;
-        prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_len+1), pbuf);
+        {
+            int n = strlen(pbuf);
+            prmt_size += n;
+            if (c == '\n')
+                cmdedit_prmt_len = 0;
+            else if (flg_not_length != ']') {
+#if 0 /*ENABLE_UNICODE_SUPPORT*/
+/* Won't work, pbuf is one BYTE string here instead of an one Unicode char string. */
+/* FIXME */
+                cmdedit_prmt_len += unicode_strwidth(pbuf);
+#else
+                cmdedit_prmt_len += n;
+#endif
+            }
+        }
+        prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_size+1), pbuf);
         free(free_me);
     } /* while */
 
+# if ENABLE_USERNAME_OR_HOMEDIR
     if (cwd_buf != (char *)bb_msg_unknown)
         free(cwd_buf);
+# endif
     cmdedit_prompt = prmt_mem_ptr;
     put_prompt();
@@ -1935 +2033 @@
             if (cursor == 0) { /* otherwise it may be bogus */
                 int col = ((ic >> 32) & 0x7fff) - 1;
-                if (col > cmdedit_prmt_len) {
+                /*
+                 * Is col > cmdedit_prmt_len?
+                 * If yes (terminal says cursor is farther to the right
+                 * of where we think it should be),
+                 * the prompt wasn't printed starting at col 1,
+                 * there was additional text before it.
+                 */
+                if ((int)(col - cmdedit_prmt_len) > 0) {
+                    /* Fix our understanding of current x position */
                     cmdedit_x += (col - cmdedit_prmt_len);
                     while (cmdedit_x >= cmdedit_termw) {
@@ -2026 +2132 @@
     const char *matched_history_line;
     const char *saved_prompt;
+    unsigned saved_prmt_len;
     int32_t ic;
 
@@ -2034 +2141 @@
     /* Save and replace the prompt */
     saved_prompt = cmdedit_prompt;
+    saved_prmt_len = cmdedit_prmt_len;
     goto set_prompt;
 
@@ -2109 +2217 @@
  set_prompt:
                     cmdedit_prompt = xasprintf("(reverse-i-search)'%s': ", match_buf);
-                    cmdedit_prmt_len = strlen(cmdedit_prompt);
+                    cmdedit_prmt_len = unicode_strwidth(cmdedit_prompt);
                     goto do_redraw;
                 }
@@ -2131 +2239 @@
     free((char*)cmdedit_prompt);
     cmdedit_prompt = saved_prompt;
-    cmdedit_prmt_len = strlen(cmdedit_prompt);
+    cmdedit_prmt_len = saved_prmt_len;
     redraw(cmdedit_y, command_len - cursor);
 
@@ -2161 +2269 @@
 
     if (tcgetattr(STDIN_FILENO, &initial_settings) < 0
-     || !(initial_settings.c_lflag & ECHO)
+     || (initial_settings.c_lflag & (ECHO|ICANON)) == ICANON
     ) {
-        /* Happens when e.g. stty -echo was run before */
+        /* Happens when e.g. stty -echo was run before.
+         * But if ICANON is not set, we don't come here.
+         * (example: interactive python ^Z-backgrounded,
+         * tty is still in "raw mode").
+         */
         parse_and_put_prompt(prompt);
         /* fflush_all(); - done by parse_and_put_prompt */
@@ -2512 +2624 @@
              * Often, Alt-<key> generates ESC-<key>.
              */
-            ic = lineedit_read_key(read_key_buffer, timeout);
+            ic = lineedit_read_key(read_key_buffer, 50);
             switch (ic) {
                 //case KEYCODE_LEFT: - bash doesn't do this
@@ -2699 +2811 @@
 #endif
 
-    if (command_len > 0)
+    if (command_len > 0) {
         remember_in_history(command);
+    }
 
     if (break_out > 0) {