emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmdedit: use qsort for sorting command completion results; style fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2006-12-19 01:10:25 +00:00
parent 8eb3b391ad
commit 7f1dc21a5d
1 changed files with 104 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
shell/cmdedit.c
View File

@ -12,12 +12,10 @@
* Erik Andersen <andersen@codepoet.org> (Majorly adjusted for busybox) * Erik Andersen <andersen@codepoet.org> (Majorly adjusted for busybox)
* *
* This code is 'as is' with no warranty. * 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 Terminal key codes are not extensive, and more will probably
need to be added. This version was created on Debian GNU/Linux 2.x. need to be added. This version was created on Debian GNU/Linux 2.x.
Delete, Backspace, Home, End, and the arrow keys were tested Delete, Backspace, Home, End, and the arrow keys were tested
@ -30,57 +28,42 @@
- not true viewing if length prompt less terminal width - not true viewing if length prompt less terminal width
*/ */
#include "busybox.h" #include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <ctype.h>
#include <signal.h>
#include <limits.h>
#include "cmdedit.h" #include "cmdedit.h"
#ifdef CONFIG_LOCALE_SUPPORT #if ENABLE_LOCALE_SUPPORT
#define Isprint(c) isprint((c)) #define Isprint(c) isprint(c)
#else #else
#define Isprint(c) ( (c) >= ' ' && (c) != ((unsigned char)'\233') ) #define Isprint(c) ((c) >= ' ' && (c) != ((unsigned char)'\233'))
#endif #endif
/* FIXME: obsolete CONFIG item? */
#define ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT 0
#ifdef TEST #ifdef TEST
/* pretect redefined for test */ #define ENABLE_FEATURE_COMMAND_EDITING 0
#undef CONFIG_FEATURE_COMMAND_EDITING #define ENABLE_FEATURE_COMMAND_TAB_COMPLETION 0
#undef CONFIG_FEATURE_COMMAND_TAB_COMPLETION #define ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION 0
#undef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION #define ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT 0
#undef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT #define ENABLE_FEATURE_CLEAN_UP 0
#undef CONFIG_FEATURE_CLEAN_UP
#define CONFIG_FEATURE_COMMAND_EDITING
#define CONFIG_FEATURE_COMMAND_TAB_COMPLETION
#define CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
#define CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
#define CONFIG_FEATURE_CLEAN_UP
#endif /* TEST */ #endif /* TEST */
#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
#include <dirent.h>
#include <sys/stat.h>
#endif
#ifdef CONFIG_FEATURE_COMMAND_EDITING #if ENABLE_FEATURE_COMMAND_EDITING
#if defined(CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION) || defined(CONFIG_FEATURE_SH_FANCY_PROMPT) #if ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION || ENABLE_FEATURE_SH_FANCY_PROMPT
#define CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR #define ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR 1
#endif #endif
/* Maximum length of the linked list for the command line history */ /* Maximum length of the linked list for the command line history */
#ifndef CONFIG_FEATURE_COMMAND_HISTORY #if !ENABLE_FEATURE_COMMAND_HISTORY
#define MAX_HISTORY 15 #define MAX_HISTORY 15
#else #else
#define MAX_HISTORY (CONFIG_FEATURE_COMMAND_HISTORY + 0) #define MAX_HISTORY (CONFIG_FEATURE_COMMAND_HISTORY + 0)
@ -94,7 +77,7 @@ static int n_history;
static int cur_history; static int cur_history;
#endif #endif
#include <termios.h> //#include <termios.h>
#define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp) #define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
#define getTermSettings(fd,argp) tcgetattr(fd, argp); #define getTermSettings(fd,argp) tcgetattr(fd, argp);
@ -119,37 +102,33 @@ static int cmdedit_x; /* real x terminal position */
static int cmdedit_y; /* pseudoreal y terminal position */ static int cmdedit_y; /* pseudoreal y terminal position */
static int cmdedit_prmt_len; /* lenght prompt without colores string */ static int cmdedit_prmt_len; /* lenght prompt without colores string */
static int cursor; /* required global for signal handler */ static int cursor; /* required globals for signal handler */
static int len; /* --- "" - - "" - -"- --""-- --""--- */ static int len; /* --- "" - - "" -- -"- --""-- --""--- */
static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */ static char *command_ps; /* --- "" - - "" -- -"- --""-- --""--- */
static static SKIP_FEATURE_SH_FANCY_PROMPT(const) char *cmdedit_prompt; /* -- */
#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
const
#endif
char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */
#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR #if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
static char *user_buf = ""; static char *user_buf = "";
static char *home_pwd_buf = ""; static char *home_pwd_buf = "";
static int my_euid; static int my_euid;
#endif #endif
#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT #if ENABLE_FEATURE_SH_FANCY_PROMPT
static char *hostname_buf; static char *hostname_buf;
static int num_ok_lines = 1; static int num_ok_lines = 1;
#endif #endif
#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION #if ENABLE_FEATURE_COMMAND_TAB_COMPLETION
#ifndef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR #if !ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
static int my_euid; static int my_euid;
#endif #endif
static int my_uid; static int my_uid;
static int my_gid; static int my_gid;
#endif /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */ #endif /* FEATURE_COMMAND_TAB_COMPLETION */
static void cmdedit_setwidth(int w, int redraw_flg); static void cmdedit_setwidth(int w, int redraw_flg);
@ -163,7 +142,7 @@ static void win_changed(int nsig)
get_terminal_width_height(0, &width, NULL); get_terminal_width_height(0, &width, NULL);
cmdedit_setwidth(width, nsig == SIGWINCH); 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); previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
@ -198,7 +177,7 @@ static void cmdedit_set_out_char(int next_char)
if (c == 0) if (c == 0)
c = ' '; /* destroy end char? */ c = ' '; /* destroy end char? */
#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT #if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT
if (!Isprint(c)) { /* Inverse put non-printable characters */ if (!Isprint(c)) { /* Inverse put non-printable characters */
if (c >= 128) if (c >= 128)
c -= 128; c -= 128;
@ -290,7 +269,7 @@ static void put_prompt(void)
cmdedit_y = 0; /* new quasireal y */ cmdedit_y = 0; /* new quasireal y */
} }
#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT #if !ENABLE_FEATURE_SH_FANCY_PROMPT
static void parse_prompt(const char *prmt_ptr) static void parse_prompt(const char *prmt_ptr)
{ {
cmdedit_prompt = prmt_ptr; cmdedit_prompt = prmt_ptr;
@ -323,12 +302,12 @@ static void parse_prompt(const char *prmt_ptr)
int l; int l;
c = bb_process_escape_sequence(&prmt_ptr); c = bb_process_escape_sequence(&prmt_ptr);
if(prmt_ptr==cp) { if (prmt_ptr==cp) {
if (*cp == 0) if (*cp == 0)
break; break;
c = *prmt_ptr++; c = *prmt_ptr++;
switch (c) { switch (c) {
#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR #if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
case 'u': case 'u':
pbuf = user_buf; pbuf = user_buf;
break; break;
@ -351,7 +330,7 @@ static void parse_prompt(const char *prmt_ptr)
case '$': case '$':
c = my_euid == 0 ? '#' : '$'; c = my_euid == 0 ? '#' : '$';
break; break;
#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR #if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
case 'w': case 'w':
pbuf = pwd_buf; pbuf = pwd_buf;
l = strlen(home_pwd_buf); l = strlen(home_pwd_buf);
@ -391,7 +370,7 @@ static void parse_prompt(const char *prmt_ptr)
} }
buf2[l] = 0; buf2[l] = 0;
c = (char)strtol(buf2, 0, 16); c = (char)strtol(buf2, 0, 16);
if(c==0) if (c==0)
c = '?'; c = '?';
pbuf = buf; pbuf = buf;
break; break;
@ -404,7 +383,7 @@ static void parse_prompt(const char *prmt_ptr)
} }
} }
} }
if(pbuf == buf) if (pbuf == buf)
*pbuf = c; *pbuf = c;
cur_prmt_len = strlen(pbuf); cur_prmt_len = strlen(pbuf);
prmt_len += cur_prmt_len; prmt_len += cur_prmt_len;
@ -412,7 +391,7 @@ static void parse_prompt(const char *prmt_ptr)
cmdedit_prmt_len += cur_prmt_len; cmdedit_prmt_len += cur_prmt_len;
prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_len+1), pbuf); prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_len+1), pbuf);
} }
if(pwd_buf!=(char *)bb_msg_unknown) if (pwd_buf!=(char *)bb_msg_unknown)
free(pwd_buf); free(pwd_buf);
cmdedit_prompt = prmt_mem_ptr; cmdedit_prompt = prmt_mem_ptr;
put_prompt(); put_prompt();
@ -432,7 +411,7 @@ static void redraw(int y, int back_cursor)
input_backward(back_cursor); input_backward(back_cursor);
} }
#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
#define DELBUFSIZ 128 #define DELBUFSIZ 128
static char *delbuf; /* a (malloced) place to store deleted characters */ static char *delbuf; /* a (malloced) place to store deleted characters */
static char *delp; static char *delp;
@ -448,7 +427,7 @@ static void input_delete(int save)
if (j == len) if (j == len)
return; return;
#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
if (save) { if (save) {
if (newdelflag) { if (newdelflag) {
if (!delbuf) if (!delbuf)
@ -469,7 +448,7 @@ static void input_delete(int save)
input_backward(cursor - j); /* back to old pos cursor */ input_backward(cursor - j); /* back to old pos cursor */
} }
#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
static void put(void) static void put(void)
{ {
int ocursor, j = delp - delbuf; int ocursor, j = delp - delbuf;
@ -532,7 +511,7 @@ static void cmdedit_init(void)
} }
if ((handlers_sets & SET_ATEXIT) == 0) { if ((handlers_sets & SET_ATEXIT) == 0) {
#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR #if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
struct passwd *entry; struct passwd *entry;
my_euid = geteuid(); my_euid = geteuid();
@ -543,20 +522,20 @@ static void cmdedit_init(void)
} }
#endif #endif
#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION #if ENABLE_FEATURE_COMMAND_TAB_COMPLETION
#ifndef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR #if !ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
my_euid = geteuid(); my_euid = geteuid();
#endif #endif
my_uid = getuid(); my_uid = getuid();
my_gid = getgid(); my_gid = getgid();
#endif /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */ #endif /* FEATURE_COMMAND_TAB_COMPLETION */
handlers_sets |= SET_ATEXIT; handlers_sets |= SET_ATEXIT;
atexit(cmdedit_reset_term); /* be sure to do this only once */ atexit(cmdedit_reset_term); /* be sure to do this only once */
} }
} }
#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION #if ENABLE_FEATURE_COMMAND_TAB_COMPLETION
static char **matches; static char **matches;
static int num_matches; static int num_matches;
@ -583,7 +562,7 @@ static int is_execute(const struct stat *st)
return FALSE; return FALSE;
} }
#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION #if ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION
static void username_tab_completion(char *ud, char *with_shash_flg) static void username_tab_completion(char *ud, char *with_shash_flg)
{ {
@ -633,7 +612,7 @@ static void username_tab_completion(char *ud, char *with_shash_flg)
endpwent(); endpwent();
} }
} }
#endif /* CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION */ #endif /* FEATURE_COMMAND_USERNAME_COMPLETION */
enum { enum {
FIND_EXE_ONLY = 0, FIND_EXE_ONLY = 0,
@ -641,7 +620,7 @@ enum {
FIND_FILE_ONLY = 2, FIND_FILE_ONLY = 2,
}; };
#ifdef CONFIG_ASH #if ENABLE_ASH
const char *cmdedit_path_lookup; const char *cmdedit_path_lookup;
#else #else
#define cmdedit_path_lookup getenv("PATH") #define cmdedit_path_lookup getenv("PATH")
@ -703,7 +682,7 @@ static char *add_quote_for_spec_chars(char *found, int add)
s[l++] = '\\'; s[l++] = '\\';
s[l++] = *found++; s[l++] = *found++;
} }
if(add) if (add)
s[l++] = (char)add; s[l++] = (char)add;
s[l] = 0; s[l] = 0;
return s; return s;
@ -734,7 +713,7 @@ static void exe_n_cwd_tab_completion(char *command, int type)
strcpy(dirbuf, command); strcpy(dirbuf, command);
/* set dir only */ /* set dir only */
dirbuf[(pfind - command) + 1] = 0; dirbuf[(pfind - command) + 1] = 0;
#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION #if ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION
if (dirbuf[0] == '~') /* ~/... or ~user/... */ if (dirbuf[0] == '~') /* ~/... or ~user/... */
username_tab_completion(dirbuf, dirbuf); username_tab_completion(dirbuf, dirbuf);
#endif #endif
@ -777,7 +756,7 @@ static void exe_n_cwd_tab_completion(char *command, int type)
char *e = found + strlen(found) - 1; char *e = found + strlen(found) - 1;
add_chr = '/'; add_chr = '/';
if(*e == '/') if (*e == '/')
*e = '\0'; *e = '\0';
} else { } else {
/* not put found file if search only dirs for cd */ /* not put found file if search only dirs for cd */
@ -832,12 +811,12 @@ static int find_match(char *matchBuf, int *len_with_quotes)
collapse_pos(j, j + 1); collapse_pos(j, j + 1);
int_buf[j] |= QUOT; int_buf[j] |= QUOT;
i++; i++;
#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT #if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT
if (matchBuf[i] == '\t') /* algorithm equivalent */ if (matchBuf[i] == '\t') /* algorithm equivalent */
int_buf[j] = ' ' | QUOT; int_buf[j] = ' ' | QUOT;
#endif #endif
} }
#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT #if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT
else if (matchBuf[i] == '\t') else if (matchBuf[i] == '\t')
int_buf[j] = ' '; int_buf[j] = ' ';
#endif #endif
@ -986,7 +965,7 @@ static void showfiles(void)
/* find the longest file name- use that as the column width */ /* find the longest file name- use that as the column width */
for (row = 0; row < nrows; row++) { for (row = 0; row < nrows; row++) {
l = strlen(matches[row]); l = strlen(matches[row]);
if(add_char_to_match[row]) if (add_char_to_match[row])
l++; l++;
if (column_width < l) if (column_width < l)
column_width = l; column_width = l;
@ -996,7 +975,7 @@ static void showfiles(void)
if (ncols > 1) { if (ncols > 1) {
nrows /= ncols; nrows /= ncols;
if(nfiles % ncols) if (nfiles % ncols)
nrows++; /* round up fractionals */ nrows++; /* round up fractionals */
} else { } else {
ncols = 1; ncols = 1;
@ -1012,7 +991,7 @@ static void showfiles(void)
acol = str_add_chr[0] ? column_width - 1 : column_width; acol = str_add_chr[0] ? column_width - 1 : column_width;
printf("%s%s", matches[n], str_add_chr); printf("%s%s", matches[n], str_add_chr);
l = strlen(matches[n]); l = strlen(matches[n]);
while(l < acol) { while (l < acol) {
putchar(' '); putchar(' ');
l++; l++;
} }
@ -1022,7 +1001,6 @@ static void showfiles(void)
} }
} }
static void input_tab(int *lastWasTab) static void input_tab(int *lastWasTab)
{ {
/* Do TAB completion */ /* Do TAB completion */
@ -1057,7 +1035,7 @@ static void input_tab(int *lastWasTab)
/* Free up any memory already allocated */ /* Free up any memory already allocated */
input_tab(0); input_tab(0);
#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION #if ENABLE_FEATURE_COMMAND_USERNAME_COMPLETION
/* If the word starts with `~' and there is no slash in the word, /* If the word starts with `~' and there is no slash in the word,
* then try completing this word as a username. */ * then try completing this word as a username. */
@ -1069,34 +1047,30 @@ static void input_tab(int *lastWasTab)
* in the current working directory that matches. */ * in the current working directory that matches. */
exe_n_cwd_tab_completion(matchBuf, find_type); exe_n_cwd_tab_completion(matchBuf, find_type);
/* Remove duplicate found and sort */ /* Remove duplicate found and sort */
if(matches) { if (matches) {
int i, j, n, srt; int i, n;
/* bubble */ /* strcmp is int(*f)(const char*, const char*) */
n = num_matches; /* qsort wants int(*f)(const void*, const void*) */
for(i=0; i<(n-1); i++) { /* We cheat here :) */
for(j=i+1; j<n; j++) { qsort(matches, num_matches, sizeof(char*), (void*)strcmp);
if(matches[i]!=NULL && matches[j]!=NULL) { i = 0;
srt = strcmp(matches[i], matches[j]); while (i < num_matches - 1) {
if(srt == 0) { n = i + 1;
free(matches[j]); if (matches[i] && matches[n]) {
matches[j]=0; while (n < num_matches
} else if(srt > 0) { && !strcmp(matches[i], matches[n])) {
tmp1 = matches[i]; free(matches[n]);
matches[i] = matches[j]; matches[n] = 0;
matches[j] = tmp1; n++;
srt = add_char_to_match[i];
add_char_to_match[i] = add_char_to_match[j];
add_char_to_match[j] = srt;
}
} }
} }
i = n;
} }
j = n;
n = 0; n = 0;
for(i=0; i<j; i++) for(i = 0; i < num_matches; i++)
if(matches[i]) { if (matches[i]) {
matches[n]=matches[i]; matches[n] = matches[i];
add_char_to_match[n]=add_char_to_match[i]; add_char_to_match[n] = add_char_to_match[i];
n++; n++;
} }
num_matches = n; num_matches = n;
@ -1162,12 +1136,12 @@ static void input_tab(int *lastWasTab)
} }
} }
} }
#endif /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */ #endif /* FEATURE_COMMAND_TAB_COMPLETION */
#if MAX_HISTORY > 0 #if MAX_HISTORY > 0
static void get_previous_history(void) static void get_previous_history(void)
{ {
if(command_ps[0] != 0 || history[cur_history] == 0) { if (command_ps[0] != 0 || history[cur_history] == 0) {
free(history[cur_history]); free(history[cur_history]);
history[cur_history] = xstrdup(command_ps); history[cur_history] = xstrdup(command_ps);
} }
@ -1188,7 +1162,7 @@ static int get_next_history(void)
} }
} }
#ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY #if ENABLE_FEATURE_COMMAND_SAVEHISTORY
void load_history ( const char *fromfile ) void load_history ( const char *fromfile )
{ {
FILE *fp; FILE *fp;
@ -1207,12 +1181,12 @@ void load_history ( const char *fromfile )
char * hl = xmalloc_getline(fp); char * hl = xmalloc_getline(fp);
int l; int l;
if(!hl) if (!hl)
break; break;
l = strlen(hl); l = strlen(hl);
if(l >= BUFSIZ) if (l >= BUFSIZ)
hl[BUFSIZ-1] = 0; hl[BUFSIZ-1] = 0;
if(l == 0 || hl[0] == ' ') { if (l == 0 || hl[0] == ' ') {
free(hl); free(hl);
continue; continue;
} }
@ -1264,7 +1238,7 @@ enum {
* *
*/ */
#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
static int vi_mode; static int vi_mode;
void setvimode ( int viflag ) void setvimode ( int viflag )
@ -1392,7 +1366,7 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
int lastWasTab = FALSE; int lastWasTab = FALSE;
unsigned char c; unsigned char c;
unsigned int ic; unsigned int ic;
#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
unsigned int prevc; unsigned int prevc;
int vi_cmdmode = 0; int vi_cmdmode = 0;
#endif #endif
@ -1434,7 +1408,7 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
ic = c; ic = c;
#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI #if ENABLE_FEATURE_COMMAND_EDITING_VI
newdelflag = 1; newdelflag = 1;
if (vi_cmdmode) if (vi_cmdmode)
ic |= vbit; ic |= vbit;
@ -1465,7 +1439,7 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
vi_case( case CNTRL('C')|vbit: ) vi_case( case CNTRL('C')|vbit: )
/* Control-c -- stop gathering input */ /* Control-c -- stop gathering input */
goto_new_line(); goto_new_line();
#ifndef CONFIG_ASH #if !ENABLE_ASH
command[0] = 0; command[0] = 0;
len = 0; len = 0;
lastWasTab = FALSE; lastWasTab = FALSE;
@ -1481,7 +1455,7 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
if (len == 0) { if (len == 0) {
errno = 0; errno = 0;
prepare_to_die: prepare_to_die:
#if !defined(CONFIG_ASH) #if !ENABLE_ASH
printf("exit"); printf("exit");
goto_new_line(); goto_new_line();
/* cmdedit_reset_term() called in atexit */ /* cmdedit_reset_term() called in atexit */
@ -1512,7 +1486,7 @@ prepare_to_die:
input_backspace(); input_backspace();
break; break;
case '\t': case '\t':
#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION #if ENABLE_FEATURE_COMMAND_TAB_COMPLETION
input_tab(&lastWasTab); input_tab(&lastWasTab);
#endif #endif
break; break;
@ -1629,7 +1603,7 @@ prepare_to_die:
goto clear_to_eol; goto clear_to_eol;
break; break;
} }
switch(c) { switch (c) {
case 'w': case 'w':
case 'W': case 'W':
case 'e': case 'e':
@ -1692,7 +1666,7 @@ prepare_to_die:
putchar('\b'); putchar('\b');
} }
break; break;
#endif /* CONFIG_FEATURE_COMMAND_EDITING_VI */ #endif /* FEATURE_COMMAND_EDITING_VI */
case ESC: case ESC:
@ -1719,11 +1693,11 @@ prepare_to_die:
if (safe_read(0, &dummy, 1) < 1) if (safe_read(0, &dummy, 1) < 1)
goto prepare_to_die; goto prepare_to_die;
if(dummy != '~') if (dummy != '~')
c = 0; c = 0;
} }
switch (c) { switch (c) {
#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION #if ENABLE_FEATURE_COMMAND_TAB_COMPLETION
case '\t': /* Alt-Tab */ case '\t': /* Alt-Tab */
input_tab(&lastWasTab); input_tab(&lastWasTab);
@ -1784,7 +1758,7 @@ rewrite_line:
break; break;
default: /* If it's regular input, do the normal thing */ default: /* If it's regular input, do the normal thing */
#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT #if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT
/* Control-V -- Add non-printable symbol */ /* Control-V -- Add non-printable symbol */
if (c == CNTRL('V')) { if (c == CNTRL('V')) {
if (safe_read(0, &c, 1) < 1) if (safe_read(0, &c, 1) < 1)
@ -1854,12 +1828,12 @@ rewrite_line:
history[i++] = xstrdup(command); history[i++] = xstrdup(command);
cur_history = i; cur_history = i;
n_history = i; n_history = i;
#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT) #if ENABLE_FEATURE_SH_FANCY_PROMPT
num_ok_lines++; num_ok_lines++;
#endif #endif
} }
#else /* MAX_HISTORY == 0 */ #else /* MAX_HISTORY == 0 */
#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT) #if ENABLE_FEATURE_SH_FANCY_PROMPT
if (len > 0) { /* no put empty line */ if (len > 0) { /* no put empty line */
num_ok_lines++; num_ok_lines++;
} }
@ -1869,26 +1843,24 @@ rewrite_line:
command[len++] = '\n'; /* set '\n' */ command[len++] = '\n'; /* set '\n' */
command[len] = 0; command[len] = 0;
} }
#if defined(CONFIG_FEATURE_CLEAN_UP) && defined(CONFIG_FEATURE_COMMAND_TAB_COMPLETION) #if ENABLE_FEATURE_CLEAN_UP && ENABLE_FEATURE_COMMAND_TAB_COMPLETION
input_tab(0); /* strong free */ input_tab(0); /* strong free */
#endif #endif
#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT) #if ENABLE_FEATURE_SH_FANCY_PROMPT
free(cmdedit_prompt); free(cmdedit_prompt);
#endif #endif
cmdedit_reset_term(); cmdedit_reset_term();
return len; return len;
} }
#endif /* FEATURE_COMMAND_EDITING */
#endif /* CONFIG_FEATURE_COMMAND_EDITING */
#ifdef TEST #ifdef TEST
const char *applet_name = "debug stuff usage"; const char *applet_name = "debug stuff usage";
#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT #if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT
#include <locale.h> #include <locale.h>
#endif #endif
@ -1896,7 +1868,7 @@ int main(int argc, char **argv)
{ {
char buff[BUFSIZ]; char buff[BUFSIZ];
char *prompt = char *prompt =
#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT) #if ENABLE_FEATURE_SH_FANCY_PROMPT
"\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\ "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\
\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \ \\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \
\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]"; \\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]";
@ -1904,13 +1876,13 @@ int main(int argc, char **argv)
"% "; "% ";
#endif #endif
#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT #if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
#endif #endif
while(1) { while (1) {
int l; int l;
l = cmdedit_read_input(prompt, buff); l = cmdedit_read_input(prompt, buff);
if(l > 0 && buff[l-1] == '\n') { if (l > 0 && buff[l-1] == '\n') {
buff[l-1] = 0; buff[l-1] = 0;
printf("*** cmdedit_read_input() returned line =%s=\n", buff); printf("*** cmdedit_read_input() returned line =%s=\n", buff);
} else { } else {