include busybox after libc includes

[oweals/busybox.git] / shell / msh.c

diff --git a/shell/msh.c b/shell/msh.c
index efba6a1ee22ccc806d4c0551e10e727d03ad5083..1485ccb6fd426fc779fd4fe6754350096c2ec7cb 100644 (file)
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -143,7 +143,7 @@ static int newfile(char *s);
 static char *findeq(char *cp);
 static char *cclass(char *p, int sub);
 static void initarea(void);
-extern int shell_main(int argc, char **argv);
+extern int msh_main(int argc, char **argv);
 
 
 struct brkcon {
@@ -681,9 +681,8 @@ static void * brktop;
 static void * brkaddr;
 
 
-#ifdef BB_FEATURE_COMMAND_EDITING
-char * current_prompt;
-unsigned int shell_context;
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
+static char * current_prompt;
 #endif
 
 
@@ -693,7 +692,7 @@ unsigned int shell_context;
  */
 
 
-extern int shell_main(int argc, char **argv)
+extern int msh_main(int argc, char **argv)
 {
        register int f;
        register char *s;
@@ -733,7 +732,7 @@ extern int shell_main(int argc, char **argv)
                setval(ifs, " \t\n");
 
        prompt = lookup("PS1");
-#ifdef BB_FEATURE_SH_FANCY_PROMPT
+#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
        if (prompt->value == null)
 #endif
                setval(prompt, "$ ");
@@ -742,7 +741,7 @@ extern int shell_main(int argc, char **argv)
                prompt->status &= ~EXPORT;
        }
        cprompt = lookup("PS2");
-#ifdef BB_FEATURE_SH_FANCY_PROMPT
+#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
        if (cprompt->value == null)
 #endif
                setval(cprompt, "> ");
@@ -802,8 +801,10 @@ extern int shell_main(int argc, char **argv)
                PUSHIO(afile, 0, iof);
                if (isatty(0) && isatty(1) && !cflag) {
                        interactive++;
+#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET 
                        printf( "\n\n" BB_BANNER " Built-in shell (msh)\n");
                        printf( "Enter 'help' for a list of built-in commands.\n\n");
+#endif
                }
        }
        signal(SIGQUIT, qflag);
@@ -834,13 +835,15 @@ extern int shell_main(int argc, char **argv)
 
        for (;;) {
                if (interactive && e.iop <= iostack) {
-#ifdef BB_FEATURE_COMMAND_EDITING
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
                        current_prompt=prompt->value;
 #else
                        prs(prompt->value);
 #endif
                }
                onecommand();
+               /* Ensure that getenv("PATH") stays current */
+               setenv("PATH", path->value, 1);
        }
 }
 
@@ -1262,7 +1265,7 @@ static void
 ronly(vp)
 struct var *vp;
 {
-       if (isalpha(vp->name[0]))       /* not an internal symbol ($# etc) */
+       if (isalpha(vp->name[0]) || vp->name[0] == '_') /* not an internal symbol */
                vp->status |= RONLY;
 }
 
@@ -1270,10 +1273,10 @@ static int
 isassign(s)
 register char *s;
 {
-       if (!isalpha((int)*s))
+       if (!isalpha((int)*s) && *s != '_')
                return(0);
        for (; *s != '='; s++)
-               if (*s == 0 || !isalnum(*s))
+               if (*s == 0 || (!isalnum(*s) && *s != '_'))
                        return(0);
        return(1);
 }
@@ -1286,10 +1289,10 @@ int cf;
        register char *cp;
        struct var *vp;
 
-       if (!isalpha(*s))
+       if (!isalpha(*s) && *s != '_')
                return(0);
        for (cp = s; *cp != '='; cp++)
-               if (*cp == 0 || !isalnum(*cp))
+               if (*cp == 0 || (!isalnum(*cp) && *cp != '_'))
                        return(0);
        vp = lookup(s);
        nameval(vp, ++cp, cf == COPYV? (char *)NULL: s);
@@ -1302,10 +1305,10 @@ static int
 checkname(cp)
 register char *cp;
 {
-       if (!isalpha(*cp++))
+       if (!isalpha(*cp++) && *(cp-1) != '_')
                return(0);
        while (*cp)
-               if (!isalnum(*cp++))
+               if (!isalnum(*cp++) && *(cp-1) != '_')
                        return(0);
        return(1);
 }
@@ -1317,7 +1320,7 @@ register int f, out;
        register struct var *vp;
 
        for (vp = vlist; vp; vp = vp->next)
-               if (vp->status & f && isalpha(*vp->name)) {
+               if (vp->status & f && (isalpha(*vp->name) || *vp->name == '_')) {
                        if (vp->status & EXPORT)
                                write(out, "export ", 7);
                        if (vp->status & RONLY)
@@ -2170,7 +2173,7 @@ loop:
                startl = 1;
                if (multiline || cf & CONTIN) {
                        if (interactive && e.iop <= iostack) {
-#ifdef BB_FEATURE_COMMAND_EDITING
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
                        current_prompt=cprompt->value;
 #else
                        prs(cprompt->value);
@@ -2223,7 +2226,7 @@ register int c, c1;
                        return(YYERRCODE);
                }
                if (interactive && c == '\n' && e.iop <= iostack) {
-#ifdef BB_FEATURE_COMMAND_EDITING
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
                    current_prompt=cprompt->value;
 #else
                    prs(cprompt->value);
@@ -2837,9 +2840,9 @@ char *c, **v, **envp;
        register char *sp, *tp;
        int eacces = 0, asis = 0;
 
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
+#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
        char *name = c;
-#ifdef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+#ifdef CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
        name = get_last_path_component(name);
 #endif
        optind = 1;
@@ -2959,7 +2962,7 @@ static int dohelp()
                        col = 0;
                }
        }
-#ifdef BB_FEATURE_SH_STANDALONE_SHELL
+#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
        {
                int i;
                const struct BB_applet *applet;
@@ -3331,11 +3334,19 @@ void (*f)();
 int key;
 {
        if (*wp != NULL) {
-               for (; *wp != NULL; wp++)
+               for (; *wp != NULL; wp++) {
+                       if (isassign(*wp)) {
+                               char *cp;
+                               assign(*wp, COPYV);
+                               for (cp = *wp; *cp != '='; cp++)
+                                       ;
+                               *cp = '\0';
+                       }
                        if (checkname(*wp))
                                (*f)(lookup(*wp));
                        else
                                badid(*wp);
+               }
        } else
                putvlist(key, 1);
 }
@@ -3399,7 +3410,7 @@ varput(s, out)
 register char *s;
 int out;
 {
-       if (isalnum(*s)) {
+       if (isalnum(*s) || *s == '_') {
                write(out, s, strlen(s));
                write(out, "\n", 1);
        }
@@ -3606,7 +3617,7 @@ loop:
                c = 0;
        }
        unget(c);
-       if (!isalpha(c))
+       if (!isalpha(c) && c != '_')
                scanequals = 0;
        for (;;) {
                c = subgetc('"', foundequals);
@@ -3624,7 +3635,7 @@ loop:
                                foundequals = 1;
                                scanequals  = 0;
                        }
-                       else if (!isalnum(c))
+                       else if (!isalnum(c) && c != '_')
                                scanequals = 0;
                }
                *e.linep++ = c;
@@ -3677,8 +3688,8 @@ int quoted;
        s = e.linep;
        if (c != '{') {
                *e.linep++ = c;
-               if (isalpha(c)) {
-                       while ((c = readc())!=0 && isalnum(c))
+               if (isalpha(c) || c == '_') {
+                       while ((c = readc())!=0 && (isalnum(c) || c == '_'))
                                if (e.linep < elinep)
                                        *e.linep++ = c;
                        unget(c);
@@ -4247,7 +4258,7 @@ readc()
                        if (multiline)
                            return e.iop->prev = 0;
                        if (interactive && e.iop == iostack+1) {
-#ifdef BB_FEATURE_COMMAND_EDITING
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
                            current_prompt=prompt->value;
 #else
                            prs(prompt->value);
@@ -4441,9 +4452,7 @@ register struct ioarg *ap;
          if ((i = ap->afid != bp->id) || bp->bufp == bp->ebufp) {
            if (i)
              lseek(ap->afile, ap->afpos, 0);
-           do {
-             i = read(ap->afile, bp->buf, sizeof(bp->buf));
-           } while (i < 0 && errno == EINTR);
+           i = safe_read(ap->afile, bp->buf, sizeof(bp->buf));
            if (i <= 0) {
              closef(ap->afile);
              return 0;
@@ -4455,14 +4464,13 @@ register struct ioarg *ap;
          return *bp->bufp++ & 0177;
        }
 
-#ifdef BB_FEATURE_COMMAND_EDITING
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
        if (interactive) {
            static char mycommand[BUFSIZ];
            static int position = 0, size = 0;
 
            while (size == 0 || position >= size) {
                cmdedit_read_input(current_prompt, mycommand);
-               cmdedit_terminate();
                size = strlen(mycommand);
                position = 0;
            }
@@ -4472,9 +4480,7 @@ register struct ioarg *ap;
        } else 
 #endif
        {
-               do {
-                       i = read(ap->afile, &c, sizeof(c));
-               } while (i < 0 && errno == EINTR);
+               i = safe_read(ap->afile, &c, sizeof(c));
                return(i == sizeof(c)? c&0177: (closef(ap->afile), 0));
        }
 }
@@ -4717,7 +4723,7 @@ int ec;
                e.iobase = e.iop;
                for (;;) {
                    if (interactive && e.iop <= iostack) {
-#ifdef BB_FEATURE_COMMAND_EDITING
+#ifdef CONFIG_FEATURE_COMMAND_EDITING
                            current_prompt=cprompt->value;
 #else
                            prs(cprompt->value);