X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fcmdedit.c;h=32001324fa5667639d76239810cdce3d5fe00e2c;hb=80602a98bcc3100279e09e1291d47a0adb6addb1;hp=c2b4123dbc7fa437465ff7307630b28bc38ddda6;hpb=4e33875759b3c13118ecf349bfe302e0d8374b78;p=oweals%2Fbusybox.git diff --git a/shell/cmdedit.c b/shell/cmdedit.c index c2b4123db..32001324f 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c @@ -1,200 +1,200 @@ /* vi: set sw=4 ts=4: */ /* - * Termios command line History and Editting, originally - * intended for NetBSD sh (ash) - * Copyright (c) 1999 - * Main code: Adam Rogoyski - * Etc: Dave Cinege - * Majorly adjusted/re-written for busybox: - * Erik Andersen + * 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. - * - * v 0.5 19990328 Initial release + * Copyright (c) 1986-2003 may safely be consumed by a BSD or GPL license. + * Written by: Vladimir Oleynik * - * Future plans: Simple file and path name completion. (like BASH) + * Used ideas: + * Adam Rogoyski + * Dave Cinege + * Jakub Jelinek (c) 1995 + * Erik Andersen (Majorly adjusted for busybox) * + * This code is 'as is' with no warranty. */ /* - Usage and Known bugs: + Usage and known bugs: Terminal key codes are not extensive, and more will probably 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. - - Editor with vertical scrolling and completion by - Vladimir Oleynik. vodz@usa.net (c) 2001 - - Small bug: not true work if terminal size (x*y symbols) less - size (prompt + editor`s line + 2 symbols) + 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 "busybox.h" +#include -#ifdef BB_FEATURE_SH_COMMAND_EDITING +#include "cmdedit.h" -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef BB_FEATURE_SH_TAB_COMPLETION -#include +#if ENABLE_LOCALE_SUPPORT +#define Isprint(c) isprint(c) +#else +#define Isprint(c) ((c) >= ' ' && (c) != ((unsigned char)'\233')) #endif -#ifdef BB_FEATURE_USERNAME_COMPLETION -#include -#endif -static const int MAX_HISTORY = 15; /* Maximum length of the linked list for the command line history */ +/* FIXME: obsolete CONFIG item? */ +#define ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT 0 -enum { - ESC = 27, - DEL = 127, -}; -#define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0) -#define whitespace(c) (((c) == ' ') || ((c) == '\t')) +#ifdef TEST -static struct history *his_front = NULL; /* First element in command line list */ -static struct history *his_end = NULL; /* Last element in command line list */ +#define ENABLE_FEATURE_COMMAND_EDITING 0 +#define ENABLE_FEATURE_COMMAND_TAB_COMPLETION 0 +#define ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION 0 +#define ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT 0 +#define ENABLE_FEATURE_CLEAN_UP 0 -/* ED: sparc termios is broken: revert back to old termio handling. */ +#endif /* TEST */ -#if #cpu(sparc) -# include -# define termios termio -# define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp) -# define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp) + +#if ENABLE_FEATURE_COMMAND_EDITING + +#define ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR \ +(ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION || ENABLE_FEATURE_SH_FANCY_PROMPT) + +/* Maximum length of the linked list for the command line history */ +#if !ENABLE_FEATURE_COMMAND_HISTORY +#define MAX_HISTORY 15 #else -# include -# define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp) -# define getTermSettings(fd,argp) tcgetattr(fd, argp); +#define MAX_HISTORY (CONFIG_FEATURE_COMMAND_HISTORY + 0) #endif -/* Current termio and the previous termio before starting sh */ -static struct termios initial_settings, new_settings; +#if MAX_HISTORY > 0 +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 +#define setTermSettings(fd,argp) tcsetattr(fd, TCSANOW, argp) +#define getTermSettings(fd,argp) tcgetattr(fd, argp); -#ifndef _POSIX_VDISABLE -#define _POSIX_VDISABLE '\0' -#endif +/* Current termio and the previous termio before starting sh */ +static struct termios initial_settings, new_settings; static -volatile int cmdedit_termw; /* actual terminal width */ -static int history_counter = 0; /* Number of commands in history list */ - +volatile int cmdedit_termw = 80; /* actual terminal width */ static -volatile int handlers_sets = 0; /* Set next bites - when atexit() has been called - and set many "terminates" signal handlers - and winchg signal handler - and if the terminal needs to be reset upon exit - */ +volatile int handlers_sets = 0; /* Set next bites: */ + enum { - SET_ATEXIT = 1, - SET_TERM_HANDLERS = 2, - SET_WCHG_HANDLERS = 4, - SET_RESET_TERM = 8, + 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 */ }; - -static int cmdedit_x; /* real x terminal position, - require put prompt in start x position */ -static int cmdedit_y; /* pseudoreal y terminal position */ -static int cmdedit_prmt_len; /* for fast running, without duplicate calculate */ -static int cursor; /* required global for signal handler */ -static int len; /* --- "" - - "" - -"- --""-- --""--- */ -static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */ -static const char *cmdedit_prompt;/* --- "" - - "" - -"- --""-- --""--- */ +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 */ -/* Link into lash to reset context to 0 - * on ^C and such */ -extern unsigned int shell_context; +static int cursor; /* required globals for signal handler */ +static int len; /* --- "" - - "" -- -"- --""-- --""--- */ +static char *command_ps; /* --- "" - - "" -- -"- --""-- --""--- */ +static SKIP_FEATURE_SH_FANCY_PROMPT(const) char *cmdedit_prompt; /* -- */ +#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR +static char *user_buf = ""; +static char *home_pwd_buf = ""; +static int my_euid; +#endif + +#if ENABLE_FEATURE_SH_FANCY_PROMPT +static char *hostname_buf; +static int num_ok_lines = 1; +#endif -struct history { - char *s; - struct history *p; - struct history *n; -}; + +#if ENABLE_FEATURE_COMMAND_TAB_COMPLETION + +#if !ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR +static int my_euid; +#endif + +static int my_uid; +static int my_gid; + +#endif /* FEATURE_COMMAND_TAB_COMPLETION */ static void cmdedit_setwidth(int w, int redraw_flg); static void win_changed(int nsig) { - struct winsize win = { 0, 0, 0, 0 }; - static __sighandler_t previous_SIGWINCH_handler; /* for reset */ + static sighandler_t previous_SIGWINCH_handler; /* for reset */ - /* emulate || signal call */ - if(nsig == -SIGWINCH || nsig == SIGWINCH) { - ioctl(0, TIOCGWINSZ, &win); - if (win.ws_col > 0) { - cmdedit_setwidth( win.ws_col, nsig == SIGWINCH ); - } + /* 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 */ + /* Unix not all standard in recall signal */ - if(nsig == -SIGWINCH) /* save previous handler */ + 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 /* set previous handler */ - signal(SIGWINCH, previous_SIGWINCH_handler); /* reset */ + 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(fileno(stdin), (void*) &initial_settings); + if (handlers_sets & SET_RESET_TERM) { +/* 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) { + if (handlers_sets & SET_WCHG_HANDLERS) { /* reset SIGWINCH handler to previous (default) */ win_changed(0); handlers_sets &= ~SET_WCHG_HANDLERS; } fflush(stdout); -#ifdef BB_FEATURE_CLEAN_UP - if (his_front) { - struct history *n; - //while(his_front!=his_end) { - while(his_front!=his_end) { - n = his_front->n; - free(his_front->s); - free(his_front); - his_front=n; - } - } -#endif } - /* special for recount position for scroll and remove terminal margin effect */ -static void cmdedit_set_out_char(int c, int next_char) { - putchar(c); - if(++cmdedit_x>=cmdedit_termw) { +static void cmdedit_set_out_char(int next_char) +{ + int c = (unsigned char)command_ps[cursor]; + + if (c == 0) + c = ' '; /* destroy end char? */ +#if ENABLE_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 + { + if (initial_settings.c_lflag & ECHO) + putchar(c); + } + if (++cmdedit_x >= cmdedit_termw) { /* terminal is scrolled down */ cmdedit_y++; - cmdedit_x=0; + cmdedit_x = 0; - if(!next_char) + if (!next_char) next_char = ' '; /* destroy "(auto)margin" */ putchar(next_char); @@ -203,467 +203,1010 @@ static void cmdedit_set_out_char(int c, int next_char) { cursor++; } -/* Move to end line. Bonus: rewrite line from cursor without use - special control terminal strings, also saved size and speed! */ -static void input_end (void) { - while(cursor < len) - cmdedit_set_out_char(command_ps[cursor], 0); +/* 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) { +static void goto_new_line(void) +{ input_end(); - cmdedit_set_out_char('\n', 0); + if (cmdedit_x) + putchar('\n'); } -static inline void out1str(const char *s) { fputs (s, stdout); } -static inline void beep (void) { putchar('\007'); } +static void out1str(const char *s) +{ + if (s) + fputs(s, stdout); +} -/* Go to HOME position */ -static void input_home(void) +static void beep(void) { - while(cmdedit_y>0) { /* up to start y */ - out1str("\033[A"); - cmdedit_y--; + 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 */ } - putchar('\r'); - cursor = 0; +} + +static void put_prompt(void) +{ out1str(cmdedit_prompt); - cmdedit_x = cmdedit_prmt_len; + cmdedit_x = cmdedit_prmt_len; /* count real x terminal position */ + cursor = 0; + cmdedit_y = 0; /* new quasireal y */ +} +#if !ENABLE_FEATURE_SH_FANCY_PROMPT +static void parse_prompt(const char *prmt_ptr) +{ + 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 = xzalloc(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; + } -/* Move back one charactor */ -static void input_backward(void) { - if (cursor > 0) { - cursor--; - if(cmdedit_x!=0) { /* no first position in terminal line */ - putchar('\b'); - cmdedit_x--; - } - else { - out1str("\033[A"); /* up */ - cmdedit_y--; - - /* to end in current terminal line */ - while(cmdedit_x<(cmdedit_termw-1)) { - out1str("\033[C"); - cmdedit_x++; + 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) { +#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR + case 'u': + pbuf = user_buf; + break; +#endif + case 'h': + pbuf = hostname_buf; + if (pbuf == 0) { + pbuf = xzalloc(256); + 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; +#if ENABLE_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) 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 + + +/* draw prompt, editor line, and clear tail */ +static void redraw(int y, int back_cursor) +{ + 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); } -/* Delete the char in front of the cursor */ -static void input_delete(void) +#if ENABLE_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) { int j = cursor; if (j == len) return; - - memmove (command_ps + j, command_ps + j + 1, BUFSIZ - j - 1); + +#if ENABLE_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(); /* rewtite new line */ - cmdedit_set_out_char(' ', 0); /* destroy end char */ - while (j < cursor) - input_backward(); /* back to old pos cursor */ + input_end(); /* rewrite new line */ + cmdedit_set_out_char(0); /* destroy end char */ + input_backward(cursor - j); /* back to old pos cursor */ +} + +#if ENABLE_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(); - input_delete (); + input_backward(1); + input_delete(0); } } -/* Move forward one charactor */ +/* Move forward one character */ static void input_forward(void) { - if (cursor < len) - cmdedit_set_out_char(command_ps[cursor], command_ps[cursor + 1]); -} - - -static void clean_up_and_die(int sig) -{ - goto_new_line(); - if (sig!=SIGINT) - exit(EXIT_SUCCESS); /* cmdedit_reset_term() called in atexit */ - cmdedit_reset_term(); + if (cursor < len) + cmdedit_set_out_char(command_ps[cursor + 1]); } static void cmdedit_setwidth(int w, int redraw_flg) { - cmdedit_termw = cmdedit_prmt_len+2; + 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) { - int sav_cursor = cursor; - - /* set variables for new terminal size */ - cmdedit_y = sav_cursor/w; - cmdedit_x = sav_cursor-cmdedit_y*w; + if (redraw_flg) { + /* new y for current cursor */ + int new_y = (cursor + cmdedit_prmt_len) / w; /* redraw */ - input_home(); - input_end(); - while(sav_cursor= cmdedit_y ? new_y : cmdedit_y), len - cursor); + fflush(stdout); } - } else { - error_msg("\n*** Error: minimum screen width is %d\n", cmdedit_termw); } } -extern void cmdedit_init(void) +static void cmdedit_init(void) { - if((handlers_sets & SET_WCHG_HANDLERS)==0) { - /* emulate usage handler to set handler and call yours work */ + cmdedit_prmt_len = 0; + if (!(handlers_sets & SET_WCHG_HANDLERS)) { + /* emulate usage handler to set handler and call yours work */ win_changed(-SIGWINCH); handlers_sets |= SET_WCHG_HANDLERS; } - if((handlers_sets & SET_ATEXIT)==0) { - atexit(cmdedit_reset_term); /* be sure to do this only once */ + if (!(handlers_sets & SET_ATEXIT)) { +#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR + struct passwd *entry; + + my_euid = geteuid(); + entry = getpwuid(my_euid); + if (entry) { + user_buf = xstrdup(entry->pw_name); + home_pwd_buf = xstrdup(entry->pw_dir); + } +#endif + +#if ENABLE_FEATURE_COMMAND_TAB_COMPLETION + +#if !ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR + my_euid = geteuid(); +#endif + my_uid = getuid(); + my_gid = getgid(); +#endif /* FEATURE_COMMAND_TAB_COMPLETION */ handlers_sets |= SET_ATEXIT; + atexit(cmdedit_reset_term); /* be sure to do this only once */ } - if((handlers_sets & SET_TERM_HANDLERS)==0) { - signal(SIGKILL, clean_up_and_die); - signal(SIGINT, clean_up_and_die); - signal(SIGQUIT, clean_up_and_die); - signal(SIGTERM, clean_up_and_die); - handlers_sets |= SET_TERM_HANDLERS; +} + +#if ENABLE_FEATURE_COMMAND_TAB_COMPLETION + +static char **matches; +static int num_matches; + +static void add_match(char *matched) +{ + int nm = num_matches; + int nm1 = nm + 1; + + matches = xrealloc(matches, nm1 * sizeof(char *)); + matches[nm] = matched; + 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 BB_FEATURE_SH_TAB_COMPLETION +#if ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION -#ifdef BB_FEATURE_USERNAME_COMPLETION -static char** username_tab_completion(char *ud, int *num_matches) +static void username_tab_completion(char *ud, char *with_shash_flg) { - static struct passwd *entry; - int userlen; - char **matches = (char **) NULL; - char *temp; - int nm = 0; + struct passwd *entry; + int userlen; - setpwent (); - userlen = strlen (ud + 1); + ud++; /* ~user/... to user/... */ + userlen = strlen(ud); - while ((entry = getpwent ()) != NULL) { - /* Null usernames should result in all users as possible completions. */ - if (!userlen || !strncmp (ud + 1, entry->pw_name, userlen)) { + if (with_shash_flg) { /* "~/..." or "~user/..." */ + char *sav_ud = ud - 1; + char *home = 0; + char *temp; - temp = xmalloc (3 + strlen (entry->pw_name)); - sprintf(temp, "~%s/", entry->pw_name); + 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 */ - matches = xrealloc(matches, (nm+1)*sizeof(char *)); - matches[nm++] = temp; - } - } + /* /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(xasprintf("~%s/", entry->pw_name)); + } + } - endpwent (); - (*num_matches) = nm; - return (matches); + endpwent(); + } } -#endif +#endif /* FEATURE_COMMAND_USERNAME_COMPLETION */ enum { - FIND_EXE_ONLY = 0, - FIND_DIR_ONLY = 1, + FIND_EXE_ONLY = 0, + FIND_DIR_ONLY = 1, FIND_FILE_ONLY = 2, }; -#include +#if ENABLE_ASH +const char *cmdedit_path_lookup; +#else +#define cmdedit_path_lookup getenv("PATH") +#endif static int path_parse(char ***p, int flags) { - int npth; - char *tmp; - char *pth; + int npth; + const char *tmp; + const char *pth = cmdedit_path_lookup; - if(flags!=FIND_EXE_ONLY || (pth=getenv("PATH"))==0) { /* if not setenv PATH variable, to search cur dir "." */ - (*p) = xmalloc(sizeof(char *)); - (*p)[0] = xstrdup("."); + if (flags != FIND_EXE_ONLY) + return 1; + /* PATH= or PATH=: */ + if (!pth || !pth[0] || LONE_CHAR(pth, ':')) return 1; - } tmp = pth; - npth=0; + npth = 0; - for(;;) { - npth++; /* count words is + 1 count ':' */ + while (1) { + npth++; /* count words is + 1 count ':' */ tmp = strchr(tmp, ':'); - if(tmp) - tmp++; - else + if (!tmp) break; + if (*++tmp == 0) + break; /* : */ } - *p = xmalloc(npth*sizeof(char *)); + *p = xmalloc(npth * sizeof(char *)); tmp = pth; (*p)[0] = xstrdup(tmp); - npth=1; /* count words is + 1 count ':' */ + npth = 1; /* count words is + 1 count ':' */ - for(;;) { + while (1) { tmp = strchr(tmp, ':'); - if(tmp) { - (*p)[0][(tmp-pth)]=0; /* ':' -> '\0'*/ - tmp++; - } else + if (!tmp) break; - (*p)[npth++] = &(*p)[0][(tmp-pth)]; /* p[next]=p[0][&'\0'+1] */ + (*p)[0][(tmp - pth)] = 0; /* ':' -> '\0' */ + if (*++tmp == 0) + break; /* : */ + (*p)[npth++] = &(*p)[0][(tmp - pth)]; /* p[next]=p[0][&'\0'+1] */ } return npth; } -static char** exe_n_cwd_tab_completion(char* command, int *num_matches, int type) +static char *add_quote_for_spec_chars(char *found) { - char *dirName; - char **matches = 0; - DIR *dir; - struct dirent *next; - char cmd [BUFSIZ+4]; - char *dirbuf; - char found [BUFSIZ+4]; - int nm = *num_matches; - struct stat st; - char **paths; - int npaths; - int i; - char full_pth[BUFSIZ+4+PATH_MAX]; - + int l = 0; + char *s = xmalloc((strlen(found) + 1) * 2); - strcpy(cmd, command); /* save for change (last '/' to '\0') */ + while (*found) { + if (strchr(" `\"#$%^&*()=+{}[]:;\'|\\<>", *found)) + s[l++] = '\\'; + s[l++] = *found++; + } + s[l] = 0; + return s; +} - dirName = strrchr(cmd, '/'); - if(dirName==NULL) { +static void exe_n_cwd_tab_completion(char *command, int type) +{ + 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); - if(npaths==0) - return 0; + pfind = command; } else { /* with dir */ + /* save for change */ + strcpy(dirbuf, command); + /* set dir only */ + dirbuf[(pfind - command) + 1] = 0; +#if ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION + if (dirbuf[0] == '~') /* ~/... or ~user/... */ + username_tab_completion(dirbuf, dirbuf); +#endif + /* "strip" dirname in command */ + pfind++; - /* save dir */ - dirbuf = xstrdup(cmd); - /* set only dirname */ - dirbuf[(dirName-cmd)+1]=0; - - /* strip dirname in cmd */ - strcpy(cmd, dirName+1); - - paths = xmalloc(sizeof(char*)); paths[0] = dirbuf; - npaths = 1; /* only 1 dir */ + npaths = 1; /* only 1 dir */ } - for(i=0; i < npaths; i++) { + for (i = 0; i < npaths; i++) { dir = opendir(paths[i]); - if (!dir) { - /* Don't print an error, just shut up and return */ - return (matches); - } - while ((next = readdir(dir)) != NULL) { - /* matched ? */ - if(strncmp(next->d_name, cmd, strlen(cmd))) + if (!dir) /* Don't print an error */ + continue; + + while ((next = readdir(dir)) != NULL) { + int len1; + char *str_found = next->d_name; + + /* matched? */ + if (strncmp(str_found, pfind, strlen(pfind))) continue; /* not see .name without .match */ - if(*next->d_name == '.' && *cmd != '.') - continue; - sprintf(full_pth, "%s/%s", paths[i], next->d_name); - /* hmm, remover in progress? */ - if(stat(full_pth, &st)<0) + if (*str_found == '.' && *pfind == 0) { + if (NOT_LONE_CHAR(paths[i], '/') || str_found[1]) continue; - /* Cool, found a match. */ + str_found = ""; /* only "/" */ + } + 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 */ + + len1 = strlen(found); + found = xrealloc(found, len1 + 2); + found[len1] = '\0'; + found[len1+1] = '\0'; + if (S_ISDIR(st.st_mode)) { - /* name is directory */ - strcpy(found, next->d_name); - strcat(found, "/"); - if(type==FIND_DIR_ONLY) - strcat(found, " "); + /* name is directory */ + if (found[len1-1] != '/') { + found[len1] = '/'; + } } else { - /* not put found file if search only dirs for cd */ - if(type==FIND_DIR_ONLY) - continue; - strcpy(found, next->d_name); - strcat(found, " "); - } + /* not put found file if search only dirs for cd */ + if (type == FIND_DIR_ONLY) + goto cont; + } /* Add it to the list */ - matches = xrealloc(matches, (nm+1)*sizeof(char *)); - matches[nm++] = xstrdup(found); + add_match(found); + continue; + cont: + free(found); } + closedir(dir); + } + if (paths != path1) { + free(paths[0]); /* allocated memory only in first member */ + free(paths); } - free(paths[0]); /* allocate memory only in first member */ - free(paths); - *num_matches = nm; - return (matches); } -static void input_tab(int lastWasTab) -{ - /* Do TAB completion */ - static int num_matches; - static char **matches; - char matchBuf[BUFSIZ]; +#define QUOT (UCHAR_MAX+1) - int pos = cursor; - int find_type=FIND_FILE_ONLY; +#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 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] = (unsigned char)matchBuf[i]; + if (int_buf[i] == 0) { + pos_buf[i] = -1; /* indicator end line */ + break; + } else + pos_buf[i] = i; + } - if (lastWasTab == FALSE) { - char *tmp, *tmp1; - int len_found; + /* 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++; +#if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT + if (matchBuf[i] == '\t') /* algorithm equivalent */ + int_buf[j] = ' ' | QUOT; +#endif + } +#if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT + else if (matchBuf[i] == '\t') + int_buf[j] = ' '; +#endif - /* For now, we will not bother with trying to distinguish - * whether the cursor is in/at a command extression -- we - * will always try all possible matches. If you don't like - * that then feel free to fix it. - */ + /* 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; + } - /* Make a local copy of the string -- up - * to the position of the cursor */ - memset(matchBuf, 0, BUFSIZ); - tmp = strncpy(matchBuf, command_ps, cursor); + /* skip commands with arguments if line has 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 */ + } - /* skip past any command seperator tokens */ - while ( (tmp1=strpbrk(tmp, ";|&{(`")) != NULL) { - tmp = ++tmp1; + /* 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 + 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 any leading white space */ - while (*tmp == ' ') - tmp++; + /* 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; + } + } + for (i = 0; int_buf[i]; i++) + /* "strlen" */; + /* 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++) + /*skip*/; + /* 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; + int l; + + /* find the longest file name- use that as the column width */ + for (row = 0; row < nrows; row++) { + l = strlen(matches[row]); + if (column_width < l) + column_width = l; + } + column_width += 2; /* min space for columns */ + ncols = cmdedit_termw / column_width; - if(strncmp(tmp, "cd ", 3)==0) - find_type = FIND_DIR_ONLY; - else if(strchr(tmp, ' ')==NULL) - find_type = FIND_EXE_ONLY; + if (ncols > 1) { + nrows /= ncols; + if (nfiles % ncols) + nrows++; /* round up fractionals */ + } else { + ncols = 1; + } + for (row = 0; row < nrows; row++) { + int n = row; + int nc; - /* find begin curent word */ - if( (tmp1=strrchr(tmp, ' ')) != NULL) { - tmp = ++tmp1; + for (nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) { + printf("%s%-*s", matches[n], + (int)(column_width - strlen(matches[n])), ""); } - strcpy(matchBuf, tmp); + printf("%s\n", matches[n]); + } +} - /* Free up any memory already allocated */ +static int match_compare(const void *a, const void *b) +{ + return strcmp(*(char**)a, *(char**)b); +} + +static void input_tab(int *lastWasTab) +{ + /* Do TAB completion */ + if (lastWasTab == 0) { /* free all memory */ if (matches) { - while(num_matches>0) + while (num_matches > 0) free(matches[--num_matches]); free(matches); matches = (char **) NULL; } + return; + } + if (!*lastWasTab) { + char *tmp, *tmp1; + int len_found; + char matchBuf[BUFSIZ]; + int find_type; + int recalc_pos; + + *lastWasTab = TRUE; /* flop trigger */ + + /* Make a local copy of the string -- up + * to the position of the cursor */ + tmp = strncpy(matchBuf, command_ps, cursor); + tmp[cursor] = 0; + + find_type = find_match(matchBuf, &recalc_pos); + + /* Free up any memory already allocated */ + input_tab(0); -#ifdef BB_FEATURE_USERNAME_COMPLETION - /* If the word starts with `~' and there is no slash in the word, +#if ENABLE_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) { - matches = username_tab_completion(matchBuf, &num_matches); - } + if (matchBuf[0] == '~' && strchr(matchBuf, '/') == 0) + username_tab_completion(matchBuf, NULL); + if (!matches) #endif - /* Try to match any executable in our path and everything + /* Try to match any executable in our path and everything * in the current working directory that matches. */ - if (!matches) - matches = exe_n_cwd_tab_completion(matchBuf, &num_matches, find_type); - + exe_n_cwd_tab_completion(matchBuf, find_type); + /* Sort, then remove any duplicates found */ + if (matches) { + int i, n = 0; + qsort(matches, num_matches, sizeof(char*), match_compare); + for (i = 0; i < num_matches - 1; ++i) { + if (matches[i] && matches[i+1]) { + if (strcmp(matches[i], matches[i+1]) == 0) { + free(matches[i]); + matches[i] = 0; + } else { + matches[n++] = matches[i]; + } + } + } + matches[n++] = matches[num_matches-1]; + num_matches = n; + } /* Did we find exactly one match? */ - if(!matches || num_matches>1) { + if (!matches || num_matches > 1) { beep(); - return; + if (!matches) + return; /* not found */ + /* find minimal match */ + tmp1 = 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); + free(tmp1); + } else { /* one match */ + tmp = add_quote_for_spec_chars(matches[0]); + /* for next completion current found */ + *lastWasTab = FALSE; + + len_found = strlen(tmp); + if (tmp[len_found-1] != '/') { + tmp[len_found] = ' '; + tmp[len_found+1] = '\0'; + } } - - len_found = strlen(matches[0]); - + len_found = strlen(tmp); /* have space to placed match? */ - if ( (len_found-strlen(matchBuf)+len) < BUFSIZ ) { - - int recalc_pos = len; - - /* before word for match */ - command_ps[pos-strlen(matchBuf)]=0; - - /* tail line */ - strcpy(matchBuf, command_ps+pos); - - /* add match */ - strcat(command_ps, matches[0]); - /* add tail */ + 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); - - /* write out the matched command */ - len=strlen(command_ps); - recalc_pos = len-recalc_pos+pos; - input_end(); /* write */ - while(recalc_pos0 ) { - int i, col; - int sav_cursor = cursor; + if (matches && num_matches > 0) { + int sav_cursor = cursor; /* change goto_new_line() */ /* Go to the next line */ goto_new_line(); - for (i=0,col=0; i 60 && matches[i+1] != NULL) { - putchar('\n'); - col = 0; - } - } - /* Go to the next line and rewrite the prompt */ - printf("\n%s", cmdedit_prompt); - cmdedit_x = cmdedit_prmt_len; - cmdedit_y = 0; - cursor = 0; - input_end(); /* Rewrite the command */ - /* Put the cursor back to where it used to be */ - while (sav_cursor < cursor) - input_backward(); + showfiles(); + redraw(0, len - sav_cursor); } } } -#endif +#endif /* FEATURE_COMMAND_TAB_COMPLETION */ -static void get_previous_history(struct history **hp, char* command) +#if MAX_HISTORY > 0 +static void get_previous_history(void) { - if ((*hp)->s) - free((*hp)->s); - (*hp)->s = strdup(command); - *hp = (*hp)->p; + if (command_ps[0] != 0 || history[cur_history] == 0) { + free(history[cur_history]); + history[cur_history] = xstrdup(command_ps); + } + cur_history--; } -static void get_next_history(struct history **hp, char* command) +static int get_next_history(void) { - if ((*hp)->s) - free((*hp)->s); - (*hp)->s = strdup(command); - *hp = (*hp)->n; + int ch = cur_history; + + if (ch < n_history) { + get_previous_history(); /* save the current history line */ + cur_history = ch + 1; + return cur_history; + } else { + beep(); + return 0; + } } +#if ENABLE_FEATURE_COMMAND_SAVEHISTORY +void load_history(const char *fromfile) +{ + FILE *fp; + int hi; + + /* cleanup old */ + + for (hi = n_history; hi > 0;) { + hi--; + free(history[hi]); + } + + fp = fopen(fromfile, "r"); + if (fp) { + for (hi = 0; hi < MAX_HISTORY;) { + char * hl = xmalloc_getline(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; + + 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: @@ -673,110 +1216,245 @@ static void get_next_history(struct history **hp, char* command) * ESC-h -- Delete forward one word * CTL-t -- Transpose two characters * - * Furthermore, the "vi" command editing keys are not implemented. + * Minimalist vi-style command line editing available if configured. + * vi mode implemented 2005 by Paul Fox * - * TODO: implement TAB command completion. :) */ -extern void cmdedit_read_input(char* prompt, char command[BUFSIZ]) + +#if ENABLE_FEATURE_COMMAND_EDITING_VI +static int vi_mode; + +void setvimode ( int viflag ) { + vi_mode = viflag; +} - int inputFd=fileno(stdin); +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(); +} - int j = 0; +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 + +/* + * 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 ret = 0; int lastWasTab = FALSE; - char c = 0; - struct history *hp = his_end; - + unsigned char c; + unsigned int ic; +#if ENABLE_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; - cursor = 0; command_ps = command; - if (new_settings.c_cc[VMIN]==0) { - - getTermSettings(inputFd, (void*) &initial_settings); - memcpy(&new_settings, &initial_settings, sizeof(struct termios)); - new_settings.c_cc[VMIN] = 1; - new_settings.c_cc[VTIME] = 0; - new_settings.c_cc[VINTR] = _POSIX_VDISABLE; /* Turn off CTRL-C, so we can trap it */ - new_settings.c_lflag &= ~ICANON; /* unbuffered input */ - new_settings.c_lflag &= ~(ECHO|ECHOCTL|ECHONL); /* Turn off echoing */ - } - setTermSettings(inputFd, (void*) &new_settings); + 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; - memset(command, 0, BUFSIZ); - + /* Now initialize things */ cmdedit_init(); - /* Print out the command prompt */ - cmdedit_prompt = prompt; - cmdedit_prmt_len = strlen(prompt); - printf("%s", prompt); - cmdedit_x = cmdedit_prmt_len; /* count real x terminal position */ - cmdedit_y = 0; /* quasireal y, not true work if line > xt*yt */ - + parse_prompt(prompt); while (1) { + fflush(stdout); /* buffered out to fast */ - 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; - if ((ret = read(inputFd, &c, 1)) < 1) - return; - //fprintf(stderr, "got a '%c' (%d)\n", c, c); + ic = c; - switch (c) { +#if ENABLE_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 */ - *(command + len) = c; - len++; - input_end (); + goto_new_line(); break_out = 1; break; - case 1: + case CNTRL('A'): + vi_case( case '0'|vbit: ) /* Control-a -- Beginning of line */ - input_home(); + 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 */ - input_backward(); + input_backward(1); break; - case 3: + case CNTRL('C'): + vi_case( case CNTRL('C')|vbit: ) /* Control-c -- stop gathering input */ - - /* Link into lash to reset context to 0 on ^C and such */ - shell_context = 0; - - /* Go to the next line */ goto_new_line(); - -#if 0 - /* Rewrite the prompt */ - printf("%s", prompt); - - /* Reset the command string */ - memset(command, 0, BUFSIZ); - len = cursor = 0; +#if !ENABLE_ASH + command[0] = 0; + len = 0; + lastWasTab = FALSE; + put_prompt(); +#else + len = 0; + break_out = -1; /* to control traps */ #endif - return; - - case 4: - /* Control-d -- Delete one character, or exit + 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 !ENABLE_ASH printf("exit"); - clean_up_and_die(0); + 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(); + input_delete(0); } break; - case 5: + case CNTRL('E'): + vi_case( case '$'|vbit: ) /* Control-e -- End of line */ input_end(); break; - case 6: + case CNTRL('F'): + vi_case( case 'l'|vbit: ) + vi_case( case ' '|vbit: ) /* Control-f -- Move forward one character */ input_forward(); break; @@ -786,231 +1464,408 @@ extern void cmdedit_read_input(char* prompt, char command[BUFSIZ]) input_backspace(); break; case '\t': -#ifdef BB_FEATURE_SH_TAB_COMPLETION - input_tab(lastWasTab); +#if ENABLE_FEATURE_COMMAND_TAB_COMPLETION + input_tab(&lastWasTab); #endif break; - case 14: + 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 > 0 + case CNTRL('N'): + vi_case( case CNTRL('N')|vbit: ) + vi_case( case 'j'|vbit: ) /* Control-n -- Get next command in history */ - if (hp && hp->n && hp->n->s) { - get_next_history(&hp, command); + if (get_next_history()) goto rewrite_line; - } else { - beep(); - } break; - case 16: + case CNTRL('P'): + vi_case( case CNTRL('P')|vbit: ) + vi_case( case 'k'|vbit: ) /* Control-p -- Get previous command from history */ - if (hp && hp->p) { - get_previous_history(&hp, command); + if (cur_history > 0) { + get_previous_history(); goto rewrite_line; } else { beep(); } break; - case ESC:{ - /* escape sequence follows */ - if ((ret = read(inputFd, &c, 1)) < 1) - return; - - if (c == '[') { /* 91 */ - if ((ret = read(inputFd, &c, 1)) < 1) - return; - - switch (c) { - case 'A': - /* Up Arrow -- Get previous command from history */ - if (hp && hp->p) { - get_previous_history(&hp, command); - goto rewrite_line; - } else { - beep(); - } - break; - case 'B': - /* Down Arrow -- Get next command in history */ - if (hp && hp->n && hp->n->s) { - get_next_history(&hp, command); - goto rewrite_line; - } else { - beep(); - } - break; - - /* Rewrite the line with the selected history item */ - rewrite_line: - /* return to begin of line */ - input_home (); - /* for next memmoves without set '\0' */ - memset (command, 0, BUFSIZ); - /* change command */ - strcpy (command, hp->s); - /* write new command */ - for (j=0; command[j]; j++) - cmdedit_set_out_char(command[j], 0); - ret = cursor; - /* erase tail if required */ - for (j = ret; j < len; j++) - cmdedit_set_out_char(' ', 0); - /* and backward cursor */ - for (j = ret; j < len; j++) - input_backward(); - len = cursor; /* set new len */ - break; - case 'C': - /* Right Arrow -- Move forward one character */ - input_forward(); - break; - case 'D': - /* Left Arrow -- Move back one character */ - input_backward(); - break; - case '3': - /* Delete */ - input_delete(); - break; - case '1': - /* Home (Ctrl-A) */ - input_home(); - break; - case '4': - /* End (Ctrl-E) */ - input_end(); - break; - default: - beep(); - } - if (c == '1' || c == '3' || c == '4') - if ((ret = read(inputFd, &c, 1)) < 1) - return; /* read 126 (~) */ - } - if (c == 'O') { - /* 79 */ - if ((ret = read(inputFd, &c, 1)) < 1) - return; - switch (c) { - case 'H': - /* Home (xterm) */ - input_home(); - break; - case 'F': - /* End (xterm) */ - input_end(); - break; - default: - beep(); - } +#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 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 ENABLE_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 '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: { + 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; } - c = 0; + 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 /* FEATURE_COMMAND_EDITING_VI */ - default: /* If it's regular input, do the normal thing */ + case ESC: - if (!isprint(c)) { /* Skip non-printable characters */ +#if ENABLE_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; + + if (safe_read(0, &dummy, 1) < 1) + goto prepare_to_die; + if (dummy != '~') + c = 0; + } + switch (c) { +#if ENABLE_FEATURE_COMMAND_TAB_COMPLETION + case '\t': /* Alt-Tab */ - if (len >= (BUFSIZ - 2)) /* Need to leave space for enter */ + input_tab(&lastWasTab); break; +#endif +#if MAX_HISTORY > 0 + case 'A': + /* Up Arrow -- Get previous command from history */ + if (cur_history > 0) { + get_previous_history(); + goto rewrite_line; + } else { + 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 ENABLE_FEATURE_COMMAND_EDITING_VI + redraw(cmdedit_y, vi_mode ? 9999:0); +#else + redraw(cmdedit_y, 0); +#endif + 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': + /* */ + input_backward(cursor); + break; + case '4': + case 'F': + /* */ + input_end(); + break; + default: + c = 0; + beep(); + } + break; - len++; + default: /* If it's regular input, do the normal thing */ +#if ENABLE_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; + } + } else +#endif + { +#if ENABLE_FEATURE_COMMAND_EDITING_VI + if (vi_cmdmode) /* don't self-insert */ + break; +#endif + if (!Isprint(c)) /* Skip non-printable characters */ + break; + } - if (cursor == (len - 1)) { /* Append if at the end of the line */ - *(command + cursor) = c; - cmdedit_set_out_char(c, command[cursor+1]); - } else { /* Insert otherwise */ - memmove(command + cursor + 1, command + cursor, - len - cursor - 1); + if (len >= (BUFSIZ - 2)) /* Need to leave space for enter */ + break; + + len++; + if (cursor == (len - 1)) { /* Append if at the end of the line */ *(command + cursor) = c; - j = cursor+1; + *(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 (); + input_end(); /* to prev x pos + 1 */ - while(cursor > j) - input_backward(); + input_backward(cursor - sc); } break; } - if (c == '\t') - lastWasTab = TRUE; - else - lastWasTab = FALSE; - - if (break_out) /* Enter is the command terminator, no more input. */ + if (break_out) /* Enter is the command terminator, no more input. */ break; + + if (c != '\t') + lastWasTab = FALSE; } - setTermSettings (inputFd, (void *) &initial_settings); + setTermSettings(0, (void *) &initial_settings); handlers_sets &= ~SET_RESET_TERM; +#if MAX_HISTORY > 0 /* Handle command history log */ - if (len>1) { /* no put empty line (only '\n') */ - - struct history *h = his_end; - char *ss; - - command[len-1] = 0; /* destroy end '\n' */ - ss = strdup(command); /* duplicate without '\n' */ - command[len-1] = '\n'; /* restore '\n' */ - - if (!h) { - /* No previous history -- this memory is never freed */ - h = his_front = xmalloc(sizeof(struct history)); - h->n = xmalloc(sizeof(struct history)); - - h->p = NULL; - h->s = ss; - h->n->p = h; - h->n->n = NULL; - h->n->s = NULL; - his_end = h->n; - history_counter++; - } else { - /* Add a new history command -- this memory is never freed */ - h->n = xmalloc(sizeof(struct history)); - - h->n->p = h; - h->n->n = NULL; - h->n->s = NULL; - h->s = ss; - his_end = h->n; + /* 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 (history_counter >= MAX_HISTORY) { - - struct history *p = his_front->n; - - p->p = NULL; - free(his_front->s); - free(his_front); - his_front = p; - } else { - history_counter++; - } + if (i >= MAX_HISTORY) { + free(history[0]); + for (i = 0; i < MAX_HISTORY-1; i++) + history[i] = history[i+1]; } + history[i++] = xstrdup(command); + cur_history = i; + n_history = i; +#if ENABLE_FEATURE_SH_FANCY_PROMPT + num_ok_lines++; +#endif } - - return; +#else /* MAX_HISTORY == 0 */ +#if ENABLE_FEATURE_SH_FANCY_PROMPT + if (len > 0) { /* no put empty line */ + num_ok_lines++; + } +#endif +#endif /* MAX_HISTORY > 0 */ + if (break_out > 0) { + command[len++] = '\n'; /* set '\n' */ + command[len] = 0; + } +#if ENABLE_FEATURE_CLEAN_UP && ENABLE_FEATURE_COMMAND_TAB_COMPLETION + input_tab(0); /* strong free */ +#endif +#if ENABLE_FEATURE_SH_FANCY_PROMPT + free(cmdedit_prompt); +#endif + cmdedit_reset_term(); + return len; } +#endif /* FEATURE_COMMAND_EDITING */ -/* Undo the effects of cmdedit_init(). */ -extern void cmdedit_terminate(void) + +#ifdef TEST + +const char *applet_name = "debug stuff usage"; + +#if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT +#include +#endif + +int main(int argc, char **argv) { - cmdedit_reset_term(); - if((handlers_sets & SET_TERM_HANDLERS)!=0) { - signal(SIGKILL, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGWINCH, SIG_DFL); - handlers_sets &= ~SET_TERM_HANDLERS; + char buff[BUFSIZ]; + char *prompt = +#if ENABLE_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 + +#if ENABLE_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') + break; + buff[l-1] = 0; + printf("*** cmdedit_read_input() returned line =%s=\n", buff); } + printf("*** cmdedit_read_input() detect ^D\n"); + return 0; } - - -#endif /* BB_FEATURE_SH_COMMAND_EDITING */ +#endif /* TEST */