#endif
/* We try to minimize both static and stack usage. */
-struct statics {
+struct lineedit_statics {
line_input_t *state;
volatile unsigned cmdedit_termw; /* = 80; */ /* actual terminal width */
sighandler_t previous_SIGWINCH_handler;
-
- int cmdedit_x; /* real x terminal position */
- int cmdedit_y; /* pseudoreal y terminal position */
- int cmdedit_prmt_len; /* length of prompt (without colors etc) */
+ unsigned cmdedit_x; /* real x terminal position */
+ unsigned cmdedit_y; /* pseudoreal y terminal position */
+ unsigned cmdedit_prmt_len; /* length of prompt (without colors etc) */
unsigned cursor;
unsigned command_len;
#endif
};
-/* Make it reside in writable memory, yet make compiler understand
- * that it is not going to change. */
-static struct statics *const ptr_to_statics __attribute__ ((section (".data")));
+/* See lineedit_ptr_hack.c */
+extern struct lineedit_statics *const lineedit_ptr_to_statics;
-#define S (*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 delbuf (S.delbuf )
#define INIT_S() do { \
- (*(struct statics**)&ptr_to_statics) = xzalloc(sizeof(S)); \
+ (*(struct lineedit_statics**)&lineedit_ptr_to_statics) = xzalloc(sizeof(S)); \
barrier(); \
cmdedit_termw = 80; \
USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
if (home_pwd_buf != null_str)
free(home_pwd_buf);
#endif
- free(ptr_to_statics);
+ free(lineedit_ptr_to_statics);
}
#define DEINIT_S() deinit_S()
+
/* 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];
/* 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" */
bb_putchar(next_char);
bb_putchar('\b');
+#endif
}
// Huh? What if command_ps[cursor] == '\0' (we are at the end already?)
cursor++;
cmdedit_x -= num;
if (num <= 4) {
/* This is longer by 5 bytes on x86.
- * Also gets mysteriously
- * miscompiled for some ARM users.
+ * Also gets miscompiled for ARM users
+ * (busybox.net/bugs/view.php?id=2274).
* printf(("\b\b\b\b" + 4) - num);
* return;
*/
/* 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)
{
out1str(cmdedit_prompt);
- cmdedit_x = cmdedit_prmt_len;
cursor = 0;
-// Huh? what if cmdedit_prmt_len >= width?
- cmdedit_y = 0; /* new quasireal y */
+ {
+ unsigned w = cmdedit_termw; /* volatile var */
+ cmdedit_y = cmdedit_prmt_len / w; /* new quasireal y */
+ cmdedit_x = cmdedit_prmt_len % w;
+ }
}
/* draw prompt, editor line, and clear tail */
{
int j = cursor;
- if (j == command_len)
+ if (j == (int)command_len)
return;
#if ENABLE_FEATURE_EDITING_VI
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 (lstat(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
if (!*lastWasTab) {
char *tmp, *tmp1;
- int len_found;
+ size_t len_found;
/* char matchBuf[MAX_LINELEN]; */
#define matchBuf (S.input_tab__matchBuf)
int find_type;
exe_n_cwd_tab_completion(matchBuf, find_type);
/* Sort, then remove any duplicates found */
if (matches) {
- int i, n = 0;
+ 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 */
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)
* 0 on ctrl-C (the line entered is still returned in 'command'),
* >0 length of input string, including terminating '\n'
*/
-int read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
+int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
{
#if ENABLE_FEATURE_TAB_COMPLETION
smallint lastWasTab = FALSE;
#endif
- unsigned int ic;
+ unsigned ic;
unsigned char c;
smallint break_out = 0;
#if ENABLE_FEATURE_EDITING_VI
if (vi_cmdmode) /* Don't self-insert */
break;
#endif
- if (command_len >= (maxsize - 2)) /* Need to leave space for enter */
+ if ((int)command_len >= (maxsize - 2)) /* Need to leave space for enter */
break;
command_len++;
return command_len;
}
-line_input_t *new_line_input_t(int flags)
+line_input_t* FAST_FUNC new_line_input_t(int flags)
{
line_input_t *n = xzalloc(sizeof(*n));
n->flags = flags;
#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);
projects / oweals / busybox.git / blobdiff