Macintosh-SW/mpw-shell
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw-shell.git synced 2024-12-22 17:29:56 +00:00
Code Issues Projects Releases Wiki Activity

remove trailing newline from sub-shell strings.

Browse Source
This commit is contained in:
Kelvin Sherlock 2017-11-26 14:02:59 -05:00
parent 9d4340b3ac
commit 5d95f10dd8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mpw-shell-expand.rl
View File

@ -157,6 +157,14 @@ std::string subshell(const std::string &s, Environment &env, const fdmask &fds)
}
tmp.append(buffer, buffer + len);
}
/* if present, a trailing carriage return is stripped */
if (!tmp.empty()) {
if (tmp.back() == '\r' || tmp.back() == '\n') tmp.pop_back();
}
std::transform(tmp.begin(), tmp.end(), tmp.begin(), [](uint8_t x){
if (x == '\r' || x == '\n') x = ' ';
return x;