diff options
| author | kaiw <kaiw@FreeBSD.org> | 2014-01-28 19:12:31 +0000 |
|---|---|---|
| committer | kaiw <kaiw@FreeBSD.org> | 2014-01-28 19:12:31 +0000 |
| commit | 9c3c6fdae0b43f1bbd5486754c20e403fc83c3b6 (patch) | |
| tree | c000f1bf7a21df619e5cc1ac52b3edc991b884d0 /bin/sh/input.c | |
| parent | 0fb1cfad9518e33fe20de1d9d694d0d5c2044fa2 (diff) | |
| parent | 17e24564634134c9b7145fcf8d1c7d51b93c3182 (diff) | |
| download | FreeBSD-src-9c3c6fdae0b43f1bbd5486754c20e403fc83c3b6.zip FreeBSD-src-9c3c6fdae0b43f1bbd5486754c20e403fc83c3b6.tar.gz | |
MFH@261240.
Diffstat (limited to 'bin/sh/input.c')
| -rw-r--r-- | bin/sh/input.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/sh/input.c b/bin/sh/input.c index da225bc..05cc1eb 100644 --- a/bin/sh/input.c +++ b/bin/sh/input.c @@ -367,12 +367,16 @@ popstring(void) struct strpush *sp = parsefile->strpush; INTOFF; + if (sp->ap) { + if (parsenextc != sp->ap->val && + (parsenextc[-1] == ' ' || parsenextc[-1] == '\t')) + forcealias(); + sp->ap->flag &= ~ALIASINUSE; + } parsenextc = sp->prevstring; parsenleft = sp->prevnleft; parselleft = sp->prevlleft; /*out2fmt_flush("*** calling popstring: restoring to '%s'\n", parsenextc);*/ - if (sp->ap) - sp->ap->flag &= ~ALIASINUSE; parsefile->strpush = sp->prev; if (sp != &(parsefile->basestrpush)) ckfree(sp); |
