Extract shell_count_argc from mch_call_shell

This commit is contained in:
Thiago de Arruda
2014-03-29 12:41:18 -03:00
parent 2d28251a6e
commit 8a61c27b1e
3 changed files with 37 additions and 23 deletions

View File

@@ -1723,26 +1723,7 @@ int options; /* SHELL_*, see vim.h */
// Count the number of arguments for the shell
p = newcmd;
argc = 0;
while (true) {
++argc;
shell_skip_word(&p);
if (*p == NUL)
break;
// Move to the next word
p = skipwhite(p);
}
// Account for multiple args in p_shcf('shellcmdflag' option)
p = p_shcf;
while (true) {
// Same as above, but doesn't need to take quotes into consideration
p = skiptowhite(p);
if (*p == NUL)
break;
++argc;
p = skipwhite(p);
}
argc = shell_count_argc(&p);
// Allocate argv memory
argv = (char **)alloc((unsigned)((argc + 4) * sizeof(char *)));