diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-01-30 23:40:39 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-01-30 23:40:39 +0000 |
| commit | 22332fd26f7d37da7ae47c15ecab6edd6a107af3 (patch) | |
| tree | 7a2de2ff3f12fcb11c085e2ffb932dcbfcc21c0b /shell | |
| parent | ac21e93a3fcac80d33cae6a69ef395fc74ba597b (diff) | |
| download | busybox-w32-22332fd26f7d37da7ae47c15ecab6edd6a107af3.tar.gz busybox-w32-22332fd26f7d37da7ae47c15ecab6edd6a107af3.tar.bz2 busybox-w32-22332fd26f7d37da7ae47c15ecab6edd6a107af3.zip | |
Patch from Bryan Rittmeyer -- be more conservative by default
with the lash prompt.
-Erik
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/lash.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/shell/lash.c b/shell/lash.c index bd6945605..b3bdcc986 100644 --- a/shell/lash.c +++ b/shell/lash.c | |||
| @@ -779,6 +779,24 @@ static void restore_redirects(int squirrel[]) | |||
| 779 | } | 779 | } |
| 780 | } | 780 | } |
| 781 | 781 | ||
| 782 | #if defined(BB_FEATURE_SH_SIMPLE_PROMPT) | ||
| 783 | static char* setup_prompt_string(int state) | ||
| 784 | { | ||
| 785 | char prompt_str[BUFSIZ]; | ||
| 786 | |||
| 787 | /* Set up the prompt */ | ||
| 788 | if (state == 0) { | ||
| 789 | /* simple prompt */ | ||
| 790 | sprintf(prompt_str, "%s %s", cwd, ( geteuid() != 0 ) ? "$ ":"# "); | ||
| 791 | } else { | ||
| 792 | strcpy(prompt_str,"> "); | ||
| 793 | } | ||
| 794 | |||
| 795 | return(strdup(prompt_str)); /* Must free this memory */ | ||
| 796 | } | ||
| 797 | |||
| 798 | #else | ||
| 799 | |||
| 782 | static char* setup_prompt_string(int state) | 800 | static char* setup_prompt_string(int state) |
| 783 | { | 801 | { |
| 784 | char user[9],buf[255],*s; | 802 | char user[9],buf[255],*s; |
| @@ -810,6 +828,8 @@ static char* setup_prompt_string(int state) | |||
| 810 | return(strdup(prompt_str)); /* Must free this memory */ | 828 | return(strdup(prompt_str)); /* Must free this memory */ |
| 811 | } | 829 | } |
| 812 | 830 | ||
| 831 | #endif | ||
| 832 | |||
| 813 | static int get_command(FILE * source, char *command) | 833 | static int get_command(FILE * source, char *command) |
| 814 | { | 834 | { |
| 815 | char *prompt_str; | 835 | char *prompt_str; |