X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fcmdedit.c;h=4f124d6475989e4e0bc804e35c8669000455ae6f;hb=ab6526c8b3d0d38bec62b181276380c0533a151d;hp=22831b10c7c96763e2511fb6994fb141080616b8;hpb=8ea7d8cdaf4a03cdc06abc8b752b589271140a88;p=oweals%2Fbusybox.git diff --git a/shell/cmdedit.c b/shell/cmdedit.c index 22831b10c..4f124d647 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c @@ -1,21 +1,18 @@ /* 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 Editting. * - * 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-2001 may safely be consumed by a BSD or GPL license. + * Written by: Vladimir Oleynik + * + * Used ideas: + * Adam Rogoyski + * Dave Cinege + * Jakub Jelinek (c) 1995 + * Erik Andersen (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) * */ @@ -25,14 +22,14 @@ 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 #include @@ -42,48 +39,56 @@ #include #include #include +#include +#include "busybox.h" -#define MAX_HISTORY 15 /* Maximum length of the linked list for the command line history */ - -#define ESC 27 -#define DEL 127 -#define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0) -#define whitespace(c) (((c) == ' ') || ((c) == '\t')) +#ifdef BB_LOCALE_SUPPORT +#define Isprint(c) isprint((c)) +#else +#define Isprint(c) ( (c) >= ' ' && (c) != ((unsigned char)'\233') ) +#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 */ +#ifndef TEST -/* ED: sparc termios is broken: revert back to old termio handling. */ -#ifdef BB_FEATURE_USE_TERMIOS +#define D(x) -#if #cpu(sparc) -# include -# define termios termio -# define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp) -# define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp) #else -# include -# define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp) -# define getTermSettings(fd,argp) tcgetattr(fd, argp); -#endif -/* Current termio and the previous termio before starting sh */ -struct termios initial_settings, new_settings; +#define BB_FEATURE_COMMAND_EDITING +#define BB_FEATURE_COMMAND_TAB_COMPLETION +#define BB_FEATURE_COMMAND_USERNAME_COMPLETION +#define BB_FEATURE_NONPRINTABLE_INVERSE_PUT +#define BB_FEATURE_CLEAN_UP + +#define D(x) x + +#endif /* TEST */ + +#ifdef BB_FEATURE_COMMAND_TAB_COMPLETION +#include +#include +#endif +#ifdef BB_FEATURE_COMMAND_EDITING -#ifndef _POSIX_VDISABLE -#define _POSIX_VDISABLE '\0' +#ifndef BB_FEATURE_COMMAND_TAB_COMPLETION +#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #endif +#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || defined(BB_FEATURE_SH_FANCY_PROMPT) +#define BB_FEATURE_GETUSERNAME_AND_HOMEDIR #endif +#ifdef BB_FEATURE_GETUSERNAME_AND_HOMEDIR +# ifndef TEST +# include "pwd_grp/pwd.h" +# else +# include +# endif /* TEST */ +#endif /* advanced FEATURES */ -static int cmdedit_termw = 80; /* actual terminal width */ -static int cmdedit_scroll = 27; /* width of EOL scrolling region */ -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 */ struct history { char *s; @@ -91,286 +96,1067 @@ struct history { struct history *n; }; -#define xwrite write +/* Maximum length of the linked list for the command line history */ +static const int MAX_HISTORY = 15; + +/* First element in command line list */ +static struct history *his_front = NULL; + +/* Last element in command line list */ +static struct history *his_end = NULL; + + +#include +#define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp) +#define getTermSettings(fd,argp) tcgetattr(fd, argp); + +/* Current termio and the previous termio before starting sh */ +static struct termios initial_settings, new_settings; + + +static +volatile int cmdedit_termw = 80; /* actual terminal width */ +static int history_counter = 0; /* Number of commands in history list */ +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_TERM_HANDLERS = 2, /* set many terminates signal handlers */ + SET_WCHG_HANDLERS = 4, /* winchg signal handler */ + SET_RESET_TERM = 8, /* if the terminal needs to be reset upon exit */ +}; + + +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 BB_FEATURE_SH_FANCY_PROMPT + const +#endif +char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */ + +/* Link into lash to reset context to 0 on ^C and such */ +extern unsigned int shell_context; + + +#ifdef BB_FEATURE_GETUSERNAME_AND_HOMEDIR +static char *user_buf = ""; +static char *home_pwd_buf = ""; +static int my_euid; +#endif + +#ifdef BB_FEATURE_SH_FANCY_PROMPT +static char *hostname_buf = ""; +static int num_ok_lines = 1; +#endif + + +#ifdef BB_FEATURE_COMMAND_TAB_COMPLETION + +#ifndef BB_FEATURE_GETUSERNAME_AND_HOMEDIR +static int my_euid; +#endif + +static int my_uid; +static int my_gid; -void -cmdedit_setwidth(int w) +#endif /* BB_FEATURE_COMMAND_TAB_COMPLETION */ + + +static void cmdedit_setwidth(int w, int redraw_flg); + +static void win_changed(int nsig) { - if (w > 20) { - cmdedit_termw = w; - cmdedit_scroll = w / 3; - } else { - errorMsg("\n*** Error: minimum screen width is 21\n"); + struct winsize win = { 0, 0, 0, 0 }; + 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); + } } + /* 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(fileno(stdin), (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); +#ifdef BB_FEATURE_CLEAN_UP + if (his_front) { + struct history *n; + + while (his_front != his_end) { + n = his_front->n; + free(his_front->s); + free(his_front); + his_front = n; + } + } +#endif } -void cmdedit_reset_term(void) +/* special for recount position for scroll and remove terminal margin effect */ +static void cmdedit_set_out_char(int next_char) { - if (reset_term) - /* sparc and other have broken termios support: use old termio handling. */ - setTermSettings(fileno(stdin), (void*) &initial_settings); + + int c = (int)((unsigned char) command_ps[cursor]); + + if (c == 0) + c = ' '; /* destroy end char? */ +#ifdef BB_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++; } -void clean_up_and_die(int sig) +/* Move to end line. Bonus: rewrite line from cursor */ +static void input_end(void) { - cmdedit_reset_term(); - fprintf(stdout, "\n"); - if (sig!=SIGINT) - exit(TRUE); + while (cursor < len) + cmdedit_set_out_char(0); } -/* Go to HOME position */ -void input_home(int outputFd, int *cursor) +/* Go to the next line */ +static void goto_new_line(void) { - while (*cursor > 0) { - xwrite(outputFd, "\b", 1); - --*cursor; - } + input_end(); + if (cmdedit_x) + putchar('\n'); } -/* Go to END position */ -void input_end(int outputFd, int *cursor, int len) + +static inline void out1str(const char *s) { - while (*cursor < len) { - xwrite(outputFd, "\033[C", 3); - ++*cursor; - } + fputs(s, stdout); +} +static inline void beep(void) +{ + putchar('\007'); } -/* Delete the char in back of the cursor */ -void input_backspace(char* command, int outputFd, int *cursor, int *len) +/* Move back one charactor */ +/* special for slow terminal */ +static void input_backward(int num) { - int j = 0; + if (num > cursor) + num = cursor; + cursor -= num; /* new cursor (in command, not terminal) */ - if (*cursor > 0) { - xwrite(outputFd, "\b \b", 3); - --*cursor; - memmove(command + *cursor, command + *cursor + 1, - BUFSIZ - *cursor + 1); + if (cmdedit_x >= num) { /* no to up line */ + cmdedit_x -= num; + if (num < 4) + while (num-- > 0) + putchar('\b'); - for (j = *cursor; j < (BUFSIZ - 1); j++) { - if (!*(command + j)) - break; - else - xwrite(outputFd, (command + j), 1); + 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 */ + } +} - xwrite(outputFd, " \b", 2); +static void put_prompt(void) +{ + out1str(cmdedit_prompt); + cmdedit_x = cmdedit_prmt_len; /* count real x terminal position */ + cursor = 0; +} - while (j-- > *cursor) - xwrite(outputFd, "\b", 1); +#ifndef BB_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; + int sub_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 *)unknown; + } - --*len; + while (*prmt_ptr) { + pbuf = buf; + pbuf[1] = 0; + c = *prmt_ptr++; + if (c == '\\') { + const char *cp = prmt_ptr; + int l; + + c = process_escape_sequence(&prmt_ptr); + if(prmt_ptr==cp) { + if (*cp == 0) + break; + c = *prmt_ptr++; + switch (c) { +#ifdef BB_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 BB_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; + prmt_len += strlen(pbuf); + prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_len+1), pbuf); + if (flg_not_length == ']') + sub_len++; } + if(pwd_buf!=(char *)unknown) + free(pwd_buf); + cmdedit_prompt = prmt_mem_ptr; + cmdedit_prmt_len = prmt_len - sub_len; + put_prompt(); +} +#endif + + +/* draw promt, editor line, and clear tail */ +static void redraw(int y, int back_cursor) +{ + if (y > 0) /* up to start y */ + printf("\033[%dA", y); + cmdedit_y = 0; /* new quasireal 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 */ -void input_delete(char* command, int outputFd, int cursor, int *len) +static void input_delete(void) { - int j = 0; + int j = cursor; - if (cursor == *len) + if (j == len) return; - - memmove(command + cursor, command + cursor + 1, - BUFSIZ - cursor - 1); - for (j = cursor; j < (BUFSIZ - 1); j++) { - if (!*(command + j)) - break; - else - xwrite(outputFd, (command + j), 1); - } - xwrite(outputFd, " \b", 2); + strcpy(command_ps + j, command_ps + j + 1); + len--; + input_end(); /* rewtite new line */ + cmdedit_set_out_char(0); /* destroy end char */ + input_backward(cursor - j); /* back to old pos cursor */ +} - while (j-- > cursor) - xwrite(outputFd, "\b", 1); - --*len; +/* Delete the char in back of the cursor */ +static void input_backspace(void) +{ + if (cursor > 0) { + input_backward(1); + input_delete(); + } } + /* Move forward one charactor */ -void input_forward(int outputFd, int *cursor, int len) +static void input_forward(void) +{ + if (cursor < len) + cmdedit_set_out_char(command_ps[cursor + 1]); +} + + +static void clean_up_and_die(int sig) { - if (*cursor < len) { - xwrite(outputFd, "\033[C", 3); - ++*cursor; + goto_new_line(); + if (sig != SIGINT) + exit(EXIT_SUCCESS); /* cmdedit_reset_term() called in atexit */ + cmdedit_reset_term(); +} + +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); + } + } } -/* Move back one charactor */ -void input_backward(int outputFd, int *cursor) +extern void cmdedit_init(void) { - if (*cursor > 0) { - xwrite(outputFd, "\033[D", 3); - --*cursor; + 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 BB_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 + +#ifdef BB_FEATURE_COMMAND_TAB_COMPLETION + +#ifndef BB_FEATURE_GETUSERNAME_AND_HOMEDIR + my_euid = geteuid(); +#endif + my_uid = getuid(); + my_gid = getgid(); +#endif /* BB_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; } } +#ifdef BB_FEATURE_COMMAND_TAB_COMPLETION + +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_COMMAND_USERNAME_COMPLETION -#ifdef BB_FEATURE_SH_TAB_COMPLETION -char** username_tab_completion(char* command, int *num_matches) +static char **username_tab_completion(char *ud, int *num_matches) { - char **matches = (char **) NULL; - *num_matches=0; - fprintf(stderr, "\nin username_tab_completion\n"); - return (matches); + struct passwd *entry; + int userlen; + char *temp; + + + ud++; /* ~user/... to user/... */ + userlen = strlen(ud); + + if (num_matches == 0) { /* "~/..." or "~user/..." */ + char *sav_ud = ud - 1; + char *home = 0; + + 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); + } + } + return 0; /* void, result save to argument :-) */ + } else { + /* "~[^/]*" */ + char **matches = (char **) NULL; + int nm = 0; + + setpwent(); + + while ((entry = getpwent()) != NULL) { + /* Null usernames should result in all users as possible completions. */ + if ( /*!userlen || */ !strncmp(ud, entry->pw_name, userlen)) { + + temp = xmalloc(3 + strlen(entry->pw_name)); + sprintf(temp, "~%s/", entry->pw_name); + matches = xrealloc(matches, (nm + 1) * sizeof(char *)); + + matches[nm++] = temp; + } + } + + endpwent(); + (*num_matches) = nm; + return (matches); + } } +#endif /* BB_FEATURE_COMMAND_USERNAME_COMPLETION */ -#include -char** exe_n_cwd_tab_completion(char* command, int *num_matches) +enum { + FIND_EXE_ONLY = 0, + FIND_DIR_ONLY = 1, + FIND_FILE_ONLY = 2, +}; + +static int path_parse(char ***p, int flags) +{ + int npth; + char *tmp; + char *pth; + + /* if not setenv PATH variable, to search cur dir "." */ + if (flags != FIND_EXE_ONLY || (pth = getenv("PATH")) == 0 || + /* PATH= or PATH=: */ + *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; /* : */ + } else + break; + } + + *p = xmalloc(npth * sizeof(char *)); + + tmp = pth; + (*p)[0] = 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; /* : */ + } else + break; + (*p)[npth++] = &(*p)[0][(tmp - pth)]; /* p[next]=p[0][&'\0'+1] */ + } + + return npth; +} + +static char *add_quote_for_spec_chars(char *found) { - char *dirName; - char **matches = (char **) NULL; + int l = 0; + char *s = xmalloc((strlen(found) + 1) * 2); + + while (*found) { + if (strchr(" `\"#$%^&*()=+{}[]:;\'|\\<>", *found)) + s[l++] = '\\'; + s[l++] = *found++; + } + s[l] = 0; + return s; +} + +static char **exe_n_cwd_tab_completion(char *command, int *num_matches, + int type) +{ + + char **matches = 0; DIR *dir; struct dirent *next; - - matches = malloc( sizeof(char*)*50); - - /* Stick a wildcard onto the command, for later use */ - strcat( command, "*"); + char dirbuf[BUFSIZ]; + int nm = *num_matches; + 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 BB_FEATURE_COMMAND_USERNAME_COMPLETION + if (dirbuf[0] == '~') /* ~/... or ~user/... */ + username_tab_completion(dirbuf, 0); +#endif + /* "strip" dirname in command */ + pfind++; - /* 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); + paths[0] = dirbuf; + npaths = 1; /* only 1 dir */ } - while ((next = readdir(dir)) != NULL) { - /* Some quick sanity checks */ - if ((strcmp(next->d_name, "..") == 0) - || (strcmp(next->d_name, ".") == 0)) { + for (i = 0; i < npaths; i++) { + + dir = opendir(paths[i]); + if (!dir) /* Don't print an error */ 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)); + + while ((next = readdir(dir)) != NULL) { + char *str_found = next->d_name; + + /* 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 */ + str_found = found; + found = concat_path_file(found, ""); + free(str_found); + str_found = add_quote_for_spec_chars(found); + } else { + /* not put found file if search only dirs for cd */ + if (type == FIND_DIR_ONLY) + goto cont; + str_found = add_quote_for_spec_chars(found); + if (type == FIND_FILE_ONLY || + (type == FIND_EXE_ONLY && is_execute(&st) == TRUE)) + strcat(str_found, " "); + } + /* Add it to the list */ + matches = xrealloc(matches, (nm + 1) * sizeof(char *)); + + matches[nm++] = str_found; +cont: + free(found); } + closedir(dir); } - + if (paths != path1) { + free(paths[0]); /* allocated memory only in first member */ + free(paths); + } + *num_matches = nm; return (matches); } -void input_tab(char* command, char* prompt, int outputFd, int *cursor, int *len) +static int match_compare(const void *a, const void *b) { - /* Do TAB completion */ - static int num_matches=0; - static char **matches = (char **) NULL; - int pos = cursor; + return strcmp(*(char **) a, *(char **) b); +} - 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. - */ +#define QUOT (UCHAR_MAX+1) - /* Make a local copy of the string -- up - * to the position of the cursor */ - matchBuf = (char *) calloc(BUFSIZ, sizeof(char)); - strncpy(matchBuf, command, 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; +#define collapse_pos(is, in) { \ + memcpy(int_buf+is, int_buf+in, (BUFSIZ+1-is-in)*sizeof(int)); \ + memcpy(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] = (int) ((unsigned char) matchBuf[i]); + if (int_buf[i] == 0) { + pos_buf[i] = -1; /* indicator end line */ + break; + } else + pos_buf[i] = i; + } + + /* 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 BB_FEATURE_NONPRINTABLE_INVERSE_PUT + if (matchBuf[i] == '\t') /* algorithm equivalent */ + int_buf[j] = ' ' | QUOT; +#endif } +#ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT + else if (matchBuf[i] == '\t') + int_buf[j] = ' '; +#endif - /* skip any leading white space */ - while (*tmp && isspace(*tmp)) - ++tmp; + /* 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; + } - /* Free up any memory already allocated */ + /* 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 + 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; +} + + +static void input_tab(int *lastWasTab) +{ + /* Do TAB completion */ + static int num_matches; + static char **matches; + + if (lastWasTab == 0) { /* free all memory */ if (matches) { + while (num_matches > 0) + free(matches[--num_matches]); free(matches); matches = (char **) NULL; } + return; + } + if (*lastWasTab == FALSE) { - /* If the word starts with `~' and there is no slash in the word, - * then try completing this word as a username. */ + char *tmp; + int len_found; + char matchBuf[BUFSIZ]; + int find_type; + int recalc_pos; - /* FIXME -- this check is broken! */ - if (*tmp == '~' && !strchr(tmp, '/')) - matches = username_tab_completion(tmp, &num_matches); + *lastWasTab = TRUE; /* flop trigger */ - /* 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(tmp, &num_matches); + /* 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); - /* Don't leak memory */ - free( matchBuf); + /* Free up any memory already allocated */ + input_tab(0); + +#ifdef BB_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); +#endif + /* 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); + /* Remove duplicate found */ + if(matches) { + int i, j; + /* bubble */ + for(i=0; i<(num_matches-1); i++) + for(j=i+1; j 1) { + char *tmp1; + + beep(); + if (!matches) + return; /* not found */ + /* sort */ + qsort(matches, num_matches, sizeof(char *), match_compare); + + /* find minimal match */ + tmp = xstrdup(matches[0]); + for (tmp1 = tmp; *tmp1; tmp1++) + for (len_found = 1; len_found < num_matches; len_found++) + if (matches[len_found][(tmp1 - tmp)] != *tmp1) { + *tmp1 = 0; + break; + } + if (*tmp == 0) { /* have unique */ + free(tmp); + return; + } + } else { /* one match */ + tmp = matches[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); + } + if (tmp != matches[0]) + 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 i, col; + if (matches && num_matches > 0) { + int i, col, l; + int sav_cursor = cursor; /* change goto_new_line() */ /* Go to the next line */ - xwrite(outputFd, "\n", 1); - /* Print the list of matches */ - for (i=0,col=0; i 60 && matches[i+1] != NULL) { - xwrite(outputFd, "\n", 1); + goto_new_line(); + for (i = 0, col = 0; i < num_matches; i++) { + l = strlen(matches[i]); + if (l < 14) + l = 14; + printf("%-14s ", matches[i]); + if ((l += 2) > 16) + while (l % 16) { + putchar(' '); + l++; + } + col += l; + col -= (col / cmdedit_termw) * cmdedit_termw; + if (col > 60 && matches[i + 1] != NULL) { + putchar('\n'); col = 0; } } - /* Go to the next line */ - xwrite(outputFd, "\n", 1); - /* Rewrite the prompt */ - xwrite(outputFd, prompt, strlen(prompt)); - /* Rewrite the command */ - xwrite(outputFd, command, len); - /* Put the cursor back to where it used to be */ - for (cursor=len; cursor > pos; cursor--) - xwrite(outputFd, "\b", 1); + /* Go to the next line and rewrite */ + putchar('\n'); + redraw(0, len - sav_cursor); } } } -#endif +#endif /* BB_FEATURE_COMMAND_TAB_COMPLETION */ -void get_previous_history(struct history **hp, char* command) +static void get_previous_history(struct history **hp, struct history *p) { - free((*hp)->s); - (*hp)->s = strdup(command); - *hp = (*hp)->p; + if ((*hp)->s) + free((*hp)->s); + (*hp)->s = xstrdup(command_ps); + *hp = p; } -void get_next_history(struct history **hp, char* command) +static inline void get_next_history(struct history **hp) { - free((*hp)->s); - (*hp)->s = strdup(command); - *hp = (*hp)->n; + get_previous_history(hp, (*hp)->n); } +enum { + ESC = 27, + DEL = 127, +}; + + /* * This function is used to grab a character buffer * from the input file descriptor and allows you to @@ -386,217 +1172,230 @@ void get_next_history(struct history **hp, char* command) * * Furthermore, the "vi" command editing keys are not implemented. * - * TODO: implement TAB command completion. :) */ -extern void cmdedit_read_input(char* prompt, char command[BUFSIZ]) + +extern void cmdedit_read_input(char *prompt, char command[BUFSIZ]) { - int inputFd=fileno(stdin); - int outputFd=fileno(stdout); - 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; + unsigned char c = 0; struct history *hp = his_end; - memset(command, 0, sizeof(command)); - if (!reset_term) { - - getTermSettings(inputFd, (void*) &initial_settings); + /* prepare before init handlers */ + cmdedit_y = 0; /* quasireal y, not true work if line > xt*yt */ + len = 0; + command_ps = command; + + if (new_settings.c_cc[VERASE] == 0) { /* first call */ + + 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); +#ifndef linux + /* Hmm, in linux c_cc[] not parsed if set ~ICANON */ 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 */ - reset_term = 1; + /* Turn off CTRL-C, so we can trap it */ +# ifndef _POSIX_VDISABLE +# define _POSIX_VDISABLE '\0' +# endif + new_settings.c_cc[VINTR] = _POSIX_VDISABLE; +#endif } - setTermSettings(inputFd, (void*) &new_settings); - memset(command, 0, BUFSIZ); + 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; - //fprintf(stderr, "got a '%c' (%d)\n", c, c); + fflush(stdout); /* buffered out to fast */ + + if (read(0, &c, 1) < 1) + /* if we can't read input then exit */ + goto prepare_to_die; switch (c) { case '\n': case '\r': /* Enter */ - *(command + len++ + 1) = c; - xwrite(outputFd, &c, 1); + goto_new_line(); break_out = 1; break; case 1: /* Control-a -- Beginning of line */ - input_home(outputFd, &cursor); + input_backward(cursor); + break; case 2: /* Control-b -- Move back one character */ - input_backward(outputFd, &cursor); + input_backward(1); break; case 3: - /* Control-c -- leave the current line, - * and start over on the next line */ + /* Control-c -- stop gathering input */ - /* Go to the next line */ - xwrite(outputFd, "\n", 1); - - /* Rewrite the prompt */ - xwrite(outputFd, prompt, strlen(prompt)); + /* Link into lash to reset context to 0 on ^C and such */ + shell_context = 0; - /* Reset the command string */ - memset(command, 0, sizeof(command)); - len = cursor = 0; + /* Go to the next line */ + goto_new_line(); + command[0] = 0; - break; + return; case 4: - /* Control-d -- Delete one character, or exit + /* Control-d -- Delete one character, or exit * if the len=0 and no chars to delete */ if (len == 0) { - xwrite(outputFd, "exit", 4); +prepare_to_die: + printf("exit"); clean_up_and_die(0); } else { - input_delete(command, outputFd, cursor, &len); + input_delete(); } break; case 5: /* Control-e -- End of line */ - input_end(outputFd, &cursor, len); + input_end(); break; case 6: /* Control-f -- Move forward one character */ - input_forward(outputFd, &cursor, len); + input_forward(); break; case '\b': case DEL: /* Control-h and DEL */ - input_backspace(command, outputFd, &cursor, &len); + input_backspace(); break; case '\t': -#ifdef BB_FEATURE_SH_TAB_COMPLETION - input_tab(command, prompt, outputFd, &cursor, &len); +#ifdef BB_FEATURE_COMMAND_TAB_COMPLETION + input_tab(&lastWasTab); #endif break; case 14: /* Control-n -- Get next command in history */ if (hp && hp->n && hp->n->s) { - get_next_history(&hp, command); + get_next_history(&hp); goto rewrite_line; } else { - xwrite(outputFd, "\007", 1); + beep(); } break; case 16: /* Control-p -- Get previous command from history */ if (hp && hp->p) { - get_previous_history(&hp, command); + get_previous_history(&hp, hp->p); goto rewrite_line; } else { - xwrite(outputFd, "\007", 1); + beep(); } break; + case 21: + /* Control-U -- Clear line before cursor */ + if (cursor) { + strcpy(command, command + cursor); + redraw(cmdedit_y, len -= cursor); + } + break; + case ESC:{ - /* escape sequence follows */ - if ((ret = read(inputFd, &c, 1)) < 1) + /* escape sequence follows */ + if (read(0, &c, 1) < 1) + return; + /* different vt100 emulations */ + if (c == '[' || c == 'O') { + if (read(0, &c, 1) < 1) return; + } + switch (c) { +#ifdef BB_FEATURE_COMMAND_TAB_COMPLETION + case '\t': /* Alt-Tab */ - 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 { - xwrite(outputFd, "\007", 1); - } - 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 { - xwrite(outputFd, "\007", 1); - } - break; - - /* Rewrite the line with the selected history item */ - rewrite_line: - /* erase old command from command line */ - len = strlen(command)-strlen(hp->s); - while (len>0) - input_backspace(command, outputFd, &cursor, &len); - input_home(outputFd, &cursor); - - /* write new command */ - strcpy(command, hp->s); - len = strlen(hp->s); - xwrite(outputFd, command, len); - cursor = len; - break; - case 'C': - /* Right Arrow -- Move forward one character */ - input_forward(outputFd, &cursor, len); - break; - case 'D': - /* Left Arrow -- Move back one character */ - input_backward(outputFd, &cursor); - break; - case '3': - /* Delete */ - input_delete(command, outputFd, cursor, &len); - break; - case '1': - /* Home (Ctrl-A) */ - input_home(outputFd, &cursor); - break; - case '4': - /* End (Ctrl-E) */ - input_end(outputFd, &cursor, len); - break; - default: - xwrite(outputFd, "\007", 1); - } - if (c == '1' || c == '3' || c == '4') - if ((ret = read(inputFd, &c, 1)) < 1) - return; /* read 126 (~) */ + input_tab(&lastWasTab); + break; +#endif + case 'A': + /* Up Arrow -- Get previous command from history */ + if (hp && hp->p) { + get_previous_history(&hp, hp->p); + goto rewrite_line; + } else { + beep(); } - if (c == 'O') { - /* 79 */ - if ((ret = read(inputFd, &c, 1)) < 1) - return; - switch (c) { - case 'H': - /* Home (xterm) */ - input_home(outputFd, &cursor); - break; - case 'F': - /* End (xterm) */ - input_end(outputFd, &cursor, len); - break; - default: - xwrite(outputFd, "\007", 1); - } + break; + case 'B': + /* Down Arrow -- Get next command in history */ + if (hp && hp->n && hp->n->s) { + get_next_history(&hp); + goto rewrite_line; + } else { + beep(); } - c = 0; break; - } - - default: /* If it's regular input, do the normal thing */ - if (!isprint(c)) { /* Skip non-printable characters */ + /* Rewrite the line with the selected history item */ + rewrite_line: + /* change command */ + len = strlen(strcpy(command, hp->s)); + /* redraw and go to end line */ + redraw(cmdedit_y, 0); + break; + 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(); break; + case '1': + case 'H': + /* Home (Ctrl-A) */ + input_backward(cursor); + break; + case '4': + case 'F': + /* End (Ctrl-E) */ + input_end(); + break; + default: + if (!(c >= '1' && c <= '9')) + c = 0; + beep(); } + if (c >= '1' && c <= '9') + do + if (read(0, &c, 1) < 1) + return; + while (c != '~'); + break; + } + + default: /* If it's regular input, do the normal thing */ +#ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT + /* Control-V -- Add non-printable symbol */ + if (c == 22) { + if (read(0, &c, 1) < 1) + return; + if (c == 0) { + beep(); + break; + } + } else +#endif + if (!Isprint(c)) /* Skip non-printable characters */ + break; if (len >= (BUFSIZ - 2)) /* Need to leave space for enter */ break; @@ -605,61 +1404,60 @@ extern void cmdedit_read_input(char* prompt, char command[BUFSIZ]) 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 */ - memmove(command + cursor + 1, command + cursor, - len - cursor - 1); - - *(command + cursor) = c; - - for (j = cursor; j < len; j++) - xwrite(outputFd, command + j, 1); - for (; j > cursor; j--) - xwrite(outputFd, "\033[D", 3); + 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 - lastWasTab = FALSE; - if (break_out) /* Enter is the command terminator, no more input. */ break; - } - nr = len + 1; - setTermSettings(inputFd, (void *) &initial_settings); - reset_term = 0; + if (c != '\t') + lastWasTab = FALSE; + } + setTermSettings(0, (void *) &initial_settings); + handlers_sets &= ~SET_RESET_TERM; /* Handle command history log */ - if (*(command)) { + if (len) { /* no put empty line */ struct history *h = his_end; + char *ss; + + ss = xstrdup(command); /* duplicate */ - if (!h) { - /* No previous history */ - h = his_front = malloc(sizeof(struct history)); - h->n = malloc(sizeof(struct history)); + if (h == 0) { + /* 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 = strdup(command); + 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 */ - h->n = malloc(sizeof(struct history)); + /* 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 = strdup(command); + h->s = ss; his_end = h->n; /* After max history, remove the oldest command */ @@ -675,17 +1473,76 @@ extern void cmdedit_read_input(char* prompt, char command[BUFSIZ]) history_counter++; } } +#if defined(BB_FEATURE_SH_FANCY_PROMPT) + num_ok_lines++; +#endif } - + command[len++] = '\n'; /* set '\n' */ + command[len] = 0; +#if defined(BB_FEATURE_CLEAN_UP) && defined(BB_FEATURE_COMMAND_TAB_COMPLETION) + input_tab(0); /* strong free */ +#endif +#if defined(BB_FEATURE_SH_FANCY_PROMPT) + free(cmdedit_prompt); +#endif return; } -extern void cmdedit_init(void) + +/* Undo the effects of cmdedit_init(). */ +extern void cmdedit_terminate(void) { - atexit(cmdedit_reset_term); - signal(SIGKILL, clean_up_and_die); - signal(SIGINT, clean_up_and_die); - signal(SIGQUIT, clean_up_and_die); - signal(SIGTERM, clean_up_and_die); + 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; + } } -#endif /* BB_FEATURE_SH_COMMAND_EDITING */ + +#endif /* BB_FEATURE_COMMAND_EDITING */ + + +#ifdef TEST + +const char *applet_name = "debug stuff usage"; +const char *memory_exhausted = "Memory exhausted"; + +#ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT +#include +#endif + +unsigned int shell_context; + +int main(int argc, char **argv) +{ + char buff[BUFSIZ]; + char *prompt = +#if defined(BB_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 BB_FEATURE_NONPRINTABLE_INVERSE_PUT + setlocale(LC_ALL, ""); +#endif + shell_context = 1; + do { + int l; + cmdedit_read_input(prompt, buff); + l = strlen(buff); + if(l > 0 && buff[l-1] == '\n') + buff[l-1] = 0; + printf("*** cmdedit_read_input() returned line =%s=\n", buff); + } while (shell_context); + printf("*** cmdedit_read_input() detect ^C\n"); + return 0; +} + +#endif /* TEST */