X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=shell%2Fmsh.c;h=62e6b6e01e1640eac11df651d8ea4228c519c002;hb=830d258dee032b0a6902e037ea4c57db8fb47d78;hp=39aecdf109b41e40aecba67262bfebe10f362b24;hpb=1781188a9d6ee045a72f37b86102380909e04539;p=oweals%2Fbusybox.git

diff --git a/shell/msh.c b/shell/msh.c
index 39aecdf10..62e6b6e01 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -27,6 +27,7 @@
  * Original copyright notice is retained at the end of this file.
  */
 
+#include "busybox.h"
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
@@ -46,7 +47,6 @@
 #include <sys/wait.h>
 
 #include "cmdedit.h"
-#include "busybox.h"
 
 
 /* Conditional use of "register" keyword */
@@ -93,6 +93,15 @@ int mshdbg_rc = 0;
 #endif							/* MSHDEBUG */
 
 
+#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
+# define DEFAULT_ROOT_PROMPT "\\u:\\w> "
+# define DEFAULT_USER_PROMPT "\\u:\\w$ "
+#else
+# define DEFAULT_ROOT_PROMPT "# "
+# define DEFAULT_USER_PROMPT "$ "
+#endif
+
+
 /* -------- sh.h -------- */
 /*
  * shell
@@ -877,9 +886,9 @@ int msh_main(int argc, char **argv)
 #ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
 	if (prompt->value == null)
 #endif
-		setval(prompt, "$ ");
+		setval(prompt, DEFAULT_USER_PROMPT);
 	if (geteuid() == 0) {
-		setval(prompt, "# ");
+		setval(prompt, DEFAULT_ROOT_PROMPT);
 		prompt->status &= ~EXPORT;
 	}
 	cprompt = lookup("PS2");
@@ -1621,7 +1630,7 @@ REGISTER int sub;
 
 static void initarea()
 {
-	brkaddr = malloc(AREASIZE);
+	brkaddr = xmalloc(AREASIZE);
 	brktop = brkaddr + AREASIZE;
 
 	while ((long) sbrk(0) & ALIGN)
@@ -3031,7 +3040,7 @@ forkexec(REGISTER struct op *t, int *pin, int *pout, int act, char **wp)
 	} else {
 		/* put non-interactive processes into a different process group.
 		 * we don't support jobs, but this is at least sane: see Bug 659 */
-		setpgrp();
+		bb_setpgrp;
 	}
 
 	if (t->type == TPAREN)