Patch from Bryan Rittmeyer -- be more conservative by default

with the lash prompt.
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@1720 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 20 insertions, 0 deletions

diff --git a/sh.c b/sh.c
index bd6945605..b3bdcc986 100644
--- a/sh.c
+++ b/sh.c
@@ -779,6 +779,24 @@ static void restore_redirects(int squirrel[])
         }
 }
 
+#if defined(BB_FEATURE_SH_SIMPLE_PROMPT)
+static char* setup_prompt_string(int state)
+{
+       char prompt_str[BUFSIZ];
+
+       /* Set up the prompt */
+       if (state == 0) {
+               /* simple prompt */
+               sprintf(prompt_str, "%s %s", cwd, ( geteuid() != 0 ) ?  "$ ":"# ");
+       } else {
+               strcpy(prompt_str,"> ");
+       }
+
+       return(strdup(prompt_str));  /* Must free this memory */
+}
+
+#else
+
 static char* setup_prompt_string(int state)
 {
         char user[9],buf[255],*s;
@@ -810,6 +828,8 @@ static char* setup_prompt_string(int state)
         return(strdup(prompt_str));  /* Must free this memory */
 }
 
+#endif 
+
 static int get_command(FILE * source, char *command)
 {
         char *prompt_str;