diff options
author | June McEnroe <june@causal.agency> | 2019-01-10 21:07:26 -0500 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2019-01-10 21:10:33 -0500 |
commit | 1ca02130e9838cdd223abad9e147c8178055683f (patch) | |
tree | d3009752bb4f3f2b02809e439687e4054b97c094 /bin/cash/parser.c | |
parent | Fix unused copyright and rcsid in cash (diff) | |
download | src-1ca02130e9838cdd223abad9e147c8178055683f.tar.gz src-1ca02130e9838cdd223abad9e147c8178055683f.zip |
Set RPROMPT from RPS1 and RPS2
Diffstat (limited to '')
-rw-r--r-- | bin/cash/parser.c | 84 |
1 files changed, 58 insertions, 26 deletions
diff --git a/bin/cash/parser.c b/bin/cash/parser.c index 5a7c7876..86c09776 100644 --- a/bin/cash/parser.c +++ b/bin/cash/parser.c @@ -1969,35 +1969,11 @@ pgetc_linecont(void) return (c); } -/* - * called by editline -- any expansions to the prompt - * should be added here. - */ -char * -getprompt(void *unused __unused) -{ +static char * +expandprompt(const char *fmt) { static char ps[PROMPTLEN]; - const char *fmt; const char *pwd; int i, trim; - static char internal_error[] = "??"; - - /* - * Select prompt format. - */ - switch (whichprompt) { - case 0: - fmt = ""; - break; - case 1: - fmt = ps1val(); - break; - case 2: - fmt = ps2val(); - break; - default: - return internal_error; - } /* * Format prompt string. @@ -2077,6 +2053,62 @@ getprompt(void *unused __unused) return (ps); } +/* + * called by editline -- any expansions to the prompt + * should be added here. + */ +char * +getprompt(void *unused __unused) +{ + const char *fmt; + static char internal_error[] = "??"; + + /* + * Select prompt format. + */ + switch (whichprompt) { + case 0: + fmt = ""; + break; + case 1: + fmt = ps1val(); + break; + case 2: + fmt = ps2val(); + break; + default: + return internal_error; + } + + return expandprompt(fmt); +} + +char * +getrprompt(void *unused __unused) +{ + const char *fmt; + static char internal_error[] = "??"; + + /* + * Select prompt format. + */ + switch (whichprompt) { + case 0: + fmt = ""; + break; + case 1: + fmt = rps1val(); + break; + case 2: + fmt = rps2val(); + break; + default: + return internal_error; + } + + return expandprompt(fmt); +} + const char * expandstr(const char *ps) |