/* vi: set sw=4 ts=4: */
/*
- * Termios command line History and Editting.
+ * Termios command line History and Editing.
*
* Copyright (c) 1986-2003 may safely be consumed by a BSD or GPL license.
* Written by: Vladimir Oleynik <dzo@simtreas.ru>
*/
+#include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <signal.h>
#include <limits.h>
-#include "busybox.h"
-
#include "../shell/cmdedit.h"
#define CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
#define CONFIG_FEATURE_CLEAN_UP
-#endif /* TEST */
+#endif /* TEST */
#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
#include <dirent.h>
#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
#include "pwd_.h"
-#endif /* advanced FEATURES */
+#endif /* advanced FEATURES */
/* Maximum length of the linked list for the command line history */
{
if ((handlers_sets & SET_RESET_TERM) != 0) {
/* sparc and other have broken termios support: use old termio handling. */
- setTermSettings(fileno(stdin), (void *) &initial_settings);
+ setTermSettings(STDIN_FILENO, (void *) &initial_settings);
handlers_sets &= ~SET_RESET_TERM;
}
if ((handlers_sets & SET_WCHG_HANDLERS) != 0) {
putchar('\007');
}
-/* Move back one charactor */
+/* Move back one character */
/* special for slow terminal */
static void input_backward(int num)
{
static void parse_prompt(const char *prmt_ptr)
{
int prmt_len = 0;
- int sub_len = 0;
+ size_t cur_prmt_len = 0;
char flg_not_length = '[';
char *prmt_mem_ptr = xcalloc(1, 1);
char *pwd_buf = xgetcwd(0);
}
if(pbuf == buf)
*pbuf = c;
- prmt_len += strlen(pbuf);
+ cur_prmt_len = strlen(pbuf);
+ prmt_len += cur_prmt_len;
+ if (flg_not_length != ']')
+ cmdedit_prmt_len += cur_prmt_len;
prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_len+1), pbuf);
- if (flg_not_length == ']')
- sub_len++;
}
if(pwd_buf!=(char *)bb_msg_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 */
+/* draw prompt, editor line, and clear tail */
static void redraw(int y, int back_cursor)
{
if (y > 0) /* up to start y */
input_backward(back_cursor);
}
-/* Delete the char in front of the cursor */
-static void input_delete(void)
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+#define DELBUFSIZ 128
+static char *delbuf; /* a (malloced) place to store deleted characters */
+static char *delp;
+static char newdelflag; /* whether delbuf should be reused yet */
+#endif
+
+/* Delete the char in front of the cursor, optionally saving it
+ * for later putback */
+static void input_delete(int save)
{
int j = cursor;
if (j == len)
return;
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+ if (save) {
+ if (newdelflag) {
+ if (!delbuf)
+ delbuf = malloc(DELBUFSIZ);
+ /* safe if malloc fails */
+ delp = delbuf;
+ newdelflag = 0;
+ }
+ if (delbuf && (delp - delbuf < DELBUFSIZ))
+ *delp++ = command_ps[j];
+ }
+#endif
+
strcpy(command_ps + j, command_ps + j + 1);
len--;
- input_end(); /* rewtite new line */
+ input_end(); /* rewrite new line */
cmdedit_set_out_char(0); /* destroy end char */
input_backward(cursor - j); /* back to old pos cursor */
}
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+static void put(void)
+{
+ int ocursor, j = delp - delbuf;
+ if (j == 0)
+ return;
+ ocursor = cursor;
+ /* open hole and then fill it */
+ memmove(command_ps + cursor + j, command_ps + cursor, len - cursor + 1);
+ strncpy(command_ps + cursor, delbuf, j);
+ len += j;
+ input_end(); /* rewrite new line */
+ input_backward(cursor-ocursor-j+1); /* at end of new text */
+}
+#endif
+
/* Delete the char in back of the cursor */
static void input_backspace(void)
{
if (cursor > 0) {
input_backward(1);
- input_delete();
+ input_delete(0);
}
}
-/* Move forward one charactor */
+/* Move forward one character */
static void input_forward(void)
{
if (cursor < len)
cmdedit_set_out_char(command_ps[cursor + 1]);
}
-
static void cmdedit_setwidth(int w, int redraw_flg)
{
cmdedit_termw = cmdedit_prmt_len + 2;
#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+static char **matches;
+static int num_matches;
+static char *add_char_to_match;
+
+static void add_match(char *matched, int add_char)
+{
+ int nm = num_matches;
+ int nm1 = nm + 1;
+
+ matches = xrealloc(matches, nm1 * sizeof(char *));
+ add_char_to_match = xrealloc(add_char_to_match, nm1);
+ matches[nm] = matched;
+ add_char_to_match[nm] = (char)add_char;
+ num_matches++;
+}
+
static int is_execute(const struct stat *st)
{
if ((!my_euid && (st->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) ||
#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
-static char **username_tab_completion(char *ud, int *num_matches)
+static void username_tab_completion(char *ud, char *with_shash_flg)
{
struct passwd *entry;
int userlen;
- char *temp;
-
ud++; /* ~user/... to user/... */
userlen = strlen(ud);
- if (num_matches == 0) { /* "~/..." or "~user/..." */
+ if (with_shash_flg) { /* "~/..." or "~user/..." */
char *sav_ud = ud - 1;
char *home = 0;
+ char *temp;
if (*ud == '/') { /* "~/..." */
home = home_pwd_buf;
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)) {
-
- bb_xasprintf(&temp, "~%s/", entry->pw_name);
- matches = xrealloc(matches, (nm + 1) * sizeof(char *));
-
- matches[nm++] = temp;
+ add_match(bb_xasprintf("~%s", entry->pw_name), '/');
}
}
endpwent();
- (*num_matches) = nm;
- return (matches);
}
}
#endif /* CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION */
return npth;
}
-static char *add_quote_for_spec_chars(char *found)
+static char *add_quote_for_spec_chars(char *found, int add)
{
int l = 0;
char *s = xmalloc((strlen(found) + 1) * 2);
s[l++] = '\\';
s[l++] = *found++;
}
+ if(add)
+ s[l++] = (char)add;
s[l] = 0;
return s;
}
-static char **exe_n_cwd_tab_completion(char *command, int *num_matches,
- int type)
+static void exe_n_cwd_tab_completion(char *command, int type)
{
-
- char **matches = 0;
DIR *dir;
struct dirent *next;
char dirbuf[BUFSIZ];
- int nm = *num_matches;
struct stat st;
char *path1[1];
char **paths = path1;
dirbuf[(pfind - command) + 1] = 0;
#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
if (dirbuf[0] == '~') /* ~/... or ~user/... */
- username_tab_completion(dirbuf, 0);
+ username_tab_completion(dirbuf, dirbuf);
#endif
/* "strip" dirname in command */
pfind++;
while ((next = readdir(dir)) != NULL) {
char *str_found = next->d_name;
+ int add_chr = 0;
/* matched ? */
if (strncmp(str_found, pfind, strlen(pfind)))
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);
+ char *e = found + strlen(found) - 1;
+
+ add_chr = '/';
+ if(*e == '/')
+ *e = '\0';
} else {
/* not put found file if search only dirs for cd */
if (type == FIND_DIR_ONLY)
goto cont;
- str_found = add_quote_for_spec_chars(found);
if (type == FIND_FILE_ONLY ||
(type == FIND_EXE_ONLY && is_execute(&st)))
- strcat(str_found, " ");
+ add_chr = ' ';
}
/* Add it to the list */
- matches = xrealloc(matches, (nm + 1) * sizeof(char *));
-
- matches[nm++] = str_found;
+ add_match(found, add_chr);
+ continue;
cont:
free(found);
}
free(paths[0]); /* allocated memory only in first member */
free(paths);
}
- *num_matches = nm;
- return (matches);
}
-static int match_compare(const void *a, const void *b)
-{
- return strcmp(*(char **) a, *(char **) b);
-}
-
-
#define QUOT (UCHAR_MAX+1)
#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)); }
+ memmove(int_buf+(is), int_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); \
+ memmove(pos_buf+(is), pos_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); }
static int find_match(char *matchBuf, int *len_with_quotes)
{
display by column original ideas from ls applet,
very optimize by my :)
*/
-static void showfiles(char **matches, int nfiles)
+static void showfiles(void)
{
int ncols, row;
int column_width = 0;
+ int nfiles = num_matches;
int nrows = nfiles;
+ char str_add_chr[2];
+ int l;
/* find the longest file name- use that as the column width */
for (row = 0; row < nrows; row++) {
- int l = strlen(matches[row]);
-
+ l = strlen(matches[row]);
+ if(add_char_to_match[row])
+ l++;
if (column_width < l)
column_width = l;
}
nrows /= ncols;
if(nfiles % ncols)
nrows++; /* round up fractionals */
- column_width = -column_width; /* for printf("%-Ns", ...); */
} else {
ncols = 1;
}
+ str_add_chr[1] = 0;
for (row = 0; row < nrows; row++) {
int n = row;
int nc;
-
- for(nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++)
- printf("%*s", column_width, matches[n]);
- printf("%s\n", matches[n]);
+ int acol;
+
+ for(nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) {
+ str_add_chr[0] = add_char_to_match[n];
+ acol = str_add_chr[0] ? column_width - 1 : column_width;
+ printf("%s%s", matches[n], str_add_chr);
+ l = strlen(matches[n]);
+ while(l < acol) {
+ putchar(' ');
+ l++;
+ }
+ }
+ str_add_chr[0] = add_char_to_match[n];
+ printf("%s%s\n", matches[n], str_add_chr);
}
}
static void input_tab(int *lastWasTab)
{
/* Do TAB completion */
- 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;
+ free(add_char_to_match);
+ add_char_to_match = NULL;
}
return;
}
if (! *lastWasTab) {
- char *tmp;
+ char *tmp, *tmp1;
int len_found;
char matchBuf[BUFSIZ];
int find_type;
* then try completing this word as a username. */
if (matchBuf[0] == '~' && strchr(matchBuf, '/') == 0)
- matches = username_tab_completion(matchBuf, &num_matches);
+ username_tab_completion(matchBuf, NULL);
+ if (!matches)
#endif
/* Try to match any executable in our path and everything
* in the current working directory that matches. */
- if (!matches)
- matches =
- exe_n_cwd_tab_completion(matchBuf,
- &num_matches, find_type);
- /* Remove duplicate found */
+ exe_n_cwd_tab_completion(matchBuf, find_type);
+ /* Remove duplicate found and sort */
if(matches) {
- int i, j;
+ int i, j, n, srt;
/* bubble */
- for(i=0; i<(num_matches-1); i++)
- for(j=i+1; j<num_matches; j++)
- if(matches[i]!=0 && matches[j]!=0 &&
- strcmp(matches[i], matches[j])==0) {
- free(matches[j]);
- matches[j]=0;
- }
- j=num_matches;
- num_matches = 0;
- for(i=0; i<j; i++)
- if(matches[i]) {
- if(!strcmp(matches[i], "./"))
- matches[i][1]=0;
- else if(!strcmp(matches[i], "../"))
- matches[i][2]=0;
- matches[num_matches++]=matches[i];
+ n = num_matches;
+ for(i=0; i<(n-1); i++)
+ for(j=i+1; j<n; j++)
+ if(matches[i]!=NULL && matches[j]!=NULL) {
+ srt = strcmp(matches[i], matches[j]);
+ if(srt == 0) {
+ free(matches[j]);
+ matches[j]=0;
+ } else if(srt > 0) {
+ tmp1 = matches[i];
+ matches[i] = matches[j];
+ matches[j] = tmp1;
+ srt = add_char_to_match[i];
+ add_char_to_match[i] = add_char_to_match[j];
+ add_char_to_match[j] = srt;
+ }
}
+ j = n;
+ n = 0;
+ for(i=0; i<j; i++)
+ if(matches[i]) {
+ matches[n]=matches[i];
+ add_char_to_match[n]=add_char_to_match[i];
+ n++;
+ }
+ num_matches = n;
}
/* Did we find exactly one match? */
if (!matches || num_matches > 1) {
- char *tmp1;
beep();
if (!matches)
return; /* not found */
- /* sort */
- qsort(matches, num_matches, sizeof(char *), match_compare);
-
/* find minimal match */
- tmp = bb_xstrdup(matches[0]);
- for (tmp1 = tmp; *tmp1; tmp1++)
+ tmp1 = bb_xstrdup(matches[0]);
+ for (tmp = tmp1; *tmp; tmp++)
for (len_found = 1; len_found < num_matches; len_found++)
- if (matches[len_found][(tmp1 - tmp)] != *tmp1) {
- *tmp1 = 0;
+ if (matches[len_found][(tmp - tmp1)] != *tmp) {
+ *tmp = 0;
break;
}
- if (*tmp == 0) { /* have unique */
- free(tmp);
+ if (*tmp1 == 0) { /* have unique */
+ free(tmp1);
return;
}
+ tmp = add_quote_for_spec_chars(tmp1, 0);
+ free(tmp1);
} else { /* one match */
- tmp = matches[0];
+ tmp = add_quote_for_spec_chars(matches[0], add_char_to_match[0]);
/* for next completion current found */
*lastWasTab = FALSE;
}
-
len_found = strlen(tmp);
/* have space to placed match? */
if ((len_found - strlen(matchBuf) + len) < BUFSIZ) {
/* write out the matched command */
redraw(cmdedit_y, len - recalc_pos);
}
- if (tmp != matches[0])
- free(tmp);
+ free(tmp);
} else {
/* Ok -- the last char was a TAB. Since they
* just hit TAB again, print a list of all the
/* Go to the next line */
goto_new_line();
- showfiles(matches, num_matches);
+ showfiles();
redraw(0, len - sav_cursor);
}
}
}
#ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY
-extern void load_history ( const char *fromfile )
+void load_history ( const char *fromfile )
{
FILE *fp;
int hi;
cur_history = n_history = hi;
}
-extern void save_history ( const char *tofile )
+void save_history ( const char *tofile )
{
FILE *fp = fopen ( tofile, "w" );
/*
* This function is used to grab a character buffer
* from the input file descriptor and allows you to
- * a string with full command editing (sortof like
+ * a string with full command editing (sort of like
* a mini readline).
*
* The following standard commands are not implemented:
* ESC-h -- Delete forward one word
* CTL-t -- Transpose two characters
*
- * Furthermore, the "vi" command editing keys are not implemented.
+ * Minimalist vi-style command line editing available if configured.
+ * vi mode implemented 2005 by Paul Fox <pgf@foxharp.boston.ma.us>
*
*/
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+static int vi_mode;
+
+void setvimode ( int viflag )
+{
+ vi_mode = viflag;
+}
+
+static void
+vi_Word_motion(char *command, int eat)
+{
+ while (cursor < len && !isspace(command[cursor]))
+ input_forward();
+ if (eat) while (cursor < len && isspace(command[cursor]))
+ input_forward();
+}
+
+static void
+vi_word_motion(char *command, int eat)
+{
+ if (isalnum(command[cursor]) || command[cursor] == '_') {
+ while (cursor < len &&
+ (isalnum(command[cursor+1]) ||
+ command[cursor+1] == '_'))
+ input_forward();
+ } else if (ispunct(command[cursor])) {
+ while (cursor < len &&
+ (ispunct(command[cursor+1])))
+ input_forward();
+ }
+
+ if (cursor < len)
+ input_forward();
+
+ if (eat && cursor < len && isspace(command[cursor]))
+ while (cursor < len && isspace(command[cursor]))
+ input_forward();
+}
+
+static void
+vi_End_motion(char *command)
+{
+ input_forward();
+ while (cursor < len && isspace(command[cursor]))
+ input_forward();
+ while (cursor < len-1 && !isspace(command[cursor+1]))
+ input_forward();
+}
+
+static void
+vi_end_motion(char *command)
+{
+ if (cursor >= len-1)
+ return;
+ input_forward();
+ while (cursor < len-1 && isspace(command[cursor]))
+ input_forward();
+ if (cursor >= len-1)
+ return;
+ if (isalnum(command[cursor]) || command[cursor] == '_') {
+ while (cursor < len-1 &&
+ (isalnum(command[cursor+1]) ||
+ command[cursor+1] == '_'))
+ input_forward();
+ } else if (ispunct(command[cursor])) {
+ while (cursor < len-1 &&
+ (ispunct(command[cursor+1])))
+ input_forward();
+ }
+}
+
+static void
+vi_Back_motion(char *command)
+{
+ while (cursor > 0 && isspace(command[cursor-1]))
+ input_backward(1);
+ while (cursor > 0 && !isspace(command[cursor-1]))
+ input_backward(1);
+}
+
+static void
+vi_back_motion(char *command)
+{
+ if (cursor <= 0)
+ return;
+ input_backward(1);
+ while (cursor > 0 && isspace(command[cursor]))
+ input_backward(1);
+ if (cursor <= 0)
+ return;
+ if (isalnum(command[cursor]) || command[cursor] == '_') {
+ while (cursor > 0 &&
+ (isalnum(command[cursor-1]) ||
+ command[cursor-1] == '_'))
+ input_backward(1);
+ } else if (ispunct(command[cursor])) {
+ while (cursor > 0 &&
+ (ispunct(command[cursor-1])))
+ input_backward(1);
+ }
+}
+#endif
+
+/*
+ * the emacs and vi modes share much of the code in the big
+ * command loop. commands entered when in vi's command mode (aka
+ * "escape mode") get an extra bit added to distinguish them --
+ * this keeps them from being self-inserted. this clutters the
+ * big switch a bit, but keeps all the code in one place.
+ */
+
+#define vbit 0x100
+
+/* leave out the "vi-mode"-only case labels if vi editing isn't
+ * configured. */
+#define vi_case(caselabel) USE_FEATURE_COMMAND_EDITING(caselabel)
+
+/* convert uppercase ascii to equivalent control char, for readability */
+#define CNTRL(uc_char) ((uc_char) - 0x40)
+
int cmdedit_read_input(char *prompt, char command[BUFSIZ])
{
int break_out = 0;
int lastWasTab = FALSE;
- unsigned char c = 0;
-
+ unsigned char c;
+ unsigned int ic;
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+ unsigned int prevc;
+ int vi_cmdmode = 0;
+#endif
/* prepare before init handlers */
cmdedit_y = 0; /* quasireal y, not true work if line > xt*yt */
len = 0;
/* if we can't read input then exit */
goto prepare_to_die;
- switch (c) {
+ ic = c;
+
+#ifdef CONFIG_FEATURE_COMMAND_EDITING_VI
+ newdelflag = 1;
+ if (vi_cmdmode)
+ ic |= vbit;
+#endif
+ switch (ic)
+ {
case '\n':
case '\r':
+ vi_case( case '\n'|vbit: )
+ vi_case( case '\r'|vbit: )
/* Enter */
goto_new_line();
break_out = 1;
break;
- case 1:
+ case CNTRL('A'):
+ vi_case( case '0'|vbit: )
/* Control-a -- Beginning of line */
input_backward(cursor);
break;
- case 2:
+ case CNTRL('B'):
+ vi_case( case 'h'|vbit: )
+ vi_case( case '\b'|vbit: )
+ vi_case( case DEL|vbit: )
/* Control-b -- Move back one character */
input_backward(1);
break;
- case 3:
+ case CNTRL('C'):
+ vi_case( case CNTRL('C')|vbit: )
/* Control-c -- stop gathering input */
goto_new_line();
+#ifndef CONFIG_ASH
command[0] = 0;
len = 0;
lastWasTab = FALSE;
put_prompt();
+#else
+ len = 0;
+ break_out = -1; /* to control traps */
+#endif
break;
- case 4:
+ case CNTRL('D'):
/* Control-d -- Delete one character, or exit
* if the len=0 and no chars to delete */
if (len == 0) {
+ errno = 0;
prepare_to_die:
#if !defined(CONFIG_ASH)
printf("exit");
/* cmdedit_reset_term() called in atexit */
exit(EXIT_SUCCESS);
#else
- break_out = -1; /* for control stoped jobs */
+ /* to control stopped jobs */
+ len = break_out = -1;
break;
#endif
} else {
- input_delete();
+ input_delete(0);
}
break;
- case 5:
+ case CNTRL('E'):
+ vi_case( case '$'|vbit: )
/* Control-e -- End of line */
input_end();
break;
- case 6:
+ case CNTRL('F'):
+ vi_case( case 'l'|vbit: )
+ vi_case( case ' '|vbit: )
/* Control-f -- Move forward one character */
input_forward();
break;
input_tab(&lastWasTab);
#endif
break;
- case 11:
+ case CNTRL('K'):
/* Control-k -- clear to end of line */
*(command + cursor) = 0;
len = cursor;
printf("\033[J");
break;
- case 12:
+ case CNTRL('L'):
+ vi_case( case CNTRL('L')|vbit: )
/* Control-l -- clear screen */
printf("\033[H");
redraw(0, len-cursor);
break;
#if MAX_HISTORY >= 1
- case 14:
+ case CNTRL('N'):
+ vi_case( case CNTRL('N')|vbit: )
+ vi_case( case 'j'|vbit: )
/* Control-n -- Get next command in history */
if (get_next_history())
goto rewrite_line;
break;
- case 16:
+ case CNTRL('P'):
+ vi_case( case CNTRL('P')|vbit: )
+ vi_case( case 'k'|vbit: )
/* Control-p -- Get previous command from history */
if (cur_history > 0) {
get_previous_history();
}
break;
#endif
- case 21:
+ case CNTRL('U'):
+ vi_case( case CNTRL('U')|vbit: )
/* Control-U -- Clear line before cursor */
if (cursor) {
strcpy(command, command + cursor);
redraw(cmdedit_y, len -= cursor);
}
break;
- case 23:
+ case CNTRL('W'):
+ vi_case( case CNTRL('W')|vbit: )
/* Control-W -- Remove the last word */
while (cursor > 0 && isspace(command[cursor-1]))
input_backspace();
while (cursor > 0 &&!isspace(command[cursor-1]))
input_backspace();
break;
- case ESC:{
+#if CONFIG_FEATURE_COMMAND_EDITING_VI
+ case 'i'|vbit:
+ vi_cmdmode = 0;
+ break;
+ case 'I'|vbit:
+ input_backward(cursor);
+ vi_cmdmode = 0;
+ break;
+ case 'a'|vbit:
+ input_forward();
+ vi_cmdmode = 0;
+ break;
+ case 'A'|vbit:
+ input_end();
+ vi_cmdmode = 0;
+ break;
+ case 'x'|vbit:
+ input_delete(1);
+ break;
+ case 'X'|vbit:
+ if (cursor > 0) {
+ input_backward(1);
+ input_delete(1);
+ }
+ break;
+ case 'W'|vbit:
+ vi_Word_motion(command, 1);
+ break;
+ case 'w'|vbit:
+ vi_word_motion(command, 1);
+ break;
+ case 'E'|vbit:
+ vi_End_motion(command);
+ break;
+ case 'e'|vbit:
+ vi_end_motion(command);
+ break;
+ case 'B'|vbit:
+ vi_Back_motion(command);
+ break;
+ case 'b'|vbit:
+ vi_back_motion(command);
+ break;
+ case 'C'|vbit:
+ vi_cmdmode = 0;
+ /* fall through */
+ case 'D'|vbit:
+ goto clear_to_eol;
+
+ case 'c'|vbit:
+ vi_cmdmode = 0;
+ /* fall through */
+ case 'd'|vbit:
+ {
+ int nc, sc;
+ sc = cursor;
+ prevc = ic;
+ if (safe_read(0, &c, 1) < 1)
+ goto prepare_to_die;
+ if (c == (prevc & 0xff)) {
+ /* "cc", "dd" */
+ input_backward(cursor);
+ goto clear_to_eol;
+ break;
+ }
+ switch(c) {
+ case 'w':
+ case 'W':
+ case 'e':
+ case 'E':
+ switch (c) {
+ case 'w': /* "dw", "cw" */
+ vi_word_motion(command, vi_cmdmode);
+ break;
+ case 'W': /* 'dW', 'cW' */
+ vi_Word_motion(command, vi_cmdmode);
+ break;
+ case 'e': /* 'de', 'ce' */
+ vi_end_motion(command);
+ input_forward();
+ break;
+ case 'E': /* 'dE', 'cE' */
+ vi_End_motion(command);
+ input_forward();
+ break;
+ }
+ nc = cursor;
+ input_backward(cursor - sc);
+ while (nc-- > cursor)
+ input_delete(1);
+ break;
+ case 'b': /* "db", "cb" */
+ case 'B': /* implemented as B */
+ if (c == 'b')
+ vi_back_motion(command);
+ else
+ vi_Back_motion(command);
+ while (sc-- > cursor)
+ input_delete(1);
+ break;
+ case ' ': /* "d ", "c " */
+ input_delete(1);
+ break;
+ case '$': /* "d$", "c$" */
+ clear_to_eol:
+ while (cursor < len)
+ input_delete(1);
+ break;
+ }
+ }
+ break;
+ case 'p'|vbit:
+ input_forward();
+ /* fallthrough */
+ case 'P'|vbit:
+ put();
+ break;
+ case 'r'|vbit:
+ if (safe_read(0, &c, 1) < 1)
+ goto prepare_to_die;
+ if (c == 0)
+ beep();
+ else {
+ *(command + cursor) = c;
+ putchar(c);
+ putchar('\b');
+ }
+ break;
+#endif /* CONFIG_FEATURE_COMMAND_EDITING_VI */
+
+ case ESC:
+
+#if CONFIG_FEATURE_COMMAND_EDITING_VI
+ if (vi_mode) {
+ /* ESC: insert mode --> command mode */
+ vi_cmdmode = 1;
+ input_backward(1);
+ break;
+ }
+#endif
/* escape sequence follows */
if (safe_read(0, &c, 1) < 1)
goto prepare_to_die;
/* different vt100 emulations */
if (c == '[' || c == 'O') {
+ vi_case( case '['|vbit: )
+ vi_case( case 'O'|vbit: )
if (safe_read(0, &c, 1) < 1)
goto prepare_to_die;
}
case 'B':
/* Down Arrow -- Get next command in history */
if (!get_next_history())
- break;
+ break;
/* Rewrite the line with the selected history item */
rewrite_line:
/* change command */
len = strlen(strcpy(command, history[cur_history]));
- /* redraw and go to end line */
+ /* redraw and go to eol (bol, in vi */
+#if CONFIG_FEATURE_COMMAND_EDITING_VI
+ redraw(cmdedit_y, vi_mode ? 9999:0);
+#else
redraw(cmdedit_y, 0);
+#endif
break;
#endif
case 'C':
break;
case '3':
/* Delete */
- input_delete();
+ input_delete(0);
break;
case '1':
case 'H':
- /* Home (Ctrl-A) */
+ /* <Home> */
input_backward(cursor);
break;
case '4':
case 'F':
- /* End (Ctrl-E) */
+ /* <End> */
input_end();
break;
default:
beep();
}
break;
- }
default: /* If it's regular input, do the normal thing */
#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
/* Control-V -- Add non-printable symbol */
- if (c == 22) {
+ if (c == CNTRL('V')) {
if (safe_read(0, &c, 1) < 1)
goto prepare_to_die;
if (c == 0) {
}
} else
#endif
- if (!Isprint(c)) /* Skip non-printable characters */
- break;
+ {
+#if CONFIG_FEATURE_COMMAND_EDITING_VI
+ if (vi_cmdmode) /* don't self-insert */
+ break;
+#endif
+ if (!Isprint(c)) /* Skip non-printable characters */
+ break;
+ }
if (len >= (BUFSIZ - 2)) /* Need to leave space for enter */
break;
#if MAX_HISTORY >= 1
/* Handle command history log */
/* cleanup may be saved current command line */
- free(history[MAX_HISTORY]);
- history[MAX_HISTORY] = 0;
- if (len) { /* no put empty line */
+ if (len> 0) { /* no put empty line */
int i = n_history;
+
+ free(history[MAX_HISTORY]);
+ history[MAX_HISTORY] = 0;
/* After max history, remove the oldest command */
if (i >= MAX_HISTORY) {
free(history[0]);
}
#else /* MAX_HISTORY < 1 */
#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
- if (len) { /* no put empty line */
+ if (len > 0) { /* no put empty line */
num_ok_lines++;
}
#endif
projects / oweals / busybox.git / blobdiff