Updates from both Vladimir and Larry

[oweals/busybox.git] / lash.c

diff --git a/lash.c b/lash.c
index 89a8fe6a50e21fdf43f65a1cce10e9ea4cb68a13..f1200ba951f5a530f7d9b9e66f080096d9915494 100644 (file)
--- a/lash.c
+++ b/lash.c
@@ -416,7 +416,7 @@ static int builtin_pwd(struct child_prog *dummy)
        cwd = xgetcwd((char *)cwd);
        if (!cwd)
                cwd = unknown;
-       printf( "%s\n", cwd);
+       puts(cwd);
        return EXIT_SUCCESS;
 }
 
@@ -429,14 +429,14 @@ static int builtin_export(struct child_prog *child)
        if (v == NULL) {
                char **e;
                for (e = environ; *e; e++) {
-                       printf( "%s\n", *e);
+                       puts(*e);
                }
                return 0;
        }
        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)