thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1506

Browse Source 
Problem:    Job cannot read from a file.
Solution:   Implement reading from a file for Unix.
This commit is contained in:
Bram Moolenaar
2016-03-06 23:06:25 +01:00
parent d0b6502a7a
commit b69fccf377
5 changed files with 85 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/os_win32.c
View File

@@ -5000,6 +5000,7 @@ mch_start_job(char *cmd, job_T *job, jobopt_T *options)
HANDLE jo;
# ifdef FEAT_CHANNEL
channel_T *channel;
int use_file_for_in = options->jo_io[PART_IN] == JIO_FILE;
int use_out_for_err = options->jo_io[PART_ERR] == JIO_OUT;
HANDLE ifd[2];
HANDLE ofd[2];
@@ -5035,13 +5036,25 @@ mch_start_job(char *cmd, job_T *job, jobopt_T *options)
saAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
saAttr.bInheritHandle = TRUE;
saAttr.lpSecurityDescriptor = NULL;
if (!CreatePipe(&ifd[0], &ifd[1], &saAttr, 0)
|| !pSetHandleInformation(ifd[1], HANDLE_FLAG_INHERIT, 0)
|| !CreatePipe(&ofd[0], &ofd[1], &saAttr, 0)
|| !pSetHandleInformation(ofd[0], HANDLE_FLAG_INHERIT, 0)
|| (!use_out_for_err
if (use_file_for_in)
{
char_u *fname = options->jo_io_name[PART_IN];
// TODO
EMSG2(_(e_notopen), fname);
goto failed;
}
else if (!CreatePipe(&ifd[0], &ifd[1], &saAttr, 0)
|| !pSetHandleInformation(ifd[1], HANDLE_FLAG_INHERIT, 0))
goto failed;
if (!CreatePipe(&ofd[0], &ofd[1], &saAttr, 0)
|| !pSetHandleInformation(ofd[0], HANDLE_FLAG_INHERIT, 0))
goto failed;
if (!use_out_for_err
&& (!CreatePipe(&efd[0], &efd[1], &saAttr, 0)
|| !pSetHandleInformation(efd[0], HANDLE_FLAG_INHERIT, 0))))
|| !pSetHandleInformation(efd[0], HANDLE_FLAG_INHERIT, 0)))
goto failed;
si.dwFlags |= STARTF_USESTDHANDLES;
si.hStdInput = ifd[0];