diff options
| -rw-r--r-- | bin/cash/histedit.c | 1 | ||||
| -rw-r--r-- | bin/cash/parser.c | 84 | ||||
| -rw-r--r-- | bin/cash/parser.h | 1 | ||||
| -rw-r--r-- | bin/cash/var.c | 6 | ||||
| -rw-r--r-- | bin/cash/var.h | 4 |
5 files changed, 70 insertions, 26 deletions
diff --git a/bin/cash/histedit.c b/bin/cash/histedit.c index a568ea05..581925d8 100644 --- a/bin/cash/histedit.c +++ b/bin/cash/histedit.c @@ -122,6 +122,7 @@ histedit(void) if (hist) el_set(el, EL_HIST, history, hist); el_set(el, EL_PROMPT, getprompt); + el_set(el, EL_RPROMPT, getrprompt); el_set(el, EL_ADDFN, "sh-complete", "Filename completion", _el_fn_sh_complete); 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) diff --git a/bin/cash/parser.h b/bin/cash/parser.h index 87337340..bc86f7e4 100644 --- a/bin/cash/parser.h +++ b/bin/cash/parser.h @@ -84,4 +84,5 @@ void fixredir(union node *, const char *, int); int goodname(const char *); int isassignment(const char *); char *getprompt(void *); +char *getrprompt(void *); const char *expandstr(const char *); diff --git a/bin/cash/var.c b/bin/cash/var.c index 9edad579..6797efdb 100644 --- a/bin/cash/var.c +++ b/bin/cash/var.c @@ -95,6 +95,8 @@ struct var vpath; struct var vps1; struct var vps2; struct var vps4; +struct var vrps1; +struct var vrps2; static struct var voptind; struct var vdisvfork; @@ -121,6 +123,10 @@ static const struct varinit varinit[] = { NULL }, { &vps4, 0, "PS4=+ ", NULL }, + { &vrps1, VUNSET, "RPS1=", + NULL }, + { &vrps2, VUNSET, "RPS2=", + NULL }, #ifndef NO_HISTORY { &vterm, VUNSET, "TERM=", setterm }, diff --git a/bin/cash/var.h b/bin/cash/var.h index 795b1893..9ebb7765 100644 --- a/bin/cash/var.h +++ b/bin/cash/var.h @@ -80,6 +80,8 @@ extern struct var vpath; extern struct var vps1; extern struct var vps2; extern struct var vps4; +extern struct var vrps1; +extern struct var vrps2; extern struct var vdisvfork; #ifndef NO_HISTORY extern struct var vhistsize; @@ -104,6 +106,8 @@ extern int initial_localeisutf8; #define ps1val() (vps1.text + 4) #define ps2val() (vps2.text + 4) #define ps4val() (vps4.text + 4) +#define rps1val() (vrps1.text + 5) +#define rps2val() (vrps2.text + 5) #define optindval() (voptind.text + 7) #ifndef NO_HISTORY #define histsizeval() (vhistsize.text + 9) |