Teach libc5 what a sighandler_t is
[oweals/busybox.git] / shell / cmdedit.c
index e317b86fa69149d5a3a9352bd938efd7b5267056..16ec2f823323491ff3cdedad97c073bb5f976d51 100644 (file)
@@ -3,7 +3,7 @@
  * 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>
+ * Written by:   Vladimir Oleynik <dzo@simtreas.ru>
  *
  * Used ideas:
  *      Adam Rogoyski    <rogoyski@cs.utexas.edu>
@@ -31,8 +31,6 @@
  */
 
 
-//#define TEST
-
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
 #include <limits.h>
 
-#ifndef TEST
-
 #include "busybox.h"
 
+#ifdef BB_LOCALE_SUPPORT
+#define Isprint(c) isprint((c))
+#else
+#define Isprint(c) ( (c) >= ' ' && (c) != ((unsigned char)'\233') )
+#endif
+
+#ifndef TEST
+
 #define D(x)
 
 #else
 
 #define D(x)  x
 
-#ifndef TRUE
-#define TRUE  1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
 #endif                                                 /* TEST */
 
 #ifdef BB_FEATURE_COMMAND_TAB_COMPLETION
 #undef  BB_FEATURE_COMMAND_USERNAME_COMPLETION
 #endif
 
-#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
+#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || defined(BB_FEATURE_SH_FANCY_PROMPT)
 #define BB_FEATURE_GETUSERNAME_AND_HOMEDIR
 #endif
 
 #ifdef BB_FEATURE_GETUSERNAME_AND_HOMEDIR
-#ifndef TEST
-#include "pwd_grp/pwd.h"
-#else
-#include <pwd.h>
-#endif                                                 /* TEST */
+#       ifndef TEST
+#               include "pwd_grp/pwd.h"
+#       else
+#               include <pwd.h>
+#       endif  /* TEST */
 #endif                                                 /* advanced FEATURES */
 
 
-#ifdef TEST
-void *xrealloc(void *old, size_t size)
-{
-       return realloc(old, size);
-}
-
-void *xmalloc(size_t size)
-{
-       return malloc(size);
-}
-char *xstrdup(const char *s)
-{
-       return strdup(s);
-}
-
-void *xcalloc(size_t size, size_t se)
-{
-       return calloc(size, se);
-}
-
-#define error_msg(s, d)                   fprintf(stderr, s, d)
-#endif /* TEST */
-
 
 struct history {
        char *s;
@@ -132,28 +106,14 @@ static struct history *his_front = NULL;
 static struct history *his_end = NULL;
 
 
-/* ED: sparc termios is broken: revert back to old termio handling. */
-
-#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)
-#else
-#      include <termios.h>
-#      define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
-#      define getTermSettings(fd,argp) tcgetattr(fd, argp);
-#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 */
@@ -163,9 +123,8 @@ 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_WCHG_HANDLERS = 2,  /* winchg signal handler */
+       SET_RESET_TERM = 4,     /* if the terminal needs to be reset upon exit */
 };
 
 
@@ -177,22 +136,18 @@ static int cursor;                /* required global for signal handler */
 static int len;                        /* --- "" - - "" - -"- --""-- --""--- */
 static char *command_ps;       /* --- "" - - "" - -"- --""-- --""--- */
 static
-#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifndef BB_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;
-
-
 #ifdef BB_FEATURE_GETUSERNAME_AND_HOMEDIR
 static char *user_buf = "";
 static char *home_pwd_buf = "";
 static int my_euid;
 #endif
 
-#ifndef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifdef BB_FEATURE_SH_FANCY_PROMPT
 static char *hostname_buf = "";
 static int num_ok_lines = 1;
 #endif
@@ -209,13 +164,17 @@ static int my_gid;
 
 #endif /* BB_FEATURE_COMMAND_TAB_COMPLETION */
 
+/* It seems that libc5 doesn't know what a sighandler_t is... */
+#if (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)
+typedef void (*sighandler_t) (int);
+#endif
 
 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) {
@@ -238,7 +197,7 @@ static void win_changed(int nsig)
 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;
        }
@@ -270,9 +229,9 @@ static void cmdedit_set_out_char(int next_char)
        int c = (int)((unsigned char) command_ps[cursor]);
 
        if (c == 0)
-               c = ' ';                                /* destroy end char? */
+               c = ' ';        /* destroy end char? */
 #ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT
-       if (!isprint(c)) {                      /* Inverse put non-printable characters */
+       if (!Isprint(c)) {      /* Inverse put non-printable characters */
                if (c >= 128)
                        c -= 128;
                if (c < ' ')
@@ -328,7 +287,7 @@ static void input_backward(int num)
 {
        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 */
                cmdedit_x -= num;
@@ -359,9 +318,10 @@ static void put_prompt(void)
        out1str(cmdedit_prompt);
        cmdedit_x = cmdedit_prmt_len;   /* count real x terminal position */
        cursor = 0;
+       cmdedit_y = 0;                  /* new quasireal y */
 }
 
-#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifndef BB_FEATURE_SH_FANCY_PROMPT
 static void parse_prompt(const char *prmt_ptr)
 {
        cmdedit_prompt = prmt_ptr;
@@ -369,134 +329,121 @@ static void parse_prompt(const char *prmt_ptr)
        put_prompt();
 }
 #else
-static void add_to_prompt(char **prmt_mem_ptr, int *alm, 
-               int *prmt_len, const char *addb)
-{
-       *prmt_len += strlen(addb);
-       if (*alm < (*prmt_len) + 1) {
-               *alm = (*prmt_len) + 1;
-               *prmt_mem_ptr = xrealloc(*prmt_mem_ptr, *alm);
-       }
-       strcat(*prmt_mem_ptr, addb);
-}
-
 static void parse_prompt(const char *prmt_ptr)
 {
-       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 *)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 = process_escape_sequence(&prmt_ptr);
+                       if(prmt_ptr==cp) {
+                         if (*cp == 0)
                                break;
-                       prmt_ptr++;
-                       switch (c) {
+                         c = *prmt_ptr++;
+                         switch (c) {
 #ifdef BB_FEATURE_GETUSERNAME_AND_HOMEDIR
-                       case 'u':
-                               add_to_prompt(&prmt_mem_ptr, &alm, &prmt_len, user_buf);
-                               continue;
+                         case 'u':
+                               pbuf = user_buf;
+                               break;
 #endif 
-                       case 'h':
-                               if (hostname_buf[0] == 0) {
-                                       hostname_buf = xcalloc(256, 1);
-                                       if (gethostname(hostname_buf, 255) < 0) {
-                                               strcpy(hostname_buf, "?");
+                         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;
 #ifdef BB_FEATURE_GETUSERNAME_AND_HOMEDIR
-                       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] = '~';
+                         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;
+                               break;
 #endif 
-                       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 */
+                         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++;
        }
+       if(pwd_buf!=(char *)unknown)
+               free(pwd_buf);
        cmdedit_prompt = prmt_mem_ptr;
        cmdedit_prmt_len = prmt_len - sub_len;
        put_prompt();
@@ -509,7 +456,6 @@ static void redraw(int y, int back_cursor)
 {
        if (y > 0)                              /* up to start y */
                printf("\033[%dA", y);
-       cmdedit_y = 0;                          /* new quasireal y */
        putchar('\r');
        put_prompt();
        input_end();                            /* rewrite */
@@ -550,14 +496,6 @@ static void input_forward(void)
 }
 
 
-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;
@@ -578,7 +516,7 @@ static void cmdedit_setwidth(int w, int redraw_flg)
        } 
 }
 
-extern void cmdedit_init(void)
+static void cmdedit_init(void)
 {
        cmdedit_prmt_len = 0;
        if ((handlers_sets & SET_WCHG_HANDLERS) == 0) {
@@ -610,15 +548,6 @@ extern void cmdedit_init(void)
                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;
-       }
-
 }
 
 #ifdef BB_FEATURE_COMMAND_TAB_COMPLETION
@@ -776,7 +705,7 @@ static char **exe_n_cwd_tab_completion(char *command, int *num_matches,
        char **paths = path1;
        int npaths;
        int i;
-       char found[BUFSIZ + 4 + PATH_MAX];
+       char *found;
        char *pfind = strrchr(command, '/');
 
        path1[0] = ".";
@@ -809,7 +738,6 @@ static char **exe_n_cwd_tab_completion(char *command, int *num_matches,
                        continue;
 
                while ((next = readdir(dir)) != NULL) {
-                       const char *str_merge = "%s/%s";
                        char *str_found = next->d_name;
 
                        /* matched ? */
@@ -822,25 +750,23 @@ static char **exe_n_cwd_tab_completion(char *command, int *num_matches,
                                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;
+                       if (stat(found, &st) < 0) 
+                               goto cont;
                        /* find with dirs ? */
                        if (paths[i] != dirbuf)
                                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;
+                               if (type == FIND_DIR_ONLY) 
+                                       goto cont;
                                str_found = add_quote_for_spec_chars(found);
                                if (type == FIND_FILE_ONLY ||
                                        (type == FIND_EXE_ONLY && is_execute(&st) == TRUE))
@@ -850,6 +776,8 @@ static char **exe_n_cwd_tab_completion(char *command, int *num_matches,
                        matches = xrealloc(matches, (nm + 1) * sizeof(char *));
 
                        matches[nm++] = str_found;
+cont:
+                       free(found);
                }
                closedir(dir);
        }
@@ -1022,17 +950,14 @@ static int find_match(char *matchBuf, int *len_with_quotes)
                         || (int_buf[i + 1] & ~QUOT) == '~')) {
                i++;
        }
-       if (i) {
-               collapse_pos(0, 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;
 
@@ -1086,9 +1011,30 @@ static void input_tab(int *lastWasTab)
                 * 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;
@@ -1136,8 +1082,7 @@ static void input_tab(int *lastWasTab)
                        /* 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);
@@ -1212,10 +1157,9 @@ enum {
  *
  */
  
-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;
@@ -1227,23 +1171,24 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
        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;
-               /* Turn off CTRL-C, so we can trap it */
-               new_settings.c_cc[VINTR] = _POSIX_VDISABLE;     
-               new_settings.c_lflag &= ~ICANON;        /* unbuffered input */
-               /* Turn off echoing */
-               new_settings.c_lflag &= ~(ECHO | ECHOCTL | ECHONL);     
-       }
-
+       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;
 
        /* Now initialize things */
@@ -1255,8 +1200,9 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
 
                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':
@@ -1275,21 +1221,26 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
                        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;
+                       lastWasTab = FALSE;
+                       put_prompt();
+                       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(BB_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();
                        }
@@ -1340,12 +1291,12 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
 
                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_COMMAND_TAB_COMPLETION
@@ -1409,8 +1360,8 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
                        }
                        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;
                }
@@ -1419,15 +1370,15 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
 #ifdef BB_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 */
@@ -1460,7 +1411,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
                        lastWasTab = FALSE;
        }
 
-       setTermSettings(inputFd, (void *) &initial_settings);
+       setTermSettings(0, (void *) &initial_settings);
        handlers_sets &= ~SET_RESET_TERM;
 
        /* Handle command history log */
@@ -1506,52 +1457,43 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ])
                                history_counter++;
                        }
                }
-#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
+#if defined(BB_FEATURE_SH_FANCY_PROMPT)
                num_ok_lines++;
 #endif
        }
+       if(break_out>0) {
        command[len++] = '\n';          /* set '\n' */
        command[len] = 0;
+       }
 #if defined(BB_FEATURE_CLEAN_UP) && defined(BB_FEATURE_COMMAND_TAB_COMPLETION)
        input_tab(0);                           /* strong free */
 #endif
-#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
+#if defined(BB_FEATURE_SH_FANCY_PROMPT)
        free(cmdedit_prompt);
 #endif
-       return;
+       cmdedit_reset_term();
+       return len;
 }
 
 
-/* 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_COMMAND_EDITING */
 
 
 #ifdef TEST
 
+const char *applet_name = "debug stuff usage";
+const char *memory_exhausted = "Memory exhausted";
+
 #ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT
 #include <locale.h>
 #endif
 
-unsigned int shell_context;
-
 int main(int argc, char **argv)
 {
        char buff[BUFSIZ];
        char *prompt =
-#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT)
+#if defined(BB_FEATURE_SH_FANCY_PROMPT)
                "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\
 \\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \
 \\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]";
@@ -1562,15 +1504,16 @@ int main(int argc, char **argv)
 #ifdef BB_FEATURE_NONPRINTABLE_INVERSE_PUT
        setlocale(LC_ALL, "");
 #endif
-       shell_context = 1;
-       do {
+       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;
 }