terminal width. (more then one line.) However, history will.
*/
-#include "internal.h"
+#include "busybox.h"
#ifdef BB_FEATURE_SH_COMMAND_EDITING
#include <stdio.h>
#include <signal.h>
-#define MAX_HISTORY 15 /* Maximum length of the linked list for the command line history */
+static const int MAX_HISTORY = 15; /* Maximum length of the linked list for the command line history */
+
+enum {
+ ESC = 27,
+ DEL = 127,
+};
-#define ESC 27
-#define DEL 127
#define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0)
#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
#endif
/* Current termio and the previous termio before starting sh */
-struct termios initial_settings, new_settings;
+static struct termios initial_settings, new_settings;
#ifndef _POSIX_VDISABLE
static int cmdedit_scroll = 27; /* width of EOL scrolling region */
static int history_counter = 0; /* Number of commands in history list */
static int reset_term = 0; /* Set to true if the terminal needs to be reset upon exit */
+static int exithandler_set = 0; /* Set to true when atexit() has been called */
+
+
+/* Link into lash to reset context to 0
+ * on ^C and such */
+extern unsigned int shell_context;
+
struct history {
char *s;
#define xwrite write
-void
-cmdedit_setwidth(int w)
+/*
+ * TODO: Someday we want to implement 'horizontal scrolling' of the
+ * command-line when the user has typed more than the current width. This
+ * would allow the user to see a 'window' of what he has typed.
+ */
+static void cmdedit_setwidth(int w)
{
if (w > 20) {
cmdedit_termw = w;
cmdedit_scroll = w / 3;
} else {
- errorMsg("\n*** Error: minimum screen width is 21\n");
+ error_msg("\n*** Error: minimum screen width is 21\n");
+ }
+}
+
+static void win_changed(int junk)
+{
+ struct winsize win = { 0, 0, 0, 0 };
+ ioctl(0, TIOCGWINSZ, &win);
+ if (win.ws_col > 0) {
+ cmdedit_setwidth( win.ws_col - 1);
}
}
-void cmdedit_reset_term(void)
+static void cmdedit_reset_term(void)
{
if (reset_term)
/* sparc and other have broken termios support: use old termio handling. */
setTermSettings(fileno(stdin), (void*) &initial_settings);
+#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
}
-void clean_up_and_die(int sig)
+static void clean_up_and_die(int sig)
{
cmdedit_reset_term();
- fprintf(stdout, "\n");
+ printf("\n");
if (sig!=SIGINT)
- exit(TRUE);
+ exit(EXIT_SUCCESS);
}
/* Go to HOME position */
-void input_home(int outputFd, int *cursor)
+static void input_home(int outputFd, int *cursor)
{
while (*cursor > 0) {
xwrite(outputFd, "\b", 1);
}
/* Go to END position */
-void input_end(int outputFd, int *cursor, int len)
+static void input_end(int outputFd, int *cursor, int len)
{
while (*cursor < len) {
xwrite(outputFd, "\033[C", 3);
}
/* Delete the char in back of the cursor */
-void input_backspace(char* command, int outputFd, int *cursor, int *len)
+static void input_backspace(char* command, int outputFd, int *cursor, int *len)
{
int j = 0;
+/* Debug crap */
+//fprintf(stderr, "\nerik: len=%d, cursor=%d, strlen(command)='%d'\n", *len, *cursor, strlen(command));
+//xwrite(outputFd, command, *len);
+//*cursor = *len;
+
+
if (*cursor > 0) {
xwrite(outputFd, "\b \b", 3);
--*cursor;
}
/* Delete the char in front of the cursor */
-void input_delete(char* command, int outputFd, int cursor, int *len)
+static void input_delete(char* command, int outputFd, int cursor, int *len)
{
int j = 0;
}
/* Move forward one charactor */
-void input_forward(int outputFd, int *cursor, int len)
+static void input_forward(int outputFd, int *cursor, int len)
{
if (*cursor < len) {
xwrite(outputFd, "\033[C", 3);
}
/* Move back one charactor */
-void input_backward(int outputFd, int *cursor)
+static void input_backward(int outputFd, int *cursor)
{
if (*cursor > 0) {
xwrite(outputFd, "\033[D", 3);
#ifdef BB_FEATURE_SH_TAB_COMPLETION
-char** username_tab_completion(char* command, int *num_matches)
+static char** username_tab_completion(char* command, int *num_matches)
{
char **matches = (char **) NULL;
*num_matches=0;
}
#include <dirent.h>
-char** exe_n_cwd_tab_completion(char* command, int *num_matches)
+static char** exe_n_cwd_tab_completion(char* command, int *num_matches)
{
char *dirName;
- char **matches = (char **) NULL;
+ char **matches;
DIR *dir;
struct dirent *next;
- matches = malloc( sizeof(char*)*50);
+ matches = xmalloc( sizeof(char*)*50);
/* Stick a wildcard onto the command, for later use */
strcat( command, "*");
/* See if this matches */
if (check_wildcard_match(next->d_name, command) == TRUE) {
/* Cool, found a match. Add it to the list */
- matches[*num_matches] = malloc(strlen(next->d_name)+1);
+ matches[*num_matches] = xmalloc(strlen(next->d_name)+1);
strcpy( matches[*num_matches], next->d_name);
++*num_matches;
//matches = realloc( matches, sizeof(char*)*(*num_matches));
return (matches);
}
-void input_tab(char* command, char* prompt, int outputFd, int *cursor, int *len)
+static void input_tab(char* command, char* prompt, int outputFd, int *cursor, int *len, int lastWasTab)
{
/* Do TAB completion */
static int num_matches=0;
static char **matches = (char **) NULL;
- int pos = cursor;
+ int pos = *cursor;
if (lastWasTab == FALSE) {
/* Make a local copy of the string -- up
* to the position of the cursor */
- matchBuf = (char *) calloc(BUFSIZ, sizeof(char));
- strncpy(matchBuf, command, cursor);
+ matchBuf = (char *) xcalloc(BUFSIZ, sizeof(char));
+ strncpy(matchBuf, command, *cursor);
tmp=matchBuf;
/* skip past any command seperator tokens */
if (matches && num_matches==1) {
/* write out the matched command */
strncpy(command+pos, matches[0]+pos, strlen(matches[0])-pos);
- len=strlen(command);
- cursor=len;
+ *len=strlen(command);
+ *cursor=*len;
xwrite(outputFd, matches[0]+pos, strlen(matches[0])-pos);
- break;
+ return;
}
} else {
/* Ok -- the last char was a TAB. Since they
/* Rewrite the prompt */
xwrite(outputFd, prompt, strlen(prompt));
/* Rewrite the command */
- xwrite(outputFd, command, len);
+ xwrite(outputFd, command, *len);
/* Put the cursor back to where it used to be */
- for (cursor=len; cursor > pos; cursor--)
+ for (cursor=len; *cursor > pos; cursor--)
xwrite(outputFd, "\b", 1);
}
}
}
#endif
-void get_previous_history(struct history **hp, char* command)
+static void get_previous_history(struct history **hp, char* command)
{
- free((*hp)->s);
+ if ((*hp)->s)
+ free((*hp)->s);
(*hp)->s = strdup(command);
*hp = (*hp)->p;
}
-void get_next_history(struct history **hp, char* command)
+static void get_next_history(struct history **hp, char* command)
{
- free((*hp)->s);
+ if ((*hp)->s)
+ free((*hp)->s);
(*hp)->s = strdup(command);
*hp = (*hp)->n;
}
char c = 0;
struct history *hp = his_end;
- memset(command, 0, sizeof(command));
if (!reset_term) {
getTermSettings(inputFd, (void*) &initial_settings);
memset(command, 0, BUFSIZ);
+ /* Print out the command prompt */
+ xwrite(outputFd, prompt, strlen(prompt));
+
while (1) {
if ((ret = read(inputFd, &c, 1)) < 1)
input_backward(outputFd, &cursor);
break;
case 3:
- /* Control-c -- leave the current line,
- * and start over on the next line */
+ /* 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 */
xwrite(outputFd, "\n", 1);
+#if 0
/* Rewrite the prompt */
xwrite(outputFd, prompt, strlen(prompt));
/* Reset the command string */
- memset(command, 0, sizeof(command));
+ memset(command, 0, BUFSIZ);
len = cursor = 0;
+#endif
+ return;
- break;
case 4:
/* Control-d -- Delete one character, or exit
* if the len=0 and no chars to delete */
break;
case '\t':
#ifdef BB_FEATURE_SH_TAB_COMPLETION
- input_tab(command, prompt, outputFd, &cursor, &len);
+ input_tab(command, prompt, outputFd, &cursor,
+&len, lastWasTab);
#endif
break;
case 14:
rewrite_line:
/* erase old command from command line */
len = strlen(command)-strlen(hp->s);
- while (len>0)
+
+ while (len>cursor)
+ input_delete(command, outputFd, cursor, &len);
+ while (cursor>0)
input_backspace(command, outputFd, &cursor, &len);
input_home(outputFd, &cursor);
struct history *h = his_end;
if (!h) {
- /* No previous history */
- h = his_front = malloc(sizeof(struct history));
- h->n = malloc(sizeof(struct history));
+ /* 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 = strdup(command);
his_end = h->n;
history_counter++;
} else {
- /* Add a new history command */
- h->n = malloc(sizeof(struct history));
+ /* Add a new history command -- this memory is never freed */
+ h->n = xmalloc(sizeof(struct history));
h->n->p = h;
h->n->n = NULL;
extern void cmdedit_init(void)
{
- atexit(cmdedit_reset_term);
+ win_changed(0);
+ signal(SIGWINCH, win_changed);
+
+ if(exithandler_set == 0) {
+ atexit(cmdedit_reset_term); /* be sure to do this only once */
+ exithandler_set = 1;
+ }
signal(SIGKILL, clean_up_and_die);
signal(SIGINT, clean_up_and_die);
signal(SIGQUIT, clean_up_and_die);
signal(SIGTERM, clean_up_and_die);
}
+
+/*
+** Undo the effects of cmdedit_init() as good as we can:
+** I am not aware of a way to revoke an atexit() handler,
+** but, fortunately, our particular handler can be made
+** a no-op by setting reset_term = 0.
+*/
+extern void cmdedit_terminate(void)
+{
+ cmdedit_reset_term();
+ reset_term = 0;
+ signal(SIGKILL, SIG_DFL);
+ signal(SIGINT, SIG_DFL);
+ signal(SIGQUIT, SIG_DFL);
+ signal(SIGTERM, SIG_DFL);
+ signal(SIGWINCH, SIG_DFL);
+}
+
+
+
#endif /* BB_FEATURE_SH_COMMAND_EDITING */
projects / oweals / busybox.git / blobdiff