IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Doxygen/comment style for make_filter_cmd().

Browse Source
This commit is contained in:
Scott Prager 2014-07-23 12:25:13 -04:00
parent b9553bd038
commit 284539f395
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/nvim/ex_cmds.c
View File

@ -1307,19 +1307,16 @@ do_shell (
apply_autocmds(EVENT_SHELLCMDPOST, NULL, NULL, FALSE, curbuf); apply_autocmds(EVENT_SHELLCMDPOST, NULL, NULL, FALSE, curbuf);
} }
/* /// Create a shell command from a command string, input redirection file and
* Create a shell command from a command string, input redirection file and /// output redirection file.
* output redirection file. ///
* Returns an allocated string with the shell command. /// @param cmd Command to execute.
*/ /// @param itmp NULL or the input file.
char_u * /// @param otmp NULL or the output file.
make_filter_cmd ( /// @returns an allocated string with the shell command.
char_u *cmd, /* command */ char_u *make_filter_cmd(char_u *cmd, char_u *itmp, char_u *otmp)
char_u *itmp, /* NULL or name of input file */
char_u *otmp /* NULL or name of output file */
)
{ {
size_t len = STRLEN(cmd) + 1; // len + NLL size_t len = STRLEN(cmd) + 1; // At least enough space for cmd + NULL.
len += sizeof("("")") - 1; len += sizeof("("")") - 1;
if (itmp != NULL) if (itmp != NULL)
len += STRLEN(itmp) + sizeof(" { "" < "" } ") - 1; len += STRLEN(itmp) + sizeof(" { "" < "" } ") - 1;
@ -1328,10 +1325,8 @@ make_filter_cmd (
char_u *buf = xmalloc(len); char_u *buf = xmalloc(len);
#if defined(UNIX) #if defined(UNIX)
/* // Put braces around the command (for concatenated commands) when
* Put braces around the command (for concatenated commands) when // redirecting input and/or output.
* redirecting input and/or output.
*/
if (itmp != NULL || otmp != NULL) if (itmp != NULL || otmp != NULL)
vim_snprintf((char *)buf, len, "(%s)", (char *)cmd); vim_snprintf((char *)buf, len, "(%s)", (char *)cmd);
else else
@ -1341,19 +1336,15 @@ make_filter_cmd (
STRCAT(buf, itmp); STRCAT(buf, itmp);
} }
#else #else
/* // for shells that don't understand braces around commands, at least allow
* for shells that don't understand braces around commands, at least allow // the use of commands in a pipe.
* the use of commands in a pipe.
*/
STRCPY(buf, cmd); STRCPY(buf, cmd);
if (itmp != NULL) { if (itmp != NULL) {
char_u *p; char_u *p;
/* // If there is a pipe, we have to put the '<' in front of it.
* If there is a pipe, we have to put the '<' in front of it. // Don't do this when 'shellquote' is not empty, otherwise the
* Don't do this when 'shellquote' is not empty, otherwise the // redirection would be inside the quotes.
* redirection would be inside the quotes.
*/
if (*p_shq == NUL) { if (*p_shq == NUL) {
p = vim_strchr(buf, '|'); p = vim_strchr(buf, '|');
if (p != NULL) if (p != NULL)
@ -1364,7 +1355,7 @@ make_filter_cmd (
if (*p_shq == NUL) { if (*p_shq == NUL) {
p = vim_strchr(cmd, '|'); p = vim_strchr(cmd, '|');
if (p != NULL) { if (p != NULL) {
STRCAT(buf, " "); /* insert a space before the '|' for DOS */ STRCAT(buf, " "); // Insert a space before the '|' for DOS
STRCAT(buf, p); STRCAT(buf, p);
} }
} }