Some more patchelttes from Larry Doolittle.

[oweals/busybox.git] / lash.c

diff --git a/lash.c b/lash.c
index cb17e2d752aae3de11733274af89678cdba0a1e8..3a421b3725fd4ab5badb491f9ca26654cc01c834 100644 (file)
--- a/lash.c
+++ b/lash.c
@@ -436,7 +436,7 @@ static int builtin_export(struct child_prog *child)
        res = putenv(v);
        if (res)
                fprintf(stderr, "export: %m\n");
-#ifndef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifdef BB_FEATURE_SH_FANCY_PROMPT
        if (strncmp(v, "PS1=", 4)==0)
                PS1 = getenv("PS1");
 #endif
@@ -809,7 +809,7 @@ static void restore_redirects(int squirrel[])
 
 static inline void cmdedit_set_initial_prompt(void)
 {
-#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifndef BB_FEATURE_SH_FANCY_PROMPT
        PS1 = NULL;
 #else
        PS1 = getenv("PS1");
@@ -820,7 +820,7 @@ static inline void cmdedit_set_initial_prompt(void)
 
 static inline void setup_prompt_string(char **prompt_str)
 {
-#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
+#ifndef BB_FEATURE_SH_FANCY_PROMPT
        /* Set up the prompt */
        if (shell_context == 0) {
                if (PS1)
@@ -1076,9 +1076,9 @@ static int expand_arguments(char *command)
                                else
                                        var = itoa(last_bg_pid);
                                break;
-                               /* Everything else like $$, $#, $[0-9], etc should all be
+                               /* Everything else like $$, $#, $[0-9], etc. should all be
                                 * expanded by wordexp(), so we can in theory skip that stuff
-                                * here, but just to be on the safe side (i.e. since uClibc
+                                * here, but just to be on the safe side (i.e., since uClibc
                                 * wordexp doesn't do this stuff yet), lets leave it in for
                                 * now. */
                        case '$':