projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use bb_xbind/bb_xlisten
[oweals/busybox.git]
/
shell
/
msh.c
diff --git
a/shell/msh.c
b/shell/msh.c
index 39aecdf109b41e40aecba67262bfebe10f362b24..62e6b6e01e1640eac11df651d8ea4228c519c002 100644
(file)
--- a/
shell/msh.c
+++ b/
shell/msh.c
@@
-27,6
+27,7
@@
* Original copyright notice is retained at the end of this file.
*/
* Original copyright notice is retained at the end of this file.
*/
+#include "busybox.h"
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
@@
-46,7
+47,6
@@
#include <sys/wait.h>
#include "cmdedit.h"
#include <sys/wait.h>
#include "cmdedit.h"
-#include "busybox.h"
/* Conditional use of "register" keyword */
/* Conditional use of "register" keyword */
@@
-93,6
+93,15
@@
int mshdbg_rc = 0;
#endif /* MSHDEBUG */
#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
/* -------- 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
#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
if (prompt->value == null)
#endif
- setval(prompt,
"$ "
);
+ setval(prompt,
DEFAULT_USER_PROMPT
);
if (geteuid() == 0) {
if (geteuid() == 0) {
- setval(prompt,
"# "
);
+ setval(prompt,
DEFAULT_ROOT_PROMPT
);
prompt->status &= ~EXPORT;
}
cprompt = lookup("PS2");
prompt->status &= ~EXPORT;
}
cprompt = lookup("PS2");
@@
-1621,7
+1630,7
@@
REGISTER int sub;
static void initarea()
{
static void initarea()
{
- brkaddr = malloc(AREASIZE);
+ brkaddr =
x
malloc(AREASIZE);
brktop = brkaddr + AREASIZE;
while ((long) sbrk(0) & ALIGN)
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 */
} 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)
}
if (t->type == TPAREN)