Mercurial > vim
comparison src/channel.c @ 18943:d90138662f49 v8.2.0032
patch 8.2.0032: MS-Windows: test for blank job fails
Commit: https://github.com/vim/vim/commit/7c2a2f869b0f5a3e36f5e7d83923a264426e434c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Dec 22 18:28:51 2019 +0100
patch 8.2.0032: MS-Windows: test for blank job fails
Problem: MS-Windows: test for blank job fails
Solution: Check before escaping.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 22 Dec 2019 18:30:03 +0100 |
parents | 70d6614aaf28 |
children | 5c405689da3e |
comparison
equal
deleted
inserted
replaced
18942:8c248bf8692f | 18943:d90138662f49 |
---|---|
5919 #endif | 5919 #endif |
5920 if (argvars[0].v_type == VAR_STRING) | 5920 if (argvars[0].v_type == VAR_STRING) |
5921 { | 5921 { |
5922 // Command is a string. | 5922 // Command is a string. |
5923 cmd = argvars[0].vval.v_string; | 5923 cmd = argvars[0].vval.v_string; |
5924 if (cmd == NULL || *cmd == NUL) | 5924 if (cmd == NULL || *skipwhite(cmd) == NUL) |
5925 { | 5925 { |
5926 emsg(_(e_invarg)); | 5926 emsg(_(e_invarg)); |
5927 goto theend; | 5927 goto theend; |
5928 } | 5928 } |
5929 | 5929 |
5943 | 5943 |
5944 if (build_argv_from_list(l, &argv, &argc) == FAIL) | 5944 if (build_argv_from_list(l, &argv, &argc) == FAIL) |
5945 goto theend; | 5945 goto theend; |
5946 | 5946 |
5947 // Empty command is invalid. | 5947 // Empty command is invalid. |
5948 #ifdef USE_ARGV | |
5949 if (argc == 0 || *skipwhite((char_u *)argv[0]) == NUL) | 5948 if (argc == 0 || *skipwhite((char_u *)argv[0]) == NUL) |
5950 { | 5949 { |
5951 emsg(_(e_invarg)); | 5950 emsg(_(e_invarg)); |
5952 goto theend; | 5951 goto theend; |
5953 } | 5952 } |
5954 #else | 5953 #ifndef USE_ARGV |
5955 if (win32_build_cmd(l, &ga) == FAIL) | 5954 if (win32_build_cmd(l, &ga) == FAIL) |
5956 goto theend; | 5955 goto theend; |
5957 cmd = ga.ga_data; | 5956 cmd = ga.ga_data; |
5958 if (cmd == NULL || *skipwhite(cmd) == NUL) | 5957 if (cmd == NULL || *skipwhite(cmd) == NUL) |
5959 { | 5958 { |