diff options
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index ebed9b50e..7b9b9f1e1 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -7366,9 +7366,14 @@ expbackq(union node *cmd, int flag IF_BASH_PROCESS_SUBST(, int ctl)) | |||
7366 | 7366 | ||
7367 | /* Eat all trailing newlines */ | 7367 | /* Eat all trailing newlines */ |
7368 | dest = expdest; | 7368 | dest = expdest; |
7369 | for (; dest > ((char *)stackblock() + startloc) && (dest[-1] == '\n' | 7369 | for (; dest > ((char *)stackblock() + startloc) && dest[-1] == '\n';) { |
7370 | IF_PLATFORM_MINGW32(|| dest[-1] == '\r'));) | ||
7371 | STUNPUTC(dest); | 7370 | STUNPUTC(dest); |
7371 | #if ENABLE_PLATFORM_MINGW32 | ||
7372 | if (dest > ((char *)stackblock() + startloc) && dest[-1] == '\r') { | ||
7373 | STUNPUTC(dest); | ||
7374 | } | ||
7375 | } | ||
7376 | #endif | ||
7372 | expdest = dest; | 7377 | expdest = dest; |
7373 | 7378 | ||
7374 | if (!(flag & EXP_QUOTED)) | 7379 | if (!(flag & EXP_QUOTED)) |