aboutsummaryrefslogtreecommitdiff
path: root/shell/msh.c
diff options
context:
space:
mode:
authorvapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-06-06 06:26:12 +0000
committervapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-06-06 06:26:12 +0000
commit1be893a21293a5c9e26de901adf900fbd3291579 (patch)
tree38887ee4813345e26f857382b4345a664b01542f /shell/msh.c
parent363e899956975832f79279bde65885245c4c60dc (diff)
downloadbusybox-w32-1be893a21293a5c9e26de901adf900fbd3291579.tar.gz
busybox-w32-1be893a21293a5c9e26de901adf900fbd3291579.tar.bz2
busybox-w32-1be893a21293a5c9e26de901adf900fbd3291579.zip
make the default prompt suck less when using fancy prompts
git-svn-id: svn://busybox.net/trunk/busybox@15296 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell/msh.c')
-rw-r--r--shell/msh.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/shell/msh.c b/shell/msh.c
index 8bc769b6e..62e6b6e01 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -93,6 +93,15 @@ int mshdbg_rc = 0;
93#endif /* MSHDEBUG */ 93#endif /* MSHDEBUG */
94 94
95 95
96#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
97# define DEFAULT_ROOT_PROMPT "\\u:\\w> "
98# define DEFAULT_USER_PROMPT "\\u:\\w$ "
99#else
100# define DEFAULT_ROOT_PROMPT "# "
101# define DEFAULT_USER_PROMPT "$ "
102#endif
103
104
96/* -------- sh.h -------- */ 105/* -------- sh.h -------- */
97/* 106/*
98 * shell 107 * shell
@@ -877,9 +886,9 @@ int msh_main(int argc, char **argv)
877#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT 886#ifdef CONFIG_FEATURE_SH_FANCY_PROMPT
878 if (prompt->value == null) 887 if (prompt->value == null)
879#endif 888#endif
880 setval(prompt, "$ "); 889 setval(prompt, DEFAULT_USER_PROMPT);
881 if (geteuid() == 0) { 890 if (geteuid() == 0) {
882 setval(prompt, "# "); 891 setval(prompt, DEFAULT_ROOT_PROMPT);
883 prompt->status &= ~EXPORT; 892 prompt->status &= ~EXPORT;
884 } 893 }
885 cprompt = lookup("PS2"); 894 cprompt = lookup("PS2");