Mercurial > vim
diff src/channel.c @ 12043:2796a2c9fc17 v8.0.0902
patch 8.0.0902: cannot specify directory or environment for a job
commit https://github.com/vim/vim/commit/05aafed54b50b602315ae55d83a7d089804cecb0
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Aug 11 19:12:11 2017 +0200
patch 8.0.0902: cannot specify directory or environment for a job
Problem: Cannot specify directory or environment for a job.
Solution: Add the "cwd" and "env" arguments to job options. (Yasuhiro
Matsumoto, closes #1160)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 11 Aug 2017 19:15:04 +0200 |
| parents | 85f0f557661e |
| children | 0498547dace0 |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -4153,6 +4153,8 @@ free_job_options(jobopt_T *opt) partial_unref(opt->jo_exit_partial); else if (opt->jo_exit_cb != NULL) func_unref(opt->jo_exit_cb); + if (opt->jo_env != NULL) + dict_unref(opt->jo_env); } /* @@ -4433,6 +4435,26 @@ get_job_options(typval_T *tv, jobopt_T * opt->jo_term_finish = *val; } #endif + else if (STRCMP(hi->hi_key, "env") == 0) + { + if (!(supported & JO2_ENV)) + break; + opt->jo_set |= JO2_ENV; + opt->jo_env = item->vval.v_dict; + ++item->vval.v_dict->dv_refcount; + } + else if (STRCMP(hi->hi_key, "cwd") == 0) + { + if (!(supported & JO2_CWD)) + break; + opt->jo_cwd = get_tv_string_buf_chk(item, opt->jo_cwd_buf); + if (opt->jo_cwd == NULL || !mch_isdir(opt->jo_cwd)) + { + EMSG2(_(e_invarg2), "cwd"); + return FAIL; + } + opt->jo_set |= JO2_CWD; + } else if (STRCMP(hi->hi_key, "waittime") == 0) { if (!(supported & JO_WAITTIME))