sh: Simplify handling of newlines in command substitution.
Unless we need to split on newlines, just append them as normal and remove them at the end.
This commit is contained in:
parent
b6ecf43450
commit
d4993b6db2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=317559
@ -462,6 +462,7 @@ expbackq(union node *cmd, int quoted, int flag, struct worddest *dst)
|
||||
int quotes = flag & (EXP_GLOB | EXP_CASE);
|
||||
size_t nnl;
|
||||
const char *ifs;
|
||||
int startloc;
|
||||
|
||||
INTOFF;
|
||||
p = grabstackstr(dest);
|
||||
@ -469,6 +470,7 @@ expbackq(union node *cmd, int quoted, int flag, struct worddest *dst)
|
||||
ungrabstackstr(p, dest);
|
||||
|
||||
p = in.buf;
|
||||
startloc = dest - stackblock();
|
||||
nnl = 0;
|
||||
if (!quoted && flag & EXP_SPLIT)
|
||||
ifs = ifsset() ? ifsval() : " \t\n";
|
||||
@ -490,31 +492,24 @@ expbackq(union node *cmd, int quoted, int flag, struct worddest *dst)
|
||||
lastc = *p++;
|
||||
if (lastc == '\0')
|
||||
continue;
|
||||
if (lastc == '\n') {
|
||||
nnl++;
|
||||
} else {
|
||||
if (nnl > 0) {
|
||||
if (strchr(ifs, '\n') != NULL) {
|
||||
if (nnl > 0 && lastc != '\n') {
|
||||
NEXTWORD('\n', flag, dest, dst);
|
||||
nnl = 0;
|
||||
} else {
|
||||
CHECKSTRSPACE(nnl + 2, dest);
|
||||
while (nnl > 0) {
|
||||
nnl--;
|
||||
USTPUTC('\n', dest);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (strchr(ifs, lastc) != NULL)
|
||||
if (strchr(ifs, lastc) != NULL) {
|
||||
if (lastc == '\n')
|
||||
nnl++;
|
||||
else
|
||||
NEXTWORD(lastc, flag, dest, dst);
|
||||
else {
|
||||
} else {
|
||||
CHECKSTRSPACE(2, dest);
|
||||
if (quotes && syntax[(int)lastc] == CCTL)
|
||||
USTPUTC(CTLESC, dest);
|
||||
USTPUTC(lastc, dest);
|
||||
}
|
||||
}
|
||||
}
|
||||
while (dest > stackblock() + startloc && STTOPC(dest) == '\n')
|
||||
STUNPUTC(dest);
|
||||
|
||||
if (in.fd >= 0)
|
||||
close(in.fd);
|
||||
|
Loading…
Reference in New Issue
Block a user