#endif
-#define SEQ_CLEAR_TILL_END_OF_SCREEN "\033[J"
-//#define SEQ_CLEAR_TILL_END_OF_LINE "\033[K"
+#define ESC "\033"
+
+#define SEQ_CLEAR_TILL_END_OF_SCREEN ESC"[J"
+//#define SEQ_CLEAR_TILL_END_OF_LINE ESC"[K"
enum {
#if ENABLE_FEATURE_EDITING_ASK_TERMINAL
smallint sent_ESC_br6n;
#endif
-
- /* Formerly these were big buffers on stack: */
-#if ENABLE_FEATURE_TAB_COMPLETION
- char input_tab__matchBuf[MAX_LINELEN];
- int16_t find_match__int_buf[MAX_LINELEN + 1]; /* need to have 9 bits at least */
-#endif
};
/* See lineedit_ptr_hack.c */
#if ENABLE_UNICODE_SUPPORT
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] = BB_NUL;
- return len;
+ if (unicode_status == UNICODE_ON) {
+ ssize_t len = mbstowcs(command_ps, src, maxsize - 1);
+ if (len < 0)
+ len = 0;
+ command_ps[len] = BB_NUL;
+ return len;
+ } else {
+ unsigned i = 0;
+ while ((command_ps[i] = src[i]) != 0)
+ i++;
+ return i;
+ }
}
static unsigned save_string(char *dst, unsigned maxsize)
{
+ if (unicode_status == UNICODE_ON) {
# if !ENABLE_UNICODE_PRESERVE_BROKEN
- ssize_t len = wcstombs(dst, command_ps, maxsize - 1);
- if (len < 0)
- len = 0;
- dst[len] = '\0';
- return len;
+ ssize_t len = wcstombs(dst, command_ps, maxsize - 1);
+ if (len < 0)
+ len = 0;
+ dst[len] = '\0';
+ return len;
# else
- unsigned dstpos = 0;
- unsigned srcpos = 0;
+ unsigned dstpos = 0;
+ unsigned srcpos = 0;
- maxsize--;
- while (dstpos < maxsize) {
- wchar_t wc;
- int n = srcpos;
+ maxsize--;
+ while (dstpos < maxsize) {
+ wchar_t wc;
+ int n = srcpos;
- /* Convert up to 1st invalid byte (or up to end) */
- while ((wc = command_ps[srcpos]) != BB_NUL
- && !unicode_is_raw_byte(wc)
- ) {
+ /* Convert up to 1st invalid byte (or up to end) */
+ while ((wc = command_ps[srcpos]) != BB_NUL
+ && !unicode_is_raw_byte(wc)
+ ) {
+ srcpos++;
+ }
+ command_ps[srcpos] = BB_NUL;
+ n = wcstombs(dst + dstpos, command_ps + n, maxsize - dstpos);
+ if (n < 0) /* should not happen */
+ break;
+ dstpos += n;
+ if (wc == BB_NUL) /* usually is */
+ break;
+
+ /* We do have invalid byte here! */
+ command_ps[srcpos] = wc; /* restore it */
srcpos++;
+ if (dstpos == maxsize)
+ break;
+ dst[dstpos++] = (char) wc;
}
- command_ps[srcpos] = BB_NUL;
- n = wcstombs(dst + dstpos, command_ps + n, maxsize - dstpos);
- if (n < 0) /* should not happen */
- break;
- dstpos += n;
- if (wc == BB_NUL) /* usually is */
- break;
-
- /* We do have invalid byte here! */
- command_ps[srcpos] = wc; /* restore it */
- srcpos++;
- if (dstpos == maxsize)
- break;
- dst[dstpos++] = (char) wc;
- }
- dst[dstpos] = '\0';
- return dstpos;
+ dst[dstpos] = '\0';
+ return dstpos;
# endif
+ } else {
+ unsigned i = 0;
+ while ((dst[i] = command_ps[i]) != 0)
+ i++;
+ return i;
+ }
}
/* 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;
-
- len = wcrtomb(buf, c, &mbst);
- if (len > 0) {
- buf[len] = '\0';
- fputs(buf, stdout);
+ if (unicode_status == UNICODE_ON) {
+ 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 {
+ /* In this case, c is always one byte */
+ putchar(c);
}
}
# if ENABLE_UNICODE_COMBINING_WCHARS || ENABLE_UNICODE_WIDE_WCHARS
} while (--num);
return;
}
- printf("\033[%uD", num);
+ printf(ESC"[%uD", num);
return;
}
*/
unsigned sv_cursor;
/* go to 1st column; go up to first line */
- printf("\r" "\033[%uA", cmdedit_y);
+ printf("\r" ESC"[%uA", cmdedit_y);
cmdedit_y = 0;
sv_cursor = cursor;
put_prompt(); /* sets cursor to 0 */
cmdedit_x = (width * cmdedit_y - num) % width;
cmdedit_y -= lines_up;
/* go to 1st column; go up */
- printf("\r" "\033[%uA", lines_up);
+ printf("\r" ESC"[%uA", lines_up);
/* go to correct column.
* xterm, konsole, Linux VT interpret 0 as 1 below! wow.
* need to *make sure* we skip it if cmdedit_x == 0 */
if (cmdedit_x)
- printf("\033[%uC", cmdedit_x);
+ printf(ESC"[%uC", cmdedit_x);
}
}
static void redraw(int y, int back_cursor)
{
if (y > 0) /* up y lines */
- printf("\033[%uA", y);
+ printf(ESC"[%uA", y);
bb_putchar('\r');
put_prompt();
put_till_end_and_adv_cursor();
#if ENABLE_FEATURE_TAB_COMPLETION
+//FIXME:
+//needs to be more clever: currently it thinks that "foo\ b<TAB>
+//matches the file named "foo bar", which is untrue.
+//Also, perhaps "foo b<TAB> needs to complete to "foo bar" <cursor>,
+//not "foo bar <cursor>...
+
static void free_tab_completion_data(void)
{
if (matches) {
num_matches++;
}
-#if ENABLE_FEATURE_USERNAME_COMPLETION
+# if ENABLE_FEATURE_USERNAME_COMPLETION
/* Replace "~user/..." with "/homedir/...".
* The parameter is malloced, free it or return it
* unchanged if no user is matched.
return 1 + userlen;
}
-#endif /* FEATURE_USERNAME_COMPLETION */
+# endif /* FEATURE_USERNAME_COMPLETION */
enum {
FIND_EXE_ONLY = 0,
pfind++;
/* dirbuf = ".../.../.../" */
dirbuf = xstrndup(command, pfind - command);
-#if ENABLE_FEATURE_USERNAME_COMPLETION
+# if ENABLE_FEATURE_USERNAME_COMPLETION
if (dirbuf[0] == '~') /* ~/... or ~user/... */
dirbuf = username_path_completion(dirbuf);
-#endif
+# endif
path1[0] = dirbuf;
}
pf_len = strlen(pfind);
continue; /* don't print an error */
while ((next = readdir(dir)) != NULL) {
+ unsigned len;
const char *name_found = next->d_name;
/* .../<tab>: bash 3.2.0 shows dotfiles, but not . and .. */
if (stat(found, &st) && lstat(found, &st))
goto cont; /* hmm, remove in progress? */
- /* save only name if we scan PATH */
- if (paths[i] != dirbuf)
- strcpy(found, name_found);
+ /* Save only name */
+ len = strlen(name_found);
+ found = xrealloc(found, len + 2); /* +2: for slash and NUL */
+ strcpy(found, name_found);
if (S_ISDIR(st.st_mode)) {
- unsigned len1 = strlen(found);
- /* name is a directory */
- if (found[len1-1] != '/') {
- found = xrealloc(found, len1 + 2);
- found[len1] = '/';
- found[len1 + 1] = '\0';
- }
+ /* name is a directory, add slash */
+ found[len] = '/';
+ found[len + 1] = '\0';
} else {
/* skip files if looking for dirs only (example: cd) */
if (type == FIND_DIR_ONLY)
if (paths != path1) {
free(paths[0]); /* allocated memory is only in first member */
free(paths);
- } else if (dirbuf) {
- pf_len += strlen(dirbuf);
- free(dirbuf);
}
+ free(dirbuf);
return pf_len;
}
/* build_match_prefix:
- * On entry, matchBuf contains everything up to cursor at the moment <tab>
+ * On entry, match_buf contains everything up to cursor at the moment <tab>
* was pressed. This function looks at it, figures out what part of it
* constitutes the command/file/directory prefix to use for completion,
- * and rewrites matchBuf to contain only that part.
+ * and rewrites match_buf to contain only that part.
*/
+#define dbg_bmp 0
/* Helpers: */
/* 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 int_buf (S.find_match__int_buf)
-#define dbg_bmp 0
-static void remove_chunk(int beg, int end)
+static void remove_chunk(int16_t *int_buf, int beg, int end)
{
/* beg must be <= end */
if (beg == end)
bb_putchar('\n');
}
}
-static NOINLINE int build_match_prefix(char *matchBuf)
+/* Caller ensures that match_buf points to a malloced buffer
+ * big enough to hold strlen(match_buf)*2 + 2
+ */
+static NOINLINE int build_match_prefix(char *match_buf)
{
int i, j;
int command_mode;
-/* Were local, but it used too much stack */
-/* int16_t int_buf[MAX_LINELEN + 1]; */
+ int16_t *int_buf = (int16_t*)match_buf;
- if (dbg_bmp) printf("\n%s\n", matchBuf);
+ if (dbg_bmp) printf("\n%s\n", match_buf);
- i = 0;
- while ((int_buf[i] = (unsigned char)matchBuf[i]) != '\0')
- i++;
+ /* Copy in reverse order, since they overlap */
+ i = strlen(match_buf);
+ do {
+ int_buf[i] = (unsigned char)match_buf[i];
+ i--;
+ } while (i >= 0);
/* Mark every \c as "quoted c" */
- for (i = j = 0; matchBuf[i]; i++, j++) {
- if (matchBuf[i] == '\\') {
- remove_chunk(j, j + 1);
- int_buf[j] |= QUOT;
- i++;
+ for (i = 0; int_buf[i]; i++) {
+ if (int_buf[i] == '\\') {
+ remove_chunk(int_buf, i, i + 1);
+ int_buf[i] |= QUOT;
}
}
/* Quote-mark "chars" and 'chars', drop delimiters */
if (cur == '\'' || cur == '"') {
if (!in_quote || (cur == in_quote)) {
in_quote ^= cur;
- remove_chunk(i, i + 1);
+ remove_chunk(int_buf, i, i + 1);
continue;
}
}
} else if (cur == '|' && prev == '>') {
continue;
}
- remove_chunk(0, i + 1 + (cur == int_buf[i + 1]));
+ remove_chunk(int_buf, 0, i + 1 + (cur == int_buf[i + 1]));
i = -1; /* back to square 1 */
}
}
* not commands c*. Therefore we don't drop
* `cmd` entirely, we replace it with single `.
*/
- remove_chunk(i, j);
+ remove_chunk(int_buf, i, j);
goto next;
}
}
/* No closing ` - command mode, remove all up to ` */
- remove_chunk(0, i + 1);
+ remove_chunk(int_buf, 0, i + 1);
break;
next: ;
}
*/
for (i = 0; int_buf[i]; i++) {
if (int_buf[i] == '(' || int_buf[i] == '{') {
- remove_chunk(0, i + 1);
- i = -1; /* hack increment */
+ remove_chunk(int_buf, 0, i + 1);
+ i = -1; /* back to square 1 */
}
}
for (i = 0; int_buf[i]; i++)
if (int_buf[i] != ' ')
break;
- remove_chunk(0, i);
+ remove_chunk(int_buf, 0, i);
/* Determine completion mode */
command_mode = FIND_EXE_ONLY;
for (--i; i >= 0; i--) {
int cur = int_buf[i];
if (cur == ' ' || cur == '<' || cur == '>' || cur == '|' || cur == '&') {
- remove_chunk(0, i + 1);
+ remove_chunk(int_buf, 0, i + 1);
break;
}
}
- /* Store only match prefix */
+ /* Convert back to string of _chars_ */
i = 0;
- while ((matchBuf[i] = int_buf[i]) != '\0')
+ while ((match_buf[i] = int_buf[i]) != '\0')
i++;
- if (dbg_bmp) printf("final matchBuf:'%s'\n", matchBuf);
+
+ if (dbg_bmp) printf("final match_buf:'%s'\n", match_buf);
return command_mode;
}
-#undef int_buf
/*
* Display by column (original idea from ls applet,
}
}
-static char *add_quote_for_spec_chars(char *found)
+static const char *is_special_char(char c)
+{
+ return strchr(" `\"#$%^&*()=+{}[]:;'|\\<>", c);
+}
+
+static char *quote_special_chars(char *found)
{
int l = 0;
char *s = xzalloc((strlen(found) + 1) * 2);
while (*found) {
- if (strchr(" `\"#$%^&*()=+{}[]:;'|\\<>", *found))
+ if (is_special_char(*found))
s[l++] = '\\';
s[l++] = *found++;
}
/* Do TAB completion */
static NOINLINE void input_tab(smallint *lastWasTab)
{
+ char *chosen_match;
+ char *match_buf;
+ size_t len_found;
+ /* Length of string used for matching */
+ unsigned match_pfx_len = match_pfx_len;
+ int find_type;
+# if ENABLE_UNICODE_SUPPORT
+ /* cursor pos in command converted to multibyte form */
+ int cursor_mb;
+# endif
if (!(state->flags & TAB_COMPLETION))
return;
- if (!*lastWasTab) {
- char *tmp;
- size_t len_found;
-/* char matchBuf[MAX_LINELEN]; */
-#define matchBuf (S.input_tab__matchBuf)
- /* Length of string used for matching */
- unsigned match_pfx_len = match_pfx_len;
- int find_type;
-#if ENABLE_UNICODE_SUPPORT
- /* cursor pos in command converted to multibyte form */
- int cursor_mb;
-#endif
+ if (*lastWasTab) {
+ /* The last char was a TAB too.
+ * Print a list of all the available choices.
+ */
+ if (num_matches > 0) {
+ /* cursor will be changed by goto_new_line() */
+ int sav_cursor = cursor;
+ goto_new_line();
+ showfiles();
+ redraw(0, command_len - sav_cursor);
+ }
+ return;
+ }
- *lastWasTab = 1;
+ *lastWasTab = 1;
+ chosen_match = NULL;
- /* Make a local copy of the string --
- * up to the position of the cursor */
-#if !ENABLE_UNICODE_SUPPORT
- save_string(matchBuf, cursor + 1);
-#else
- {
- CHAR_T wc = command_ps[cursor];
- command_ps[cursor] = BB_NUL;
- save_string(matchBuf, MAX_LINELEN);
- command_ps[cursor] = wc;
- cursor_mb = strlen(matchBuf);
- }
-#endif
- tmp = matchBuf;
+ /* Make a local copy of the string up to the position of the cursor.
+ * build_match_prefix will expand it into int16_t's, need to allocate
+ * twice as much as the string_len+1.
+ * (we then also (ab)use this extra space later - see (**))
+ */
+ match_buf = xmalloc(MAX_LINELEN * sizeof(int16_t));
+# if !ENABLE_UNICODE_SUPPORT
+ save_string(match_buf, cursor + 1); /* +1 for NUL */
+# else
+ {
+ CHAR_T wc = command_ps[cursor];
+ command_ps[cursor] = BB_NUL;
+ save_string(match_buf, MAX_LINELEN);
+ command_ps[cursor] = wc;
+ cursor_mb = strlen(match_buf);
+ }
+# endif
+ find_type = build_match_prefix(match_buf);
- find_type = build_match_prefix(matchBuf);
+ /* Free up any memory already allocated */
+ free_tab_completion_data();
- /* Free up any memory already allocated */
- free_tab_completion_data();
+# if ENABLE_FEATURE_USERNAME_COMPLETION
+ /* 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 (match_buf[0] == '~' && strchr(match_buf, '/') == NULL)
+ match_pfx_len = complete_username(match_buf);
+# endif
+ /* If complete_username() did not match,
+ * try to match a command in $PATH, or a directory, or a file */
+ if (!matches)
+ match_pfx_len = complete_cmd_dir_file(match_buf, find_type);
-#if ENABLE_FEATURE_USERNAME_COMPLETION
- /* 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, '/') == NULL)
- match_pfx_len = complete_username(matchBuf);
-#endif
- /* Try to match a command in $PATH, or a directory, or a file */
- if (!matches)
- match_pfx_len = complete_cmd_dir_file(matchBuf, find_type);
- /* Remove duplicates */
- if (matches) {
- unsigned i;
- unsigned 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) {
- free(matches[i]);
- //matches[i] = NULL; /* paranoia */
- } else {
- matches[n++] = matches[i];
- }
- //}
- }
- matches[n++] = matches[i];
- num_matches = n;
+ /* Account for backslashes which will be inserted
+ * by quote_special_chars() later */
+ {
+ const char *e = match_buf + strlen(match_buf);
+ const char *s = e - match_pfx_len;
+ while (s < e)
+ if (is_special_char(*s++))
+ match_pfx_len++;
+ }
+
+ /* Remove duplicates */
+ if (matches) {
+ unsigned i, 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) {
+ free(matches[i]);
+ //matches[i] = NULL; /* paranoia */
+ } else {
+ matches[n++] = matches[i];
+ }
+ //}
}
- /* Did we find exactly one match? */
- if (num_matches != 1) { /* no */
- char *tmp1;
- beep();
- if (!matches)
- return; /* no matches at all */
- /* Find common prefix */
- tmp1 = xstrdup(matches[0]);
- for (tmp = tmp1; *tmp; tmp++) {
- unsigned n;
- for (n = 1; n < num_matches; n++) {
- if (matches[n][tmp - tmp1] != *tmp) {
- goto stop;
- }
+ matches[n++] = matches[i];
+ num_matches = n;
+ }
+
+ /* Did we find exactly one match? */
+ if (num_matches != 1) { /* no */
+ char *cp;
+ beep();
+ if (!matches)
+ goto ret; /* no matches at all */
+ /* Find common prefix */
+ chosen_match = xstrdup(matches[0]);
+ for (cp = chosen_match; *cp; cp++) {
+ unsigned n;
+ for (n = 1; n < num_matches; n++) {
+ if (matches[n][cp - chosen_match] != *cp) {
+ goto stop;
}
}
+ }
stop:
- if (tmp1 == tmp) { /* have unique prefix? */
- free(tmp1); /* no */
- return;
- }
- *tmp = '\0';
- tmp = add_quote_for_spec_chars(tmp1);
- free(tmp1);
- len_found = strlen(tmp);
- } else { /* exactly one match */
- /* Next <tab> is not a double-tab */
- *lastWasTab = 0;
-
- tmp = add_quote_for_spec_chars(matches[0]);
- len_found = strlen(tmp);
- if (tmp[len_found-1] != '/') {
- tmp[len_found] = ' ';
- tmp[++len_found] = '\0';
- }
+ if (cp == chosen_match) { /* have unique prefix? */
+ goto ret; /* no */
+ }
+ *cp = '\0';
+ cp = quote_special_chars(chosen_match);
+ free(chosen_match);
+ chosen_match = cp;
+ len_found = strlen(chosen_match);
+ } else { /* exactly one match */
+ /* Next <tab> is not a double-tab */
+ *lastWasTab = 0;
+
+ chosen_match = quote_special_chars(matches[0]);
+ len_found = strlen(chosen_match);
+ if (chosen_match[len_found-1] != '/') {
+ chosen_match[len_found] = ' ';
+ chosen_match[++len_found] = '\0';
}
+ }
-#if !ENABLE_UNICODE_SUPPORT
+# if !ENABLE_UNICODE_SUPPORT
+ /* Have space to place the match? */
+ /* The result consists of three parts with these lengths: */
+ /* cursor + (len_found - match_pfx_len) + (command_len - cursor) */
+ /* it simplifies into: */
+ if ((int)(len_found - match_pfx_len + command_len) < S.maxsize) {
+ int pos;
+ /* save tail */
+ strcpy(match_buf, &command_ps[cursor]);
+ /* add match and tail */
+ sprintf(&command_ps[cursor], "%s%s", chosen_match + match_pfx_len, match_buf);
+ command_len = strlen(command_ps);
+ /* new pos */
+ pos = cursor + len_found - match_pfx_len;
+ /* write out the matched command */
+ redraw(cmdedit_y, command_len - pos);
+ }
+# else
+ {
+ /* Use 2nd half of match_buf as scratch space - see (**) */
+ char *command = match_buf + MAX_LINELEN;
+ int len = save_string(command, MAX_LINELEN);
/* Have space to place the match? */
- /* The result consists of three parts with these lengths: */
- /* cursor + (len_found - match_pfx_len) + (command_len - cursor) */
- /* it simplifies into: */
- if ((int)(len_found - match_pfx_len + command_len) < S.maxsize) {
+ /* cursor_mb + (len_found - match_pfx_len) + (len - cursor_mb) */
+ if ((int)(len_found - match_pfx_len + len) < MAX_LINELEN) {
int pos;
/* save tail */
- strcpy(matchBuf, &command_ps[cursor]);
+ strcpy(match_buf, &command[cursor_mb]);
+ /* where do we want to have cursor after all? */
+ strcpy(&command[cursor_mb], chosen_match + match_pfx_len);
+ len = load_string(command, S.maxsize);
/* add match and tail */
- sprintf(&command_ps[cursor], "%s%s", tmp + match_pfx_len, matchBuf);
- command_len = strlen(command_ps);
- /* new pos */
- pos = cursor + len_found - match_pfx_len;
+ sprintf(&command[cursor_mb], "%s%s", chosen_match + match_pfx_len, match_buf);
+ command_len = load_string(command, S.maxsize);
/* write out the matched command */
- redraw(cmdedit_y, command_len - pos);
- }
-#else
- {
- char command[MAX_LINELEN];
- int len = save_string(command, sizeof(command));
- /* Have space to place the match? */
- /* cursor_mb + (len_found - match_pfx_len) + (len - cursor_mb) */
- if ((int)(len_found - match_pfx_len + len) < MAX_LINELEN) {
- int pos;
- /* save tail */
- strcpy(matchBuf, &command[cursor_mb]);
- /* where do we want to have cursor after all? */
- strcpy(&command[cursor_mb], tmp + match_pfx_len);
- len = load_string(command, S.maxsize);
- /* add match and tail */
- sprintf(&command[cursor_mb], "%s%s", tmp + match_pfx_len, matchBuf);
- command_len = load_string(command, S.maxsize);
- /* write out the matched command */
- /* paranoia: load_string can return 0 on conv error,
- * prevent passing pos = (0 - 12) to redraw */
- pos = command_len - len;
- redraw(cmdedit_y, pos >= 0 ? pos : 0);
- }
- }
-#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) {
- /* changed by goto_new_line() */
- int sav_cursor = cursor;
-
- /* Go to the next line */
- goto_new_line();
- showfiles();
- redraw(0, command_len - sav_cursor);
+ /* paranoia: load_string can return 0 on conv error,
+ * prevent passing pos = (0 - 12) to redraw */
+ pos = command_len - len;
+ redraw(cmdedit_y, pos >= 0 ? pos : 0);
}
}
+# endif
+ ret:
+ free(chosen_match);
+ free(match_buf);
}
#endif /* FEATURE_TAB_COMPLETION */
{
line_input_t *n = xzalloc(sizeof(*n));
n->flags = flags;
+ n->max_history = MAX_HISTORY;
return n;
}
#if MAX_HISTORY > 0
+unsigned size_from_HISTFILESIZE(const char *hp)
+{
+ int size = MAX_HISTORY;
+ if (hp) {
+ size = atoi(hp);
+ if (size <= 0)
+ return 1;
+ if (size > MAX_HISTORY)
+ return MAX_HISTORY;
+ }
+ return size;
+}
+
static void save_command_ps_at_cur_history(void)
{
if (command_ps[0] != BB_NUL) {
temp_h[idx] = line;
st_parm->cnt_history_in_file++;
idx++;
- if (idx == MAX_HISTORY)
+ if (idx == st_parm->max_history)
idx = 0;
}
fclose(fp);
if (st_parm->cnt_history_in_file) {
while (temp_h[idx] == NULL) {
idx++;
- if (idx == MAX_HISTORY)
+ if (idx == st_parm->max_history)
idx = 0;
}
}
/* copy temp_h[] to st_parm->history[] */
- for (i = 0; i < MAX_HISTORY;) {
+ for (i = 0; i < st_parm->max_history;) {
line = temp_h[idx];
if (!line)
break;
idx++;
- if (idx == MAX_HISTORY)
+ if (idx == st_parm->max_history)
idx = 0;
line_len = strlen(line);
if (line_len >= MAX_LINELEN)
int fd;
int len, len2;
- fd = open(state->hist_file, O_WRONLY | O_CREAT | O_APPEND, 0666);
+ fd = open(state->hist_file, O_WRONLY | O_CREAT | O_APPEND, 0600);
if (fd < 0)
return;
xlseek(fd, 0, SEEK_END); /* paranoia */
/* 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;
+ if (state->cnt_history_in_file > state->max_history * 4) {
char *new_name;
line_input_t *st_temp;
- int 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;
+ st_temp->max_history = state->max_history;
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) {
+ fd = open(state->hist_file, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+ if (fd >= 0) {
+ FILE *fp;
+ int i;
+
+ fp = xfdopen_for_write(fd);
for (i = 0; i < st_temp->cnt_history; i++)
fprintf(fp, "%s\n", st_temp->history[i]);
fclose(fp);
if (i && strcmp(state->history[i-1], str) == 0)
return;
- free(state->history[MAX_HISTORY]); /* redundant, paranoia */
- state->history[MAX_HISTORY] = NULL; /* redundant, paranoia */
+ free(state->history[state->max_history]); /* redundant, paranoia */
+ state->history[state->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) {
+ /* we need to keep history[state->max_history] empty, hence >=, not > */
+ if (i >= state->max_history) {
free(state->history[0]);
- for (i = 0; i < MAX_HISTORY-1; i++)
+ for (i = 0; i < state->max_history-1; i++)
state->history[i] = state->history[i+1];
- /* i == MAX_HISTORY-1 */
+ /* i == state->max_history-1 */
}
- /* i <= MAX_HISTORY-1 */
+ /* i <= state->max_history-1 */
state->history[i++] = xstrdup(str);
- /* i <= MAX_HISTORY */
+ /* i <= state->max_history */
state->cur_history = i;
state->cnt_history = i;
# if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY
pfd.events = POLLIN;
if (safe_poll(&pfd, 1, 0) == 0) {
S.sent_ESC_br6n = 1;
- fputs("\033" "[6n", stdout);
+ fputs(ESC"[6n", stdout);
fflush_all(); /* make terminal see it ASAP! */
}
}
errno = sv_errno;
}
-static int lineedit_read_key(char *read_key_buffer)
+static int lineedit_read_key(char *read_key_buffer, int timeout)
{
int64_t ic;
- int timeout = -1;
#if ENABLE_UNICODE_SUPPORT
char unicode_buf[MB_CUR_MAX + 1];
int unicode_idx = 0;
* 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 FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize, int timeout)
{
int len;
#if ENABLE_FEATURE_TAB_COMPLETION
maxsize = MAX_LINELEN;
S.maxsize = maxsize;
- /* With null flags, no other fields are ever used */
+ /* With zero flags, no other fields are ever used */
state = st ? st : (line_input_t*) &const_int_0;
#if MAX_HISTORY > 0
# if ENABLE_FEATURE_EDITING_SAVEHISTORY
new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
tcsetattr_stdin_TCSANOW(&new_settings);
- /* Now initialize things */
previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
win_changed(0); /* do initial resizing */
#if ENABLE_USERNAME_OR_HOMEDIR
#endif
#if 0
- for (i = 0; i <= MAX_HISTORY; i++)
+ for (i = 0; i <= state->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
int32_t ic, ic_raw;
fflush_all();
- ic = ic_raw = lineedit_read_key(read_key_buffer);
+ ic = ic_raw = lineedit_read_key(read_key_buffer, timeout);
#if ENABLE_FEATURE_EDITING_VI
newdelflag = 1;
case CTRL('L'):
vi_case(CTRL('L')|VI_CMDMODE_BIT:)
/* Control-l -- clear screen */
- printf("\033[H"); /* cursor to top,left */
+ printf(ESC"[H"); /* cursor to top,left */
redraw(0, command_len - cursor);
break;
#if MAX_HISTORY > 0
case 'd'|VI_CMDMODE_BIT: {
int nc, sc;
- ic = lineedit_read_key(read_key_buffer);
+ ic = lineedit_read_key(read_key_buffer, timeout);
if (errno) /* error */
- goto prepare_to_die;
+ goto return_error_indicator;
if (ic == ic_raw) { /* "cc", "dd" */
input_backward(cursor);
goto clear_to_eol;
break;
case 'r'|VI_CMDMODE_BIT:
//FIXME: unicode case?
- ic = lineedit_read_key(read_key_buffer);
+ ic = lineedit_read_key(read_key_buffer, timeout);
if (errno) /* error */
- goto prepare_to_die;
+ goto return_error_indicator;
if (ic < ' ' || ic > 255) {
beep();
} else {
* 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
+
+ case -1: /* error (e.g. EIO when tty is destroyed) */
+ IF_FEATURE_EDITING_VI(return_error_indicator:)
break_out = command_len = -1;
break;
}
// /* Control-V -- force insert of next char */
// if (c == CTRL('V')) {
// if (safe_read(STDIN_FILENO, &c, 1) < 1)
-// goto prepare_to_die;
+// goto return_error_indicator;
// if (c == 0) {
// beep();
// break;
projects / oweals / busybox.git / blobdiff