/*
* Termios command line History and Editting.
*
- * Copyright (c) 1986-2001 may safely be consumed by a BSD or GPL license.
- * Written by: Vladimir Oleynik <vodz@usa.net>
+ * Copyright (c) 1986-2003 may safely be consumed by a BSD or GPL license.
+ * Written by: Vladimir Oleynik <dzo@simtreas.ru>
*
* Used ideas:
* Adam Rogoyski <rogoyski@cs.utexas.edu>
* Dave Cinege <dcinege@psychosis.com>
* Jakub Jelinek (c) 1995
- * Erik Andersen <andersee@debian.org> (Majorly adjusted for busybox)
+ * Erik Andersen <andersen@codepoet.org> (Majorly adjusted for busybox)
*
* This code is 'as is' with no warranty.
*
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
*/
-//#define TEST
-
-
-#ifndef TEST
-
-#include "busybox.h"
-
-#define D(x)
-
-#else
-
-#define BB_FEATURE_SH_COMMAND_EDITING
-#define BB_FEATURE_SH_TAB_COMPLETION
-#define BB_FEATURE_SH_USERNAME_COMPLETION
-#define BB_FEATURE_NONPRINTABLE_INVERSE_PUT
-#define BB_FEATURE_BASH_STYLE_PROMT
-#define BB_FEATURE_CLEAN_UP
-
-#define D(x) x
-
-#endif /* TEST */
-
-#ifdef BB_FEATURE_SH_COMMAND_EDITING
-
-#ifndef BB_FEATURE_SH_TAB_COMPLETION
-#undef BB_FEATURE_SH_USERNAME_COMPLETION
-#endif
-
-#if defined(BB_FEATURE_SH_USERNAME_COMPLETION) || defined(BB_FEATURE_BASH_STYLE_PROMT)
-#define BB_FEATURE_GETUSERNAME_AND_HOMEDIR
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <signal.h>
#include <limits.h>
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
-#include <dirent.h>
-#include <sys/stat.h>
+#include "busybox.h"
+
+#ifdef CONFIG_LOCALE_SUPPORT
+#define Isprint(c) isprint((c))
+#else
+#define Isprint(c) ( (c) >= ' ' && (c) != ((unsigned char)'\233') )
#endif
-#ifdef BB_FEATURE_GETUSERNAME_AND_HOMEDIR
#ifndef TEST
-#include "pwd_grp/pwd.h"
-#else
-#include <pwd.h>
-#endif /* TEST */
-#endif /* advanced FEATURES */
+#define D(x)
-#ifdef TEST
-void *xrealloc(void *old, size_t size)
-{
- return realloc(old, size);
-}
+#else
-void *xmalloc(size_t size)
-{
- return malloc(size);
-}
-char *xstrdup(const char *s)
-{
- return strdup(s);
-}
+#define CONFIG_FEATURE_COMMAND_EDITING
+#define CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+#define CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+#define CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+#define CONFIG_FEATURE_CLEAN_UP
-void *xcalloc(size_t size, size_t se)
-{
- return calloc(size, se);
-}
+#define D(x) x
-#define error_msg(s, d) fprintf(stderr, s, d)
-#endif
+#endif /* TEST */
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+#include <dirent.h>
+#include <sys/stat.h>
+#endif
-struct history {
- char *s;
- struct history *p;
- struct history *n;
-};
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
-/* Maximum length of the linked list for the command line history */
-static const int MAX_HISTORY = 15;
+#ifndef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+#undef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+#endif
-/* First element in command line list */
-static struct history *his_front = NULL;
+#if defined(CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION) || defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
+#define CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+#endif
-/* Last element in command line list */
-static struct history *his_end = NULL;
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+# ifndef TEST
+# include "pwd_.h"
+# else
+# include <pwd.h>
+# endif /* TEST */
+#endif /* advanced FEATURES */
-/* ED: sparc termios is broken: revert back to old termio handling. */
+/* Maximum length of the linked list for the command line history */
+#ifndef CONFIG_FEATURE_COMMAND_HISTORY
+#define MAX_HISTORY 15
+#else
+#define MAX_HISTORY CONFIG_FEATURE_COMMAND_HISTORY
+#endif
-#if #cpu(sparc)
-# include <termio.h>
-# define termios termio
-# define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp)
-# define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp)
+#if MAX_HISTORY < 1
+#warning cmdedit: You set MAX_HISTORY < 1. The history algorithm switched off.
#else
-# include <termios.h>
-# define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
-# define getTermSettings(fd,argp) tcgetattr(fd, argp);
+static char *history[MAX_HISTORY+1]; /* history + current */
+/* saved history lines */
+static int n_history;
+/* current pointer to history line */
+static int cur_history;
#endif
+#include <termios.h>
+#define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
+#define getTermSettings(fd,argp) tcgetattr(fd, argp);
+
/* Current termio and the previous termio before starting sh */
static struct termios initial_settings, new_settings;
-#ifndef _POSIX_VDISABLE
-#define _POSIX_VDISABLE '\0'
-#endif
-
-
static
-volatile int cmdedit_termw = 80; /* actual terminal width */
-static int history_counter = 0; /* Number of commands in history list */
+volatile int cmdedit_termw = 80; /* actual terminal width */
static
-volatile int handlers_sets = 0; /* Set next bites: */
+volatile int handlers_sets = 0; /* Set next bites: */
enum {
- SET_ATEXIT = 1, /* when atexit() has been called and
- get euid,uid,gid to fast compare */
- SET_TERM_HANDLERS = 2, /* set many terminates signal handlers */
- SET_WCHG_HANDLERS = 4, /* winchg signal handler */
- SET_RESET_TERM = 8, /* if the terminal needs to be reset upon exit */
+ SET_ATEXIT = 1, /* when atexit() has been called
+ and get euid,uid,gid to fast compare */
+ SET_WCHG_HANDLERS = 2, /* winchg signal handler */
+ SET_RESET_TERM = 4, /* if the terminal needs to be reset upon exit */
};
-static int cmdedit_x; /* real x terminal position */
-static int cmdedit_y; /* pseudoreal y terminal position */
-static int cmdedit_prmt_len; /* lenght prompt without colores string */
+static int cmdedit_x; /* real x terminal position */
+static int cmdedit_y; /* pseudoreal y terminal position */
+static int cmdedit_prmt_len; /* lenght prompt without colores string */
-static int cursor; /* required global for signal handler */
-static int len; /* --- "" - - "" - -"- --""-- --""--- */
-static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */
+static int cursor; /* required global for signal handler */
+static int len; /* --- "" - - "" - -"- --""-- --""--- */
+static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */
static
-#ifndef BB_FEATURE_BASH_STYLE_PROMT
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
const
#endif
-char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */
-
-/* Link into lash to reset context to 0 on ^C and such */
-extern unsigned int shell_context;
+char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */
-
-#ifdef BB_FEATURE_GETUSERNAME_AND_HOMEDIR
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
static char *user_buf = "";
static char *home_pwd_buf = "";
static int my_euid;
#endif
-#ifdef BB_FEATURE_BASH_STYLE_PROMT
-static char *hostname_buf = "";
+#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
+static char *hostname_buf;
static int num_ok_lines = 1;
#endif
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
-#ifndef BB_FEATURE_GETUSERNAME_AND_HOMEDIR
+#ifndef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
static int my_euid;
#endif
static int my_uid;
static int my_gid;
-#endif /* BB_FEATURE_SH_TAB_COMPLETION */
-
+#endif /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */
static void cmdedit_setwidth(int w, int redraw_flg);
static void win_changed(int nsig)
{
- struct winsize win = { 0, 0, 0, 0 };
- static __sighandler_t previous_SIGWINCH_handler; /* for reset */
+ static sighandler_t previous_SIGWINCH_handler; /* for reset */
/* emulate || signal call */
if (nsig == -SIGWINCH || nsig == SIGWINCH) {
- ioctl(0, TIOCGWINSZ, &win);
- if (win.ws_col > 0) {
- cmdedit_setwidth(win.ws_col, nsig == SIGWINCH);
- }
+ int width = 0;
+ get_terminal_width_height(0, &width, NULL);
+ cmdedit_setwidth(width, nsig == SIGWINCH);
}
/* Unix not all standart in recall signal */
- if (nsig == -SIGWINCH) /* save previous handler */
+ if (nsig == -SIGWINCH) /* save previous handler */
previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
- else if (nsig == SIGWINCH) /* signaled called handler */
- signal(SIGWINCH, win_changed); /* set for next call */
- else /* nsig == 0 */
+ else if (nsig == SIGWINCH) /* signaled called handler */
+ signal(SIGWINCH, win_changed); /* set for next call */
+ else /* nsig == 0 */
/* set previous handler */
- signal(SIGWINCH, previous_SIGWINCH_handler); /* reset */
+ signal(SIGWINCH, previous_SIGWINCH_handler); /* reset */
}
static void cmdedit_reset_term(void)
{
if ((handlers_sets & SET_RESET_TERM) != 0) {
- /* sparc and other have broken termios support: use old termio handling. */
+/* sparc and other have broken termios support: use old termio handling. */
setTermSettings(fileno(stdin), (void *) &initial_settings);
handlers_sets &= ~SET_RESET_TERM;
}
handlers_sets &= ~SET_WCHG_HANDLERS;
}
fflush(stdout);
-#ifdef BB_FEATURE_CLEAN_UP
- if (his_front) {
- struct history *n;
-
- //while(his_front!=his_end) {
- while (his_front != his_end) {
- n = his_front->n;
- free(his_front->s);
- free(his_front);
- his_front = n;
- }
- }
-#endif
}
static void cmdedit_set_out_char(int next_char)
{
- int c = command_ps[cursor];
+ int c = (int)((unsigned char) command_ps[cursor]);
if (c == 0)
- c = ' '; /* destroy end char? */
-#ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT
- if (!isprint(c)) { /* Inverse put non-printable characters */
- if (((unsigned char) c) >= 128)
+ c = ' '; /* destroy end char? */
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+ if (!Isprint(c)) { /* Inverse put non-printable characters */
+ if (c >= 128)
c -= 128;
- if (((unsigned char) c) < ' ')
+ if (c < ' ')
c += '@';
if (c == 127)
c = '?';
static inline void out1str(const char *s)
{
- fputs(s, stdout);
+ if ( s )
+ fputs(s, stdout);
}
+
static inline void beep(void)
{
putchar('\007');
{
if (num > cursor)
num = cursor;
- cursor -= num; /* new cursor (in command, not terminal) */
+ cursor -= num; /* new cursor (in command, not terminal) */
- if (cmdedit_x >= num) { /* no to up line */
+ if (cmdedit_x >= num) { /* no to up line */
cmdedit_x -= num;
if (num < 4)
while (num-- > 0)
int count_y;
if (cmdedit_x) {
- putchar('\r'); /* back to first terminal pos. */
- num -= cmdedit_x; /* set previous backward */
+ putchar('\r'); /* back to first terminal pos. */
+ num -= cmdedit_x; /* set previous backward */
}
count_y = 1 + num / cmdedit_termw;
printf("\033[%dA", count_y);
cmdedit_y -= count_y;
/* require forward after uping */
cmdedit_x = cmdedit_termw * count_y - num;
- printf("\033[%dC", cmdedit_x); /* set term cursor */
+ printf("\033[%dC", cmdedit_x); /* set term cursor */
}
}
static void put_prompt(void)
{
out1str(cmdedit_prompt);
- cmdedit_x = cmdedit_prmt_len; /* count real x terminal position */
+ cmdedit_x = cmdedit_prmt_len; /* count real x terminal position */
cursor = 0;
+ cmdedit_y = 0; /* new quasireal y */
}
-#ifdef BB_FEATURE_BASH_STYLE_PROMT
-static void
-add_to_prompt(char **prmt_mem_ptr, int *alm, int *prmt_len,
- const char *addb)
+#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
+static void parse_prompt(const char *prmt_ptr)
{
- int l = strlen(addb);
-
- *prmt_len += l;
- if (*alm < (*prmt_len) + 1) {
- *alm = (*prmt_len) + 1;
- *prmt_mem_ptr = xrealloc(*prmt_mem_ptr, *alm);
- }
- strcat(*prmt_mem_ptr, addb);
+ cmdedit_prompt = prmt_ptr;
+ cmdedit_prmt_len = strlen(prmt_ptr);
+ put_prompt();
}
-#endif
-
+#else
static void parse_prompt(const char *prmt_ptr)
{
-#ifdef BB_FEATURE_BASH_STYLE_PROMT
- int alm = strlen(prmt_ptr) + 1; /* supposedly require memory */
int prmt_len = 0;
int sub_len = 0;
- int flg_not_length = '[';
- char *prmt_mem_ptr = xstrdup(prmt_ptr);
- char pwd_buf[PATH_MAX + 1];
- char buf[16];
- int c;
-
- pwd_buf[0] = 0;
- *prmt_mem_ptr = 0;
+ char flg_not_length = '[';
+ char *prmt_mem_ptr = xcalloc(1, 1);
+ char *pwd_buf = xgetcwd(0);
+ char buf2[PATH_MAX + 1];
+ char buf[2];
+ char c;
+ char *pbuf;
+
+ if (!pwd_buf) {
+ pwd_buf=(char *)bb_msg_unknown;
+ }
while (*prmt_ptr) {
+ pbuf = buf;
+ pbuf[1] = 0;
c = *prmt_ptr++;
if (c == '\\') {
- c = *prmt_ptr;
- if (c == 0)
+ const char *cp = prmt_ptr;
+ int l;
+
+ c = bb_process_escape_sequence(&prmt_ptr);
+ if(prmt_ptr==cp) {
+ if (*cp == 0)
break;
- prmt_ptr++;
- switch (c) {
- case 'u':
- add_to_prompt(&prmt_mem_ptr, &alm, &prmt_len, user_buf);
- continue;
- case 'h':
- if (hostname_buf[0] == 0) {
- hostname_buf = xcalloc(256, 1);
- if (gethostname(hostname_buf, 255) < 0) {
- strcpy(hostname_buf, "?");
+ c = *prmt_ptr++;
+ switch (c) {
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+ case 'u':
+ pbuf = user_buf;
+ break;
+#endif
+ case 'h':
+ pbuf = hostname_buf;
+ if (pbuf == 0) {
+ pbuf = xcalloc(256, 1);
+ if (gethostname(pbuf, 255) < 0) {
+ strcpy(pbuf, "?");
} else {
- char *s = strchr(hostname_buf, '.');
+ char *s = strchr(pbuf, '.');
if (s)
*s = 0;
}
+ hostname_buf = pbuf;
}
- add_to_prompt(&prmt_mem_ptr, &alm, &prmt_len,
- hostname_buf);
- continue;
- case '$':
+ break;
+ case '$':
c = my_euid == 0 ? '#' : '$';
break;
- case 'w':
- if (pwd_buf[0] == 0) {
- int l;
-
- getcwd(pwd_buf, PATH_MAX);
- l = strlen(home_pwd_buf);
- if (home_pwd_buf[0] != 0 &&
- strncmp(home_pwd_buf, pwd_buf, l) == 0) {
- strcpy(pwd_buf + 1, pwd_buf + l);
- pwd_buf[0] = '~';
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
+ case 'w':
+ pbuf = pwd_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) {
+ pbuf = buf2;
+ *pbuf = '~';
+ strcpy(pbuf+1, pwd_buf+l);
}
- }
- add_to_prompt(&prmt_mem_ptr, &alm, &prmt_len, pwd_buf);
- continue;
- case '!':
- snprintf(buf, sizeof(buf), "%d", num_ok_lines);
- add_to_prompt(&prmt_mem_ptr, &alm, &prmt_len, buf);
- continue;
- case 'e':
- case 'E': /* \e \E = \033 */
+ break;
+#endif
+ case 'W':
+ pbuf = pwd_buf;
+ cp = strrchr(pbuf,'/');
+ if ( (cp != NULL) && (cp != pbuf) )
+ pbuf += (cp-pbuf)+1;
+ break;
+ case '!':
+ snprintf(pbuf = buf2, sizeof(buf2), "%d", num_ok_lines);
+ break;
+ case 'e': case 'E': /* \e \E = \033 */
c = '\033';
break;
- case 'x':
- case 'X':
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':{
- int l;
- int ho = 0;
- char *eho;
-
- if (c == 'X')
- c = 'x';
-
+ case 'x': case 'X':
for (l = 0; l < 3;) {
-
- buf[l++] = *prmt_ptr;
- buf[l] = 0;
- ho = strtol(buf, &eho, c == 'x' ? 16 : 8);
- if (ho > UCHAR_MAX || (eho - buf) < l) {
+ int h;
+ buf2[l++] = *prmt_ptr;
+ buf2[l] = 0;
+ h = strtol(buf2, &pbuf, 16);
+ if (h > UCHAR_MAX || (pbuf - buf2) < l) {
l--;
break;
}
prmt_ptr++;
}
- buf[l] = 0;
- ho = strtol(buf, 0, c == 'x' ? 16 : 8);
- c = ho == 0 ? '?' : (char) ho;
+ buf2[l] = 0;
+ c = (char)strtol(buf2, 0, 16);
+ if(c==0)
+ c = '?';
+ pbuf = buf;
break;
- }
- case '[':
- case ']':
+ case '[': case ']':
if (c == flg_not_length) {
flg_not_length = flg_not_length == '[' ? ']' : '[';
continue;
}
break;
+ }
}
}
- buf[0] = c;
- buf[1] = 0;
- add_to_prompt(&prmt_mem_ptr, &alm, &prmt_len, buf);
+ if(pbuf == buf)
+ *pbuf = c;
+ prmt_len += strlen(pbuf);
+ prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_len+1), pbuf);
if (flg_not_length == ']')
sub_len++;
}
- cmdedit_prmt_len = prmt_len - sub_len;
+ if(pwd_buf!=(char *)bb_msg_unknown)
+ free(pwd_buf);
cmdedit_prompt = prmt_mem_ptr;
-#else
- cmdedit_prompt = prmt_ptr;
- cmdedit_prmt_len = strlen(prmt_ptr);
-#endif
+ cmdedit_prmt_len = prmt_len - sub_len;
put_prompt();
}
+#endif
/* draw promt, editor line, and clear tail */
static void redraw(int y, int back_cursor)
{
- if (y > 0) /* up to start y */
+ if (y > 0) /* up to start y */
printf("\033[%dA", y);
- cmdedit_y = 0; /* new quasireal y */
putchar('\r');
put_prompt();
- input_end(); /* rewrite */
- printf("\033[J"); /* destroy tail after cursor */
+ input_end(); /* rewrite */
+ printf("\033[J"); /* destroy tail after cursor */
input_backward(back_cursor);
}
strcpy(command_ps + j, command_ps + j + 1);
len--;
- input_end(); /* rewtite new line */
- cmdedit_set_out_char(0); /* destroy end char */
- input_backward(cursor - j); /* back to old pos cursor */
+ input_end(); /* rewtite new line */
+ cmdedit_set_out_char(0); /* destroy end char */
+ input_backward(cursor - j); /* back to old pos cursor */
}
/* Delete the char in back of the cursor */
}
-static void clean_up_and_die(int sig)
-{
- goto_new_line();
- if (sig != SIGINT)
- exit(EXIT_SUCCESS); /* cmdedit_reset_term() called in atexit */
- cmdedit_reset_term();
-}
-
static void cmdedit_setwidth(int w, int redraw_flg)
{
cmdedit_termw = cmdedit_prmt_len + 2;
cmdedit_termw = cmdedit_termw % w;
}
if (w > cmdedit_termw) {
-
cmdedit_termw = w;
if (redraw_flg) {
redraw((new_y >= cmdedit_y ? new_y : cmdedit_y), len - cursor);
fflush(stdout);
}
- }
+ }
}
-extern void cmdedit_init(void)
+static void cmdedit_init(void)
{
+ cmdedit_prmt_len = 0;
if ((handlers_sets & SET_WCHG_HANDLERS) == 0) {
/* emulate usage handler to set handler and call yours work */
win_changed(-SIGWINCH);
}
if ((handlers_sets & SET_ATEXIT) == 0) {
-#ifdef BB_FEATURE_GETUSERNAME_AND_HOMEDIR
+#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
struct passwd *entry;
my_euid = geteuid();
entry = getpwuid(my_euid);
if (entry) {
- user_buf = xstrdup(entry->pw_name);
- home_pwd_buf = xstrdup(entry->pw_dir);
+ user_buf = bb_xstrdup(entry->pw_name);
+ home_pwd_buf = bb_xstrdup(entry->pw_dir);
}
#endif
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
-#ifndef BB_FEATURE_GETUSERNAME_AND_HOMEDIR
+#ifndef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
my_euid = geteuid();
#endif
my_uid = getuid();
my_gid = getgid();
-#endif /* BB_FEATURE_SH_TAB_COMPLETION */
+#endif /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */
handlers_sets |= SET_ATEXIT;
- atexit(cmdedit_reset_term); /* be sure to do this only once */
- }
-
- if ((handlers_sets & SET_TERM_HANDLERS) == 0) {
- signal(SIGKILL, clean_up_and_die);
- signal(SIGINT, clean_up_and_die);
- signal(SIGQUIT, clean_up_and_die);
- signal(SIGTERM, clean_up_and_die);
- handlers_sets |= SET_TERM_HANDLERS;
+ atexit(cmdedit_reset_term); /* be sure to do this only once */
}
-
}
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
static int is_execute(const struct stat *st)
{
return FALSE;
}
-#ifdef BB_FEATURE_SH_USERNAME_COMPLETION
+#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
static char **username_tab_completion(char *ud, int *num_matches)
{
char *temp;
- ud++; /* ~user/... to user/... */
+ ud++; /* ~user/... to user/... */
userlen = strlen(ud);
- if (num_matches == 0) { /* "~/..." or "~user/..." */
+ if (num_matches == 0) { /* "~/..." or "~user/..." */
char *sav_ud = ud - 1;
char *home = 0;
- if (*ud == '/') { /* "~/..." */
+ if (*ud == '/') { /* "~/..." */
home = home_pwd_buf;
} else {
/* "~user/..." */
temp = strchr(ud, '/');
- *temp = 0; /* ~user\0 */
+ *temp = 0; /* ~user\0 */
entry = getpwnam(ud);
- *temp = '/'; /* restore ~user/... */
+ *temp = '/'; /* restore ~user/... */
ud = temp;
if (entry)
home = entry->pw_dir;
}
if (home) {
if ((userlen + strlen(home) + 1) < BUFSIZ) {
- char temp2[BUFSIZ]; /* argument size */
+ char temp2[BUFSIZ]; /* argument size */
/* /home/user/... */
sprintf(temp2, "%s%s", home, ud);
strcpy(sav_ud, temp2);
}
}
- return 0; /* void, result save to argument :-) */
+ return 0; /* void, result save to argument :-) */
} else {
/* "~[^/]*" */
char **matches = (char **) NULL;
/* Null usernames should result in all users as possible completions. */
if ( /*!userlen || */ !strncmp(ud, entry->pw_name, userlen)) {
- temp = xmalloc(3 + strlen(entry->pw_name));
- sprintf(temp, "~%s/", entry->pw_name);
+ bb_xasprintf(&temp, "~%s/", entry->pw_name);
matches = xrealloc(matches, (nm + 1) * sizeof(char *));
matches[nm++] = temp;
return (matches);
}
}
-#endif /* BB_FEATURE_SH_USERNAME_COMPLETION */
+#endif /* CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION */
enum {
FIND_EXE_ONLY = 0,
npth = 0;
for (;;) {
- npth++; /* count words is + 1 count ':' */
+ npth++; /* count words is + 1 count ':' */
tmp = strchr(tmp, ':');
if (tmp) {
if (*++tmp == 0)
- break; /* :<empty> */
+ break; /* :<empty> */
} else
break;
}
*p = xmalloc(npth * sizeof(char *));
tmp = pth;
- (*p)[0] = xstrdup(tmp);
- npth = 1; /* count words is + 1 count ':' */
+ (*p)[0] = bb_xstrdup(tmp);
+ npth = 1; /* count words is + 1 count ':' */
for (;;) {
tmp = strchr(tmp, ':');
if (tmp) {
- (*p)[0][(tmp - pth)] = 0; /* ':' -> '\0' */
+ (*p)[0][(tmp - pth)] = 0; /* ':' -> '\0' */
if (*++tmp == 0)
- break; /* :<empty> */
+ break; /* :<empty> */
} else
break;
- (*p)[npth++] = &(*p)[0][(tmp - pth)]; /* p[next]=p[0][&'\0'+1] */
+ (*p)[npth++] = &(*p)[0][(tmp - pth)]; /* p[next]=p[0][&'\0'+1] */
}
return npth;
}
static char **exe_n_cwd_tab_completion(char *command, int *num_matches,
- int type)
+ int type)
{
char **matches = 0;
char **paths = path1;
int npaths;
int i;
- char found[BUFSIZ + 4 + PATH_MAX];
+ char *found;
char *pfind = strrchr(command, '/');
path1[0] = ".";
strcpy(dirbuf, command);
/* set dir only */
dirbuf[(pfind - command) + 1] = 0;
-#ifdef BB_FEATURE_SH_USERNAME_COMPLETION
- if (dirbuf[0] == '~') /* ~/... or ~user/... */
+#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+ if (dirbuf[0] == '~') /* ~/... or ~user/... */
username_tab_completion(dirbuf, 0);
#endif
/* "strip" dirname in command */
pfind++;
paths[0] = dirbuf;
- npaths = 1; /* only 1 dir */
+ npaths = 1; /* only 1 dir */
}
for (i = 0; i < npaths; i++) {
dir = opendir(paths[i]);
- if (!dir) /* Don't print an error */
+ if (!dir) /* Don't print an error */
continue;
while ((next = readdir(dir)) != NULL) {
- const char *str_merge = "%s/%s";
char *str_found = next->d_name;
/* matched ? */
/* not see .name without .match */
if (*str_found == '.' && *pfind == 0) {
if (*paths[i] == '/' && paths[i][1] == 0
- && str_found[1] == 0) str_found = ""; /* only "/" */
+ && str_found[1] == 0) str_found = ""; /* only "/" */
else
continue;
}
- if (paths[i][strlen(paths[i]) - 1] == '/')
- str_merge = "%s%s";
- sprintf(found, str_merge, paths[i], str_found);
+ found = concat_path_file(paths[i], str_found);
/* hmm, remover in progress? */
if (stat(found, &st) < 0)
- continue;
+ goto cont;
/* find with dirs ? */
if (paths[i] != dirbuf)
- strcpy(found, next->d_name); /* only name */
+ strcpy(found, next->d_name); /* only name */
if (S_ISDIR(st.st_mode)) {
/* name is directory */
- /* algorithmic only "/" ? */
- if (*str_found)
- strcat(found, "/");
+ str_found = found;
+ found = concat_path_file(found, "");
+ free(str_found);
str_found = add_quote_for_spec_chars(found);
} else {
/* not put found file if search only dirs for cd */
if (type == FIND_DIR_ONLY)
- continue;
+ goto cont;
str_found = add_quote_for_spec_chars(found);
if (type == FIND_FILE_ONLY ||
- (type == FIND_EXE_ONLY && is_execute(&st) == TRUE))
+ (type == FIND_EXE_ONLY && is_execute(&st)))
strcat(str_found, " ");
}
/* Add it to the list */
matches = xrealloc(matches, (nm + 1) * sizeof(char *));
matches[nm++] = str_found;
+cont:
+ free(found);
}
closedir(dir);
}
if (paths != path1) {
- free(paths[0]); /* allocated memory only in first member */
+ free(paths[0]); /* allocated memory only in first member */
free(paths);
}
*num_matches = nm;
#define QUOT (UCHAR_MAX+1)
#define collapse_pos(is, in) { \
- memcpy(int_buf+is, int_buf+in, (BUFSIZ+1-is-in)*sizeof(int)); \
- memcpy(pos_buf+is, pos_buf+in, (BUFSIZ+1-is-in)*sizeof(int)); }
+ memcpy(int_buf+(is), int_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); \
+ memcpy(pos_buf+(is), pos_buf+(in), (BUFSIZ+1-(is)-(in))*sizeof(int)); }
static int find_match(char *matchBuf, int *len_with_quotes)
{
for (i = 0;; i++) {
int_buf[i] = (int) ((unsigned char) matchBuf[i]);
if (int_buf[i] == 0) {
- pos_buf[i] = -1; /* indicator end line */
+ pos_buf[i] = -1; /* indicator end line */
break;
} else
pos_buf[i] = i;
collapse_pos(j, j + 1);
int_buf[j] |= QUOT;
i++;
-#ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT
- if (matchBuf[i] == '\t') /* algorithm equivalent */
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+ if (matchBuf[i] == '\t') /* algorithm equivalent */
int_buf[j] = ' ' | QUOT;
#endif
}
-#ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
else if (matchBuf[i] == '\t')
int_buf[j] = ' ';
#endif
}
if (command_mode) {
collapse_pos(0, i + command_mode);
- i = -1; /* hack incremet */
+ i = -1; /* hack incremet */
}
}
/* collapse `command...` */
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++)
if (int_buf[i] == '(' || int_buf[i] == '{') {
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++)
if ((int_buf[i] == ')' && c > 0) || (int_buf[i] == '}' && c2 > 0)) {
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++)
if (int_buf[i] == ' ' || int_buf[i] == '<' || int_buf[i] == '>') {
if (int_buf[i] == ' ' && command_mode == FIND_EXE_ONLY
- && strncmp(&matchBuf[pos_buf[0]], "cd", 2) == 0)
+ && matchBuf[pos_buf[0]]=='c'
+ && matchBuf[pos_buf[1]]=='d' )
command_mode = FIND_DIR_ONLY;
else {
command_mode = FIND_FILE_ONLY;
/* skip first not quoted '\'' or '"' */
for (i = 0; int_buf[i] == '\'' || int_buf[i] == '"'; i++);
/* collapse quote or unquote // or /~ */
- while ((int_buf[i] & ~QUOT) == '/' && (
- (int_buf[i + 1] & ~QUOT) == '/'
- || (int_buf[i + 1] & ~QUOT) ==
- '~')) i++;
- if (i)
- collapse_pos(0, i);
+ while ((int_buf[i] & ~QUOT) == '/' &&
+ ((int_buf[i + 1] & ~QUOT) == '/'
+ || (int_buf[i + 1] & ~QUOT) == '~')) {
+ i++;
+ }
/* set only match and destroy quotes */
j = 0;
- for (i = 0; pos_buf[i] >= 0; i++) {
- matchBuf[i] = matchBuf[pos_buf[i]];
+ for (c = 0; pos_buf[i] >= 0; i++) {
+ matchBuf[c++] = matchBuf[pos_buf[i]];
j = pos_buf[i] + 1;
}
- matchBuf[i] = 0;
+ matchBuf[c] = 0;
/* old lenght matchBuf with quotes symbols */
*len_with_quotes = j ? j - pos_buf[0] : 0;
return command_mode;
}
+/*
+ display by column original ideas from ls applet,
+ very optimize by my :)
+*/
+static void showfiles(char **matches, int nfiles)
+{
+ int ncols, row;
+ int column_width = 0;
+ int nrows = nfiles;
+
+ /* find the longest file name- use that as the column width */
+ for (row = 0; row < nrows; row++) {
+ int l = strlen(matches[row]);
+
+ if (column_width < l)
+ column_width = l;
+ }
+ column_width += 2; /* min space for columns */
+ ncols = cmdedit_termw / column_width;
+
+ if (ncols > 1) {
+ nrows /= ncols;
+ if(nfiles % ncols)
+ nrows++; /* round up fractionals */
+ column_width = -column_width; /* for printf("%-Ns", ...); */
+ } else {
+ ncols = 1;
+ }
+ for (row = 0; row < nrows; row++) {
+ int n = row;
+ int nc;
+
+ for(nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++)
+ printf("%*s", column_width, matches[n]);
+ printf("%s\n", matches[n]);
+ }
+}
+
static void input_tab(int *lastWasTab)
{
static int num_matches;
static char **matches;
- if (lastWasTab == 0) { /* free all memory */
+ if (lastWasTab == 0) { /* free all memory */
if (matches) {
while (num_matches > 0)
free(matches[--num_matches]);
}
return;
}
- if (*lastWasTab == FALSE) {
+ if (! *lastWasTab) {
char *tmp;
int len_found;
int find_type;
int recalc_pos;
- *lastWasTab = TRUE; /* flop trigger */
+ *lastWasTab = TRUE; /* flop trigger */
/* Make a local copy of the string -- up
* to the position of the cursor */
/* Free up any memory already allocated */
input_tab(0);
-#ifdef BB_FEATURE_SH_USERNAME_COMPLETION
+#ifdef CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
/* If the word starts with `~' and there is no slash in the word,
* then try completing this word as a username. */
* in the current working directory that matches. */
if (!matches)
matches =
- exe_n_cwd_tab_completion(matchBuf, &num_matches,
- find_type);
-
+ exe_n_cwd_tab_completion(matchBuf,
+ &num_matches, find_type);
+ /* Remove duplicate found */
+ if(matches) {
+ int i, j;
+ /* bubble */
+ for(i=0; i<(num_matches-1); i++)
+ for(j=i+1; j<num_matches; j++)
+ if(matches[i]!=0 && matches[j]!=0 &&
+ strcmp(matches[i], matches[j])==0) {
+ free(matches[j]);
+ matches[j]=0;
+ }
+ j=num_matches;
+ num_matches = 0;
+ for(i=0; i<j; i++)
+ if(matches[i]) {
+ if(!strcmp(matches[i], "./"))
+ matches[i][1]=0;
+ else if(!strcmp(matches[i], "../"))
+ matches[i][2]=0;
+ matches[num_matches++]=matches[i];
+ }
+ }
/* Did we find exactly one match? */
if (!matches || num_matches > 1) {
char *tmp1;
beep();
if (!matches)
- return; /* not found */
+ return; /* not found */
/* sort */
qsort(matches, num_matches, sizeof(char *), match_compare);
/* find minimal match */
- tmp = xstrdup(matches[0]);
+ tmp = bb_xstrdup(matches[0]);
for (tmp1 = tmp; *tmp1; tmp1++)
for (len_found = 1; len_found < num_matches; len_found++)
if (matches[len_found][(tmp1 - tmp)] != *tmp1) {
*tmp1 = 0;
break;
}
- if (*tmp == 0) { /* have unique */
+ if (*tmp == 0) { /* have unique */
free(tmp);
return;
}
- } else { /* one match */
+ } else { /* one match */
tmp = matches[0];
/* for next completion current found */
*lastWasTab = FALSE;
/* new len */
len = strlen(command_ps);
/* write out the matched command */
- input_end();
- input_backward(cursor - recalc_pos);
+ redraw(cmdedit_y, len - recalc_pos);
}
if (tmp != matches[0])
free(tmp);
* just hit TAB again, print a list of all the
* available choices... */
if (matches && num_matches > 0) {
- int i, col, l;
- int sav_cursor = cursor; /* change goto_new_line() */
+ int sav_cursor = cursor; /* change goto_new_line() */
/* Go to the next line */
goto_new_line();
- for (i = 0, col = 0; i < num_matches; i++) {
- l = strlen(matches[i]);
- if (l < 14)
- l = 14;
- printf("%-14s ", matches[i]);
- if ((l += 2) > 16)
- while (l % 16) {
- putchar(' ');
- l++;
- }
- col += l;
- col -= (col / cmdedit_termw) * cmdedit_termw;
- if (col > 60 && matches[i + 1] != NULL) {
- putchar('\n');
- col = 0;
- }
- }
- /* Go to the next line and rewrite */
- putchar('\n');
+ showfiles(matches, num_matches);
redraw(0, len - sav_cursor);
}
}
}
-#endif /* BB_FEATURE_SH_TAB_COMPLETION */
+#endif /* CONFIG_FEATURE_COMMAND_TAB_COMPLETION */
+
+#if MAX_HISTORY >= 1
+static void get_previous_history(void)
+{
+ if(command_ps[0] != 0 || history[cur_history] == 0) {
+ free(history[cur_history]);
+ history[cur_history] = bb_xstrdup(command_ps);
+ }
+ cur_history--;
+}
+
+static int get_next_history(void)
+{
+ int ch = cur_history;
+
+ if (ch < n_history) {
+ get_previous_history(); /* save the current history line */
+ return (cur_history = ch+1);
+ } else {
+ beep();
+ return 0;
+ }
+}
-static void get_previous_history(struct history **hp, struct history *p)
+#ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY
+extern void load_history ( const char *fromfile )
{
- if ((*hp)->s)
- free((*hp)->s);
- (*hp)->s = xstrdup(command_ps);
- *hp = p;
+ FILE *fp;
+ int hi;
+
+ /* cleanup old */
+
+ for(hi = n_history; hi > 0; ) {
+ hi--;
+ free ( history [hi] );
+ }
+
+ if (( fp = fopen ( fromfile, "r" ))) {
+
+ for ( hi = 0; hi < MAX_HISTORY; ) {
+ char * hl = bb_get_chomped_line_from_file(fp);
+ int l;
+
+ if(!hl)
+ break;
+ l = strlen(hl);
+ if(l >= BUFSIZ)
+ hl[BUFSIZ-1] = 0;
+ if(l == 0 || hl[0] == ' ') {
+ free(hl);
+ continue;
+ }
+ history [hi++] = hl;
+ }
+ fclose ( fp );
+ }
+ cur_history = n_history = hi;
}
-static inline void get_next_history(struct history **hp)
+extern void save_history ( const char *tofile )
{
- get_previous_history(hp, (*hp)->n);
+ FILE *fp = fopen ( tofile, "w" );
+
+ if ( fp ) {
+ int i;
+
+ for ( i = 0; i < n_history; i++ ) {
+ fputs ( history [i], fp );
+ fputc ( '\n', fp );
+ }
+ fclose ( fp );
+ }
}
+#endif
+
+#endif
enum {
ESC = 27,
* Furthermore, the "vi" command editing keys are not implemented.
*
*/
-extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
-{
- int inputFd = fileno(stdin);
+
+int cmdedit_read_input(char *prompt, char command[BUFSIZ])
+{
int break_out = 0;
int lastWasTab = FALSE;
- char c = 0;
- struct history *hp = his_end;
+ unsigned char c = 0;
/* prepare before init handlers */
- cmdedit_y = 0; /* quasireal y, not true work if line > xt*yt */
+ cmdedit_y = 0; /* quasireal y, not true work if line > xt*yt */
len = 0;
command_ps = command;
- if (new_settings.c_cc[VMIN] == 0) { /* first call */
-
- getTermSettings(inputFd, (void *) &initial_settings);
- memcpy(&new_settings, &initial_settings, sizeof(struct termios));
-
- new_settings.c_cc[VMIN] = 1;
- new_settings.c_cc[VTIME] = 0;
- new_settings.c_cc[VINTR] = _POSIX_VDISABLE; /* Turn off CTRL-C, so we can trap it */
- new_settings.c_lflag &= ~ICANON; /* unbuffered input */
- new_settings.c_lflag &= ~(ECHO | ECHOCTL | ECHONL); /* Turn off echoing */
- }
-
+ getTermSettings(0, (void *) &initial_settings);
+ memcpy(&new_settings, &initial_settings, sizeof(struct termios));
+ 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);
+#ifndef linux
+ /* Hmm, in linux c_cc[] not parsed if set ~ICANON */
+ new_settings.c_cc[VMIN] = 1;
+ new_settings.c_cc[VTIME] = 0;
+ /* Turn off CTRL-C, so we can trap it */
+# ifndef _POSIX_VDISABLE
+# define _POSIX_VDISABLE '\0'
+# endif
+ new_settings.c_cc[VINTR] = _POSIX_VDISABLE;
+#endif
command[0] = 0;
- setTermSettings(inputFd, (void *) &new_settings);
+ setTermSettings(0, (void *) &new_settings);
handlers_sets |= SET_RESET_TERM;
- /* Print out the command prompt */
- parse_prompt(prompt);
/* Now initialize things */
cmdedit_init();
+ /* Print out the command prompt */
+ parse_prompt(prompt);
while (1) {
- fflush(stdout); /* buffered out to fast */
+ fflush(stdout); /* buffered out to fast */
- if (read(inputFd, &c, 1) < 1)
- return;
+ if (safe_read(0, &c, 1) < 1)
+ /* if we can't read input then exit */
+ goto prepare_to_die;
switch (c) {
case '\n':
break;
case 3:
/* Control-c -- stop gathering input */
-
- /* Link into lash to reset context to 0 on ^C and such */
- shell_context = 0;
-
- /* Go to the next line */
goto_new_line();
command[0] = 0;
-
- return;
+ len = 0;
+#if !defined(CONFIG_ASH)
+ lastWasTab = FALSE;
+ put_prompt();
+#else
+ break_out = 2;
+#endif
+ break;
case 4:
/* Control-d -- Delete one character, or exit
* if the len=0 and no chars to delete */
if (len == 0) {
+prepare_to_die:
+#if !defined(CONFIG_ASH)
printf("exit");
- clean_up_and_die(0);
+ goto_new_line();
+ /* cmdedit_reset_term() called in atexit */
+ exit(EXIT_SUCCESS);
+#else
+ break_out = -1; /* for control stoped jobs */
+ break;
+#endif
} else {
input_delete();
}
input_backspace();
break;
case '\t':
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
input_tab(&lastWasTab);
#endif
break;
+ case 11:
+ /* Control-k -- clear to end of line */
+ *(command + cursor) = 0;
+ len = cursor;
+ printf("\033[J");
+ break;
+ case 12:
+ /* Control-l -- clear screen */
+ printf("\033[H");
+ redraw(0, len-cursor);
+ break;
+#if MAX_HISTORY >= 1
case 14:
/* Control-n -- Get next command in history */
- if (hp && hp->n && hp->n->s) {
- get_next_history(&hp);
+ if (get_next_history())
goto rewrite_line;
- } else {
- beep();
- }
break;
case 16:
/* Control-p -- Get previous command from history */
- if (hp && hp->p) {
- get_previous_history(&hp, hp->p);
+ if (cur_history > 0) {
+ get_previous_history();
goto rewrite_line;
} else {
beep();
}
break;
+#endif
case 21:
/* Control-U -- Clear line before cursor */
if (cursor) {
redraw(cmdedit_y, len -= cursor);
}
break;
-
case ESC:{
/* escape sequence follows */
- if (read(inputFd, &c, 1) < 1)
- return;
+ if (safe_read(0, &c, 1) < 1)
+ goto prepare_to_die;
/* different vt100 emulations */
if (c == '[' || c == 'O') {
- if (read(inputFd, &c, 1) < 1)
- return;
+ if (safe_read(0, &c, 1) < 1)
+ goto prepare_to_die;
}
switch (c) {
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
- case '\t': /* Alt-Tab */
+#ifdef CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+ case '\t': /* Alt-Tab */
input_tab(&lastWasTab);
break;
#endif
+#if MAX_HISTORY >= 1
case 'A':
/* Up Arrow -- Get previous command from history */
- if (hp && hp->p) {
- get_previous_history(&hp, hp->p);
+ if (cur_history > 0) {
+ get_previous_history();
goto rewrite_line;
} else {
beep();
break;
case 'B':
/* Down Arrow -- Get next command in history */
- if (hp && hp->n && hp->n->s) {
- get_next_history(&hp);
- goto rewrite_line;
- } else {
- beep();
- }
+ if (!get_next_history())
break;
-
/* Rewrite the line with the selected history item */
- rewrite_line:
+rewrite_line:
/* change command */
- len = strlen(strcpy(command, hp->s));
+ len = strlen(strcpy(command, history[cur_history]));
/* redraw and go to end line */
redraw(cmdedit_y, 0);
break;
+#endif
case 'C':
/* Right Arrow -- Move forward one character */
input_forward();
}
if (c >= '1' && c <= '9')
do
- if (read(inputFd, &c, 1) < 1)
- return;
+ if (safe_read(0, &c, 1) < 1)
+ goto prepare_to_die;
while (c != '~');
break;
}
- default: /* If it's regular input, do the normal thing */
-#ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT
+ default: /* If it's regular input, do the normal thing */
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
/* Control-V -- Add non-printable symbol */
if (c == 22) {
- if (read(inputFd, &c, 1) < 1)
- return;
+ if (safe_read(0, &c, 1) < 1)
+ goto prepare_to_die;
if (c == 0) {
beep();
break;
}
} else
#endif
- if (!isprint(c)) /* Skip non-printable characters */
+ if (!Isprint(c)) /* Skip non-printable characters */
break;
- if (len >= (BUFSIZ - 2)) /* Need to leave space for enter */
+ if (len >= (BUFSIZ - 2)) /* Need to leave space for enter */
break;
len++;
- if (cursor == (len - 1)) { /* Append if at the end of the line */
+ if (cursor == (len - 1)) { /* Append if at the end of the line */
*(command + cursor) = c;
*(command + cursor + 1) = 0;
cmdedit_set_out_char(0);
- } else { /* Insert otherwise */
+ } else { /* Insert otherwise */
int sc = cursor;
memmove(command + sc + 1, command + sc, len - sc);
break;
}
- if (break_out) /* Enter is the command terminator, no more input. */
+ if (break_out) /* Enter is the command terminator, no more input. */
break;
if (c != '\t')
lastWasTab = FALSE;
}
- setTermSettings(inputFd, (void *) &initial_settings);
+ setTermSettings(0, (void *) &initial_settings);
handlers_sets &= ~SET_RESET_TERM;
+#if MAX_HISTORY >= 1
/* Handle command history log */
- if (len) { /* no put empty line */
-
- struct history *h = his_end;
- char *ss;
-
- ss = xstrdup(command); /* duplicate */
-
- if (h == 0) {
- /* No previous history -- this memory is never freed */
- h = his_front = xmalloc(sizeof(struct history));
- h->n = xmalloc(sizeof(struct history));
-
- h->p = NULL;
- h->s = ss;
- h->n->p = h;
- h->n->n = NULL;
- h->n->s = NULL;
- his_end = h->n;
- history_counter++;
- } else {
- /* Add a new history command -- this memory is never freed */
- h->n = xmalloc(sizeof(struct history));
-
- h->n->p = h;
- h->n->n = NULL;
- h->n->s = NULL;
- h->s = ss;
- his_end = h->n;
-
+ /* cleanup may be saved current command line */
+ free(history[MAX_HISTORY]);
+ history[MAX_HISTORY] = 0;
+ if (len) { /* no put empty line */
+ int i = n_history;
/* After max history, remove the oldest command */
- if (history_counter >= MAX_HISTORY) {
-
- struct history *p = his_front->n;
-
- p->p = NULL;
- free(his_front->s);
- free(his_front);
- his_front = p;
- } else {
- history_counter++;
- }
+ if (i >= MAX_HISTORY) {
+ free(history[0]);
+ for(i = 0; i < (MAX_HISTORY-1); i++)
+ history[i] = history[i+1];
}
-#if defined(BB_FEATURE_BASH_STYLE_PROMT)
+ history[i++] = bb_xstrdup(command);
+ cur_history = i;
+ n_history = i;
+#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
num_ok_lines++;
#endif
}
- command[len++] = '\n'; /* set '\n' */
- command[len] = 0;
-#if defined(BB_FEATURE_CLEAN_UP) && defined(BB_FEATURE_SH_TAB_COMPLETION)
- input_tab(0); /* strong free */
+#else /* MAX_HISTORY < 1 */
+#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
+ if (len) { /* no put empty line */
+ num_ok_lines++;
+ }
#endif
-#if defined(BB_FEATURE_BASH_STYLE_PROMT)
+#endif /* MAX_HISTORY >= 1 */
+ if(break_out == 1) {
+ command[len++] = '\n'; /* set '\n' */
+ command[len] = 0;
+ }
+#if defined(CONFIG_FEATURE_CLEAN_UP) && defined(CONFIG_FEATURE_COMMAND_TAB_COMPLETION)
+ input_tab(0); /* strong free */
+#endif
+#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
free(cmdedit_prompt);
#endif
- return;
+ cmdedit_reset_term();
+#if !defined(CONFIG_ASH)
+ return len;
+#else
+ return break_out < 0 ? break_out : len;
+#endif
}
-/* Undo the effects of cmdedit_init(). */
-extern void cmdedit_terminate(void)
-{
- cmdedit_reset_term();
- if ((handlers_sets & SET_TERM_HANDLERS) != 0) {
- signal(SIGKILL, SIG_DFL);
- signal(SIGINT, SIG_DFL);
- signal(SIGQUIT, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
- signal(SIGWINCH, SIG_DFL);
- handlers_sets &= ~SET_TERM_HANDLERS;
- }
-}
-#endif /* BB_FEATURE_SH_COMMAND_EDITING */
+#endif /* CONFIG_FEATURE_COMMAND_EDITING */
#ifdef TEST
-unsigned int shell_context;
+const char *bb_applet_name = "debug stuff usage";
+const char *memory_exhausted = "Memory exhausted";
+
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+#include <locale.h>
+#endif
int main(int argc, char **argv)
{
char buff[BUFSIZ];
char *prompt =
-#if defined(BB_FEATURE_BASH_STYLE_PROMT)
- "\\[\\033[32;1m\\]\\u@\\[\\033[33;1m\\]\\h:\
+#if defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
+ "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\
\\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \
-\\!\\[\\033[36;1m\\]\\$ \\[\\033[0m\\]";
+\\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]";
#else
"% ";
#endif
- shell_context = 1;
- do {
+#ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
+ setlocale(LC_ALL, "");
+#endif
+ while(1) {
+ int l;
cmdedit_read_input(prompt, buff);
+ l = strlen(buff);
+ if(l==0)
+ break;
+ if(l > 0 && buff[l-1] == '\n')
+ buff[l-1] = 0;
printf("*** cmdedit_read_input() returned line =%s=\n", buff);
- } while (shell_context);
+ }
printf("*** cmdedit_read_input() detect ^C\n");
return 0;
}
-#endif /* TEST */
+#endif /* TEST */
projects / oweals / busybox.git / blobdiff