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

cmdedit: reformat code a bit, no algorithm changes

Browse Source
This commit is contained in:
Denis Vlasenko 2006-12-21 22:27:10 +00:00
parent d56b47f9a6
commit 0a8a774179
1 changed files with 230 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

463
shell/cmdedit.c
View File

@ -78,7 +78,7 @@ 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);
/* Current termio and the previous termio before starting sh */ /* Current termio and the previous termio before starting sh */
@ -136,7 +136,7 @@ static void win_changed(int nsig)
{ {
static sighandler_t previous_SIGWINCH_handler; /* for reset */ static sighandler_t previous_SIGWINCH_handler; /* for reset */
/* emulate || signal call */ /* emulate || signal call */
if (nsig == -SIGWINCH || nsig == SIGWINCH) { if (nsig == -SIGWINCH || nsig == SIGWINCH) {
int width = 0; int width = 0;
get_terminal_width_height(0, &width, NULL); get_terminal_width_height(0, &width, NULL);
@ -155,12 +155,12 @@ static void win_changed(int nsig)
static void cmdedit_reset_term(void) static void cmdedit_reset_term(void)
{ {
if ((handlers_sets & SET_RESET_TERM) != 0) { if (handlers_sets & SET_RESET_TERM) {
/* sparc and other have broken termios support: use old termio handling. */ /* sparc and other have broken termios support: use old termio handling. */
setTermSettings(STDIN_FILENO, (void *) &initial_settings); setTermSettings(STDIN_FILENO, (void *) &initial_settings);
handlers_sets &= ~SET_RESET_TERM; handlers_sets &= ~SET_RESET_TERM;
} }
if ((handlers_sets & SET_WCHG_HANDLERS) != 0) { if (handlers_sets & SET_WCHG_HANDLERS) {
/* reset SIGWINCH handler to previous (default) */ /* reset SIGWINCH handler to previous (default) */
win_changed(0); win_changed(0);
handlers_sets &= ~SET_WCHG_HANDLERS; handlers_sets &= ~SET_WCHG_HANDLERS;
@ -172,8 +172,7 @@ static void cmdedit_reset_term(void)
/* special for recount position for scroll and remove terminal margin effect */ /* special for recount position for scroll and remove terminal margin effect */
static void cmdedit_set_out_char(int next_char) static void cmdedit_set_out_char(int next_char)
{ {
int c = (unsigned char)command_ps[cursor];
int c = (int)((unsigned char) command_ps[cursor]);
if (c == 0) if (c == 0)
c = ' '; /* destroy end char? */ c = ' '; /* destroy end char? */
@ -188,7 +187,10 @@ static void cmdedit_set_out_char(int next_char)
printf("\033[7m%c\033[0m", c); printf("\033[7m%c\033[0m", c);
} else } else
#endif #endif
if (initial_settings.c_lflag & ECHO) putchar(c); {
if (initial_settings.c_lflag & ECHO)
putchar(c);
}
if (++cmdedit_x >= cmdedit_termw) { if (++cmdedit_x >= cmdedit_termw) {
/* terminal is scrolled down */ /* terminal is scrolled down */
cmdedit_y++; cmdedit_y++;
@ -221,7 +223,7 @@ static void goto_new_line(void)
static void out1str(const char *s) static void out1str(const char *s)
{ {
if ( s ) if (s)
fputs(s, stdout); fputs(s, stdout);
} }
@ -255,7 +257,7 @@ static void input_backward(int num)
count_y = 1 + num / cmdedit_termw; count_y = 1 + num / cmdedit_termw;
printf("\033[%dA", count_y); printf("\033[%dA", count_y);
cmdedit_y -= count_y; cmdedit_y -= count_y;
/* require forward after uping */ /* require forward after uping */
cmdedit_x = cmdedit_termw * count_y - num; cmdedit_x = cmdedit_termw * count_y - num;
printf("\033[%dC", cmdedit_x); /* set term cursor */ printf("\033[%dC", cmdedit_x); /* set term cursor */
} }
@ -281,20 +283,20 @@ static void parse_prompt(const char *prmt_ptr)
{ {
int prmt_len = 0; int prmt_len = 0;
size_t cur_prmt_len = 0; size_t cur_prmt_len = 0;
char flg_not_length = '['; char flg_not_length = '[';
char *prmt_mem_ptr = xzalloc(1); char *prmt_mem_ptr = xzalloc(1);
char *pwd_buf = xgetcwd(0); char *pwd_buf = xgetcwd(0);
char buf2[PATH_MAX + 1]; char buf2[PATH_MAX + 1];
char buf[2]; char buf[2];
char c; char c;
char *pbuf; char *pbuf;
if (!pwd_buf) { if (!pwd_buf) {
pwd_buf=(char *)bb_msg_unknown; pwd_buf = (char *)bb_msg_unknown;
} }
while (*prmt_ptr) { while (*prmt_ptr) {
pbuf = buf; pbuf = buf;
pbuf[1] = 0; pbuf[1] = 0;
c = *prmt_ptr++; c = *prmt_ptr++;
if (c == '\\') { if (c == '\\') {
@ -302,85 +304,85 @@ 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) {
#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR #if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
case 'u': case 'u':
pbuf = user_buf; pbuf = user_buf;
break; break;
#endif #endif
case 'h': case 'h':
pbuf = hostname_buf; pbuf = hostname_buf;
if (pbuf == 0) { if (pbuf == 0) {
pbuf = xzalloc(256); pbuf = xzalloc(256);
if (gethostname(pbuf, 255) < 0) { if (gethostname(pbuf, 255) < 0) {
strcpy(pbuf, "?"); strcpy(pbuf, "?");
} else { } else {
char *s = strchr(pbuf, '.'); char *s = strchr(pbuf, '.');
if (s)
if (s) *s = 0;
*s = 0; }
hostname_buf = pbuf;
} }
hostname_buf = pbuf; break;
} case '$':
break; c = (my_euid == 0 ? '#' : '$');
case '$': break;
c = my_euid == 0 ? '#' : '$';
break;
#if ENABLE_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);
if (home_pwd_buf[0] != 0 && if (home_pwd_buf[0] != 0
strncmp(home_pwd_buf, pbuf, l) == 0 && && strncmp(home_pwd_buf, pbuf, l) == 0
(pbuf[l]=='/' || pbuf[l]=='\0') && && (pbuf[l]=='/' || pbuf[l]=='\0')
strlen(pwd_buf+l)<PATH_MAX) { && strlen(pwd_buf+l)<PATH_MAX
pbuf = buf2; ) {
*pbuf = '~'; pbuf = buf2;
strcpy(pbuf+1, pwd_buf+l); *pbuf = '~';
} strcpy(pbuf+1, pwd_buf+l);
break; }
break;
#endif #endif
case 'W': case 'W':
pbuf = pwd_buf; pbuf = pwd_buf;
cp = strrchr(pbuf,'/'); cp = strrchr(pbuf,'/');
if ( (cp != NULL) && (cp != pbuf) ) if (cp != NULL && cp != pbuf)
pbuf += (cp-pbuf)+1; pbuf += (cp-pbuf) + 1;
break; break;
case '!': case '!':
snprintf(pbuf = buf2, sizeof(buf2), "%d", num_ok_lines); snprintf(pbuf = buf2, sizeof(buf2), "%d", num_ok_lines);
break; break;
case 'e': case 'E': /* \e \E = \033 */ case 'e': case 'E': /* \e \E = \033 */
c = '\033'; c = '\033';
break; break;
case 'x': case 'X': case 'x': case 'X':
for (l = 0; l < 3;) { for (l = 0; l < 3;) {
int h; int h;
buf2[l++] = *prmt_ptr; buf2[l++] = *prmt_ptr;
buf2[l] = 0;
h = strtol(buf2, &pbuf, 16);
if (h > UCHAR_MAX || (pbuf - buf2) < l) {
l--;
break;
}
prmt_ptr++;
}
buf2[l] = 0; buf2[l] = 0;
h = strtol(buf2, &pbuf, 16); c = (char)strtol(buf2, 0, 16);
if (h > UCHAR_MAX || (pbuf - buf2) < l) { if (c == 0)
l--; c = '?';
break; pbuf = buf;
break;
case '[': case ']':
if (c == flg_not_length) {
flg_not_length = flg_not_length == '[' ? ']' : '[';
continue;
} }
prmt_ptr++; break;
} }
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) if (pbuf == buf)
@ -460,7 +462,7 @@ static void put(void)
strncpy(command_ps + cursor, delbuf, j); strncpy(command_ps + cursor, delbuf, j);
len += j; len += j;
input_end(); /* rewrite new line */ input_end(); /* rewrite new line */
input_backward(cursor-ocursor-j+1); /* at end of new text */ input_backward(cursor - ocursor - j + 1); /* at end of new text */
} }
#endif #endif
@ -504,13 +506,13 @@ static void cmdedit_setwidth(int w, int redraw_flg)
static void cmdedit_init(void) static void cmdedit_init(void)
{ {
cmdedit_prmt_len = 0; cmdedit_prmt_len = 0;
if ((handlers_sets & SET_WCHG_HANDLERS) == 0) { if (!(handlers_sets & SET_WCHG_HANDLERS)) {
/* emulate usage handler to set handler and call yours work */ /* emulate usage handler to set handler and call yours work */
win_changed(-SIGWINCH); win_changed(-SIGWINCH);
handlers_sets |= SET_WCHG_HANDLERS; handlers_sets |= SET_WCHG_HANDLERS;
} }
if ((handlers_sets & SET_ATEXIT) == 0) { if (!(handlers_sets & SET_ATEXIT)) {
#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR #if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
struct passwd *entry; struct passwd *entry;
@ -553,10 +555,13 @@ static void add_match(char *matched)
/* /*
static int is_execute(const struct stat *st) static int is_execute(const struct stat *st)
{ {
if ((!my_euid && (st->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) || if ((!my_euid && (st->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
(my_uid == st->st_uid && (st->st_mode & S_IXUSR)) || || (my_uid == st->st_uid && (st->st_mode & S_IXUSR))
(my_gid == st->st_gid && (st->st_mode & S_IXGRP)) || || (my_gid == st->st_gid && (st->st_mode & S_IXGRP))
(st->st_mode & S_IXOTH)) return TRUE; || (st->st_mode & S_IXOTH)
) {
return TRUE;
}
return FALSE; return FALSE;
} }
*/ */
@ -629,26 +634,25 @@ static int path_parse(char ***p, int flags)
{ {
int npth; int npth;
const char *tmp; const char *tmp;
const char *pth; const char *pth = cmdedit_path_lookup;
/* if not setenv PATH variable, to search cur dir "." */ /* if not setenv PATH variable, to search cur dir "." */
if (flags != FIND_EXE_ONLY || (pth = cmdedit_path_lookup) == 0 || if (flags != FIND_EXE_ONLY)
/* PATH=<empty> or PATH=:<empty> */ return 1;
*pth == 0 || (*pth == ':' && *(pth + 1) == 0)) { /* PATH=<empty> or PATH=:<empty> */
if (!pth || !pth[0] || LONE_CHAR(pth, ':'))
return 1; return 1;
}
tmp = pth; tmp = pth;
npth = 0; npth = 0;
for (;;) { while (1) {
npth++; /* count words is + 1 count ':' */ npth++; /* count words is + 1 count ':' */
tmp = strchr(tmp, ':'); tmp = strchr(tmp, ':');
if (tmp) { if (!tmp)
if (*++tmp == 0)
break; /* :<empty> */
} else
break; break;
if (*++tmp == 0)
break; /* :<empty> */
} }
*p = xmalloc(npth * sizeof(char *)); *p = xmalloc(npth * sizeof(char *));
@ -657,14 +661,13 @@ static int path_parse(char ***p, int flags)
(*p)[0] = xstrdup(tmp); (*p)[0] = xstrdup(tmp);
npth = 1; /* count words is + 1 count ':' */ npth = 1; /* count words is + 1 count ':' */
for (;;) { while (1) {
tmp = strchr(tmp, ':'); tmp = strchr(tmp, ':');
if (tmp) { if (!tmp)
(*p)[0][(tmp - pth)] = 0; /* ':' -> '\0' */
if (*++tmp == 0)
break; /* :<empty> */
} else
break; break;
(*p)[0][(tmp - pth)] = 0; /* ':' -> '\0' */
if (*++tmp == 0)
break; /* :<empty> */
(*p)[npth++] = &(*p)[0][(tmp - pth)]; /* p[next]=p[0][&'\0'+1] */ (*p)[npth++] = &(*p)[0][(tmp - pth)]; /* p[next]=p[0][&'\0'+1] */
} }
@ -728,28 +731,28 @@ static void exe_n_cwd_tab_completion(char *command, int type)
continue; continue;
while ((next = readdir(dir)) != NULL) { while ((next = readdir(dir)) != NULL) {
int len1;
char *str_found = next->d_name; char *str_found = next->d_name;
/* matched ? */ /* matched? */
if (strncmp(str_found, pfind, strlen(pfind))) if (strncmp(str_found, pfind, strlen(pfind)))
continue; continue;
/* not see .name without .match */ /* not see .name without .match */
if (*str_found == '.' && *pfind == 0) { if (*str_found == '.' && *pfind == 0) {
if (*paths[i] == '/' && paths[i][1] == 0 if (NOT_LONE_CHAR(paths[i], '/') || str_found[1])
&& str_found[1] == 0) str_found = ""; /* only "/" */
else
continue; continue;
str_found = ""; /* only "/" */
} }
found = concat_path_file(paths[i], str_found); found = concat_path_file(paths[i], str_found);
/* hmm, remover in progress? */ /* hmm, remover in progress? */
if (stat(found, &st) < 0) if (stat(found, &st) < 0)
goto cont; goto cont;
/* find with dirs ? */ /* find with dirs? */
if (paths[i] != dirbuf) if (paths[i] != dirbuf)
strcpy(found, next->d_name); /* only name */ strcpy(found, next->d_name); /* only name */
int len1 = strlen(found); len1 = strlen(found);
found = xrealloc(found, len1+2); found = xrealloc(found, len1 + 2);
found[len1] = '\0'; found[len1] = '\0';
found[len1+1] = '\0'; found[len1+1] = '\0';
@ -766,7 +769,7 @@ static void exe_n_cwd_tab_completion(char *command, int type)
/* Add it to the list */ /* Add it to the list */
add_match(found); add_match(found);
continue; continue;
cont: cont:
free(found); free(found);
} }
closedir(dir); closedir(dir);
@ -778,7 +781,7 @@ cont:
} }
#define QUOT (UCHAR_MAX+1) #define QUOT (UCHAR_MAX+1)
#define collapse_pos(is, in) { \ #define collapse_pos(is, in) { \
memmove(int_buf+(is), int_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); \ memmove(int_buf+(is), int_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); \
@ -794,7 +797,7 @@ static int find_match(char *matchBuf, int *len_with_quotes)
/* set to integer dimension characters and own positions */ /* set to integer dimension characters and own positions */
for (i = 0;; i++) { for (i = 0;; i++) {
int_buf[i] = (int) ((unsigned char) matchBuf[i]); int_buf[i] = (unsigned char)matchBuf[i];
if (int_buf[i] == 0) { if (int_buf[i] == 0) {
pos_buf[i] = -1; /* indicator end line */ pos_buf[i] = -1; /* indicator end line */
break; break;
@ -835,7 +838,7 @@ static int find_match(char *matchBuf, int *len_with_quotes)
int_buf[i] |= QUOT; int_buf[i] |= QUOT;
} }
/* skip commands with arguments if line have commands delimiters */ /* skip commands with arguments if line has commands delimiters */
/* ';' ';;' '&' '|' '&&' '||' but `>&' `<&' `>|' */ /* ';' ';;' '&' '|' '&&' '||' but `>&' `<&' `>|' */
for (i = 0; int_buf[i]; i++) { for (i = 0; int_buf[i]; i++) {
c = int_buf[i]; c = int_buf[i];
@ -906,16 +909,17 @@ static int find_match(char *matchBuf, int *len_with_quotes)
for (i = 0; int_buf[i]; i++) for (i = 0; int_buf[i]; i++)
if (int_buf[i] == ' ' || int_buf[i] == '<' || int_buf[i] == '>') { if (int_buf[i] == ' ' || int_buf[i] == '<' || int_buf[i] == '>') {
if (int_buf[i] == ' ' && command_mode == FIND_EXE_ONLY if (int_buf[i] == ' ' && command_mode == FIND_EXE_ONLY
&& matchBuf[pos_buf[0]]=='c' && matchBuf[pos_buf[0]]=='c'
&& matchBuf[pos_buf[1]]=='d' ) && matchBuf[pos_buf[1]]=='d'
) {
command_mode = FIND_DIR_ONLY; command_mode = FIND_DIR_ONLY;
else { } else {
command_mode = FIND_FILE_ONLY; command_mode = FIND_FILE_ONLY;
break; break;
} }
} }
/* "strlen" */ for (i = 0; int_buf[i]; i++)
for (i = 0; int_buf[i]; i++); /* "strlen" */;
/* find last word */ /* find last word */
for (--i; i >= 0; i--) { for (--i; i >= 0; i--) {
c = int_buf[i]; c = int_buf[i];
@ -925,11 +929,12 @@ static int find_match(char *matchBuf, int *len_with_quotes)
} }
} }
/* skip first not quoted '\'' or '"' */ /* skip first not quoted '\'' or '"' */
for (i = 0; int_buf[i] == '\'' || int_buf[i] == '"'; i++); for (i = 0; int_buf[i] == '\'' || int_buf[i] == '"'; i++)
/*skip*/;
/* collapse quote or unquote // or /~ */ /* collapse quote or unquote // or /~ */
while ((int_buf[i] & ~QUOT) == '/' && while ((int_buf[i] & ~QUOT) == '/'
((int_buf[i + 1] & ~QUOT) == '/' && ((int_buf[i+1] & ~QUOT) == '/' || (int_buf[i+1] & ~QUOT) == '~')
|| (int_buf[i + 1] & ~QUOT) == '~')) { ) {
i++; i++;
} }
@ -978,9 +983,9 @@ static void showfiles(void)
int n = row; int n = row;
int nc; int nc;
for(nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) { for (nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) {
printf("%s%-*s", matches[n], printf("%s%-*s", matches[n],
column_width - strlen(matches[n]), ""); column_width - strlen(matches[n]), "");
} }
printf("%s\n", matches[n]); printf("%s\n", matches[n]);
} }
@ -1003,7 +1008,7 @@ static void input_tab(int *lastWasTab)
} }
return; return;
} }
if (! *lastWasTab) { if (!*lastWasTab) {
char *tmp, *tmp1; char *tmp, *tmp1;
int len_found; int len_found;
char matchBuf[BUFSIZ]; char matchBuf[BUFSIZ];
@ -1143,21 +1148,21 @@ static int get_next_history(void)
} }
#if ENABLE_FEATURE_COMMAND_SAVEHISTORY #if ENABLE_FEATURE_COMMAND_SAVEHISTORY
void load_history ( const char *fromfile ) void load_history(const char *fromfile)
{ {
FILE *fp; FILE *fp;
int hi; int hi;
/* cleanup old */ /* cleanup old */
for(hi = n_history; hi > 0; ) { for (hi = n_history; hi > 0;) {
hi--; hi--;
free ( history [hi] ); free(history[hi]);
} }
if (( fp = fopen ( fromfile, "r" ))) { fp = fopen(fromfile, "r");
if (fp) {
for ( hi = 0; hi < MAX_HISTORY; ) { for (hi = 0; hi < MAX_HISTORY;) {
char * hl = xmalloc_getline(fp); char * hl = xmalloc_getline(fp);
int l; int l;
@ -1170,24 +1175,24 @@ void load_history ( const char *fromfile )
free(hl); free(hl);
continue; continue;
} }
history [hi++] = hl; history[hi++] = hl;
} }
fclose ( fp ); fclose(fp);
} }
cur_history = n_history = hi; cur_history = n_history = hi;
} }
void save_history ( const char *tofile ) void save_history (const char *tofile)
{ {
FILE *fp = fopen ( tofile, "w" ); FILE *fp = fopen(tofile, "w");
if ( fp ) { if (fp) {
int i; int i;
for ( i = 0; i < n_history; i++ ) { for (i = 0; i < n_history; i++) {
fprintf(fp, "%s\n", history [i]); fprintf(fp, "%s\n", history[i]);
} }
fclose ( fp ); fclose(fp);
} }
} }
#endif #endif
@ -1239,13 +1244,11 @@ static void
vi_word_motion(char *command, int eat) vi_word_motion(char *command, int eat)
{ {
if (isalnum(command[cursor]) || command[cursor] == '_') { if (isalnum(command[cursor]) || command[cursor] == '_') {
while (cursor < len && while (cursor < len
(isalnum(command[cursor+1]) || && (isalnum(command[cursor+1]) || command[cursor+1] == '_'))
command[cursor+1] == '_'))
input_forward(); input_forward();
} else if (ispunct(command[cursor])) { } else if (ispunct(command[cursor])) {
while (cursor < len && while (cursor < len && ispunct(command[cursor+1]))
(ispunct(command[cursor+1])))
input_forward(); input_forward();
} }
@ -1278,13 +1281,13 @@ vi_end_motion(char *command)
if (cursor >= len-1) if (cursor >= len-1)
return; return;
if (isalnum(command[cursor]) || command[cursor] == '_') { if (isalnum(command[cursor]) || command[cursor] == '_') {
while (cursor < len-1 && while (cursor < len-1
(isalnum(command[cursor+1]) || && (isalnum(command[cursor+1]) || command[cursor+1] == '_')
command[cursor+1] == '_')) ) {
input_forward(); input_forward();
}
} else if (ispunct(command[cursor])) { } else if (ispunct(command[cursor])) {
while (cursor < len-1 && while (cursor < len-1 && ispunct(command[cursor+1]))
(ispunct(command[cursor+1])))
input_forward(); input_forward();
} }
} }
@ -1309,13 +1312,13 @@ vi_back_motion(char *command)
if (cursor <= 0) if (cursor <= 0)
return; return;
if (isalnum(command[cursor]) || command[cursor] == '_') { if (isalnum(command[cursor]) || command[cursor] == '_') {
while (cursor > 0 && while (cursor > 0
(isalnum(command[cursor-1]) || && (isalnum(command[cursor-1]) || command[cursor-1] == '_')
command[cursor-1] == '_')) ) {
input_backward(1); input_backward(1);
}
} else if (ispunct(command[cursor])) { } else if (ispunct(command[cursor])) {
while (cursor > 0 && while (cursor > 0 && ispunct(command[cursor-1]))
(ispunct(command[cursor-1])))
input_backward(1); input_backward(1);
} }
} }
@ -1341,7 +1344,6 @@ vi_back_motion(char *command)
int cmdedit_read_input(char *prompt, char command[BUFSIZ]) int cmdedit_read_input(char *prompt, char command[BUFSIZ])
{ {
int break_out = 0; int break_out = 0;
int lastWasTab = FALSE; int lastWasTab = FALSE;
unsigned char c; unsigned char c;
@ -1364,9 +1366,9 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
new_settings.c_cc[VMIN] = 1; new_settings.c_cc[VMIN] = 1;
new_settings.c_cc[VTIME] = 0; new_settings.c_cc[VTIME] = 0;
/* Turn off CTRL-C, so we can trap it */ /* Turn off CTRL-C, so we can trap it */
# ifndef _POSIX_VDISABLE # ifndef _POSIX_VDISABLE
# define _POSIX_VDISABLE '\0' # define _POSIX_VDISABLE '\0'
# endif # endif
new_settings.c_cc[VINTR] = _POSIX_VDISABLE; new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
command[0] = 0; command[0] = 0;
@ -1379,7 +1381,6 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
parse_prompt(prompt); parse_prompt(prompt);
while (1) { while (1) {
fflush(stdout); /* buffered out to fast */ fflush(stdout); /* buffered out to fast */
if (safe_read(0, &c, 1) < 1) if (safe_read(0, &c, 1) < 1)
@ -1393,8 +1394,7 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
if (vi_cmdmode) if (vi_cmdmode)
ic |= vbit; ic |= vbit;
#endif #endif
switch (ic) switch (ic) {
{
case '\n': case '\n':
case '\r': case '\r':
vi_case( case '\n'|vbit: ) vi_case( case '\n'|vbit: )
@ -1433,8 +1433,8 @@ int cmdedit_read_input(char *prompt, char command[BUFSIZ])
/* Control-d -- Delete one character, or exit /* Control-d -- Delete one character, or exit
* if the len=0 and no chars to delete */ * if the len=0 and no chars to delete */
if (len == 0) { if (len == 0) {
errno = 0; errno = 0;
prepare_to_die: prepare_to_die:
#if !ENABLE_ASH #if !ENABLE_ASH
printf("exit"); printf("exit");
goto_new_line(); goto_new_line();
@ -1472,7 +1472,7 @@ prepare_to_die:
break; break;
case CNTRL('K'): case CNTRL('K'):
/* Control-k -- clear to end of line */ /* Control-k -- clear to end of line */
*(command + cursor) = 0; command[cursor] = 0;
len = cursor; len = cursor;
printf("\033[J"); printf("\033[J");
break; break;
@ -1480,7 +1480,7 @@ prepare_to_die:
vi_case( case CNTRL('L')|vbit: ) vi_case( case CNTRL('L')|vbit: )
/* Control-l -- clear screen */ /* Control-l -- clear screen */
printf("\033[H"); printf("\033[H");
redraw(0, len-cursor); redraw(0, len - cursor);
break; break;
#if MAX_HISTORY > 0 #if MAX_HISTORY > 0
case CNTRL('N'): case CNTRL('N'):
@ -1570,65 +1570,64 @@ prepare_to_die:
case 'c'|vbit: case 'c'|vbit:
vi_cmdmode = 0; vi_cmdmode = 0;
/* fall through */ /* fall through */
case 'd'|vbit: case 'd'|vbit: {
{ int nc, sc;
int nc, sc; sc = cursor;
sc = cursor; prevc = ic;
prevc = ic; if (safe_read(0, &c, 1) < 1)
if (safe_read(0, &c, 1) < 1) goto prepare_to_die;
goto prepare_to_die; if (c == (prevc & 0xff)) {
if (c == (prevc & 0xff)) { /* "cc", "dd" */
/* "cc", "dd" */ input_backward(cursor);
input_backward(cursor); goto clear_to_eol;
goto clear_to_eol; break;
break; }
} switch (c) {
case 'w':
case 'W':
case 'e':
case 'E':
switch (c) { switch (c) {
case 'w': case 'w': /* "dw", "cw" */
case 'W': vi_word_motion(command, vi_cmdmode);
case 'e':
case 'E':
switch (c) {
case 'w': /* "dw", "cw" */
vi_word_motion(command, vi_cmdmode);
break;
case 'W': /* 'dW', 'cW' */
vi_Word_motion(command, vi_cmdmode);
break;
case 'e': /* 'de', 'ce' */
vi_end_motion(command);
input_forward();
break;
case 'E': /* 'dE', 'cE' */
vi_End_motion(command);
input_forward();
break;
}
nc = cursor;
input_backward(cursor - sc);
while (nc-- > cursor)
input_delete(1);
break; break;
case 'b': /* "db", "cb" */ case 'W': /* 'dW', 'cW' */
case 'B': /* implemented as B */ vi_Word_motion(command, vi_cmdmode);
if (c == 'b')
vi_back_motion(command);
else
vi_Back_motion(command);
while (sc-- > cursor)
input_delete(1);
break; break;
case ' ': /* "d ", "c " */ case 'e': /* 'de', 'ce' */
input_delete(1); vi_end_motion(command);
input_forward();
break; break;
case '$': /* "d$", "c$" */ case 'E': /* 'dE', 'cE' */
clear_to_eol: vi_End_motion(command);
while (cursor < len) input_forward();
input_delete(1);
break; break;
} }
nc = cursor;
input_backward(cursor - sc);
while (nc-- > cursor)
input_delete(1);
break;
case 'b': /* "db", "cb" */
case 'B': /* implemented as B */
if (c == 'b')
vi_back_motion(command);
else
vi_Back_motion(command);
while (sc-- > cursor)
input_delete(1);
break;
case ' ': /* "d ", "c " */
input_delete(1);
break;
case '$': /* "d$", "c$" */
clear_to_eol:
while (cursor < len)
input_delete(1);
break;
} }
break; break;
}
case 'p'|vbit: case 'p'|vbit:
input_forward(); input_forward();
/* fallthrough */ /* fallthrough */
@ -1794,7 +1793,7 @@ rewrite_line:
#if MAX_HISTORY > 0 #if MAX_HISTORY > 0
/* Handle command history log */ /* Handle command history log */
/* cleanup may be saved current command line */ /* cleanup may be saved current command line */
if (len> 0) { /* no put empty line */ if (len > 0) { /* no put empty line */
int i = n_history; int i = n_history;
free(history[MAX_HISTORY]); free(history[MAX_HISTORY]);
@ -1802,7 +1801,7 @@ rewrite_line:
/* After max history, remove the oldest command */ /* After max history, remove the oldest command */
if (i >= MAX_HISTORY) { if (i >= MAX_HISTORY) {
free(history[0]); free(history[0]);
for(i = 0; i < (MAX_HISTORY-1); i++) for(i = 0; i < MAX_HISTORY-1; i++)
history[i] = history[i+1]; history[i] = history[i+1];
} }
history[i++] = xstrdup(command); history[i++] = xstrdup(command);
@ -1849,9 +1848,9 @@ int main(int argc, char **argv)
char buff[BUFSIZ]; char buff[BUFSIZ];
char *prompt = char *prompt =
#if ENABLE_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\\]";
#else #else
"% "; "% ";
#endif #endif
@ -1862,12 +1861,10 @@ int main(int argc, char **argv)
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;
printf("*** cmdedit_read_input() returned line =%s=\n", buff);
} else {
break; break;
} buff[l-1] = 0;
printf("*** cmdedit_read_input() returned line =%s=\n", buff);
} }
printf("*** cmdedit_read_input() detect ^D\n"); printf("*** cmdedit_read_input() detect ^D\n");
return 0; return 0;