emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Bryan Rittmeyer -- be more conservative by default

Browse Source 
with the lash prompt.
 -Erik
This commit is contained in:
Eric Andersen 2001-01-30 23:40:39 +00:00
parent ac21e93a3f
commit 22332fd26f
4 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Config.h
View File

@ -262,9 +262,15 @@
// Only relevant if BB_SH is enabled.
#define BB_FEATURE_SH_TAB_COMPLETION
//
// Enable a simpler shell prompt of the form "path #" instead of the default
// "[username@hostname path]#". Some deeply embedded systems don't have
// usernames or even hostnames and the default prompt can look rather hideous
// on them. Uncomment this option for a simpler, path-only prompt (which was
// the default until around BusyBox-0.48):
#define BB_FEATURE_SH_SIMPLE_PROMPT
//
// Attempts to match usernames in a ~-prefixed path
// XXX: Doesn't work without NSS, off by default
//#define BB_FEATURE_USERNAME_COMPLETION /* require NSS */
//#define BB_FEATURE_USERNAME_COMPLETION
//
//Turn on extra fbset options
//#define BB_FEATURE_FBSET_FANCY

20
lash.c
View File

@ -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;

20
sh.c
View File

@ -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;

20
shell/lash.c
View File

@ -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;