mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tests): introduce testprg()

Browse Source 
Also:
- Add a describe('shell :!') section to system_spec.
- Make the test for #16271 work on systems without powershell.
This commit is contained in:
Justin M. Keyes
2022-06-22 05:51:52 -07:00
parent 0b9664f524
commit f977f9445f
22 changed files with 117 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/ex_cmds.c
View File

@@ -1579,11 +1579,11 @@ char *make_filter_cmd(char *cmd, char *itmp, char *otmp)
size_t len = STRLEN(cmd) + 1; // At least enough space for cmd + NULL.
len += is_fish_shell ? sizeof("begin; " "; end") - 1
: is_pwsh ? STRLEN("Start-Process ")
: is_pwsh ? sizeof("Start-Process ")
: sizeof("(" ")") - 1;
if (itmp != NULL) {
len += is_pwsh ? STRLEN(itmp) + STRLEN(" -RedirectStandardInput ")
len += is_pwsh ? STRLEN(itmp) + sizeof(" -RedirectStandardInput ")
: STRLEN(itmp) + sizeof(" { " " < " " } ") - 1;
}
if (otmp != NULL) {
@@ -1596,7 +1596,7 @@ char *make_filter_cmd(char *cmd, char *itmp, char *otmp)
// redirecting input and/or output.
if (is_pwsh) {
xstrlcpy(buf, "Start-Process ", len);
xstrlcat(buf, (char *)cmd, len);
xstrlcat(buf, cmd, len);
} else if (itmp != NULL || otmp != NULL) {
char *fmt = is_fish_shell ? "begin; %s; end"
: "(%s)";
@@ -1611,16 +1611,16 @@ char *make_filter_cmd(char *cmd, char *itmp, char *otmp)
} else {
xstrlcat(buf, " < ", len - 1);
}
xstrlcat(buf, (const char *)itmp, len - 1);
xstrlcat(buf, itmp, len - 1);
}
#else
// For shells that don't understand braces around commands, at least allow
// the use of commands in a pipe.
if (is_pwsh) {
xstrlcpy(buf, "Start-Process ", len);
xstrlcat(buf, (char *)cmd, len);
xstrlcat(buf, cmd, len);
} else {
xstrlcpy(buf, (char *)cmd, len);
xstrlcpy(buf, cmd, len);
}
if (itmp != NULL) {
// If there is a pipe, we have to put the '<' in front of it.
@@ -1637,9 +1637,9 @@ char *make_filter_cmd(char *cmd, char *itmp, char *otmp)
} else {
xstrlcat(buf, " < ", len);
}
xstrlcat(buf, (const char *)itmp, len);
xstrlcat(buf, itmp, len);
if (*p_shq == NUL) {
const char *const p = find_pipe((const char *)cmd);
const char *const p = find_pipe(cmd);
if (p != NULL) {
xstrlcat(buf, " ", len - 1); // Insert a space before the '|' for DOS
xstrlcat(buf, p, len - 1);