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

make ash prompt the same as other shells if cmdedit and fancyprompt

Browse Source
This commit is contained in:
Tim Riker 2002-04-13 05:37:10 +00:00
parent 85208e2ab9
commit 497a88506e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shell/ash.c
View File

@ -1213,9 +1213,10 @@ static const struct varinit varinit[] = {
NULL }, NULL },
{ &vpath, VSTRFIXED|VTEXTFIXED, defpathvar, { &vpath, VSTRFIXED|VTEXTFIXED, defpathvar,
changepath }, changepath },
/* #if defined(CONFIG_FEATURE_COMMAND_EDITING) && defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
* vps1 depends on uid { &vps1, VSTRFIXED|VTEXTFIXED, "PS1=\\w \\$ ",
*/ NULL },
#endif /* else vps1 depends on uid */
{ &vps2, VSTRFIXED|VTEXTFIXED, "PS2=> ", { &vps2, VSTRFIXED|VTEXTFIXED, "PS2=> ",
NULL }, NULL },
{ &voptind, VSTRFIXED|VTEXTFIXED, "OPTIND=1", { &voptind, VSTRFIXED|VTEXTFIXED, "OPTIND=1",
@ -11896,6 +11897,7 @@ initvar() {
vp->func = ip->func; vp->func = ip->func;
} }
} }
#if !defined(CONFIG_FEATURE_COMMAND_EDITING) || !defined(CONFIG_FEATURE_SH_FANCY_PROMPT)
/* /*
* PS1 depends on uid * PS1 depends on uid
*/ */
@ -11906,6 +11908,7 @@ initvar() {
vps1.text = xstrdup(geteuid() ? "PS1=$ " : "PS1=# "); vps1.text = xstrdup(geteuid() ? "PS1=$ " : "PS1=# ");
vps1.flags = VSTRFIXED|VTEXTFIXED; vps1.flags = VSTRFIXED|VTEXTFIXED;
} }
#endif
} }
/* /*
@ -12430,7 +12433,7 @@ findvar(struct var **vpp, const char *name)
/* /*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org> * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This file contains code for the times builtin. * This file contains code for the times builtin.
* $Id: ash.c,v 1.46 2002/01/09 15:37:36 andersen Exp $ * $Id: ash.c,v 1.47 2002/04/13 05:37:10 timr Exp $
*/ */
static int timescmd (int argc, char **argv) static int timescmd (int argc, char **argv)
{ {