diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input.c | 6 | ||||
| -rw-r--r-- | src/parser.c | 66 |
2 files changed, 37 insertions, 35 deletions
diff --git a/src/input.c b/src/input.c index 17544e7..4167bd1 100644 --- a/src/input.c +++ b/src/input.c @@ -152,12 +152,8 @@ retry: static const char *rl_cp; static int el_len; - if (rl_cp == NULL) { - struct stackmark smark; - pushstackmark(&smark, stackblocksize()); + if (rl_cp == NULL) rl_cp = el_gets(el, &el_len); - popstackmark(&smark); - } if (rl_cp == NULL) nr = 0; else { diff --git a/src/parser.c b/src/parser.c index fc9af07..3cebb25 100644 --- a/src/parser.c +++ b/src/parser.c @@ -107,6 +107,9 @@ struct heredoc *heredoc; int quoteflag; /* set if (part of) last token was quoted */ +static char *promptcache; + + STATIC union node *list(int); STATIC union node *andor(void); STATIC union node *pipeline(void); @@ -1544,27 +1547,6 @@ synerror(const char *msg) /* NOTREACHED */ } -STATIC void -setprompt(int which) -{ - struct stackmark smark; - int show; - - needprompt = 0; - whichprompt = which; - -#ifdef SMALL - show = 1; -#else - show = !el; -#endif - if (show) { - pushstackmark(&smark, stackblocksize()); - out2str(getprompt(NULL)); - popstackmark(&smark); - } -} - const char * expandstr(const char *ps) { @@ -1614,22 +1596,25 @@ out: return result; } -/* - * called by editline -- any expansions to the prompt - * should be added here. - */ -const char * -getprompt(void *unused) +STATIC void +setprompt(int which) { + struct stackmark smark; const char *prompt; + int show; + + needprompt = 0; + whichprompt = which; switch (whichprompt) { default: #ifdef DEBUG - return "<internal prompt error>"; + prompt = "<internal prompt error>"; + break; #endif case 0: - return nullstr; + prompt = nullstr; + break; case 1: prompt = ps1val(); break; @@ -1638,7 +1623,28 @@ getprompt(void *unused) break; } - return expandstr(prompt); +#ifdef SMALL + show = 1; +#else + show = !el; +#endif + pushstackmark(&smark, stackblocksize()); + if (show) { + out2str(expandstr(prompt)); + } else { + free(promptcache); + promptcache = savestr(expandstr(prompt)); + } + popstackmark(&smark); +} + +/* + * called by editline -- return the cached prompt expansion. + */ +const char * +getprompt(void *unused) +{ + return promptcache; } const char *const * |