diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sh/expand.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/bin/sh/expand.c b/bin/sh/expand.c index e3748ab0095d..214f53a9b224 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -437,6 +437,7 @@ expbackq(union node *cmd, int quoted, int flag) char const *syntax = quoted? DQSYNTAX : BASESYNTAX; int saveherefd; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); + int nnl; INTOFF; saveifs = ifsfirst; @@ -454,6 +455,8 @@ expbackq(union node *cmd, int quoted, int flag) p = in.buf; lastc = '\0'; + nnl = 0; + /* Don't copy trailing newlines */ for (;;) { if (--in.nleft < 0) { if (in.fd < 0) @@ -469,14 +472,18 @@ expbackq(union node *cmd, int quoted, int flag) if (lastc != '\0') { if (quotes && syntax[(int)lastc] == CCTL) STPUTC(CTLESC, dest); - STPUTC(lastc, dest); + if (lastc == '\n') { + nnl++; + } else { + while (nnl > 0) { + nnl--; + STPUTC('\n', dest); + } + STPUTC(lastc, dest); + } } } - /* Eat all trailing newlines */ - for (p--; lastc == '\n'; lastc = *--p) - STUNPUTC(dest); - if (in.fd >= 0) close(in.fd); if (in.buf) |