*/
/*
- Usage and known bugs:
- Terminal key codes are not extensive, and more will probably
- need to be added. This version was created on Debian GNU/Linux 2.x.
- Delete, Backspace, Home, End, and the arrow keys were tested
- to work in an Xterm and console. Ctrl-A also works as Home.
- Ctrl-E also works as End.
-
- 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
+ * Usage and known bugs:
+ * Terminal key codes are not extensive, more needs 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 following readline-like commands are not implemented:
+ * ESC-b -- Move back one word
+ * ESC-f -- Move forward one word
+ * ESC-d -- Delete forward one word
+ * CTL-t -- Transpose two characters
+ *
+ * lineedit does not know that the terminal escape sequences do not
+ * take up space on the screen. The redisplay code assumes, unless
+ * told otherwise, that each character in the prompt is a printable
+ * character that takes up one character position on the screen.
+ * You need to tell lineedit that some sequences of characters
+ * in the prompt take up no screen space. Compatibly with readline,
+ * use the \[ escape to begin a sequence of non-printing characters,
+ * and the \] escape to signal the end of such a sequence. Example:
+ *
+ * PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
*/
-
-#include <sys/ioctl.h>
-#include "busybox.h"
-
+#include "libbb.h"
+#include "unicode.h"
/* FIXME: obsolete CONFIG item? */
#define ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT 0
-
#ifdef TEST
-
-#define ENABLE_FEATURE_EDITING 0
-#define ENABLE_FEATURE_TAB_COMPLETION 0
-#define ENABLE_FEATURE_USERNAME_COMPLETION 0
-#define ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT 0
-#define ENABLE_FEATURE_CLEAN_UP 0
-
-#endif /* TEST */
+# define ENABLE_FEATURE_EDITING 0
+# define ENABLE_FEATURE_TAB_COMPLETION 0
+# define ENABLE_FEATURE_USERNAME_COMPLETION 0
+# define ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT 0
+#endif
/* Entire file (except TESTing part) sits inside this #if */
#if ENABLE_FEATURE_EDITING
-#if ENABLE_LOCALE_SUPPORT
-#define Isprint(c) isprint(c)
+
+#define ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR \
+ (ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT)
+#define IF_FEATURE_GETUSERNAME_AND_HOMEDIR(...)
+#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+#undef IF_FEATURE_GETUSERNAME_AND_HOMEDIR
+#define IF_FEATURE_GETUSERNAME_AND_HOMEDIR(...) __VA_ARGS__
+#endif
+
+
+#undef CHAR_T
+#if ENABLE_FEATURE_ASSUME_UNICODE
+# define BB_NUL L'\0'
+# define CHAR_T wchar_t
+static bool BB_isspace(CHAR_T c) { return ((unsigned)c < 256 && isspace(c)); }
+static bool BB_isalnum(CHAR_T c) { return ((unsigned)c < 256 && isalnum(c)); }
+static bool BB_ispunct(CHAR_T c) { return ((unsigned)c < 256 && ispunct(c)); }
+# undef isspace
+# undef isalnum
+# undef ispunct
+# undef isprint
+# define isspace isspace_must_not_be_used
+# define isalnum isalnum_must_not_be_used
+# define ispunct ispunct_must_not_be_used
+# define isprint isprint_must_not_be_used
#else
-#define Isprint(c) ((c) >= ' ' && (c) != ((unsigned char)'\233'))
+# define BB_NUL '\0'
+# define CHAR_T char
+# define BB_isspace(c) isspace(c)
+# define BB_isalnum(c) isalnum(c)
+# define BB_ispunct(c) ispunct(c)
#endif
-#define ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR \
-(ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT)
+enum {
+ /* We use int16_t for positions, need to limit line len */
+ MAX_LINELEN = CONFIG_FEATURE_EDITING_MAX_LEN < 0x7ff0
+ ? CONFIG_FEATURE_EDITING_MAX_LEN
+ : 0x7ff0
+};
-static line_input_t *state;
+#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+static const char null_str[] ALIGN1 = "";
+#endif
-static struct termios initial_settings, new_settings;
+/* We try to minimize both static and stack usage. */
+struct lineedit_statics {
+ line_input_t *state;
-static volatile unsigned cmdedit_termw = 80; /* actual terminal width */
+ volatile unsigned cmdedit_termw; /* = 80; */ /* actual terminal width */
+ sighandler_t previous_SIGWINCH_handler;
-static int cmdedit_x; /* real x terminal position */
-static int cmdedit_y; /* pseudoreal y terminal position */
-static int cmdedit_prmt_len; /* length of prompt (without colors etc) */
+ unsigned cmdedit_x; /* real x (col) terminal position */
+ unsigned cmdedit_y; /* pseudoreal y (row) terminal position */
+ unsigned cmdedit_prmt_len; /* length of prompt (without colors etc) */
-static unsigned cursor;
-static unsigned command_len;
-static char *command_ps;
-static const char *cmdedit_prompt;
+ unsigned cursor;
+ int command_len; /* must be signed */
+ /* signed maxsize: we want x in "if (x > S.maxsize)"
+ * to _not_ be promoted to unsigned */
+ int maxsize;
+ CHAR_T *command_ps;
+ const char *cmdedit_prompt;
#if ENABLE_FEATURE_EDITING_FANCY_PROMPT
-static char *hostname_buf;
-static int num_ok_lines = 1;
+ int num_ok_lines; /* = 1; */
#endif
#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
-static char *user_buf = (char*)"";
-static char *home_pwd_buf = (char*)"";
+ char *user_buf;
+ char *home_pwd_buf; /* = (char*)null_str; */
+#endif
+
+#if ENABLE_FEATURE_TAB_COMPLETION
+ char **matches;
+ unsigned num_matches;
+#endif
+
+#if ENABLE_FEATURE_EDITING_VI
+#define DELBUFSIZ 128
+ CHAR_T *delptr;
+ smallint newdelflag; /* whether delbuf should be reused yet */
+ CHAR_T delbuf[DELBUFSIZ]; /* a place to store deleted characters */
+#endif
+#if ENABLE_FEATURE_EDITING_ASK_TERMINAL
+ smallint sent_ESC_br6n;
#endif
+ /* Formerly these were big buffers on stack: */
#if ENABLE_FEATURE_TAB_COMPLETION
-static int my_uid;
-static int my_gid;
+ char exe_n_cwd_tab_completion__dirbuf[MAX_LINELEN];
+ char input_tab__matchBuf[MAX_LINELEN];
+ int16_t find_match__int_buf[MAX_LINELEN + 1]; /* need to have 9 bits at least */
+ int16_t find_match__pos_buf[MAX_LINELEN + 1];
+#endif
+};
+
+/* See lineedit_ptr_hack.c */
+extern struct lineedit_statics *const lineedit_ptr_to_statics;
+
+#define S (*lineedit_ptr_to_statics)
+#define state (S.state )
+#define cmdedit_termw (S.cmdedit_termw )
+#define previous_SIGWINCH_handler (S.previous_SIGWINCH_handler)
+#define cmdedit_x (S.cmdedit_x )
+#define cmdedit_y (S.cmdedit_y )
+#define cmdedit_prmt_len (S.cmdedit_prmt_len)
+#define cursor (S.cursor )
+#define command_len (S.command_len )
+#define command_ps (S.command_ps )
+#define cmdedit_prompt (S.cmdedit_prompt )
+#define num_ok_lines (S.num_ok_lines )
+#define user_buf (S.user_buf )
+#define home_pwd_buf (S.home_pwd_buf )
+#define matches (S.matches )
+#define num_matches (S.num_matches )
+#define delptr (S.delptr )
+#define newdelflag (S.newdelflag )
+#define delbuf (S.delbuf )
+
+#define INIT_S() do { \
+ (*(struct lineedit_statics**)&lineedit_ptr_to_statics) = xzalloc(sizeof(S)); \
+ barrier(); \
+ cmdedit_termw = 80; \
+ IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
+ IF_FEATURE_GETUSERNAME_AND_HOMEDIR(home_pwd_buf = (char*)null_str;) \
+} while (0)
+static void deinit_S(void)
+{
+#if ENABLE_FEATURE_EDITING_FANCY_PROMPT
+ /* This one is allocated only if FANCY_PROMPT is on
+ * (otherwise it points to verbatim prompt (NOT malloced) */
+ free((char*)cmdedit_prompt);
+#endif
+#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+ free(user_buf);
+ if (home_pwd_buf != null_str)
+ free(home_pwd_buf);
+#endif
+ free(lineedit_ptr_to_statics);
+}
+#define DEINIT_S() deinit_S()
+
+
+#if ENABLE_FEATURE_ASSUME_UNICODE
+static size_t load_string(const char *src, int maxsize)
+{
+ ssize_t len = mbstowcs(command_ps, src, maxsize - 1);
+ if (len < 0)
+ len = 0;
+ command_ps[len] = L'\0';
+ return len;
+}
+static size_t save_string(char *dst, int maxsize)
+{
+ ssize_t len = wcstombs(dst, command_ps, maxsize - 1);
+ if (len < 0)
+ len = 0;
+ dst[len] = '\0';
+ return len;
+}
+/* I thought just fputwc(c, stdout) would work. But no... */
+static void BB_PUTCHAR(wchar_t c)
+{
+ char buf[MB_CUR_MAX + 1];
+ mbstate_t mbst = { 0 };
+ ssize_t len = wcrtomb(buf, c, &mbst);
+
+ if (len > 0) {
+ buf[len] = '\0';
+ fputs(buf, stdout);
+ }
+}
+#else
+static size_t load_string(const char *src, int maxsize)
+{
+ safe_strncpy(command_ps, src, maxsize);
+ return strlen(command_ps);
+}
+# if ENABLE_FEATURE_TAB_COMPLETION
+static void save_string(char *dst, int maxsize)
+{
+ safe_strncpy(dst, command_ps, maxsize);
+}
+# endif
+# define BB_PUTCHAR(c) bb_putchar(c)
#endif
+
/* Put 'command_ps[cursor]', cursor++.
* Advance cursor on screen. If we reached right margin, scroll text up
* and remove terminal margin effect by printing 'next_char' */
+#define HACK_FOR_WRONG_WIDTH 1
+#if HACK_FOR_WRONG_WIDTH
+static void cmdedit_set_out_char(void)
+#define cmdedit_set_out_char(next_char) cmdedit_set_out_char()
+#else
static void cmdedit_set_out_char(int next_char)
+#endif
{
- int c = (unsigned char)command_ps[cursor];
+ CHAR_T c = command_ps[cursor];
- if (c == '\0') {
+ if (c == BB_NUL) {
/* erase character after end of input string */
c = ' ';
}
#if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT
/* Display non-printable characters in reverse */
- if (!Isprint(c)) {
+ if (!BB_isprint(c)) {
if (c >= 128)
c -= 128;
if (c < ' ')
} else
#endif
{
- if (initial_settings.c_lflag & ECHO)
- putchar(c);
+ BB_PUTCHAR(c);
}
if (++cmdedit_x >= cmdedit_termw) {
/* terminal is scrolled down */
cmdedit_y++;
cmdedit_x = 0;
+#if HACK_FOR_WRONG_WIDTH
+ /* This works better if our idea of term width is wrong
+ * and it is actually wider (often happens on serial lines).
+ * Printing CR,LF *forces* cursor to next line.
+ * OTOH if terminal width is correct AND terminal does NOT
+ * have automargin (IOW: it is moving cursor to next line
+ * by itself (which is wrong for VT-10x terminals)),
+ * this will break things: there will be one extra empty line */
+ puts("\r"); /* + implicit '\n' */
+#else
+ /* Works ok only if cmdedit_termw is correct */
/* destroy "(auto)margin" */
- putchar(next_char);
- putchar('\b');
+ bb_putchar(next_char);
+ bb_putchar('\b');
+#endif
}
-// Huh? What if command_ps[cursor] == '\0' (we are at the end already?)
+// Huh? What if command_ps[cursor] == BB_NUL (we are at the end already?)
cursor++;
}
{
input_end();
if (cmdedit_x)
- putchar('\n');
+ bb_putchar('\n');
}
static void beep(void)
{
- putchar('\007');
+ bb_putchar('\007');
}
/* Move back one character */
if (cmdedit_x >= num) {
cmdedit_x -= num;
if (num <= 4) {
- printf("\b\b\b\b" + (4-num));
+ /* This is longer by 5 bytes on x86.
+ * Also gets miscompiled for ARM users
+ * (busybox.net/bugs/view.php?id=2274).
+ * printf(("\b\b\b\b" + 4) - num);
+ * return;
+ */
+ do {
+ bb_putchar('\b');
+ } while (--num);
return;
}
printf("\033[%uD", num);
/* Need to go one or more lines up */
num -= cmdedit_x;
- count_y = 1 + (num / cmdedit_termw);
- cmdedit_y -= count_y;
- cmdedit_x = cmdedit_termw * count_y - num;
+ {
+ unsigned w = cmdedit_termw; /* volatile var */
+ count_y = 1 + (num / w);
+ cmdedit_y -= count_y;
+ cmdedit_x = w * count_y - num;
+ }
/* go to 1st column; go up; go to correct column */
printf("\r" "\033[%dA" "\033[%dC", count_y, cmdedit_x);
}
static void put_prompt(void)
{
+ unsigned w;
+
out1str(cmdedit_prompt);
- cmdedit_x = cmdedit_prmt_len;
+ fflush_all();
cursor = 0;
-// Huh? what if cmdedit_prmt_len >= width?
- cmdedit_y = 0; /* new quasireal y */
+ w = cmdedit_termw; /* read volatile var once */
+ cmdedit_y = cmdedit_prmt_len / w; /* new quasireal y */
+ cmdedit_x = cmdedit_prmt_len % w;
}
/* draw prompt, editor line, and clear tail */
static void redraw(int y, int back_cursor)
{
- if (y > 0) /* up to start y */
- printf("\033[%dA", y);
- putchar('\r');
+ if (y > 0) /* up to start y */
+ printf("\033[%uA", y);
+ bb_putchar('\r');
put_prompt();
- input_end(); /* rewrite */
- printf("\033[J"); /* erase after cursor */
+ input_end(); /* rewrite */
+ printf("\033[J"); /* erase after cursor */
input_backward(back_cursor);
}
-#if ENABLE_FEATURE_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 */
+#if !ENABLE_FEATURE_EDITING_VI
+static void input_delete(void)
+#define input_delete(save) input_delete()
+#else
static void input_delete(int save)
+#endif
{
int j = cursor;
- if (j == command_len)
+ if (j == (int)command_len)
return;
#if ENABLE_FEATURE_EDITING_VI
if (save) {
if (newdelflag) {
- if (!delbuf)
- delbuf = malloc(DELBUFSIZ);
- /* safe if malloc fails */
- delp = delbuf;
+ delptr = delbuf;
newdelflag = 0;
}
- if (delbuf && (delp - delbuf < DELBUFSIZ))
- *delp++ = command_ps[j];
+ if ((delptr - delbuf) < DELBUFSIZ)
+ *delptr++ = command_ps[j];
}
#endif
- strcpy(command_ps + j, command_ps + j + 1);
+ memmove(command_ps + j, command_ps + j + 1,
+ /* (command_len + 1 [because of NUL]) - (j + 1)
+ * simplified into (command_len - j) */
+ (command_len - j) * sizeof(command_ps[0]));
command_len--;
input_end(); /* rewrite new line */
cmdedit_set_out_char(' '); /* erase char */
static void put(void)
{
int ocursor;
- int j = delp - delbuf;
+ int j = delptr - delbuf;
if (j == 0)
return;
ocursor = cursor;
/* open hole and then fill it */
- memmove(command_ps + cursor + j, command_ps + cursor, command_len - cursor + 1);
- strncpy(command_ps + cursor, delbuf, j);
+ memmove(command_ps + cursor + j, command_ps + cursor,
+ (command_len - cursor + 1) * sizeof(command_ps[0]));
+ memcpy(command_ps + cursor, delbuf, j * sizeof(command_ps[0]));
command_len += j;
input_end(); /* rewrite new line */
input_backward(cursor - ocursor - j + 1); /* at end of new text */
cmdedit_set_out_char(command_ps[cursor + 1]);
}
-
#if ENABLE_FEATURE_TAB_COMPLETION
-static char **matches;
-static unsigned num_matches;
-
static void free_tab_completion_data(void)
{
if (matches) {
static void add_match(char *matched)
{
- int nm = num_matches;
- int nm1 = nm + 1;
-
- matches = xrealloc(matches, nm1 * sizeof(char *));
- matches[nm] = matched;
+ matches = xrealloc_vector(matches, 4, num_matches);
+ matches[num_matches] = matched;
num_matches++;
}
if (with_shash_flg) { /* "~/..." or "~user/..." */
char *sav_ud = ud - 1;
- char *home = 0;
- char *temp;
+ char *home = NULL;
if (*ud == '/') { /* "~/..." */
home = home_pwd_buf;
} else {
/* "~user/..." */
+ char *temp;
temp = strchr(ud, '/');
- *temp = 0; /* ~user\0 */
+ *temp = '\0'; /* ~user\0 */
entry = getpwnam(ud);
*temp = '/'; /* restore ~user/... */
ud = temp;
home = entry->pw_dir;
}
if (home) {
- if ((userlen + strlen(home) + 1) < BUFSIZ) {
- char temp2[BUFSIZ]; /* argument size */
-
+ if ((userlen + strlen(home) + 1) < MAX_LINELEN) {
/* /home/user/... */
- sprintf(temp2, "%s%s", home, ud);
- strcpy(sav_ud, temp2);
+ sprintf(sav_ud, "%s%s", home, ud);
}
}
} else {
{
DIR *dir;
struct dirent *next;
- char dirbuf[BUFSIZ];
struct stat st;
char *path1[1];
char **paths = path1;
int i;
char *found;
char *pfind = strrchr(command, '/');
+/* char dirbuf[MAX_LINELEN]; */
+#define dirbuf (S.exe_n_cwd_tab_completion__dirbuf)
npaths = 1;
path1[0] = (char*)".";
for (i = 0; i < npaths; i++) {
dir = opendir(paths[i]);
- if (!dir) /* Don't print an error */
- continue;
+ if (!dir)
+ continue; /* don't print an error */
while ((next = readdir(dir)) != NULL) {
int len1;
if (strncmp(str_found, pfind, strlen(pfind)))
continue;
/* not see .name without .match */
- if (*str_found == '.' && *pfind == 0) {
+ if (*str_found == '.' && *pfind == '\0') {
if (NOT_LONE_CHAR(paths[i], '/') || str_found[1])
continue;
str_found = ""; /* only "/" */
}
found = concat_path_file(paths[i], str_found);
- /* hmm, remover in progress? */
- if (stat(found, &st) < 0)
+ /* hmm, remove in progress? */
+ /* NB: stat() first so that we see is it a directory;
+ * but if that fails, use lstat() so that
+ * we still match dangling links */
+ if (stat(found, &st) && lstat(found, &st))
goto cont;
/* find with dirs? */
if (paths[i] != dirbuf)
- strcpy(found, next->d_name); /* only name */
+ strcpy(found, next->d_name); /* only name */
len1 = strlen(found);
found = xrealloc(found, len1 + 2);
found[len1+1] = '\0';
if (S_ISDIR(st.st_mode)) {
- /* name is directory */
+ /* name is a directory */
if (found[len1-1] != '/') {
found[len1] = '/';
}
closedir(dir);
}
if (paths != path1) {
- free(paths[0]); /* allocated memory only in first member */
+ free(paths[0]); /* allocated memory is only in first member */
free(paths);
}
+#undef dirbuf
}
+/* QUOT is used on elements of int_buf[], which are bytes,
+ * not Unicode chars. Therefore it works correctly even in Unicode mode.
+ */
#define QUOT (UCHAR_MAX+1)
-#define collapse_pos(is, in) { \
- memmove(int_buf+(is), int_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); \
- memmove(pos_buf+(is), pos_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); }
-
-static int find_match(char *matchBuf, int *len_with_quotes)
+#define int_buf (S.find_match__int_buf)
+#define pos_buf (S.find_match__pos_buf)
+/* is must be <= in */
+static void collapse_pos(int is, int in)
+{
+ memmove(int_buf+is, int_buf+in, (MAX_LINELEN+1-in)*sizeof(int_buf[0]));
+ memmove(pos_buf+is, pos_buf+in, (MAX_LINELEN+1-in)*sizeof(pos_buf[0]));
+}
+static NOINLINE 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];
+/* Were local, but it uses too much stack */
+/* int16_t int_buf[MAX_LINELEN + 1]; */
+/* int16_t pos_buf[MAX_LINELEN + 1]; */
/* set to integer dimension characters and own positions */
for (i = 0;; i++) {
int_buf[i] = (unsigned char)matchBuf[i];
if (int_buf[i] == 0) {
- pos_buf[i] = -1; /* indicator end line */
+ pos_buf[i] = -1; /* end-fo-line indicator */
break;
}
pos_buf[i] = i;
int_buf[j] |= QUOT;
i++;
#if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT
- if (matchBuf[i] == '\t') /* algorithm equivalent */
+ if (matchBuf[i] == '\t') /* algorithm equivalent */
int_buf[j] = ' ' | QUOT;
#endif
}
}
if (command_mode) {
collapse_pos(0, i + command_mode);
- i = -1; /* hack incremet */
+ i = -1; /* hack incremet */
}
}
/* collapse `command...` */
- for (i = 0; int_buf[i]; i++)
+ for (i = 0; int_buf[i]; i++) {
if (int_buf[i] == '`') {
for (j = i + 1; int_buf[j]; j++)
if (int_buf[j] == '`') {
break;
}
if (j) {
- /* not found close ` - command mode, collapse all previous */
+ /* not found closing ` - command mode, collapse all previous */
collapse_pos(0, i + 1);
break;
} else
- i--; /* hack incremet */
+ i--; /* hack incremet */
}
+ }
/* collapse (command...(command...)...) or {command...{command...}...} */
- c = 0; /* "recursive" level */
+ c = 0; /* "recursive" level */
c2 = 0;
- for (i = 0; int_buf[i]; i++)
+ 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 */
+ i = -1; /* hack incremet */
}
- for (i = 0; pos_buf[i] >= 0 && (c > 0 || c2 > 0); i++)
+ }
+ 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 */
+ i = -1; /* hack incremet */
}
+ }
/* skip first not quote space */
for (i = 0; int_buf[i]; i++)
/* set find mode for completion */
command_mode = FIND_EXE_ONLY;
- 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] == ' ' && command_mode == FIND_EXE_ONLY
- && matchBuf[pos_buf[0]]=='c'
- && matchBuf[pos_buf[1]]=='d'
+ && matchBuf[pos_buf[0]] == 'c'
+ && matchBuf[pos_buf[1]] == 'd'
) {
command_mode = FIND_DIR_ONLY;
} else {
break;
}
}
+ }
for (i = 0; int_buf[i]; i++)
/* "strlen" */;
/* find last word */
matchBuf[c++] = matchBuf[pos_buf[i]];
j = pos_buf[i] + 1;
}
- matchBuf[c] = 0;
- /* old lenght matchBuf with quotes symbols */
+ matchBuf[c] = '\0';
+ /* old length matchBuf with quotes symbols */
*len_with_quotes = j ? j - pos_buf[0] : 0;
return command_mode;
}
+#undef int_buf
+#undef pos_buf
/*
* display by column (original idea from ls applet,
int nrows = nfiles;
int l;
- /* 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++) {
- l = strlen(matches[row]);
+ l = bb_mbstrlen(matches[row]);
if (column_width < l)
column_width = l;
}
for (nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) {
printf("%s%-*s", matches[n],
- (int)(column_width - strlen(matches[n])), "");
+ (int)(column_width - bb_mbstrlen(matches[n])), ""
+ );
}
- printf("%s\n", matches[n]);
+ puts(matches[n]);
}
}
static char *add_quote_for_spec_chars(char *found)
{
int l = 0;
- char *s = xmalloc((strlen(found) + 1) * 2);
+ char *s = xzalloc((strlen(found) + 1) * 2);
while (*found) {
- if (strchr(" `\"#$%^&*()=+{}[]:;\'|\\<>", *found))
+ if (strchr(" `\"#$%^&*()=+{}[]:;'|\\<>", *found))
s[l++] = '\\';
s[l++] = *found++;
}
- s[l] = 0;
+ /* s[l] = '\0'; - already is */
return s;
}
-static int match_compare(const void *a, const void *b)
-{
- return strcmp(*(char**)a, *(char**)b);
-}
-
/* Do TAB completion */
-static void input_tab(int *lastWasTab)
+static void input_tab(smallint *lastWasTab)
{
if (!(state->flags & TAB_COMPLETION))
return;
if (!*lastWasTab) {
char *tmp, *tmp1;
- int len_found;
- char matchBuf[BUFSIZ];
+ size_t len_found;
+/* char matchBuf[MAX_LINELEN]; */
+#define matchBuf (S.input_tab__matchBuf)
int find_type;
int recalc_pos;
+#if ENABLE_FEATURE_ASSUME_UNICODE
+ /* cursor pos in command converted to multibyte form */
+ int cursor_mb;
+#endif
*lastWasTab = TRUE; /* flop trigger */
- /* Make a local copy of the string -- up
- * to the position of the cursor */
- tmp = strncpy(matchBuf, command_ps, cursor);
- tmp[cursor] = '\0';
+ /* Make a local copy of the string --
+ * up to the position of the cursor */
+ save_string(matchBuf, cursor + 1);
+#if ENABLE_FEATURE_ASSUME_UNICODE
+ cursor_mb = strlen(matchBuf);
+#endif
+ tmp = matchBuf;
find_type = find_match(matchBuf, &recalc_pos);
/* If the word starts with `~' and there is no slash in the word,
* then try completing this word as a username. */
if (state->flags & USERNAME_COMPLETION)
- if (matchBuf[0] == '~' && strchr(matchBuf, '/') == 0)
+ if (matchBuf[0] == '~' && strchr(matchBuf, '/') == NULL)
username_tab_completion(matchBuf, NULL);
#endif
/* Try to match any executable in our path and everything
exe_n_cwd_tab_completion(matchBuf, find_type);
/* Sort, then remove any duplicates found */
if (matches) {
- int i, n = 0;
- qsort(matches, num_matches, sizeof(char*), match_compare);
+ unsigned i;
+ int n = 0;
+ qsort_string_vector(matches, num_matches);
for (i = 0; i < num_matches - 1; ++i) {
if (matches[i] && matches[i+1]) { /* paranoia */
if (strcmp(matches[i], matches[i+1]) == 0) {
num_matches = n + 1;
}
/* Did we find exactly one match? */
- if (!matches || num_matches > 1) {
+ if (!matches || num_matches > 1) { /* no */
beep();
if (!matches)
return; /* not found */
/* find minimal match */
tmp1 = xstrdup(matches[0]);
- for (tmp = tmp1; *tmp; tmp++)
- for (len_found = 1; len_found < num_matches; len_found++)
- if (matches[len_found][(tmp - tmp1)] != *tmp) {
+ for (tmp = tmp1; *tmp; tmp++) {
+ for (len_found = 1; len_found < num_matches; len_found++) {
+ if (matches[len_found][tmp - tmp1] != *tmp) {
*tmp = '\0';
break;
}
+ }
+ }
if (*tmp1 == '\0') { /* have unique */
free(tmp1);
return;
tmp[len_found+1] = '\0';
}
}
+
len_found = strlen(tmp);
- /* have space to placed match? */
- if ((len_found - strlen(matchBuf) + command_len) < BUFSIZ) {
- /* before word for match */
- command_ps[cursor - recalc_pos] = 0;
- /* save tail line */
+#if !ENABLE_FEATURE_ASSUME_UNICODE
+ /* have space to place the match? */
+ /* The result consists of three parts with these lengths: */
+ /* (cursor - recalc_pos) + len_found + (command_len - cursor) */
+ /* it simplifies into: */
+ if ((int)(len_found + command_len - recalc_pos) < S.maxsize) {
+ /* save tail */
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 */
+ /* add match and tail */
+ sprintf(&command_ps[cursor - recalc_pos], "%s%s", tmp, matchBuf);
command_len = strlen(command_ps);
- /* write out the matched command */
+ /* new pos */
+ recalc_pos = cursor - recalc_pos + len_found;
+ /* write out the matched command */
redraw(cmdedit_y, command_len - recalc_pos);
}
+#else
+ {
+ char command[MAX_LINELEN];
+ int len = save_string(command, sizeof(command));
+ /* have space to place the match? */
+ /* (cursor_mb - recalc_pos) + len_found + (len - cursor_mb) */
+ if ((int)(len_found + len - recalc_pos) < MAX_LINELEN) {
+ /* save tail */
+ strcpy(matchBuf, command + cursor_mb);
+ /* where do we want to have cursor after all? */
+ strcpy(&command[cursor_mb - recalc_pos], tmp);
+ len = load_string(command, S.maxsize);
+ /* add match and tail */
+ sprintf(&command[cursor_mb - recalc_pos], "%s%s", tmp, matchBuf);
+ command_len = load_string(command, S.maxsize);
+ /* write out the matched command */
+ redraw(cmdedit_y, command_len - len);
+ }
+ }
+#endif
free(tmp);
+#undef matchBuf
} 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 sav_cursor = cursor; /* change goto_new_line() */
+ /* changed by goto_new_line() */
+ int sav_cursor = cursor;
/* Go to the next line */
goto_new_line();
}
}
-#else
-#define input_tab(a) ((void)0)
#endif /* FEATURE_COMMAND_TAB_COMPLETION */
+line_input_t* FAST_FUNC new_line_input_t(int flags)
+{
+ line_input_t *n = xzalloc(sizeof(*n));
+ n->flags = flags;
+ return n;
+}
+
+
#if MAX_HISTORY > 0
+static void save_command_ps_at_cur_history(void)
+{
+ if (command_ps[0] != BB_NUL) {
+ int cur = state->cur_history;
+ free(state->history[cur]);
+
+# if ENABLE_FEATURE_ASSUME_UNICODE
+ {
+ char tbuf[MAX_LINELEN];
+ save_string(tbuf, sizeof(tbuf));
+ state->history[cur] = xstrdup(tbuf);
+ }
+# else
+ state->history[cur] = xstrdup(command_ps);
+# endif
+ }
+}
+
/* state->flags is already checked to be nonzero */
-static void get_previous_history(void)
+static int get_previous_history(void)
{
- if (command_ps[0] != '\0' || state->history[state->cur_history] == NULL) {
- free(state->history[state->cur_history]);
- state->history[state->cur_history] = xstrdup(command_ps);
+ if ((state->flags & DO_HISTORY) && state->cur_history) {
+ save_command_ps_at_cur_history();
+ state->cur_history--;
+ return 1;
}
- state->cur_history--;
+ beep();
+ return 0;
}
static int get_next_history(void)
{
if (state->flags & DO_HISTORY) {
- int ch = state->cur_history;
- if (ch < state->cnt_history) {
- get_previous_history(); /* save the current history line */
- state->cur_history = ch + 1;
- return state->cur_history;
+ if (state->cur_history < state->cnt_history) {
+ save_command_ps_at_cur_history(); /* save the current history line */
+ return ++state->cur_history;
}
}
beep();
return 0;
}
-#if ENABLE_FEATURE_EDITING_SAVEHISTORY
+# if ENABLE_FEATURE_EDITING_SAVEHISTORY
+/* We try to ensure that concurrent additions to the history
+ * do not overwrite each other.
+ * Otherwise shell users get unhappy.
+ *
+ * History file is trimmed lazily, when it grows several times longer
+ * than configured MAX_HISTORY lines.
+ */
+
+static void free_line_input_t(line_input_t *n)
+{
+ int i = n->cnt_history;
+ while (i > 0)
+ free(n->history[--i]);
+ free(n);
+}
+
/* state->flags is already checked to be nonzero */
-static void load_history(const char *fromfile)
+static void load_history(line_input_t *st_parm)
{
+ char *temp_h[MAX_HISTORY];
+ char *line;
FILE *fp;
- int hi;
+ unsigned idx, i, line_len;
- /* cleanup old */
- for (hi = state->cnt_history; hi > 0;) {
- hi--;
- free(state->history[hi]);
- }
+ /* NB: do not trash old history if file can't be opened */
- fp = fopen(fromfile, "r");
+ fp = fopen_for_read(st_parm->hist_file);
if (fp) {
- for (hi = 0; hi < MAX_HISTORY;) {
- char * hl = xmalloc_getline(fp);
- int l;
+ /* clean up old history */
+ for (idx = st_parm->cnt_history; idx > 0;) {
+ idx--;
+ free(st_parm->history[idx]);
+ st_parm->history[idx] = NULL;
+ }
- if (!hl)
- break;
- l = strlen(hl);
- if (l >= BUFSIZ)
- hl[BUFSIZ-1] = 0;
- if (l == 0 || hl[0] == ' ') {
- free(hl);
+ /* fill temp_h[], retaining only last MAX_HISTORY lines */
+ memset(temp_h, 0, sizeof(temp_h));
+ st_parm->cnt_history_in_file = idx = 0;
+ while ((line = xmalloc_fgetline(fp)) != NULL) {
+ if (line[0] == '\0') {
+ free(line);
continue;
}
- state->history[hi++] = hl;
+ free(temp_h[idx]);
+ temp_h[idx] = line;
+ st_parm->cnt_history_in_file++;
+ idx++;
+ if (idx == MAX_HISTORY)
+ idx = 0;
}
fclose(fp);
+
+ /* find first non-NULL temp_h[], if any */
+ if (st_parm->cnt_history_in_file) {
+ while (temp_h[idx] == NULL) {
+ idx++;
+ if (idx == MAX_HISTORY)
+ idx = 0;
+ }
+ }
+
+ /* copy temp_h[] to st_parm->history[] */
+ for (i = 0; i < MAX_HISTORY;) {
+ line = temp_h[idx];
+ if (!line)
+ break;
+ idx++;
+ if (idx == MAX_HISTORY)
+ idx = 0;
+ line_len = strlen(line);
+ if (line_len >= MAX_LINELEN)
+ line[MAX_LINELEN-1] = '\0';
+ st_parm->history[i++] = line;
+ }
+ st_parm->cnt_history = i;
}
- state->cur_history = state->cnt_history = hi;
}
/* state->flags is already checked to be nonzero */
-static void save_history(const char *tofile)
+static void save_history(char *str)
{
- FILE *fp;
+ int fd;
+ int len, len2;
- fp = fopen(tofile, "w");
- if (fp) {
+ fd = open(state->hist_file, O_WRONLY | O_CREAT | O_APPEND, 0666);
+ if (fd < 0)
+ return;
+ xlseek(fd, 0, SEEK_END); /* paranoia */
+ len = strlen(str);
+ str[len] = '\n'; /* we (try to) do atomic write */
+ len2 = full_write(fd, str, len + 1);
+ str[len] = '\0';
+ close(fd);
+ if (len2 != len + 1)
+ return; /* "wtf?" */
+
+ /* did we write so much that history file needs trimming? */
+ state->cnt_history_in_file++;
+ if (state->cnt_history_in_file > MAX_HISTORY * 4) {
+ FILE *fp;
+ char *new_name;
+ line_input_t *st_temp;
int i;
- for (i = 0; i < state->cnt_history; i++) {
- fprintf(fp, "%s\n", state->history[i]);
+ /* we may have concurrently written entries from others.
+ * load them */
+ st_temp = new_line_input_t(state->flags);
+ st_temp->hist_file = state->hist_file;
+ load_history(st_temp);
+
+ /* write out temp file and replace hist_file atomically */
+ new_name = xasprintf("%s.%u.new", state->hist_file, (int) getpid());
+ fp = fopen_for_write(new_name);
+ if (fp) {
+ for (i = 0; i < st_temp->cnt_history; i++)
+ fprintf(fp, "%s\n", st_temp->history[i]);
+ fclose(fp);
+ if (rename(new_name, state->hist_file) == 0)
+ state->cnt_history_in_file = st_temp->cnt_history;
}
- fclose(fp);
+ free(new_name);
+ free_line_input_t(st_temp);
}
}
-#else
-#define load_history(a) ((void)0)
-#define save_history(a) ((void)0)
-#endif /* FEATURE_COMMAND_SAVEHISTORY */
+# else
+# define load_history(a) ((void)0)
+# define save_history(a) ((void)0)
+# endif /* FEATURE_COMMAND_SAVEHISTORY */
-static void remember_in_history(const char *str)
+static void remember_in_history(char *str)
{
int i;
if (!(state->flags & DO_HISTORY))
return;
-
+ if (str[0] == '\0')
+ return;
i = state->cnt_history;
- free(state->history[MAX_HISTORY]);
- state->history[MAX_HISTORY] = NULL;
- /* After max history, remove the oldest command */
+ /* Don't save dupes */
+ if (i && strcmp(state->history[i-1], str) == 0)
+ return;
+
+ free(state->history[MAX_HISTORY]); /* redundant, paranoia */
+ state->history[MAX_HISTORY] = NULL; /* redundant, paranoia */
+
+ /* If history[] is full, remove the oldest command */
+ /* we need to keep history[MAX_HISTORY] empty, hence >=, not > */
if (i >= MAX_HISTORY) {
free(state->history[0]);
for (i = 0; i < MAX_HISTORY-1; i++)
state->history[i] = state->history[i+1];
+ /* i == MAX_HISTORY-1 */
}
-// Maybe "if (!i || strcmp(history[i-1], command) != 0) ..."
-// (i.e. do not save dups?)
+ /* i <= MAX_HISTORY-1 */
state->history[i++] = xstrdup(str);
+ /* i <= MAX_HISTORY */
state->cur_history = i;
state->cnt_history = i;
- if (state->flags & SAVE_HISTORY)
- save_history(state->hist_file);
- USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;)
+# if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY
+ if ((state->flags & SAVE_HISTORY) && state->hist_file)
+ save_history(str);
+# endif
+ IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;)
}
#else /* MAX_HISTORY == 0 */
-#define remember_in_history(a) ((void)0)
+# define remember_in_history(a) ((void)0)
#endif /* MAX_HISTORY */
+#if ENABLE_FEATURE_EDITING_VI
/*
- * This function is used to grab a character buffer
- * from the input file descriptor and allows you to
- * a string with full command editing (sort of like
- * a mini readline).
- *
- * The following standard commands are not implemented:
- * ESC-b -- Move back one word
- * ESC-f -- Move forward one word
- * ESC-d -- Delete back one word
- * ESC-h -- Delete forward one word
- * CTL-t -- Transpose two characters
- *
- * Minimalist vi-style command line editing available if configured.
* vi mode implemented 2005 by Paul Fox <pgf@foxharp.boston.ma.us>
*/
-
-#if ENABLE_FEATURE_EDITING_VI
static void
-vi_Word_motion(char *command, int eat)
+vi_Word_motion(int eat)
{
- while (cursor < command_len && !isspace(command[cursor]))
+ CHAR_T *command = command_ps;
+
+ while (cursor < command_len && !BB_isspace(command[cursor]))
input_forward();
- if (eat) while (cursor < command_len && isspace(command[cursor]))
+ if (eat) while (cursor < command_len && BB_isspace(command[cursor]))
input_forward();
}
static void
-vi_word_motion(char *command, int eat)
+vi_word_motion(int eat)
{
- if (isalnum(command[cursor]) || command[cursor] == '_') {
+ CHAR_T *command = command_ps;
+
+ if (BB_isalnum(command[cursor]) || command[cursor] == '_') {
while (cursor < command_len
- && (isalnum(command[cursor+1]) || command[cursor+1] == '_'))
+ && (BB_isalnum(command[cursor+1]) || command[cursor+1] == '_')
+ ) {
input_forward();
- } else if (ispunct(command[cursor])) {
- while (cursor < command_len && ispunct(command[cursor+1]))
+ }
+ } else if (BB_ispunct(command[cursor])) {
+ while (cursor < command_len && BB_ispunct(command[cursor+1]))
input_forward();
}
if (cursor < command_len)
input_forward();
- if (eat && cursor < command_len && isspace(command[cursor]))
- while (cursor < command_len && isspace(command[cursor]))
+ if (eat) {
+ while (cursor < command_len && BB_isspace(command[cursor]))
input_forward();
+ }
}
static void
-vi_End_motion(char *command)
+vi_End_motion(void)
{
+ CHAR_T *command = command_ps;
+
input_forward();
- while (cursor < command_len && isspace(command[cursor]))
+ while (cursor < command_len && BB_isspace(command[cursor]))
input_forward();
- while (cursor < command_len-1 && !isspace(command[cursor+1]))
+ while (cursor < command_len-1 && !BB_isspace(command[cursor+1]))
input_forward();
}
static void
-vi_end_motion(char *command)
+vi_end_motion(void)
{
+ CHAR_T *command = command_ps;
+
if (cursor >= command_len-1)
return;
input_forward();
- while (cursor < command_len-1 && isspace(command[cursor]))
+ while (cursor < command_len-1 && BB_isspace(command[cursor]))
input_forward();
if (cursor >= command_len-1)
return;
- if (isalnum(command[cursor]) || command[cursor] == '_') {
+ if (BB_isalnum(command[cursor]) || command[cursor] == '_') {
while (cursor < command_len-1
- && (isalnum(command[cursor+1]) || command[cursor+1] == '_')
+ && (BB_isalnum(command[cursor+1]) || command[cursor+1] == '_')
) {
input_forward();
}
- } else if (ispunct(command[cursor])) {
- while (cursor < command_len-1 && ispunct(command[cursor+1]))
+ } else if (BB_ispunct(command[cursor])) {
+ while (cursor < command_len-1 && BB_ispunct(command[cursor+1]))
input_forward();
}
}
static void
-vi_Back_motion(char *command)
+vi_Back_motion(void)
{
- while (cursor > 0 && isspace(command[cursor-1]))
+ CHAR_T *command = command_ps;
+
+ while (cursor > 0 && BB_isspace(command[cursor-1]))
input_backward(1);
- while (cursor > 0 && !isspace(command[cursor-1]))
+ while (cursor > 0 && !BB_isspace(command[cursor-1]))
input_backward(1);
}
static void
-vi_back_motion(char *command)
+vi_back_motion(void)
{
+ CHAR_T *command = command_ps;
+
if (cursor <= 0)
return;
input_backward(1);
- while (cursor > 0 && isspace(command[cursor]))
+ while (cursor > 0 && BB_isspace(command[cursor]))
input_backward(1);
if (cursor <= 0)
return;
- if (isalnum(command[cursor]) || command[cursor] == '_') {
+ if (BB_isalnum(command[cursor]) || command[cursor] == '_') {
while (cursor > 0
- && (isalnum(command[cursor-1]) || command[cursor-1] == '_')
+ && (BB_isalnum(command[cursor-1]) || command[cursor-1] == '_')
) {
input_backward(1);
}
- } else if (ispunct(command[cursor])) {
- while (cursor > 0 && ispunct(command[cursor-1]))
+ } else if (BB_ispunct(command[cursor])) {
+ while (cursor > 0 && BB_ispunct(command[cursor-1]))
input_backward(1);
}
}
#endif
+/* Modelled after bash 4.0 behavior of Ctrl-<arrow> */
+static void ctrl_left(void)
+{
+ CHAR_T *command = command_ps;
+
+ while (1) {
+ CHAR_T c;
+
+ input_backward(1);
+ if (cursor == 0)
+ break;
+ c = command[cursor];
+ if (c != ' ' && !BB_ispunct(c)) {
+ /* we reached a "word" delimited by spaces/punct.
+ * go to its beginning */
+ while (1) {
+ c = command[cursor - 1];
+ if (c == ' ' || BB_ispunct(c))
+ break;
+ input_backward(1);
+ if (cursor == 0)
+ break;
+ }
+ break;
+ }
+ }
+}
+static void ctrl_right(void)
+{
+ CHAR_T *command = command_ps;
+
+ while (1) {
+ CHAR_T c;
+
+ c = command[cursor];
+ if (c == BB_NUL)
+ break;
+ if (c != ' ' && !BB_ispunct(c)) {
+ /* we reached a "word" delimited by spaces/punct.
+ * go to its end + 1 */
+ while (1) {
+ input_forward();
+ c = command[cursor];
+ if (c == BB_NUL || c == ' ' || BB_ispunct(c))
+ break;
+ }
+ break;
+ }
+ input_forward();
+ }
+}
+
/*
* read_line_input and its helpers
*/
+#if ENABLE_FEATURE_EDITING_ASK_TERMINAL
+static void ask_terminal(void)
+{
+ /* Ask terminal where is the cursor now.
+ * lineedit_read_key handles response and corrects
+ * our idea of current cursor position.
+ * Testcase: run "echo -n long_line_long_line_long_line",
+ * then type in a long, wrapping command and try to
+ * delete it using backspace key.
+ * Note: we print it _after_ prompt, because
+ * prompt may contain CR. Example: PS1='\[\r\n\]\w '
+ */
+ /* Problem: if there is buffered input on stdin,
+ * the response will be delivered later,
+ * possibly to an unsuspecting application.
+ * Testcase: "sleep 1; busybox ash" + press and hold [Enter].
+ * Result:
+ * ~/srcdevel/bbox/fix/busybox.t4 #
+ * ~/srcdevel/bbox/fix/busybox.t4 #
+ * ^[[59;34~/srcdevel/bbox/fix/busybox.t4 # <-- garbage
+ * ~/srcdevel/bbox/fix/busybox.t4 #
+ *
+ * Checking for input with poll only makes the race narrower,
+ * I still can trigger it. Strace:
+ *
+ * write(1, "~/srcdevel/bbox/fix/busybox.t4 # ", 33) = 33
+ * poll([{fd=0, events=POLLIN}], 1, 0) = 0 (Timeout) <-- no input exists
+ * write(1, "\33[6n", 4) = 4 <-- send the ESC sequence, quick!
+ * poll([{fd=0, events=POLLIN}], 1, 4294967295) = 1 ([{fd=0, revents=POLLIN}])
+ * read(0, "\n", 1) = 1 <-- oh crap, user's input got in first
+ */
+ struct pollfd pfd;
+
+ pfd.fd = STDIN_FILENO;
+ pfd.events = POLLIN;
+ if (safe_poll(&pfd, 1, 0) == 0) {
+ S.sent_ESC_br6n = 1;
+ out1str("\033" "[6n");
+ fflush_all(); /* make terminal see it ASAP! */
+ }
+}
+#else
+#define ask_terminal() ((void)0)
+#endif
+
#if !ENABLE_FEATURE_EDITING_FANCY_PROMPT
-static void parse_prompt(const char *prmt_ptr)
+static void parse_and_put_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)
+static void parse_and_put_prompt(const char *prmt_ptr)
{
int prmt_len = 0;
size_t cur_prmt_len = 0;
char flg_not_length = '[';
char *prmt_mem_ptr = xzalloc(1);
- char *pwd_buf = xrealloc_getcwd_or_warn(NULL);
- char buf2[PATH_MAX + 1];
- char buf[2];
+ char *cwd_buf = xrealloc_getcwd_or_warn(NULL);
+ char cbuf[2];
char c;
char *pbuf;
cmdedit_prmt_len = 0;
- if (!pwd_buf) {
- pwd_buf = (char *)bb_msg_unknown;
+ if (!cwd_buf) {
+ cwd_buf = (char *)bb_msg_unknown;
}
+ cbuf[1] = '\0'; /* never changes */
+
while (*prmt_ptr) {
- pbuf = buf;
- pbuf[1] = 0;
+ char *free_me = NULL;
+
+ pbuf = cbuf;
c = *prmt_ptr++;
if (c == '\\') {
const char *cp = prmt_ptr;
c = bb_process_escape_sequence(&prmt_ptr);
if (prmt_ptr == cp) {
- if (*cp == 0)
+ if (*cp == '\0')
break;
c = *prmt_ptr++;
+
switch (c) {
-#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+# if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
case 'u':
- pbuf = user_buf;
+ pbuf = user_buf ? user_buf : (char*)"";
break;
-#endif
+# endif
case 'h':
- pbuf = hostname_buf;
- if (!pbuf) {
- pbuf = xzalloc(256);
- if (gethostname(pbuf, 255) < 0) {
- strcpy(pbuf, "?");
- } else {
- char *s = strchr(pbuf, '.');
- if (s)
- *s = '\0';
- }
- hostname_buf = pbuf;
- }
+ pbuf = free_me = safe_gethostname();
+ *strchrnul(pbuf, '.') = '\0';
break;
case '$':
c = (geteuid() == 0 ? '#' : '$');
break;
-#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+# if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
case 'w':
- pbuf = pwd_buf;
+ /* /home/user[/something] -> ~[/something] */
+ pbuf = cwd_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)<PATH_MAX
+ if (l != 0
+ && strncmp(home_pwd_buf, cwd_buf, l) == 0
+ && (cwd_buf[l]=='/' || cwd_buf[l]=='\0')
+ && strlen(cwd_buf + l) < PATH_MAX
) {
- pbuf = buf2;
- *pbuf = '~';
- strcpy(pbuf+1, pwd_buf+l);
+ pbuf = free_me = xasprintf("~%s", cwd_buf + l);
}
break;
-#endif
+# endif
case 'W':
- pbuf = pwd_buf;
- cp = strrchr(pbuf,'/');
+ pbuf = cwd_buf;
+ cp = strrchr(pbuf, '/');
if (cp != NULL && cp != pbuf)
pbuf += (cp-pbuf) + 1;
break;
case '!':
- pbuf = buf2;
- snprintf(buf2, sizeof(buf2), "%d", num_ok_lines);
+ pbuf = free_me = xasprintf("%d", num_ok_lines);
break;
case 'e': case 'E': /* \e \E = \033 */
c = '\033';
break;
- case 'x': case 'X':
+ case 'x': case 'X': {
+ char buf2[4];
for (l = 0; l < 3;) {
- int h;
+ unsigned h;
buf2[l++] = *prmt_ptr;
- buf2[l] = 0;
- h = strtol(buf2, &pbuf, 16);
+ buf2[l] = '\0';
+ h = strtoul(buf2, &pbuf, 16);
if (h > UCHAR_MAX || (pbuf - buf2) < l) {
- l--;
+ buf2[--l] = '\0';
break;
}
prmt_ptr++;
}
- buf2[l] = 0;
- c = (char)strtol(buf2, NULL, 16);
+ c = (char)strtoul(buf2, NULL, 16);
if (c == 0)
c = '?';
- pbuf = buf;
+ pbuf = cbuf;
break;
+ }
case '[': case ']':
if (c == flg_not_length) {
- flg_not_length = flg_not_length == '[' ? ']' : '[';
+ flg_not_length = (flg_not_length == '[' ? ']' : '[');
continue;
}
break;
- }
- }
- }
- if (pbuf == buf)
- *pbuf = c;
+ } /* switch */
+ } /* if */
+ } /* if */
+ cbuf[0] = c;
cur_prmt_len = strlen(pbuf);
prmt_len += cur_prmt_len;
if (flg_not_length != ']')
cmdedit_prmt_len += cur_prmt_len;
prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_len+1), pbuf);
- }
- if (pwd_buf != (char *)bb_msg_unknown)
- free(pwd_buf);
+ free(free_me);
+ } /* while */
+
+ if (cwd_buf != (char *)bb_msg_unknown)
+ free(cwd_buf);
cmdedit_prompt = prmt_mem_ptr;
put_prompt();
}
#endif
-#define setTermSettings(fd, argp) tcsetattr(fd, TCSANOW, argp)
-#define getTermSettings(fd, argp) tcgetattr(fd, argp);
-
-static sighandler_t previous_SIGWINCH_handler;
-
static void cmdedit_setwidth(unsigned w, int redraw_flg)
{
cmdedit_termw = w;
int new_y = (cursor + cmdedit_prmt_len) / w;
/* redraw */
redraw((new_y >= cmdedit_y ? new_y : cmdedit_y), command_len - cursor);
- fflush(stdout);
+ fflush_all();
}
}
static void win_changed(int nsig)
{
- int width;
+ unsigned width;
get_terminal_width_height(0, &width, NULL);
cmdedit_setwidth(width, nsig /* - just a yes/no flag */);
if (nsig == SIGWINCH)
signal(SIGWINCH, win_changed); /* rearm ourself */
}
-/*
- * 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.
- */
+static int lineedit_read_key(char *read_key_buffer)
+{
+ int64_t ic;
+ struct pollfd pfd;
+ int delay = -1;
+#if ENABLE_FEATURE_ASSUME_UNICODE
+ char unicode_buf[MB_CUR_MAX + 1];
+ int unicode_idx = 0;
+#endif
-#define vbit 0x100
+ pfd.fd = STDIN_FILENO;
+ pfd.events = POLLIN;
+ do {
+#if ENABLE_FEATURE_EDITING_ASK_TERMINAL || ENABLE_FEATURE_ASSUME_UNICODE
+ poll_again:
+#endif
+ if (read_key_buffer[0] == 0) {
+ /* Wait for input. Can't just call read_key,
+ * it returns at once if stdin
+ * is in non-blocking mode. */
+ safe_poll(&pfd, 1, delay);
+ }
+ /* Note: read_key sets errno to 0 on success: */
+ ic = read_key(STDIN_FILENO, read_key_buffer);
+
+#if ENABLE_FEATURE_EDITING_ASK_TERMINAL
+ if ((int32_t)ic == KEYCODE_CURSOR_POS
+ && S.sent_ESC_br6n
+ ) {
+ S.sent_ESC_br6n = 0;
+ if (cursor == 0) { /* otherwise it may be bogus */
+ int col = ((ic >> 32) & 0x7fff) - 1;
+ if (col > cmdedit_prmt_len) {
+ cmdedit_x += (col - cmdedit_prmt_len);
+ while (cmdedit_x >= cmdedit_termw) {
+ cmdedit_x -= cmdedit_termw;
+ cmdedit_y++;
+ }
+ }
+ }
+ goto poll_again;
+ }
+#endif
+
+#if ENABLE_FEATURE_ASSUME_UNICODE
+ {
+ wchar_t wc;
+
+ if ((int32_t)ic < 0) /* KEYCODE_xxx */
+ return ic;
+ unicode_buf[unicode_idx++] = ic;
+ unicode_buf[unicode_idx] = '\0';
+ if (mbstowcs(&wc, unicode_buf, 1) != 1 && unicode_idx < MB_CUR_MAX) {
+ delay = 50;
+ goto poll_again;
+ }
+ ic = wc;
+ }
+#endif
+ } while (errno == EAGAIN);
+
+ return ic;
+}
/* leave out the "vi-mode"-only case labels if vi editing isn't
* configured. */
-#define vi_case(caselabel) USE_FEATURE_EDITING(case caselabel)
+#define vi_case(caselabel) IF_FEATURE_EDITING_VI(case caselabel)
/* convert uppercase ascii to equivalent control char, for readability */
#undef CTRL
#define CTRL(a) ((a) & ~0x40)
-int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *st)
+/* maxsize must be >= 2.
+ * Returns:
+ * -1 on read errors or EOF, or on bare Ctrl-D,
+ * 0 on ctrl-C (the line entered is still returned in 'command'),
+ * >0 length of input string, including terminating '\n'
+ */
+int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
{
- int lastWasTab = FALSE;
- unsigned int ic;
- unsigned char c;
+ int len;
+#if ENABLE_FEATURE_TAB_COMPLETION
+ smallint lastWasTab = FALSE;
+#endif
smallint break_out = 0;
#if ENABLE_FEATURE_EDITING_VI
smallint vi_cmdmode = 0;
- smalluint prevc;
#endif
+ struct termios initial_settings;
+ struct termios new_settings;
+ char read_key_buffer[KEYCODE_BUFFER_SIZE];
+
+ INIT_S();
+
+ if (tcgetattr(STDIN_FILENO, &initial_settings) < 0
+ || !(initial_settings.c_lflag & ECHO)
+ ) {
+ /* Happens when e.g. stty -echo was run before */
+ parse_and_put_prompt(prompt);
+ /* fflush_all(); - done by parse_and_put_prompt */
+ if (fgets(command, maxsize, stdin) == NULL)
+ len = -1; /* EOF or error */
+ else
+ len = strlen(command);
+ DEINIT_S();
+ return len;
+ }
+
+ check_unicode_in_env();
// FIXME: audit & improve this
- if (maxsize > BUFSIZ)
- maxsize = BUFSIZ;
+ if (maxsize > MAX_LINELEN)
+ maxsize = MAX_LINELEN;
+ S.maxsize = maxsize;
/* With null flags, no other fields are ever used */
state = st ? st : (line_input_t*) &const_int_0;
-#if ENABLE_FEATURE_EDITING_SAVEHISTORY
- if (state->flags & SAVE_HISTORY)
- load_history(state->hist_file);
+#if MAX_HISTORY > 0
+# if ENABLE_FEATURE_EDITING_SAVEHISTORY
+ if ((state->flags & SAVE_HISTORY) && state->hist_file)
+ if (state->cnt_history == 0)
+ load_history(state);
+# endif
+ if (state->flags & DO_HISTORY)
+ state->cur_history = state->cnt_history;
#endif
/* prepare before init handlers */
cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */
command_len = 0;
+#if ENABLE_FEATURE_ASSUME_UNICODE
+ command_ps = xzalloc(maxsize * sizeof(command_ps[0]));
+#else
command_ps = command;
command[0] = '\0';
+#endif
+#define command command_must_not_be_used
- getTermSettings(0, (void *) &initial_settings);
- memcpy(&new_settings, &initial_settings, sizeof(new_settings));
+ new_settings = initial_settings;
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);
new_settings.c_cc[VTIME] = 0;
/* Turn off CTRL-C, so we can trap it */
#ifndef _POSIX_VDISABLE
-#define _POSIX_VDISABLE '\0'
+# define _POSIX_VDISABLE '\0'
#endif
new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
- setTermSettings(0, (void *) &new_settings);
+ tcsetattr_stdin_TCSANOW(&new_settings);
/* Now initialize things */
previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
}
}
#endif
-#if ENABLE_FEATURE_TAB_COMPLETION
- my_uid = getuid();
- my_gid = getgid();
+
+#if 0
+ for (i = 0; i <= MAX_HISTORY; i++)
+ bb_error_msg("history[%d]:'%s'", i, state->history[i]);
+ bb_error_msg("cur_history:%d cnt_history:%d", state->cur_history, state->cnt_history);
#endif
- /* Print out the command prompt */
- parse_prompt(prompt);
- while (1) {
- fflush(stdout);
+ /* Print out the command prompt, optionally ask where cursor is */
+ parse_and_put_prompt(prompt);
+ ask_terminal();
- if (safe_read(0, &c, 1) < 1) {
- /* if we can't read input then exit */
- goto prepare_to_die;
- }
-
- ic = c;
+ read_key_buffer[0] = 0;
+ while (1) {
+ /*
+ * 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.
+ */
+ enum {
+ VI_CMDMODE_BIT = 0x40000000,
+ /* 0x80000000 bit flags KEYCODE_xxx */
+ };
+ int32_t ic, ic_raw;
+
+ fflush_all();
+ ic = ic_raw = lineedit_read_key(read_key_buffer);
#if ENABLE_FEATURE_EDITING_VI
newdelflag = 1;
- if (vi_cmdmode)
- ic |= vbit;
+ if (vi_cmdmode) {
+ /* btw, since KEYCODE_xxx are all < 0, this doesn't
+ * change ic if it contains one of them: */
+ ic |= VI_CMDMODE_BIT;
+ }
#endif
+
switch (ic) {
case '\n':
case '\r':
- vi_case('\n'|vbit:)
- vi_case('\r'|vbit:)
+ vi_case('\n'|VI_CMDMODE_BIT:)
+ vi_case('\r'|VI_CMDMODE_BIT:)
/* Enter */
goto_new_line();
break_out = 1;
break;
-#if ENABLE_FEATURE_EDITING_FANCY_KEYS
case CTRL('A'):
- vi_case('0'|vbit:)
+ vi_case('0'|VI_CMDMODE_BIT:)
/* Control-a -- Beginning of line */
input_backward(cursor);
break;
case CTRL('B'):
- vi_case('h'|vbit:)
- vi_case('\b'|vbit:)
- vi_case('\x7f'|vbit:) /* DEL */
+ vi_case('h'|VI_CMDMODE_BIT:)
+ vi_case('\b'|VI_CMDMODE_BIT:)
+ vi_case('\x7f'|VI_CMDMODE_BIT:) /* DEL */
/* Control-b -- Move back one character */
input_backward(1);
break;
-#endif
- case CTRL('C'):
- vi_case(CTRL('C')|vbit:)
- /* Control-c -- stop gathering input */
- goto_new_line();
- command_len = 0;
- break_out = -1; /* "do not append '\n'" */
- break;
- case CTRL('D'):
- /* Control-d -- Delete one character, or exit
- * if the len=0 and no chars to delete */
- if (command_len == 0) {
- errno = 0;
- prepare_to_die:
- /* to control stopped jobs */
- break_out = command_len = -1;
- break;
- }
- input_delete(0);
- break;
-
-#if ENABLE_FEATURE_EDITING_FANCY_KEYS
case CTRL('E'):
- vi_case('$'|vbit:)
+ vi_case('$'|VI_CMDMODE_BIT:)
/* Control-e -- End of line */
input_end();
break;
case CTRL('F'):
- vi_case('l'|vbit:)
- vi_case(' '|vbit:)
+ vi_case('l'|VI_CMDMODE_BIT:)
+ vi_case(' '|VI_CMDMODE_BIT:)
/* Control-f -- Move forward one character */
input_forward();
break;
-#endif
-
case '\b':
case '\x7f': /* DEL */
/* Control-h and DEL */
input_backspace();
break;
-
+#if ENABLE_FEATURE_TAB_COMPLETION
case '\t':
input_tab(&lastWasTab);
break;
-
-#if ENABLE_FEATURE_EDITING_FANCY_KEYS
+#endif
case CTRL('K'):
/* Control-k -- clear to end of line */
- command[cursor] = 0;
+ command_ps[cursor] = BB_NUL;
command_len = cursor;
printf("\033[J");
break;
case CTRL('L'):
- vi_case(CTRL('L')|vbit:)
+ vi_case(CTRL('L')|VI_CMDMODE_BIT:)
/* Control-l -- clear screen */
printf("\033[H");
redraw(0, command_len - cursor);
break;
-#endif
-
#if MAX_HISTORY > 0
case CTRL('N'):
- vi_case(CTRL('N')|vbit:)
- vi_case('j'|vbit:)
+ vi_case(CTRL('N')|VI_CMDMODE_BIT:)
+ vi_case('j'|VI_CMDMODE_BIT:)
/* Control-n -- Get next command in history */
if (get_next_history())
goto rewrite_line;
break;
case CTRL('P'):
- vi_case(CTRL('P')|vbit:)
- vi_case('k'|vbit:)
+ vi_case(CTRL('P')|VI_CMDMODE_BIT:)
+ vi_case('k'|VI_CMDMODE_BIT:)
/* Control-p -- Get previous command from history */
- if ((state->flags & DO_HISTORY) && state->cur_history > 0) {
- get_previous_history();
+ if (get_previous_history())
goto rewrite_line;
- }
- beep();
break;
#endif
-
-#if ENABLE_FEATURE_EDITING_FANCY_KEYS
case CTRL('U'):
- vi_case(CTRL('U')|vbit:)
+ vi_case(CTRL('U')|VI_CMDMODE_BIT:)
/* Control-U -- Clear line before cursor */
if (cursor) {
- strcpy(command, command + cursor);
command_len -= cursor;
+ memmove(command_ps, command_ps + cursor,
+ (command_len + 1) * sizeof(command_ps[0]));
redraw(cmdedit_y, command_len);
}
break;
-#endif
case CTRL('W'):
- vi_case(CTRL('W')|vbit:)
+ vi_case(CTRL('W')|VI_CMDMODE_BIT:)
/* Control-W -- Remove the last word */
- while (cursor > 0 && isspace(command[cursor-1]))
+ while (cursor > 0 && BB_isspace(command_ps[cursor-1]))
input_backspace();
- while (cursor > 0 && !isspace(command[cursor-1]))
+ while (cursor > 0 && !BB_isspace(command_ps[cursor-1]))
input_backspace();
break;
#if ENABLE_FEATURE_EDITING_VI
- case 'i'|vbit:
+ case 'i'|VI_CMDMODE_BIT:
vi_cmdmode = 0;
break;
- case 'I'|vbit:
+ case 'I'|VI_CMDMODE_BIT:
input_backward(cursor);
vi_cmdmode = 0;
break;
- case 'a'|vbit:
+ case 'a'|VI_CMDMODE_BIT:
input_forward();
vi_cmdmode = 0;
break;
- case 'A'|vbit:
+ case 'A'|VI_CMDMODE_BIT:
input_end();
vi_cmdmode = 0;
break;
- case 'x'|vbit:
+ case 'x'|VI_CMDMODE_BIT:
input_delete(1);
break;
- case 'X'|vbit:
+ case 'X'|VI_CMDMODE_BIT:
if (cursor > 0) {
input_backward(1);
input_delete(1);
}
break;
- case 'W'|vbit:
- vi_Word_motion(command, 1);
+ case 'W'|VI_CMDMODE_BIT:
+ vi_Word_motion(1);
break;
- case 'w'|vbit:
- vi_word_motion(command, 1);
+ case 'w'|VI_CMDMODE_BIT:
+ vi_word_motion(1);
break;
- case 'E'|vbit:
- vi_End_motion(command);
+ case 'E'|VI_CMDMODE_BIT:
+ vi_End_motion();
break;
- case 'e'|vbit:
- vi_end_motion(command);
+ case 'e'|VI_CMDMODE_BIT:
+ vi_end_motion();
break;
- case 'B'|vbit:
- vi_Back_motion(command);
+ case 'B'|VI_CMDMODE_BIT:
+ vi_Back_motion();
break;
- case 'b'|vbit:
- vi_back_motion(command);
+ case 'b'|VI_CMDMODE_BIT:
+ vi_back_motion();
break;
- case 'C'|vbit:
+ case 'C'|VI_CMDMODE_BIT:
vi_cmdmode = 0;
/* fall through */
- case 'D'|vbit:
+ case 'D'|VI_CMDMODE_BIT:
goto clear_to_eol;
- case 'c'|vbit:
+ case 'c'|VI_CMDMODE_BIT:
vi_cmdmode = 0;
/* fall through */
- case 'd'|vbit: {
+ case 'd'|VI_CMDMODE_BIT: {
int nc, sc;
- sc = cursor;
- prevc = ic;
- if (safe_read(0, &c, 1) < 1)
+
+ ic = lineedit_read_key(read_key_buffer);
+ if (errno) /* error */
goto prepare_to_die;
- if (c == (prevc & 0xff)) {
- /* "cc", "dd" */
+ if (ic == ic_raw) { /* "cc", "dd" */
input_backward(cursor);
goto clear_to_eol;
break;
}
- switch (c) {
+
+ sc = cursor;
+ switch (ic) {
case 'w':
case 'W':
case 'e':
case 'E':
- switch (c) {
+ switch (ic) {
case 'w': /* "dw", "cw" */
- vi_word_motion(command, vi_cmdmode);
+ vi_word_motion(vi_cmdmode);
break;
case 'W': /* 'dW', 'cW' */
- vi_Word_motion(command, vi_cmdmode);
+ vi_Word_motion(vi_cmdmode);
break;
case 'e': /* 'de', 'ce' */
- vi_end_motion(command);
+ vi_end_motion();
input_forward();
break;
case 'E': /* 'dE', 'cE' */
- vi_End_motion(command);
+ vi_End_motion();
input_forward();
break;
}
break;
case 'b': /* "db", "cb" */
case 'B': /* implemented as B */
- if (c == 'b')
- vi_back_motion(command);
+ if (ic == 'b')
+ vi_back_motion();
else
- vi_Back_motion(command);
+ vi_Back_motion();
while (sc-- > cursor)
input_delete(1);
break;
input_delete(1);
break;
case '$': /* "d$", "c$" */
- clear_to_eol:
+ clear_to_eol:
while (cursor < command_len)
input_delete(1);
break;
}
break;
}
- case 'p'|vbit:
+ case 'p'|VI_CMDMODE_BIT:
input_forward();
/* fallthrough */
- case 'P'|vbit:
+ case 'P'|VI_CMDMODE_BIT:
put();
break;
- case 'r'|vbit:
- if (safe_read(0, &c, 1) < 1)
+ case 'r'|VI_CMDMODE_BIT:
+//FIXME: unicode case?
+ ic = lineedit_read_key(read_key_buffer);
+ if (errno) /* error */
goto prepare_to_die;
- if (c == 0)
+ if (ic < ' ' || ic > 255) {
beep();
- else {
- *(command + cursor) = c;
- putchar(c);
- putchar('\b');
+ } else {
+ command_ps[cursor] = ic;
+ bb_putchar(ic);
+ bb_putchar('\b');
}
break;
-#endif /* FEATURE_COMMAND_EDITING_VI */
-
case '\x1b': /* ESC */
-
-#if ENABLE_FEATURE_EDITING_VI
if (state->flags & VI_MODE) {
- /* ESC: insert mode --> command mode */
+ /* 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('['|vbit:)
- vi_case('O'|vbit:)
- if (safe_read(0, &c, 1) < 1)
- goto prepare_to_die;
- }
- if (c >= '1' && c <= '9') {
- unsigned char dummy;
-
- if (safe_read(0, &dummy, 1) < 1)
- goto prepare_to_die;
- if (dummy != '~')
- c = '\0';
}
+ break;
+#endif /* FEATURE_COMMAND_EDITING_VI */
- switch (c) {
-#if ENABLE_FEATURE_TAB_COMPLETION
- case '\t': /* Alt-Tab */
- input_tab(&lastWasTab);
- break;
-#endif
#if MAX_HISTORY > 0
- case 'A':
- /* Up Arrow -- Get previous command from history */
- if ((state->flags & DO_HISTORY) && state->cur_history > 0) {
- get_previous_history();
- goto rewrite_line;
- }
- beep();
+ case KEYCODE_UP:
+ if (get_previous_history())
+ goto rewrite_line;
+ beep();
+ break;
+ case KEYCODE_DOWN:
+ if (!get_next_history())
break;
- case 'B':
- /* Down Arrow -- Get next command in history */
- if (!get_next_history())
- break;
rewrite_line:
- /* Rewrite the line with the selected history item */
- /* change command */
- command_len = strlen(strcpy(command, state->history[state->cur_history]));
- /* redraw and go to eol (bol, in vi */
- redraw(cmdedit_y, (state->flags & VI_MODE) ? 9999 : 0);
- break;
+ /* Rewrite the line with the selected history item */
+ /* change command */
+ command_len = load_string(state->history[state->cur_history] ?
+ state->history[state->cur_history] : "", maxsize);
+ /* redraw and go to eol (bol, in vi) */
+ redraw(cmdedit_y, (state->flags & VI_MODE) ? 9999 : 0);
+ break;
#endif
- case 'C':
- /* Right Arrow -- Move forward one character */
- input_forward();
- break;
- case 'D':
- /* Left Arrow -- Move back one character */
- input_backward(1);
- break;
- case '3':
- /* Delete */
- input_delete(0);
- break;
- case '1':
- case 'H':
- /* <Home> */
- input_backward(cursor);
- break;
- case '4':
- case 'F':
- /* <End> */
- input_end();
- break;
- default:
- c = '\0';
- beep();
- }
+ case KEYCODE_RIGHT:
+ input_forward();
+ break;
+ case KEYCODE_LEFT:
+ input_backward(1);
+ break;
+ case KEYCODE_CTRL_LEFT:
+ ctrl_left();
+ break;
+ case KEYCODE_CTRL_RIGHT:
+ ctrl_right();
+ break;
+ case KEYCODE_DELETE:
+ input_delete(0);
+ break;
+ case KEYCODE_HOME:
+ input_backward(cursor);
+ break;
+ case KEYCODE_END:
+ input_end();
break;
- default: /* If it's regular input, do the normal thing */
-#if ENABLE_FEATURE_NONPRINTABLE_INVERSE_PUT
- /* Control-V -- Add non-printable symbol */
- if (c == CTRL('V')) {
- if (safe_read(0, &c, 1) < 1)
- goto prepare_to_die;
- if (c == 0) {
- beep();
+ default:
+ if (initial_settings.c_cc[VINTR] != 0
+ && ic_raw == initial_settings.c_cc[VINTR]
+ ) {
+ /* Ctrl-C (usually) - stop gathering input */
+ goto_new_line();
+ command_len = 0;
+ break_out = -1; /* "do not append '\n'" */
+ break;
+ }
+ if (initial_settings.c_cc[VEOF] != 0
+ && ic_raw == initial_settings.c_cc[VEOF]
+ ) {
+ /* Ctrl-D (usually) - delete one character,
+ * or exit if len=0 and no chars to delete */
+ if (command_len == 0) {
+ errno = 0;
+#if ENABLE_FEATURE_EDITING_VI
+ prepare_to_die:
+#endif
+ break_out = command_len = -1;
break;
}
- } else
-#endif
-
-#if ENABLE_FEATURE_EDITING_VI
- if (vi_cmdmode) /* Don't self-insert */
+ input_delete(0);
break;
-#endif
- if (!Isprint(c)) /* Skip non-printable characters */
+ }
+// /* Control-V -- force insert of next char */
+// if (c == CTRL('V')) {
+// if (safe_read(STDIN_FILENO, &c, 1) < 1)
+// goto prepare_to_die;
+// if (c == 0) {
+// beep();
+// break;
+// }
+// }
+ if (ic < ' '
+ || (!ENABLE_FEATURE_ASSUME_UNICODE && ic >= 256)
+ || (ENABLE_FEATURE_ASSUME_UNICODE && ic >= VI_CMDMODE_BIT)
+ ) {
+ /* If VI_CMDMODE_BIT is set, ic is >= 256
+ * and vi mode ignores unexpected chars.
+ * Otherwise, we are here if ic is a
+ * control char or an unhandled ESC sequence,
+ * which is also ignored.
+ */
break;
-
- if (command_len >= (maxsize - 2)) /* Need to leave space for enter */
+ }
+ if ((int)command_len >= (maxsize - 2)) {
+ /* Not enough space for the char and EOL */
break;
+ }
command_len++;
- if (cursor == (command_len - 1)) { /* Append if at the end of the line */
- command[cursor] = c;
- command[cursor+1] = '\0';
+ if (cursor == (command_len - 1)) {
+ /* We are at the end, append */
+ command_ps[cursor] = ic;
+ command_ps[cursor + 1] = BB_NUL;
cmdedit_set_out_char(' ');
- } else { /* Insert otherwise */
+ } else {
+ /* In the middle, insert */
int sc = cursor;
- memmove(command + sc + 1, command + sc, command_len - sc);
- command[sc] = c;
+ memmove(command_ps + sc + 1, command_ps + sc,
+ (command_len - sc) * sizeof(command_ps[0]));
+ command_ps[sc] = ic;
sc++;
/* rewrite from cursor */
input_end();
input_backward(cursor - sc);
}
break;
- }
- if (break_out) /* Enter is the command terminator, no more input. */
+ } /* switch (ic) */
+
+ if (break_out)
break;
- if (c != '\t')
+#if ENABLE_FEATURE_TAB_COMPLETION
+ if (ic_raw != '\t')
lastWasTab = FALSE;
+#endif
+ } /* while (1) */
+
+#if ENABLE_FEATURE_EDITING_ASK_TERMINAL
+ if (S.sent_ESC_br6n) {
+ /* "sleep 1; busybox ash" + hold [Enter] to trigger.
+ * We sent "ESC [ 6 n", but got '\n' first, and
+ * KEYCODE_CURSOR_POS response is now buffered from terminal.
+ * It's bad already and not much can be done with it
+ * (it _will_ be visible for the next process to read stdin),
+ * but without this delay it even shows up on the screen
+ * as garbage because we restore echo settings with tcsetattr
+ * before it comes in. UGLY!
+ */
+ usleep(20*1000);
}
+#endif
+
+/* Stop bug catching using "command_must_not_be_used" trick */
+#undef command
+
+#if ENABLE_FEATURE_ASSUME_UNICODE
+ command[0] = '\0';
+ if (command_len > 0)
+ command_len = save_string(command, maxsize - 1);
+ free(command_ps);
+#endif
if (command_len > 0)
remember_in_history(command);
command[command_len] = '\0';
}
-#if ENABLE_FEATURE_CLEAN_UP && ENABLE_FEATURE_TAB_COMPLETION
+#if ENABLE_FEATURE_TAB_COMPLETION
free_tab_completion_data();
#endif
-#if ENABLE_FEATURE_EDITING_FANCY_PROMPT
- free((char*)cmdedit_prompt);
-#endif
/* restore initial_settings */
- setTermSettings(STDIN_FILENO, (void *) &initial_settings);
+ tcsetattr_stdin_TCSANOW(&initial_settings);
/* restore SIGWINCH handler */
signal(SIGWINCH, previous_SIGWINCH_handler);
- fflush(stdout);
- return command_len;
-}
+ fflush_all();
-line_input_t *new_line_input_t(int flags)
-{
- line_input_t *n = xzalloc(sizeof(*n));
- n->flags = flags;
- return n;
+ len = command_len;
+ DEINIT_S();
+
+ return len; /* can't return command_len, DEINIT_S() destroys it */
}
#else
#undef read_line_input
-int read_line_input(const char* prompt, char* command, int maxsize)
+int FAST_FUNC read_line_input(const char* prompt, char* command, int maxsize)
{
fputs(prompt, stdout);
- fflush(stdout);
+ fflush_all();
fgets(command, maxsize, stdin);
return strlen(command);
}
-#endif /* FEATURE_COMMAND_EDITING */
+#endif /* FEATURE_EDITING */
/*
int main(int argc, char **argv)
{
- char buff[BUFSIZ];
+ char buff[MAX_LINELEN];
char *prompt =
#if ENABLE_FEATURE_EDITING_FANCY_PROMPT
"\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:"