Clean up.
[oweals/busybox.git] / shell / cmdedit.c
index d15c694977ff28f746cf6723b6aae36b9ac04e1f..8b5b2b94254929681c9f65ccd182eacacc70829d 100644 (file)
@@ -1,19 +1,18 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Termios command line History and Editting for NetBSD sh (ash)
- * Copyright (c) 1999
- *      Main code:            Adam Rogoyski <rogoyski@cs.utexas.edu> 
- *      Etc:                  Dave Cinege <dcinege@psychosis.com>
- *      Adjusted for busybox: Erik Andersen <andersee@debian.org>
+ * Termios command line History and Editing.
  *
- * You may use this code as you wish, so long as the original author(s)
- * are attributed in any redistributions of the source code.
- * This code is 'as is' with no warranty.
- * This code may safely be consumed by a BSD or GPL license.
+ * Copyright (c) 1986-2003 may safely be consumed by a BSD or GPL license.
+ * Written by:   Vladimir Oleynik <dzo@simtreas.ru>
+ *
+ * Used ideas:
+ *      Adam Rogoyski    <rogoyski@cs.utexas.edu>
+ *      Dave Cinege      <dcinege@psychosis.com>
+ *      Jakub Jelinek (c) 1995
+ *      Erik Andersen    <andersen@codepoet.org> (Majorly adjusted for busybox)
  *
- * v 0.5  19990328      Initial release 
+ * This code is 'as is' with no warranty.
  *
- * Future plans: Simple file and path name completion. (like BASH)
  *
  */
 
    need to be added. This version was created on Debian GNU/Linux 2.x.
    Delete, Backspace, Home, End, and the arrow keys were tested
    to work in an Xterm and console. Ctrl-A also works as Home.
-   Ctrl-E also works as End. The binary size increase is <3K.
+   Ctrl-E also works as End.
 
-   Editting will not display correctly for lines greater then the 
-   terminal width. (more then one line.) However, history will.
+   Small bugs (simple effect):
+   - not true viewing if terminal size (x*y symbols) less
+     size (prompt + editor`s line + 2 symbols)
+   - not true viewing if length prompt less terminal width
  */
 
-#include "internal.h"
-#ifdef BB_FEATURE_SH_COMMAND_EDITING
 
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <termio.h>
+#include <sys/ioctl.h>
 #include <ctype.h>
 #include <signal.h>
+#include <limits.h>
+
+#include "../shell/cmdedit.h"
+
+
+#ifdef CONFIG_LOCALE_SUPPORT
+#define Isprint(c) isprint((c))
+#else
+#define Isprint(c) ( (c) >= ' ' && (c) != ((unsigned char)'\233') )
+#endif
+
+#ifdef TEST
+
+/* pretect redefined for test */
+#undef CONFIG_FEATURE_COMMAND_EDITING
+#undef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+#undef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+#undef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+#undef CONFIG_FEATURE_CLEAN_UP
+
+#define CONFIG_FEATURE_COMMAND_EDITING
+#define CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+#define CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+#define CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+#define CONFIG_FEATURE_CLEAN_UP
+
+#endif  /* TEST */
+
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+#include <dirent.h>
+#include <sys/stat.h>
+#endif
 
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
 
-#define  MAX_HISTORY   15              /* Maximum length of the linked list for the command line history */
+#if defined(CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION) || defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
+#define CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+#endif
+
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+#include "pwd_.h"
+#endif  /* advanced FEATURES */
+
+
+/* Maximum length of the linked list for the command line history */
+#ifndef CONFIG_FEATURE_COMMAND_HISTORY
+#define MAX_HISTORY   15
+#else
+#define MAX_HISTORY   CONFIG_FEATURE_COMMAND_HISTORY
+#endif
 
-#define ESC    27
-#define DEL    127
-#define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0)
-#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
+#if MAX_HISTORY < 1
+#warning cmdedit: You set MAX_HISTORY < 1. The history algorithm switched off.
+#else
+static char *history[MAX_HISTORY+1]; /* history + current */
+/* saved history lines */
+static int n_history;
+/* current pointer to history line */
+static int cur_history;
+#endif
 
-static struct history *his_front = NULL;       /* First element in command line list */
-static struct history *his_end = NULL; /* Last element in command line list */
-static struct termio old_term, new_term;       /* Current termio and the previous termio before starting ash */
+#include <termios.h>
+#define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
+#define getTermSettings(fd,argp) tcgetattr(fd, argp);
 
-static int history_counter = 0;        /* Number of commands in history list */
-static int reset_term = 0;             /* Set to true if the terminal needs to be reset upon exit */
-char *parsenextc;                              /* copy of parsefile->nextc */
+/* Current termio and the previous termio before starting sh */
+static struct termios initial_settings, new_settings;
 
-struct history {
-       char *s;
-       struct history *p;
-       struct history *n;
+
+static
+volatile int cmdedit_termw = 80;        /* actual terminal width */
+static
+volatile int handlers_sets = 0; /* Set next bites: */
+
+enum {
+       SET_ATEXIT = 1,         /* when atexit() has been called
+                                  and get euid,uid,gid to fast compare */
+       SET_WCHG_HANDLERS = 2,  /* winchg signal handler */
+       SET_RESET_TERM = 4,     /* if the terminal needs to be reset upon exit */
 };
 
 
-/* Version of write which resumes after a signal is caught.  */
-int xwrite(int fd, char *buf, int nbytes)
+static int cmdedit_x;           /* real x terminal position */
+static int cmdedit_y;           /* pseudoreal y terminal position */
+static int cmdedit_prmt_len;    /* lenght prompt without colores string */
+
+static int cursor;              /* required global for signal handler */
+static int len;                 /* --- "" - - "" - -"- --""-- --""--- */
+static char *command_ps;        /* --- "" - - "" - -"- --""-- --""--- */
+static
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
+       const
+#endif
+char *cmdedit_prompt;           /* --- "" - - "" - -"- --""-- --""--- */
+
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+static char *user_buf = "";
+static char *home_pwd_buf = "";
+static int my_euid;
+#endif
+
+#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
+static char *hostname_buf;
+static int num_ok_lines = 1;
+#endif
+
+
+#ifdef  CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+
+#ifndef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+static int my_euid;
+#endif
+
+static int my_uid;
+static int my_gid;
+
+#endif  /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */
+
+static void cmdedit_setwidth(int w, int redraw_flg);
+
+static void win_changed(int nsig)
 {
-       int ntry;
-       int i;
-       int n;
+       static sighandler_t previous_SIGWINCH_handler;  /* for reset */
 
-       n = nbytes;
-       ntry = 0;
-       for (;;) {
-               i = write(fd, buf, n);
-               if (i > 0) {
-                       if ((n -= i) <= 0)
-                               return nbytes;
-                       buf += i;
-                       ntry = 0;
-               } else if (i == 0) {
-                       if (++ntry > 10)
-                               return nbytes - n;
-               } else if (errno != EINTR) {
-                       return -1;
+       /*   emulate      || signal call */
+       if (nsig == -SIGWINCH || nsig == SIGWINCH) {
+               int width = 0;
+               get_terminal_width_height(0, &width, NULL);
+               cmdedit_setwidth(width, nsig == SIGWINCH);
+       }
+       /* Unix not all standart in recall signal */
+
+       if (nsig == -SIGWINCH)          /* save previous handler   */
+               previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
+       else if (nsig == SIGWINCH)      /* signaled called handler */
+               signal(SIGWINCH, win_changed);  /* set for next call       */
+       else                                            /* nsig == 0 */
+               /* set previous handler    */
+               signal(SIGWINCH, previous_SIGWINCH_handler);    /* reset    */
+}
+
+static void cmdedit_reset_term(void)
+{
+       if ((handlers_sets & SET_RESET_TERM) != 0) {
+/* sparc and other have broken termios support: use old termio handling. */
+               setTermSettings(STDIN_FILENO, (void *) &initial_settings);
+               handlers_sets &= ~SET_RESET_TERM;
+       }
+       if ((handlers_sets & SET_WCHG_HANDLERS) != 0) {
+               /* reset SIGWINCH handler to previous (default) */
+               win_changed(0);
+               handlers_sets &= ~SET_WCHG_HANDLERS;
+       }
+       fflush(stdout);
+}
+
+
+/* special for recount position for scroll and remove terminal margin effect */
+static void cmdedit_set_out_char(int next_char)
+{
+
+       int c = (int)((unsigned char) command_ps[cursor]);
+
+       if (c == 0)
+               c = ' ';        /* destroy end char? */
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+       if (!Isprint(c)) {      /* Inverse put non-printable characters */
+               if (c >= 128)
+                       c -= 128;
+               if (c < ' ')
+                       c += '@';
+               if (c == 127)
+                       c = '?';
+               printf("\033[7m%c\033[0m", c);
+       } else
+#endif
+               putchar(c);
+       if (++cmdedit_x >= cmdedit_termw) {
+               /* terminal is scrolled down */
+               cmdedit_y++;
+               cmdedit_x = 0;
+
+               if (!next_char)
+                       next_char = ' ';
+               /* destroy "(auto)margin" */
+               putchar(next_char);
+               putchar('\b');
+       }
+       cursor++;
+}
+
+/* Move to end line. Bonus: rewrite line from cursor */
+static void input_end(void)
+{
+       while (cursor < len)
+               cmdedit_set_out_char(0);
+}
+
+/* Go to the next line */
+static void goto_new_line(void)
+{
+       input_end();
+       if (cmdedit_x)
+               putchar('\n');
+}
+
+
+static inline void out1str(const char *s)
+{
+       if ( s )
+               fputs(s, stdout);
+}
+
+static inline void beep(void)
+{
+       putchar('\007');
+}
+
+/* Move back one character */
+/* special for slow terminal */
+static void input_backward(int num)
+{
+       if (num > cursor)
+               num = cursor;
+       cursor -= num;          /* new cursor (in command, not terminal) */
+
+       if (cmdedit_x >= num) {         /* no to up line */
+               cmdedit_x -= num;
+               if (num < 4)
+                       while (num-- > 0)
+                               putchar('\b');
+
+               else
+                       printf("\033[%dD", num);
+       } else {
+               int count_y;
+
+               if (cmdedit_x) {
+                       putchar('\r');          /* back to first terminal pos.  */
+                       num -= cmdedit_x;       /* set previous backward        */
                }
+               count_y = 1 + num / cmdedit_termw;
+               printf("\033[%dA", count_y);
+               cmdedit_y -= count_y;
+               /*  require  forward  after  uping   */
+               cmdedit_x = cmdedit_termw * count_y - num;
+               printf("\033[%dC", cmdedit_x);  /* set term cursor   */
        }
 }
 
+static void put_prompt(void)
+{
+       out1str(cmdedit_prompt);
+       cmdedit_x = cmdedit_prmt_len;   /* count real x terminal position */
+       cursor = 0;
+       cmdedit_y = 0;                  /* new quasireal y */
+}
 
-/* Version of ioctl that retries after a signal is caught.  */
-int xioctl(int fd, unsigned long request, char *arg)
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
+static void parse_prompt(const char *prmt_ptr)
 {
-       int i;
+       cmdedit_prompt = prmt_ptr;
+       cmdedit_prmt_len = strlen(prmt_ptr);
+       put_prompt();
+}
+#else
+static void parse_prompt(const char *prmt_ptr)
+{
+       int prmt_len = 0;
+       size_t cur_prmt_len = 0;
+       char  flg_not_length = '[';
+       char *prmt_mem_ptr = xcalloc(1, 1);
+       char *pwd_buf = xgetcwd(0);
+       char  buf2[PATH_MAX + 1];
+       char  buf[2];
+       char  c;
+       char *pbuf;
+
+       if (!pwd_buf) {
+               pwd_buf=(char *)bb_msg_unknown;
+       }
 
-       while ((i = ioctl(fd, request, arg)) == -1 && errno == EINTR);
-       return i;
+       while (*prmt_ptr) {
+               pbuf    = buf;
+               pbuf[1] = 0;
+               c = *prmt_ptr++;
+               if (c == '\\') {
+                       const char *cp = prmt_ptr;
+                       int l;
+
+                       c = bb_process_escape_sequence(&prmt_ptr);
+                       if(prmt_ptr==cp) {
+                         if (*cp == 0)
+                               break;
+                         c = *prmt_ptr++;
+                         switch (c) {
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+                         case 'u':
+                               pbuf = user_buf;
+                               break;
+#endif
+                         case 'h':
+                               pbuf = hostname_buf;
+                               if (pbuf == 0) {
+                                       pbuf = xcalloc(256, 1);
+                                       if (gethostname(pbuf, 255) < 0) {
+                                               strcpy(pbuf, "?");
+                                       } else {
+                                               char *s = strchr(pbuf, '.');
+
+                                               if (s)
+                                                       *s = 0;
+                                       }
+                                       hostname_buf = pbuf;
+                               }
+                               break;
+                         case '$':
+                               c = my_euid == 0 ? '#' : '$';
+                               break;
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+                         case 'w':
+                               pbuf = pwd_buf;
+                               l = strlen(home_pwd_buf);
+                               if (home_pwd_buf[0] != 0 &&
+                                   strncmp(home_pwd_buf, pbuf, l) == 0 &&
+                                   (pbuf[l]=='/' || pbuf[l]=='\0') &&
+                                   strlen(pwd_buf+l)<PATH_MAX) {
+                                       pbuf = buf2;
+                                       *pbuf = '~';
+                                       strcpy(pbuf+1, pwd_buf+l);
+                                       }
+                               break;
+#endif
+                         case 'W':
+                               pbuf = pwd_buf;
+                               cp = strrchr(pbuf,'/');
+                               if ( (cp != NULL) && (cp != pbuf) )
+                                       pbuf += (cp-pbuf)+1;
+                               break;
+                         case '!':
+                               snprintf(pbuf = buf2, sizeof(buf2), "%d", num_ok_lines);
+                               break;
+                         case 'e': case 'E':     /* \e \E = \033 */
+                               c = '\033';
+                               break;
+                         case 'x': case 'X':
+                               for (l = 0; l < 3;) {
+                                       int h;
+                                       buf2[l++] = *prmt_ptr;
+                                       buf2[l] = 0;
+                                       h = strtol(buf2, &pbuf, 16);
+                                       if (h > UCHAR_MAX || (pbuf - buf2) < l) {
+                                               l--;
+                                               break;
+                                       }
+                                       prmt_ptr++;
+                               }
+                               buf2[l] = 0;
+                               c = (char)strtol(buf2, 0, 16);
+                               if(c==0)
+                                       c = '?';
+                               pbuf = buf;
+                               break;
+                         case '[': case ']':
+                               if (c == flg_not_length) {
+                                       flg_not_length = flg_not_length == '[' ? ']' : '[';
+                                       continue;
+                               }
+                               break;
+                         }
+                       }
+               }
+               if(pbuf == buf)
+                       *pbuf = 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);
+       }
+       if(pwd_buf!=(char *)bb_msg_unknown)
+               free(pwd_buf);
+       cmdedit_prompt = prmt_mem_ptr;
+       put_prompt();
 }
+#endif
 
 
-void cmdedit_reset_term(void)
+/* draw prompt, editor line, and clear tail */
+static void redraw(int y, int back_cursor)
 {
-       if (reset_term)
-               xioctl(fileno(stdin), TCSETA, (void *) &old_term);
+       if (y > 0)                              /* up to start y */
+               printf("\033[%dA", y);
+       putchar('\r');
+       put_prompt();
+       input_end();                            /* rewrite */
+       printf("\033[J");                       /* destroy tail after cursor */
+       input_backward(back_cursor);
 }
 
-void prepareToDie(int sig)
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+#define DELBUFSIZ 128
+static char *delbuf;  /* a (malloced) place to store deleted characters */
+static char *delp;
+static char newdelflag;      /* whether delbuf should be reused yet */
+#endif
+
+/* Delete the char in front of the cursor, optionally saving it
+ * for later putback */
+static void input_delete(int save)
 {
-       cmdedit_reset_term();
-       fprintf(stdout, "\n");
-       exit(TRUE);
+       int j = cursor;
+
+       if (j == len)
+               return;
+
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+       if (save) {
+               if (newdelflag) {
+                       if (!delbuf)
+                               delbuf = malloc(DELBUFSIZ);
+                       /* safe if malloc fails */
+                       delp = delbuf;
+                       newdelflag = 0;
+               }
+               if (delbuf && (delp - delbuf < DELBUFSIZ))
+                       *delp++ = command_ps[j];
+       }
+#endif
+
+       strcpy(command_ps + j, command_ps + j + 1);
+       len--;
+       input_end();                    /* rewrite new line */
+       cmdedit_set_out_char(0);        /* destroy end char */
+       input_backward(cursor - j);     /* back to old pos cursor */
 }
 
-void input_home(int outputFd, int *cursor)
-{                                                              /* Command line input routines */
-       while (*cursor > 0) {
-               xwrite(outputFd, "\b", 1);
-               --*cursor;
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+static void put(void)
+{
+       int ocursor, j = delp - delbuf;
+       if (j == 0)
+               return;
+       ocursor = cursor;
+       /* open hole and then fill it */
+       memmove(command_ps + cursor + j, command_ps + cursor, len - cursor + 1);
+       strncpy(command_ps + cursor, delbuf, j);
+       len += j;
+       input_end();                    /* rewrite new line */
+       input_backward(cursor-ocursor-j+1); /* at end of new text */
+}
+#endif
+
+/* Delete the char in back of the cursor */
+static void input_backspace(void)
+{
+       if (cursor > 0) {
+               input_backward(1);
+               input_delete(0);
        }
 }
 
 
-void input_delete(int outputFd, int cursor)
+/* Move forward one character */
+static void input_forward(void)
 {
-       int j = 0;
+       if (cursor < len)
+               cmdedit_set_out_char(command_ps[cursor + 1]);
+}
 
-       memmove(parsenextc + cursor, parsenextc + cursor + 1,
-                       BUFSIZ - cursor - 1);
-       for (j = cursor; j < (BUFSIZ - 1); j++) {
-               if (!*(parsenextc + j))
+static void cmdedit_setwidth(int w, int redraw_flg)
+{
+       cmdedit_termw = cmdedit_prmt_len + 2;
+       if (w <= cmdedit_termw) {
+               cmdedit_termw = cmdedit_termw % w;
+       }
+       if (w > cmdedit_termw) {
+               cmdedit_termw = w;
+
+               if (redraw_flg) {
+                       /* new y for current cursor */
+                       int new_y = (cursor + cmdedit_prmt_len) / w;
+
+                       /* redraw */
+                       redraw((new_y >= cmdedit_y ? new_y : cmdedit_y), len - cursor);
+                       fflush(stdout);
+               }
+       }
+}
+
+static void cmdedit_init(void)
+{
+       cmdedit_prmt_len = 0;
+       if ((handlers_sets & SET_WCHG_HANDLERS) == 0) {
+               /* emulate usage handler to set handler and call yours work */
+               win_changed(-SIGWINCH);
+               handlers_sets |= SET_WCHG_HANDLERS;
+       }
+
+       if ((handlers_sets & SET_ATEXIT) == 0) {
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+               struct passwd *entry;
+
+               my_euid = geteuid();
+               entry = getpwuid(my_euid);
+               if (entry) {
+                       user_buf = bb_xstrdup(entry->pw_name);
+                       home_pwd_buf = bb_xstrdup(entry->pw_dir);
+               }
+#endif
+
+#ifdef  CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+
+#ifndef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+               my_euid = geteuid();
+#endif
+               my_uid = getuid();
+               my_gid = getgid();
+#endif  /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */
+               handlers_sets |= SET_ATEXIT;
+               atexit(cmdedit_reset_term);     /* be sure to do this only once */
+       }
+}
+
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+
+static char **matches;
+static int num_matches;
+static char *add_char_to_match;
+
+static void add_match(char *matched, int add_char)
+{
+       int nm = num_matches;
+       int nm1 = nm + 1;
+
+       matches = xrealloc(matches, nm1 * sizeof(char *));
+       add_char_to_match = xrealloc(add_char_to_match, nm1);
+       matches[nm] = matched;
+       add_char_to_match[nm] = (char)add_char;
+       num_matches++;
+}
+
+static int is_execute(const struct stat *st)
+{
+       if ((!my_euid && (st->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) ||
+               (my_uid == st->st_uid && (st->st_mode & S_IXUSR)) ||
+               (my_gid == st->st_gid && (st->st_mode & S_IXGRP)) ||
+               (st->st_mode & S_IXOTH)) return TRUE;
+       return FALSE;
+}
+
+#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+
+static void username_tab_completion(char *ud, char *with_shash_flg)
+{
+       struct passwd *entry;
+       int userlen;
+
+       ud++;                           /* ~user/... to user/... */
+       userlen = strlen(ud);
+
+       if (with_shash_flg) {           /* "~/..." or "~user/..." */
+               char *sav_ud = ud - 1;
+               char *home = 0;
+               char *temp;
+
+               if (*ud == '/') {       /* "~/..."     */
+                       home = home_pwd_buf;
+               } else {
+                       /* "~user/..." */
+                       temp = strchr(ud, '/');
+                       *temp = 0;              /* ~user\0 */
+                       entry = getpwnam(ud);
+                       *temp = '/';            /* restore ~user/... */
+                       ud = temp;
+                       if (entry)
+                               home = entry->pw_dir;
+               }
+               if (home) {
+                       if ((userlen + strlen(home) + 1) < BUFSIZ) {
+                               char temp2[BUFSIZ];     /* argument size */
+
+                               /* /home/user/... */
+                               sprintf(temp2, "%s%s", home, ud);
+                               strcpy(sav_ud, temp2);
+                       }
+               }
+       } else {
+               /* "~[^/]*" */
+               setpwent();
+
+               while ((entry = getpwent()) != NULL) {
+                       /* Null usernames should result in all users as possible completions. */
+                       if ( /*!userlen || */ !strncmp(ud, entry->pw_name, userlen)) {
+                               add_match(bb_xasprintf("~%s", entry->pw_name), '/');
+                       }
+               }
+
+               endpwent();
+       }
+}
+#endif  /* CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION */
+
+enum {
+       FIND_EXE_ONLY = 0,
+       FIND_DIR_ONLY = 1,
+       FIND_FILE_ONLY = 2,
+};
+
+#ifdef CONFIG_ASH
+const char *cmdedit_path_lookup;
+#else
+#define cmdedit_path_lookup getenv("PATH")
+#endif
+
+static int path_parse(char ***p, int flags)
+{
+       int npth;
+       const char *tmp;
+       const char *pth;
+
+       /* if not setenv PATH variable, to search cur dir "." */
+       if (flags != FIND_EXE_ONLY || (pth = cmdedit_path_lookup) == 0 ||
+               /* PATH=<empty> or PATH=:<empty> */
+               *pth == 0 || (*pth == ':' && *(pth + 1) == 0)) {
+               return 1;
+       }
+
+       tmp = pth;
+       npth = 0;
+
+       for (;;) {
+               npth++;                 /* count words is + 1 count ':' */
+               tmp = strchr(tmp, ':');
+               if (tmp) {
+                       if (*++tmp == 0)
+                               break;  /* :<empty> */
+               } else
                        break;
-               else
-                       xwrite(outputFd, (parsenextc + j), 1);
        }
 
-       xwrite(outputFd, " \b", 2);
+       *p = xmalloc(npth * sizeof(char *));
+
+       tmp = pth;
+       (*p)[0] = bb_xstrdup(tmp);
+       npth = 1;                       /* count words is + 1 count ':' */
+
+       for (;;) {
+               tmp = strchr(tmp, ':');
+               if (tmp) {
+                       (*p)[0][(tmp - pth)] = 0;       /* ':' -> '\0' */
+                       if (*++tmp == 0)
+                               break;                  /* :<empty> */
+               } else
+                       break;
+               (*p)[npth++] = &(*p)[0][(tmp - pth)];   /* p[next]=p[0][&'\0'+1] */
+       }
 
-       while (j-- > cursor)
-               xwrite(outputFd, "\b", 1);
+       return npth;
 }
 
+static char *add_quote_for_spec_chars(char *found, int add)
+{
+       int l = 0;
+       char *s = xmalloc((strlen(found) + 1) * 2);
+
+       while (*found) {
+               if (strchr(" `\"#$%^&*()=+{}[]:;\'|\\<>", *found))
+                       s[l++] = '\\';
+               s[l++] = *found++;
+       }
+       if(add)
+           s[l++] = (char)add;
+       s[l] = 0;
+       return s;
+}
 
-void input_end(int outputFd, int *cursor, int len)
+static void exe_n_cwd_tab_completion(char *command, int type)
 {
-       while (*cursor < len) {
-               xwrite(outputFd, "\033[C", 3);
-               ++*cursor;
+       DIR *dir;
+       struct dirent *next;
+       char dirbuf[BUFSIZ];
+       struct stat st;
+       char *path1[1];
+       char **paths = path1;
+       int npaths;
+       int i;
+       char *found;
+       char *pfind = strrchr(command, '/');
+
+       path1[0] = ".";
+
+       if (pfind == NULL) {
+               /* no dir, if flags==EXE_ONLY - get paths, else "." */
+               npaths = path_parse(&paths, type);
+               pfind = command;
+       } else {
+               /* with dir */
+               /* save for change */
+               strcpy(dirbuf, command);
+               /* set dir only */
+               dirbuf[(pfind - command) + 1] = 0;
+#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+               if (dirbuf[0] == '~')   /* ~/... or ~user/... */
+                       username_tab_completion(dirbuf, dirbuf);
+#endif
+               /* "strip" dirname in command */
+               pfind++;
+
+               paths[0] = dirbuf;
+               npaths = 1;                             /* only 1 dir */
+       }
+
+       for (i = 0; i < npaths; i++) {
+
+               dir = opendir(paths[i]);
+               if (!dir)                       /* Don't print an error */
+                       continue;
+
+               while ((next = readdir(dir)) != NULL) {
+                       char *str_found = next->d_name;
+                       int add_chr = 0;
+
+                       /* matched ? */
+                       if (strncmp(str_found, pfind, strlen(pfind)))
+                               continue;
+                       /* not see .name without .match */
+                       if (*str_found == '.' && *pfind == 0) {
+                               if (*paths[i] == '/' && paths[i][1] == 0
+                                       && str_found[1] == 0) str_found = "";   /* only "/" */
+                               else
+                                       continue;
+                       }
+                       found = concat_path_file(paths[i], str_found);
+                       /* hmm, remover in progress? */
+                       if (stat(found, &st) < 0)
+                               goto cont;
+                       /* find with dirs ? */
+                       if (paths[i] != dirbuf)
+                               strcpy(found, next->d_name);    /* only name */
+                       if (S_ISDIR(st.st_mode)) {
+                               /* name is directory      */
+                               char *e = found + strlen(found) - 1;
+
+                               add_chr = '/';
+                               if(*e == '/')
+                                       *e = '\0';
+                       } else {
+                               /* not put found file if search only dirs for cd */
+                               if (type == FIND_DIR_ONLY)
+                                       goto cont;
+                               if (type == FIND_FILE_ONLY ||
+                                       (type == FIND_EXE_ONLY && is_execute(&st)))
+                                       add_chr = ' ';
+                       }
+                       /* Add it to the list */
+                       add_match(found, add_chr);
+                       continue;
+cont:
+                       free(found);
+               }
+               closedir(dir);
+       }
+       if (paths != path1) {
+               free(paths[0]);                 /* allocated memory only in first member */
+               free(paths);
        }
 }
 
 
-void input_backspace(int outputFd, int *cursor, int *len)
+#define QUOT    (UCHAR_MAX+1)
+
+#define collapse_pos(is, in) { \
+       memmove(int_buf+(is), int_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); \
+       memmove(pos_buf+(is), pos_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); }
+
+static int find_match(char *matchBuf, int *len_with_quotes)
 {
-       int j = 0;
+       int i, j;
+       int command_mode;
+       int c, c2;
+       int int_buf[BUFSIZ + 1];
+       int pos_buf[BUFSIZ + 1];
+
+       /* set to integer dimension characters and own positions */
+       for (i = 0;; i++) {
+               int_buf[i] = (int) ((unsigned char) matchBuf[i]);
+               if (int_buf[i] == 0) {
+                       pos_buf[i] = -1;        /* indicator end line */
+                       break;
+               } else
+                       pos_buf[i] = i;
+       }
 
-       if (*cursor > 0) {
-               xwrite(outputFd, "\b \b", 3);
-               --*cursor;
-               memmove(parsenextc + *cursor, parsenextc + *cursor + 1,
-                               BUFSIZ - *cursor + 1);
+       /* mask \+symbol and convert '\t' to ' ' */
+       for (i = j = 0; matchBuf[i]; i++, j++)
+               if (matchBuf[i] == '\\') {
+                       collapse_pos(j, j + 1);
+                       int_buf[j] |= QUOT;
+                       i++;
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+                       if (matchBuf[i] == '\t')        /* algorithm equivalent */
+                               int_buf[j] = ' ' | QUOT;
+#endif
+               }
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+               else if (matchBuf[i] == '\t')
+                       int_buf[j] = ' ';
+#endif
+
+       /* mask "symbols" or 'symbols' */
+       c2 = 0;
+       for (i = 0; int_buf[i]; i++) {
+               c = int_buf[i];
+               if (c == '\'' || c == '"') {
+                       if (c2 == 0)
+                               c2 = c;
+                       else {
+                               if (c == c2)
+                                       c2 = 0;
+                               else
+                                       int_buf[i] |= QUOT;
+                       }
+               } else if (c2 != 0 && c != '$')
+                       int_buf[i] |= QUOT;
+       }
 
-               for (j = *cursor; j < (BUFSIZ - 1); j++) {
-                       if (!*(parsenextc + j))
+       /* skip commands with arguments if line have commands delimiters */
+       /* ';' ';;' '&' '|' '&&' '||' but `>&' `<&' `>|' */
+       for (i = 0; int_buf[i]; i++) {
+               c = int_buf[i];
+               c2 = int_buf[i + 1];
+               j = i ? int_buf[i - 1] : -1;
+               command_mode = 0;
+               if (c == ';' || c == '&' || c == '|') {
+                       command_mode = 1 + (c == c2);
+                       if (c == '&') {
+                               if (j == '>' || j == '<')
+                                       command_mode = 0;
+                       } else if (c == '|' && j == '>')
+                               command_mode = 0;
+               }
+               if (command_mode) {
+                       collapse_pos(0, i + command_mode);
+                       i = -1;                         /* hack incremet */
+               }
+       }
+       /* collapse `command...` */
+       for (i = 0; int_buf[i]; i++)
+               if (int_buf[i] == '`') {
+                       for (j = i + 1; int_buf[j]; j++)
+                               if (int_buf[j] == '`') {
+                                       collapse_pos(i, j + 1);
+                                       j = 0;
+                                       break;
+                               }
+                       if (j) {
+                               /* not found close ` - command mode, collapse all previous */
+                               collapse_pos(0, i + 1);
                                break;
+                       } else
+                               i--;                    /* hack incremet */
+               }
+
+       /* collapse (command...(command...)...) or {command...{command...}...} */
+       c = 0;                                          /* "recursive" level */
+       c2 = 0;
+       for (i = 0; int_buf[i]; i++)
+               if (int_buf[i] == '(' || int_buf[i] == '{') {
+                       if (int_buf[i] == '(')
+                               c++;
                        else
-                               xwrite(outputFd, (parsenextc + j), 1);
+                               c2++;
+                       collapse_pos(0, i + 1);
+                       i = -1;                         /* hack incremet */
+               }
+       for (i = 0; pos_buf[i] >= 0 && (c > 0 || c2 > 0); i++)
+               if ((int_buf[i] == ')' && c > 0) || (int_buf[i] == '}' && c2 > 0)) {
+                       if (int_buf[i] == ')')
+                               c--;
+                       else
+                               c2--;
+                       collapse_pos(0, i + 1);
+                       i = -1;                         /* hack incremet */
+               }
+
+       /* skip first not quote space */
+       for (i = 0; int_buf[i]; i++)
+               if (int_buf[i] != ' ')
+                       break;
+       if (i)
+               collapse_pos(0, i);
+
+       /* set find mode for completion */
+       command_mode = FIND_EXE_ONLY;
+       for (i = 0; int_buf[i]; i++)
+               if (int_buf[i] == ' ' || int_buf[i] == '<' || int_buf[i] == '>') {
+                       if (int_buf[i] == ' ' && command_mode == FIND_EXE_ONLY
+                               && matchBuf[pos_buf[0]]=='c'
+                               && matchBuf[pos_buf[1]]=='d' )
+                               command_mode = FIND_DIR_ONLY;
+                       else {
+                               command_mode = FIND_FILE_ONLY;
+                               break;
+                       }
+               }
+       /* "strlen" */
+       for (i = 0; int_buf[i]; i++);
+       /* find last word */
+       for (--i; i >= 0; i--) {
+               c = int_buf[i];
+               if (c == ' ' || c == '<' || c == '>' || c == '|' || c == '&') {
+                       collapse_pos(0, i + 1);
+                       break;
+               }
+       }
+       /* skip first not quoted '\'' or '"' */
+       for (i = 0; int_buf[i] == '\'' || int_buf[i] == '"'; i++);
+       /* collapse quote or unquote // or /~ */
+       while ((int_buf[i] & ~QUOT) == '/' &&
+                       ((int_buf[i + 1] & ~QUOT) == '/'
+                        || (int_buf[i + 1] & ~QUOT) == '~')) {
+               i++;
+       }
+
+       /* set only match and destroy quotes */
+       j = 0;
+       for (c = 0; pos_buf[i] >= 0; i++) {
+               matchBuf[c++] = matchBuf[pos_buf[i]];
+               j = pos_buf[i] + 1;
+       }
+       matchBuf[c] = 0;
+       /* old lenght matchBuf with quotes symbols */
+       *len_with_quotes = j ? j - pos_buf[0] : 0;
+
+       return command_mode;
+}
+
+/*
+   display by column original ideas from ls applet,
+   very optimize by my :)
+*/
+static void showfiles(void)
+{
+       int ncols, row;
+       int column_width = 0;
+       int nfiles = num_matches;
+       int nrows = nfiles;
+       char str_add_chr[2];
+       int l;
+
+       /* find the longest file name-  use that as the column width */
+       for (row = 0; row < nrows; row++) {
+               l = strlen(matches[row]);
+               if(add_char_to_match[row])
+                   l++;
+               if (column_width < l)
+                       column_width = l;
+       }
+       column_width += 2;              /* min space for columns */
+       ncols = cmdedit_termw / column_width;
+
+       if (ncols > 1) {
+               nrows /= ncols;
+               if(nfiles % ncols)
+                       nrows++;        /* round up fractionals */
+       } else {
+               ncols = 1;
+       }
+       str_add_chr[1] = 0;
+       for (row = 0; row < nrows; row++) {
+               int n = row;
+               int nc;
+               int acol;
+
+               for(nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) {
+                       str_add_chr[0] = add_char_to_match[n];
+                       acol = str_add_chr[0] ? column_width - 1 : column_width;
+                       printf("%s%s", matches[n], str_add_chr);
+                       l = strlen(matches[n]);
+                       while(l < acol) {
+                           putchar(' ');
+                           l++;
+                       }
                }
+               str_add_chr[0] = add_char_to_match[n];
+               printf("%s%s\n", matches[n], str_add_chr);
+       }
+}
+
+
+static void input_tab(int *lastWasTab)
+{
+       /* Do TAB completion */
+       if (lastWasTab == 0) {          /* free all memory */
+               if (matches) {
+                       while (num_matches > 0)
+                               free(matches[--num_matches]);
+                       free(matches);
+                       matches = (char **) NULL;
+                       free(add_char_to_match);
+                       add_char_to_match = NULL;
+               }
+               return;
+       }
+       if (! *lastWasTab) {
+
+               char *tmp, *tmp1;
+               int len_found;
+               char matchBuf[BUFSIZ];
+               int find_type;
+               int recalc_pos;
+
+               *lastWasTab = TRUE;             /* flop trigger */
 
-               xwrite(outputFd, " \b", 2);
+               /* Make a local copy of the string -- up
+                * to the position of the cursor */
+               tmp = strncpy(matchBuf, command_ps, cursor);
+               tmp[cursor] = 0;
 
-               while (j-- > *cursor)
-                       xwrite(outputFd, "\b", 1);
+               find_type = find_match(matchBuf, &recalc_pos);
 
-               --*len;
+               /* Free up any memory already allocated */
+               input_tab(0);
+
+#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+               /* If the word starts with `~' and there is no slash in the word,
+                * then try completing this word as a username. */
+
+               if (matchBuf[0] == '~' && strchr(matchBuf, '/') == 0)
+                       username_tab_completion(matchBuf, NULL);
+               if (!matches)
+#endif
+               /* Try to match any executable in our path and everything
+                * in the current working directory that matches.  */
+                       exe_n_cwd_tab_completion(matchBuf, find_type);
+               /* Remove duplicate found and sort */
+               if(matches) {
+                       int i, j, n, srt;
+                       /* bubble */
+                       n = num_matches;
+                       for(i=0; i<(n-1); i++)
+                           for(j=i+1; j<n; j++)
+                               if(matches[i]!=NULL && matches[j]!=NULL) {
+                                   srt = strcmp(matches[i], matches[j]);
+                                   if(srt == 0) {
+                                       free(matches[j]);
+                                       matches[j]=0;
+                                   } else if(srt > 0) {
+                                       tmp1 = matches[i];
+                                       matches[i] = matches[j];
+                                       matches[j] = tmp1;
+                                       srt = add_char_to_match[i];
+                                       add_char_to_match[i] = add_char_to_match[j];
+                                       add_char_to_match[j] = srt;
+                                   }
+                               }
+                       j = n;
+                       n = 0;
+                       for(i=0; i<j; i++)
+                           if(matches[i]) {
+                               matches[n]=matches[i];
+                               add_char_to_match[n]=add_char_to_match[i];
+                               n++;
+                           }
+                       num_matches = n;
+               }
+               /* Did we find exactly one match? */
+               if (!matches || num_matches > 1) {
+
+                       beep();
+                       if (!matches)
+                               return;         /* not found */
+                       /* find minimal match */
+                       tmp1 = bb_xstrdup(matches[0]);
+                       for (tmp = tmp1; *tmp; tmp++)
+                               for (len_found = 1; len_found < num_matches; len_found++)
+                                       if (matches[len_found][(tmp - tmp1)] != *tmp) {
+                                               *tmp = 0;
+                                               break;
+                                       }
+                       if (*tmp1 == 0) {        /* have unique */
+                               free(tmp1);
+                               return;
+                       }
+                       tmp = add_quote_for_spec_chars(tmp1, 0);
+                       free(tmp1);
+               } else {                        /* one match */
+                       tmp = add_quote_for_spec_chars(matches[0], add_char_to_match[0]);
+                       /* for next completion current found */
+                       *lastWasTab = FALSE;
+               }
+               len_found = strlen(tmp);
+               /* have space to placed match? */
+               if ((len_found - strlen(matchBuf) + len) < BUFSIZ) {
+
+                       /* before word for match   */
+                       command_ps[cursor - recalc_pos] = 0;
+                       /* save   tail line        */
+                       strcpy(matchBuf, command_ps + cursor);
+                       /* add    match            */
+                       strcat(command_ps, tmp);
+                       /* add    tail             */
+                       strcat(command_ps, matchBuf);
+                       /* back to begin word for match    */
+                       input_backward(recalc_pos);
+                       /* new pos                         */
+                       recalc_pos = cursor + len_found;
+                       /* new len                         */
+                       len = strlen(command_ps);
+                       /* write out the matched command   */
+                       redraw(cmdedit_y, len - recalc_pos);
+               }
+               free(tmp);
+       } else {
+               /* Ok -- the last char was a TAB.  Since they
+                * just hit TAB again, print a list of all the
+                * available choices... */
+               if (matches && num_matches > 0) {
+                       int sav_cursor = cursor;        /* change goto_new_line() */
+
+                       /* Go to the next line */
+                       goto_new_line();
+                       showfiles();
+                       redraw(0, len - sav_cursor);
+               }
        }
 }
+#endif  /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */
 
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
+#if MAX_HISTORY >= 1
+static void get_previous_history(void)
+{
+       if(command_ps[0] != 0 || history[cur_history] == 0) {
+               free(history[cur_history]);
+               history[cur_history] = bb_xstrdup(command_ps);
+       }
+       cur_history--;
+}
 
-char** username_completion_matches(char* command, int *num_matches)
+static int get_next_history(void)
 {
-       char **matches = (char **) NULL;
-       *num_matches=0;
-       fprintf(stderr, "\nin username_completion_matches\n");
-       return (matches);
+       int ch = cur_history;
+
+       if (ch < n_history) {
+               get_previous_history(); /* save the current history line */
+               return (cur_history = ch+1);
+       } else {
+               beep();
+               return 0;
+       }
 }
 
-#include <dirent.h>
-char** find_path_executable_n_cwd_matches(char* command, int *num_matches)
+#ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY
+void load_history ( const char *fromfile )
 {
-       char *dirName;
-       char **matches = (char **) NULL;
-       DIR *dir;
-       struct dirent *next;
-                       
-       matches = malloc( sizeof(char*)*50);
+       FILE *fp;
+       int hi;
 
-       /* Stick a wildcard onto the command, for later use */
-       strcat( command, "*");
+       /* cleanup old */
 
-       /* Now wall the current directory */
-       dirName = get_current_dir_name();
-       dir = opendir(dirName);
-       if (!dir) {
-               /* Don't print an error, just shut up and return */
-               *num_matches=0;
-               return (matches);
+       for(hi = n_history; hi > 0; ) {
+               hi--;
+               free ( history [hi] );
        }
-       while ((next = readdir(dir)) != NULL) {
 
-               /* Some quick sanity checks */
-               if ((strcmp(next->d_name, "..") == 0)
-                       || (strcmp(next->d_name, ".") == 0)) {
-                       continue;
-               } 
-               /* See if this matches */
-               if (check_wildcard_match(next->d_name, command) == TRUE) {
-                       /* Cool, found a match.  Add it to the list */
-                       matches[*num_matches] = malloc(strlen(next->d_name)+1);
-                       strcpy( matches[*num_matches], next->d_name);
-                       ++*num_matches;
-                       //matches = realloc( matches, sizeof(char*)*(*num_matches));
+       if (( fp = fopen ( fromfile, "r" ))) {
+
+               for ( hi = 0; hi < MAX_HISTORY; ) {
+                       char * hl = bb_get_chomped_line_from_file(fp);
+                       int l;
+
+                       if(!hl)
+                               break;
+                       l = strlen(hl);
+                       if(l >= BUFSIZ)
+                               hl[BUFSIZ-1] = 0;
+                       if(l == 0 || hl[0] == ' ') {
+                               free(hl);
+                               continue;
+                       }
+                       history [hi++] = hl;
                }
+               fclose ( fp );
        }
+       cur_history = n_history = hi;
+}
+
+void save_history ( const char *tofile )
+{
+       FILE *fp = fopen ( tofile, "w" );
+
+       if ( fp ) {
+               int i;
 
-       return (matches);
+               for ( i = 0; i < n_history; i++ ) {
+                       fprintf(fp, "%s\n", history [i]);
+               }
+               fclose ( fp );
+       }
 }
 #endif
 
+#endif
+
+enum {
+       ESC = 27,
+       DEL = 127,
+};
+
+
 /*
  * This function is used to grab a character buffer
  * from the input file descriptor and allows you to
- * a string with full command editing (sortof like
+ * a string with full command editing (sort of like
  * a mini readline).
  *
  * The following standard commands are not implemented:
@@ -242,424 +1264,666 @@ char** find_path_executable_n_cwd_matches(char* command, int *num_matches)
  * ESC-h -- Delete forward one word
  * CTL-t -- Transpose two characters
  *
- * Furthermore, the "vi" command editing keys are not implemented.
- *
- * TODO: implement TAB command completion. :)
+ * Minimalist vi-style command line editing available if configured.
+ *  vi mode implemented 2005 by Paul Fox <pgf@foxharp.boston.ma.us>
  *
  */
-extern int cmdedit_read_input(char* prompt, int inputFd, int outputFd,
-                                                         char command[BUFSIZ])
+
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+static int vi_mode;
+
+void setvimode ( int viflag )
 {
+       vi_mode = viflag;
+}
 
-       int nr = 0;
-       int len = 0;
-       int j = 0;
-       int cursor = 0;
-       int break_out = 0;
-       int ret = 0;
-       int lastWasTab = FALSE;
-       char c = 0;
-       struct history *hp = his_end;
-
-       memset(command, 0, sizeof(command));
-       parsenextc = command;
-       if (!reset_term) {
-               xioctl(inputFd, TCGETA, (void *) &old_term);
-               memcpy(&new_term, &old_term, sizeof(struct termio));
-
-               new_term.c_cc[VMIN] = 1;
-               new_term.c_cc[VTIME] = 0;
-               new_term.c_lflag &= ~ICANON;    /* unbuffered input */
-               new_term.c_lflag &= ~ECHO;
-               xioctl(inputFd, TCSETA, (void *) &new_term);
-               reset_term = 1;
-       } else {
-               xioctl(inputFd, TCSETA, (void *) &new_term);
+static void
+vi_Word_motion(char *command, int eat)
+{
+       while (cursor < len && !isspace(command[cursor]))
+               input_forward();
+       if (eat) while (cursor < len && isspace(command[cursor]))
+               input_forward();
+}
+
+static void
+vi_word_motion(char *command, int eat)
+{
+       if (isalnum(command[cursor]) || command[cursor] == '_') {
+               while (cursor < len &&
+                   (isalnum(command[cursor+1]) ||
+                               command[cursor+1] == '_'))
+                       input_forward();
+       } else if (ispunct(command[cursor])) {
+               while (cursor < len &&
+                   (ispunct(command[cursor+1])))
+                       input_forward();
+       }
+
+       if (cursor < len)
+               input_forward();
+
+       if (eat && cursor < len && isspace(command[cursor]))
+               while (cursor < len && isspace(command[cursor]))
+                       input_forward();
+}
+
+static void
+vi_End_motion(char *command)
+{
+       input_forward();
+       while (cursor < len && isspace(command[cursor]))
+               input_forward();
+       while (cursor < len-1 && !isspace(command[cursor+1]))
+               input_forward();
+}
+
+static void
+vi_end_motion(char *command)
+{
+       if (cursor >= len-1)
+               return;
+       input_forward();
+       while (cursor < len-1 && isspace(command[cursor]))
+               input_forward();
+       if (cursor >= len-1)
+               return;
+       if (isalnum(command[cursor]) || command[cursor] == '_') {
+               while (cursor < len-1 &&
+                   (isalnum(command[cursor+1]) ||
+                               command[cursor+1] == '_'))
+                       input_forward();
+       } else if (ispunct(command[cursor])) {
+               while (cursor < len-1 &&
+                   (ispunct(command[cursor+1])))
+                       input_forward();
+       }
+}
+
+static void
+vi_Back_motion(char *command)
+{
+       while (cursor > 0 && isspace(command[cursor-1]))
+               input_backward(1);
+       while (cursor > 0 && !isspace(command[cursor-1]))
+               input_backward(1);
+}
+
+static void
+vi_back_motion(char *command)
+{
+       if (cursor <= 0)
+               return;
+       input_backward(1);
+       while (cursor > 0 && isspace(command[cursor]))
+               input_backward(1);
+       if (cursor <= 0)
+               return;
+       if (isalnum(command[cursor]) || command[cursor] == '_') {
+               while (cursor > 0 &&
+                   (isalnum(command[cursor-1]) ||
+                               command[cursor-1] == '_'))
+                       input_backward(1);
+       } else if (ispunct(command[cursor])) {
+               while (cursor > 0 &&
+                   (ispunct(command[cursor-1])))
+                       input_backward(1);
        }
+}
+#endif
 
-       memset(parsenextc, 0, BUFSIZ);
+/*
+ * the emacs and vi modes share much of the code in the big
+ * command loop.  commands entered when in vi's command mode (aka
+ * "escape mode") get an extra bit added to distinguish them --
+ * this keeps them from being self-inserted.  this clutters the
+ * big switch a bit, but keeps all the code in one place.
+ */
+
+#define vbit 0x100
+
+/* leave out the "vi-mode"-only case labels if vi editing isn't
+ * configured. */
+#define vi_case(caselabel) USE_FEATURE_COMMAND_EDITING(caselabel)
+
+/* convert uppercase ascii to equivalent control char, for readability */
+#define CNTRL(uc_char) ((uc_char) - 0x40)
+
+
+int cmdedit_read_input(char *prompt, char command[BUFSIZ])
+{
+
+       int break_out = 0;
+       int lastWasTab = FALSE;
+       unsigned char c;
+       unsigned int ic;
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+       unsigned int prevc;
+       int vi_cmdmode = 0;
+#endif
+       /* prepare before init handlers */
+       cmdedit_y = 0;  /* quasireal y, not true work if line > xt*yt */
+       len = 0;
+       command_ps = command;
+
+       getTermSettings(0, (void *) &initial_settings);
+       memcpy(&new_settings, &initial_settings, sizeof(struct termios));
+       new_settings.c_lflag &= ~ICANON;        /* unbuffered input */
+       /* Turn off echoing and CTRL-C, so we can trap it */
+       new_settings.c_lflag &= ~(ECHO | ECHONL | ISIG);
+       /* Hmm, in linux c_cc[] not parsed if set ~ICANON */
+       new_settings.c_cc[VMIN] = 1;
+       new_settings.c_cc[VTIME] = 0;
+       /* Turn off CTRL-C, so we can trap it */
+#       ifndef _POSIX_VDISABLE
+#               define _POSIX_VDISABLE '\0'
+#       endif
+       new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
+       command[0] = 0;
+
+       setTermSettings(0, (void *) &new_settings);
+       handlers_sets |= SET_RESET_TERM;
+
+       /* Now initialize things */
+       cmdedit_init();
+       /* Print out the command prompt */
+       parse_prompt(prompt);
 
        while (1) {
 
-               if ((ret = read(inputFd, &c, 1)) < 1)
-                       return ret;
+               fflush(stdout);                 /* buffered out to fast */
+
+               if (safe_read(0, &c, 1) < 1)
+                       /* if we can't read input then exit */
+                       goto prepare_to_die;
 
-               fprintf(stderr, "\n\nkey=%d (%c)\n\n", c, c);
-               /* Go to the next line */
-               xwrite(outputFd, "\n", 1);
-               /* Rewrite the prompt */
-               xwrite(outputFd, prompt, strlen(prompt));
-               /* Rewrite the command */
-               xwrite(outputFd, parsenextc, len);
+               ic = c;
 
-               switch (c) {
-               case 1:
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+               newdelflag = 1;
+               if (vi_cmdmode)
+                       ic |= vbit;
+#endif
+               switch (ic)
+               {
+               case '\n':
+               case '\r':
+               vi_case( case '\n'|vbit: )
+               vi_case( case '\r'|vbit: )
+                       /* Enter */
+                       goto_new_line();
+                       break_out = 1;
+                       break;
+               case CNTRL('A'):
+               vi_case( case '0'|vbit: )
                        /* Control-a -- Beginning of line */
-                       input_home(outputFd, &cursor);
-               case 5:
-                       /* Control-e -- End of line */
-                       input_end(outputFd, &cursor, len);
+                       input_backward(cursor);
                        break;
-               case 2:
+               case CNTRL('B'):
+               vi_case( case 'h'|vbit: )
+               vi_case( case '\b'|vbit: )
+               vi_case( case DEL|vbit: )
                        /* Control-b -- Move back one character */
-                       if (cursor > 0) {
-                               xwrite(outputFd, "\033[D", 3);
-                               cursor--;
+                       input_backward(1);
+                       break;
+               case CNTRL('C'):
+               vi_case( case CNTRL('C')|vbit: )
+                       /* Control-c -- stop gathering input */
+                       goto_new_line();
+#ifndef CONFIG_ASH
+                       command[0] = 0;
+                       len = 0;
+                       lastWasTab = FALSE;
+                       put_prompt();
+#else
+                       len = 0;
+                       break_out = -1; /* to control traps */
+#endif
+                       break;
+               case CNTRL('D'):
+                       /* Control-d -- Delete one character, or exit
+                        * if the len=0 and no chars to delete */
+                       if (len == 0) {
+                                       errno = 0;
+prepare_to_die:
+#if !defined(CONFIG_ASH)
+                               printf("exit");
+                               goto_new_line();
+                               /* cmdedit_reset_term() called in atexit */
+                               exit(EXIT_SUCCESS);
+#else
+                               /* to control stopped jobs */
+                               len = break_out = -1;
+                               break;
+#endif
+                       } else {
+                               input_delete(0);
                        }
                        break;
-               case 6:
+               case CNTRL('E'):
+               vi_case( case '$'|vbit: )
+                       /* Control-e -- End of line */
+                       input_end();
+                       break;
+               case CNTRL('F'):
+               vi_case( case 'l'|vbit: )
+               vi_case( case ' '|vbit: )
                        /* Control-f -- Move forward one character */
-                       if (cursor < len) {
-                               xwrite(outputFd, "\033[C", 3);
-                               cursor++;
-                       }
+                       input_forward();
+                       break;
+               case '\b':
+               case DEL:
+                       /* Control-h and DEL */
+                       input_backspace();
+                       break;
+               case '\t':
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+                       input_tab(&lastWasTab);
+#endif
                        break;
-               case 4:
-                       /* Control-d -- Delete one character */
-                       if (cursor != len) {
-                               input_delete(outputFd, cursor);
-                               len--;
-                       } else if (len == 0) {
-                               prepareToDie(0);
-                               exit(0);
+               case CNTRL('K'):
+                       /* Control-k -- clear to end of line */
+                       *(command + cursor) = 0;
+                       len = cursor;
+                       printf("\033[J");
+                       break;
+               case CNTRL('L'):
+               vi_case( case CNTRL('L')|vbit: )
+                       /* Control-l -- clear screen */
+                       printf("\033[H");
+                       redraw(0, len-cursor);
+                       break;
+#if MAX_HISTORY >= 1
+               case CNTRL('N'):
+               vi_case( case CNTRL('N')|vbit: )
+               vi_case( case 'j'|vbit: )
+                       /* Control-n -- Get next command in history */
+                       if (get_next_history())
+                               goto rewrite_line;
+                       break;
+               case CNTRL('P'):
+               vi_case( case CNTRL('P')|vbit: )
+               vi_case( case 'k'|vbit: )
+                       /* Control-p -- Get previous command from history */
+                       if (cur_history > 0) {
+                               get_previous_history();
+                               goto rewrite_line;
+                       } else {
+                               beep();
                        }
                        break;
-               case 14:
-                       /* Control-n -- Get next command */
-                       if (hp && hp->n && hp->n->s) {
-                               free(hp->s);
-                               hp->s = strdup(parsenextc);
-                               hp = hp->n;
-                               goto hop;
+#endif
+               case CNTRL('U'):
+               vi_case( case CNTRL('U')|vbit: )
+                       /* Control-U -- Clear line before cursor */
+                       if (cursor) {
+                               strcpy(command, command + cursor);
+                               redraw(cmdedit_y, len -= cursor);
                        }
                        break;
-               case 16:
-                       /* Control-p -- Get previous command */
-                       if (hp && hp->p) {
-                               free(hp->s);
-                               hp->s = strdup(parsenextc);
-                               hp = hp->p;
-                               goto hop;
+               case CNTRL('W'):
+               vi_case( case CNTRL('W')|vbit: )
+                       /* Control-W -- Remove the last word */
+                       while (cursor > 0 && isspace(command[cursor-1]))
+                               input_backspace();
+                       while (cursor > 0 &&!isspace(command[cursor-1]))
+                               input_backspace();
+                       break;
+#if CONFIG_FEATURE_COMMAND_EDITING_VI
+               case 'i'|vbit:
+                       vi_cmdmode = 0;
+                       break;
+               case 'I'|vbit:
+                       input_backward(cursor);
+                       vi_cmdmode = 0;
+                       break;
+               case 'a'|vbit:
+                       input_forward();
+                       vi_cmdmode = 0;
+                       break;
+               case 'A'|vbit:
+                       input_end();
+                       vi_cmdmode = 0;
+                       break;
+               case 'x'|vbit:
+                       input_delete(1);
+                       break;
+               case 'X'|vbit:
+                       if (cursor > 0) {
+                               input_backward(1);
+                               input_delete(1);
                        }
                        break;
-               case '\t':
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
+               case 'W'|vbit:
+                       vi_Word_motion(command, 1);
+                       break;
+               case 'w'|vbit:
+                       vi_word_motion(command, 1);
+                       break;
+               case 'E'|vbit:
+                       vi_End_motion(command);
+                       break;
+               case 'e'|vbit:
+                       vi_end_motion(command);
+                       break;
+               case 'B'|vbit:
+                       vi_Back_motion(command);
+                       break;
+               case 'b'|vbit:
+                       vi_back_motion(command);
+                       break;
+               case 'C'|vbit:
+                       vi_cmdmode = 0;
+                       /* fall through */
+               case 'D'|vbit:
+                       goto clear_to_eol;
+
+               case 'c'|vbit:
+                       vi_cmdmode = 0;
+                       /* fall through */
+               case 'd'|vbit:
                        {
-                               /* Do TAB completion */
-                               static int num_matches=0;
-                               static char **matches = (char **) NULL;
-                               int pos = cursor;
-                               
-
-                               if (lastWasTab == FALSE) {
-                                       char *tmp, *tmp1, *matchBuf;
-
-                                       /* For now, we will not bother with trying to distinguish
-                                        * whether the cursor is in/at a command extression -- we
-                                        * will always try all possable matches.  If you don't like
-                                        * that then feel free to fix it.
-                                        */
-                                       
-                                       /* Make a local copy of the string -- up 
-                                        * to the position of the cursor */
-                                       matchBuf = (char *) calloc(BUFSIZ, sizeof(char));
-                                       strncpy(matchBuf, parsenextc, cursor);
-                                       tmp=matchBuf;
-
-                                       /* skip past any command seperator tokens */
-                                       while (*tmp && (tmp1=strpbrk(tmp, ";|&{(`")) != NULL) {
-                                               tmp=++tmp1;
-                                               /* skip any leading white space */
-                                               while (*tmp && isspace(*tmp)) 
-                                                       ++tmp;
-                                       }
-
-                                       /* skip any leading white space */
-                                       while (*tmp && isspace(*tmp)) 
-                                               ++tmp;
-
-                                       /* Free up any memory already allocated */
-                                       if (matches) {
-                                               free(matches);
-                                               matches = (char **) NULL;
-                                       }
-
-                                       /* If the word starts with `~' and there is no slash in the word, 
-                                        * then try completing this word as a username. */
+                       int nc, sc;
+                       sc = cursor;
+                       prevc = ic;
+                       if (safe_read(0, &c, 1) < 1)
+                               goto prepare_to_die;
+                       if (c == (prevc & 0xff)) {
+                           /* "cc", "dd" */
+                           input_backward(cursor);
+                           goto clear_to_eol;
+                           break;
+                       }
+                       switch(c) {
+                       case 'w':
+                       case 'W':
+                       case 'e':
+                       case 'E':
+                           switch (c) {
+                           case 'w':   /* "dw", "cw" */
+                                   vi_word_motion(command, vi_cmdmode);
+                                   break;
+                           case 'W':   /* 'dW', 'cW' */
+                                   vi_Word_motion(command, vi_cmdmode);
+                                   break;
+                           case 'e':   /* 'de', 'ce' */
+                                   vi_end_motion(command);
+                                   input_forward();
+                                   break;
+                           case 'E':   /* 'dE', 'cE' */
+                                   vi_End_motion(command);
+                                   input_forward();
+                                   break;
+                           }
+                           nc = cursor;
+                           input_backward(cursor - sc);
+                           while (nc-- > cursor)
+                                   input_delete(1);
+                           break;
+                       case 'b':  /* "db", "cb" */
+                       case 'B':  /* implemented as B */
+                           if (c == 'b')
+                                   vi_back_motion(command);
+                           else
+                                   vi_Back_motion(command);
+                           while (sc-- > cursor)
+                                   input_delete(1);
+                           break;
+                       case ' ':  /* "d ", "c " */
+                           input_delete(1);
+                           break;
+                       case '$':  /* "d$", "c$" */
+                       clear_to_eol:
+                           while (cursor < len)
+                                   input_delete(1);
+                           break;
+                       }
+                       }
+                       break;
+               case 'p'|vbit:
+                       input_forward();
+                       /* fallthrough */
+               case 'P'|vbit:
+                       put();
+                       break;
+               case 'r'|vbit:
+                       if (safe_read(0, &c, 1) < 1)
+                               goto prepare_to_die;
+                       if (c == 0)
+                               beep();
+                       else {
+                               *(command + cursor) = c;
+                               putchar(c);
+                               putchar('\b');
+                       }
+                       break;
+#endif /* CONFIG_FEATURE_COMMAND_EDITING_VI */
 
-                                       /* FIXME -- this check is broken! */
-                                       if (*tmp == '~' && !strchr(tmp, '/'))
-                                               matches = username_completion_matches(tmp, &num_matches);
+               case ESC:
 
-                                       /* Try to match any executable in our path and everything 
-                                        * in the current working directory that matches.  */
-                                       if (!matches)
-                                               matches = find_path_executable_n_cwd_matches(tmp, &num_matches);
+#if CONFIG_FEATURE_COMMAND_EDITING_VI
+                       if (vi_mode) {
+                               /* ESC: insert mode --> command mode */
+                               vi_cmdmode = 1;
+                               input_backward(1);
+                               break;
+                       }
+#endif
+                       /* escape sequence follows */
+                       if (safe_read(0, &c, 1) < 1)
+                               goto prepare_to_die;
+                       /* different vt100 emulations */
+                       if (c == '[' || c == 'O') {
+               vi_case( case '['|vbit: )
+               vi_case( case 'O'|vbit: )
+                               if (safe_read(0, &c, 1) < 1)
+                                       goto prepare_to_die;
+                       }
+                       if (c >= '1' && c <= '9') {
+                               unsigned char dummy;
 
-                                       /* Don't leak memory */
-                                       free( matchBuf);
+                               if (safe_read(0, &dummy, 1) < 1)
+                                       goto prepare_to_die;
+                               if(dummy != '~')
+                                       c = 0;
+                       }
+                       switch (c) {
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+                       case '\t':                      /* Alt-Tab */
 
-                                       /* Did we find exactly one match? */
-                                       if (matches && num_matches==1) {
-                                               /* write out the matched command */
-                                               strncpy(parsenextc+pos, matches[0]+pos, strlen(matches[0])-pos);
-                                               len=strlen(parsenextc);
-                                               cursor=len;
-                                               xwrite(outputFd, matches[0]+pos, strlen(matches[0])-pos);
-                                               break;
-                                       }
+                               input_tab(&lastWasTab);
+                               break;
+#endif
+#if MAX_HISTORY >= 1
+                       case 'A':
+                               /* Up Arrow -- Get previous command from history */
+                               if (cur_history > 0) {
+                                       get_previous_history();
+                                       goto rewrite_line;
                                } else {
-                                       /* Ok -- the last char was a TAB.  Since they
-                                        * just hit TAB again, print a list of all the
-                                        * available choices... */
-                                       if ( matches && num_matches>0 ) {
-                                               int i, col;
-                                               
-                                               /* Go to the next line */
-                                               xwrite(outputFd, "\n", 1);
-                                               /* Print the list of matches */
-                                               for (i=0,col=0; i<num_matches; i++) {
-                                                       char foo[17];
-                                                       sprintf(foo, "%-14s  ", matches[i]);
-                                                       col += xwrite(outputFd, foo, strlen(foo));
-                                                       if (col > 60 && matches[i+1] != NULL) {
-                                                               xwrite(outputFd, "\n", 1);
-                                                               col = 0;
-                                                       }
-                                               }
-                                               /* Go to the next line */
-                                               xwrite(outputFd, "\n", 1);
-                                               /* Rewrite the prompt */
-                                               xwrite(outputFd, prompt, strlen(prompt));
-                                               /* Rewrite the command */
-                                               xwrite(outputFd, parsenextc, len);
-                                               /* Put the cursor back to where it used to be */
-                                               for (cursor=len; cursor > pos; cursor--)
-                                                       xwrite(outputFd, "\b", 1);
-                                       }
+                                       beep();
                                }
                                break;
-                       }
+                       case 'B':
+                               /* Down Arrow -- Get next command in history */
+                               if (!get_next_history())
+                                       break;
+                               /* Rewrite the line with the selected history item */
+rewrite_line:
+                               /* change command */
+                               len = strlen(strcpy(command, history[cur_history]));
+                               /* redraw and go to eol (bol, in vi */
+#if CONFIG_FEATURE_COMMAND_EDITING_VI
+                               redraw(cmdedit_y, vi_mode ? 9999:0);
 #else
-                       break;
+                               redraw(cmdedit_y, 0);
 #endif
-               case '\b':
-               case DEL:
-                       /* Backspace */
-                       input_backspace(outputFd, &cursor, &len);
-                       break;
-               case '\n':
-                       /* Enter */
-                       *(parsenextc + len++ + 1) = c;
-                       xwrite(outputFd, &c, 1);
-                       break_out = 1;
+                               break;
+#endif
+                       case 'C':
+                               /* Right Arrow -- Move forward one character */
+                               input_forward();
+                               break;
+                       case 'D':
+                               /* Left Arrow -- Move back one character */
+                               input_backward(1);
+                               break;
+                       case '3':
+                               /* Delete */
+                               input_delete(0);
+                               break;
+                       case '1':
+                       case 'H':
+                               /* <Home> */
+                               input_backward(cursor);
+                               break;
+                       case '4':
+                       case 'F':
+                               /* <End> */
+                               input_end();
+                               break;
+                       default:
+                               c = 0;
+                               beep();
+                       }
                        break;
-               case ESC:{
-                               /* escape sequence follows */
-                               if ((ret = read(inputFd, &c, 1)) < 1)
-                                       return ret;
-
-                               if (c == '[') { /* 91 */
-                                       if ((ret = read(inputFd, &c, 1)) < 1)
-                                               return ret;
-
-                                       switch (c) {
-                                       case 'A':
-                                               /* Up Arrow -- Get previous command */
-                                               if (hp && hp->p) {
-                                                       free(hp->s);
-                                                       hp->s = strdup(parsenextc);
-                                                       hp = hp->p;
-                                                       goto hop;
-                                               }
-                                               break;
-                                       case 'B':
-                                               /* Down Arrow -- Get next command */
-                                               if (hp && hp->n && hp->n->s) {
-                                                       free(hp->s);
-                                                       hp->s = strdup(parsenextc);
-                                                       hp = hp->n;
-                                                       goto hop;
-                                               }
-                                               break;
-
-                                               /* This is where we rewrite the line 
-                                                * using the selected history item */
-                                         hop:
-                                               len = strlen(parsenextc);
-
-                                               /* return to begining of line */
-                                               for (; cursor > 0; cursor--)
-                                                       xwrite(outputFd, "\b", 1);
-
-                                               /* erase old command */
-                                               for (j = 0; j < len; j++)
-                                                       xwrite(outputFd, " ", 1);
-
-                                               /* return to begining of line */
-                                               for (j = len; j > 0; j--)
-                                                       xwrite(outputFd, "\b", 1);
-
-                                               memset(parsenextc, 0, BUFSIZ);
-                                               len = strlen(parsenextc);
-                                               /* write new command */
-                                               strcpy(parsenextc, hp->s);
-                                               len = strlen(hp->s);
-                                               xwrite(outputFd, parsenextc, len);
-                                               cursor = len;
-                                               break;
-                                       case 'C':
-                                               /* Right Arrow -- Move forward one character */
-                                               if (cursor < len) {
-                                                       xwrite(outputFd, "\033[C", 3);
-                                                       cursor++;
-                                               }
-                                               break;
-                                       case 'D':
-                                               /* Left Arrow -- Move back one character */
-                                               if (cursor > 0) {
-                                                       xwrite(outputFd, "\033[D", 3);
-                                                       cursor--;
-                                               }
-                                               break;
-                                       case '3':
-                                               /* Delete */
-                                               if (cursor != len) {
-                                                       input_delete(outputFd, cursor);
-                                                       len--;
-                                               }
-                                               break;
 
-                                       //case '5': case '6': /* pgup/pgdown */
-
-                                       case '7':
-                                               /* rxvt home */
-                                       case '1':
-                                               /* Home (Ctrl-A) */
-                                               input_home(outputFd, &cursor);
-                                               break;
-                                       case '8':
-                                               /* rxvt END */
-                                       case '4':
-                                               /* End (Ctrl-E) */
-                                               input_end(outputFd, &cursor, len);
-                                               break;
-                                       }
-                                       if (c == '1' || c == '3' || c == '4')
-                                               if ((ret = read(inputFd, &c, 1)) < 1)
-                                                       return ret;     /* read 126 (~) */
+               default:        /* If it's regular input, do the normal thing */
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+                       /* Control-V -- Add non-printable symbol */
+                       if (c == CNTRL('V')) {
+                               if (safe_read(0, &c, 1) < 1)
+                                       goto prepare_to_die;
+                               if (c == 0) {
+                                       beep();
+                                       break;
                                }
-                               if (c == 'O') {
-                                       /* 79 */
-                                       if ((ret = read(inputFd, &c, 1)) < 1)
-                                               return ret;
-                                       switch (c) {
-                                       case 'H':
-                                               /* Home (xterm) */
-                                               input_home(outputFd, &cursor);
-                                               break;
-                                       case 'F':
-                                               /* End (xterm) */
-                                               input_end(outputFd, &cursor, len);
-                                               break;
-                                       }
-                               }
-                               c = 0;
-                               break;
+                       } else
+#endif
+                       {
+#if CONFIG_FEATURE_COMMAND_EDITING_VI
+                               if (vi_cmdmode)  /* don't self-insert */
+                                       break;
+#endif
+                               if (!Isprint(c)) /* Skip non-printable characters */
+                                       break;
                        }
 
-               default:                                /* If it's regular input, do the normal thing */
-
-                       if (!isprint(c))        /* Skip non-printable characters */
-                               break;
-
-                       if (len >= (BUFSIZ - 2))        /* Need to leave space for enter */
+                       if (len >= (BUFSIZ - 2))        /* Need to leave space for enter */
                                break;
 
                        len++;
 
-                       if (cursor == (len - 1)) {      /* Append if at the end of the line */
-                               *(parsenextc + cursor) = c;
-                       } else {                        /* Insert otherwise */
-                               memmove(parsenextc + cursor + 1, parsenextc + cursor,
-                                               len - cursor - 1);
-
-                               *(parsenextc + cursor) = c;
-
-                               for (j = cursor; j < len; j++)
-                                       xwrite(outputFd, parsenextc + j, 1);
-                               for (; j > cursor; j--)
-                                       xwrite(outputFd, "\033[D", 3);
+                       if (cursor == (len - 1)) {      /* Append if at the end of the line */
+                               *(command + cursor) = c;
+                               *(command + cursor + 1) = 0;
+                               cmdedit_set_out_char(0);
+                       } else {                        /* Insert otherwise */
+                               int sc = cursor;
+
+                               memmove(command + sc + 1, command + sc, len - sc);
+                               *(command + sc) = c;
+                               sc++;
+                               /* rewrite from cursor */
+                               input_end();
+                               /* to prev x pos + 1 */
+                               input_backward(cursor - sc);
                        }
 
-                       cursor++;
-                       xwrite(outputFd, &c, 1);
                        break;
                }
-               if (c == '\t')
-                       lastWasTab = TRUE;
-               else
+               if (break_out)                  /* Enter is the command terminator, no more input. */
+                       break;
+
+               if (c != '\t')
                        lastWasTab = FALSE;
+       }
 
-               if (break_out)                  /* Enter is the command terminator, no more input. */
-                       break;
+       setTermSettings(0, (void *) &initial_settings);
+       handlers_sets &= ~SET_RESET_TERM;
+
+#if MAX_HISTORY >= 1
+       /* Handle command history log */
+       /* cleanup may be saved current command line */
+       if (len> 0) {                                      /* no put empty line */
+               int i = n_history;
+
+               free(history[MAX_HISTORY]);
+               history[MAX_HISTORY] = 0;
+                       /* After max history, remove the oldest command */
+               if (i >= MAX_HISTORY) {
+                       free(history[0]);
+                       for(i = 0; i < (MAX_HISTORY-1); i++)
+                               history[i] = history[i+1];
+               }
+               history[i++] = bb_xstrdup(command);
+               cur_history = i;
+               n_history = i;
+#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
+               num_ok_lines++;
+#endif
+       }
+#else  /* MAX_HISTORY < 1 */
+#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
+       if (len > 0) {              /* no put empty line */
+               num_ok_lines++;
+       }
+#endif
+#endif  /* MAX_HISTORY >= 1 */
+       if (break_out > 0) {
+               command[len++] = '\n';          /* set '\n' */
+               command[len] = 0;
        }
+#if defined(CONFIG_FEATURE_CLEAN_UP) && defined(CONFIG_FEATURE_COMMAND_TAB_COMPLETION)
+       input_tab(0);                           /* strong free */
+#endif
+#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
+       free(cmdedit_prompt);
+#endif
+       cmdedit_reset_term();
+       return len;
+}
 
-       nr = len + 1;
-       xioctl(inputFd, TCSETA, (void *) &old_term);
-       reset_term = 0;
 
 
-       /* Handle command history log */
-       if (*(parsenextc)) {
-
-               struct history *h = his_end;
-
-               if (!h) {
-                       /* No previous history */
-                       h = his_front = malloc(sizeof(struct history));
-                       h->n = malloc(sizeof(struct history));
-
-                       h->p = NULL;
-                       h->s = strdup(parsenextc);
-                       h->n->p = h;
-                       h->n->n = NULL;
-                       h->n->s = NULL;
-                       his_end = h->n;
-                       history_counter++;
-               } else {
-                       /* Add a new history command */
-                       h->n = malloc(sizeof(struct history));
+#endif  /* CONFIG_FEATURE_COMMAND_EDITING */
 
-                       h->n->p = h;
-                       h->n->n = NULL;
-                       h->n->s = NULL;
-                       h->s = strdup(parsenextc);
-                       his_end = h->n;
 
-                       /* After max history, remove the oldest command */
-                       if (history_counter >= MAX_HISTORY) {
+#ifdef TEST
 
-                               struct history *p = his_front->n;
+const char *bb_applet_name = "debug stuff usage";
 
-                               p->p = NULL;
-                               free(his_front->s);
-                               free(his_front);
-                               his_front = p;
-                       } else {
-                               history_counter++;
-                       }
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+#include <locale.h>
+#endif
+
+int main(int argc, char **argv)
+{
+       char buff[BUFSIZ];
+       char *prompt =
+#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
+               "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\
+\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \
+\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]";
+#else
+               "% ";
+#endif
+
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+       setlocale(LC_ALL, "");
+#endif
+       while(1) {
+               int l;
+               l = cmdedit_read_input(prompt, buff);
+               if(l > 0 && buff[l-1] == '\n') {
+                       buff[l-1] = 0;
+                       printf("*** cmdedit_read_input() returned line =%s=\n", buff);
+               } else {
+                       break;
                }
        }
-
-       return nr;
+       printf("*** cmdedit_read_input() detect ^D\n");
+       return 0;
 }
 
-extern void cmdedit_init(void)
-{
-       atexit(cmdedit_reset_term);
-       signal(SIGINT, prepareToDie);
-       signal(SIGQUIT, prepareToDie);
-       signal(SIGTERM, prepareToDie);
-}
-#endif                                                 /* BB_FEATURE_SH_COMMAND_EDITING */
+#endif  /* TEST */