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

eval: reimplement f_system() on top of os_system()

Browse Source 
This evades the tempfile problem (unless of course one manually adds
redirects to the shell commandline, which some plugins seem to do, e.g.:
vim-easytags).
This commit is contained in:
Nicolas Hillegeer
2014-07-21 22:51:04 +02:00
committed by Thiago de Arruda
parent 3d3b233df8
commit 6f30b25f45
1 changed files with 38 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/nvim/eval.c
View File

@@ -14077,76 +14077,58 @@ static void f_synstack(typval_T *argvars, typval_T *rettv)
}
}
/*
* "system()" function
*/
/// f_system - the VimL system() function
static void f_system(typval_T *argvars, typval_T *rettv)
{
char_u *res = NULL;
char_u *p;
char_u *infile = NULL;
char_u buf[NUMBUFLEN];
int err = FALSE;
FILE *fd;
rettv->v_type = VAR_STRING;
rettv->vval.v_string = NULL;
if (check_restricted() || check_secure())
goto done;
if (argvars[1].v_type != VAR_UNKNOWN) {
/*
* Write the string to a temp file, to be used for input of the shell
* command.
*/
if ((infile = vim_tempname()) == NULL) {
EMSG(_(e_notmp));
goto done;
}
fd = mch_fopen((char *)infile, WRITEBIN);
if (fd == NULL) {
EMSG2(_(e_notopen), infile);
goto done;
}
p = get_tv_string_buf_chk(&argvars[1], buf);
if (p == NULL) {
fclose(fd);
goto done; /* type error; errmsg already given */
}
if (fwrite(p, STRLEN(p), 1, fd) != 1)
err = TRUE;
if (fclose(fd) != 0)
err = TRUE;
if (err) {
EMSG(_("E677: Error writing temp file"));
goto done;
}
if (check_restricted() || check_secure()) {
return;
}
res = get_cmd_output(get_tv_string(&argvars[0]), infile,
kShellOptSilent | kShellOptCooked);
// get input to the shell command (if any), and its length
char_u buf[NUMBUFLEN];
const char *input = (argvars[1].v_type != VAR_UNKNOWN)
? (char *) get_tv_string_buf_chk(&argvars[1], buf): NULL;
size_t input_len = input ? strlen(input) : 0;
#ifdef USE_CRNL
/* translate <CR><NL> into <NL> */
// get shell command to execute
const char *cmd = (char *) get_tv_string(&argvars[0]);
// execute the command
size_t nread = 0;
char *res = NULL;
int status = os_system(cmd, input, input_len, &res, &nread);
set_vim_var_nr(VV_SHELL_ERROR, (long) status);
#if defined(USE_CR)
// translate <CR> into <NL>
if (res != NULL) {
char_u *s, *d;
d = res;
for (s = res; *s; ++s) {
if (s[0] == CAR && s[1] == NL)
for (char *s = res; *s; ++s) {
if (*s == CAR) {
*s = NL;
}
}
}
#elif defined(USE_CRNL)
// translate <CR><NL> into <NL>
if (res != NULL) {
char *d = res;
for (char *s = res; *s; ++s) {
if (s[0] == CAR && s[1] == NL) {
++s;
}
*d++ = *s;
}
*d = NUL;
}
#endif
done:
if (infile != NULL) {
os_remove((char *)infile);
free(infile);
}
rettv->v_type = VAR_STRING;
rettv->vval.v_string = res;
rettv->vval.v_string = (char_u *) res;
}
/*