aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 9.0.0584: cscope test with wrong executable name fails

Browse Source 
Problem:    Cscope test with wrong executable name fails.
Solution:   Use /bin/sh to execute the command. (Yegappan Lakshmanan)
This commit is contained in:
Bram Moolenaar
2022-09-25 17:03:26 +01:00
parent b9725bc7f6
commit dc21552c9a
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/if_cscope.c
View File

@@ -799,7 +799,7 @@ cs_create_cmd(char *csoption, char *pattern)
return NULL;
}
// Skip white space before the patter, except for text and pattern search,
// Skip white space before the pattern, except for text and pattern search,
// they may want to use the leading white space.
pat = pattern;
if (search != 4 && search != 6)
@@ -825,6 +825,7 @@ cs_create_connection(int i)
#ifdef UNIX
int to_cs[2], from_cs[2];
#endif
int cmdlen;
int len;
char *prog, *cmd, *ppath = NULL;
#ifdef MSWIN
@@ -917,7 +918,7 @@ err_closing:
expand_env(p_csprg, (char_u *)prog, MAXPATHL);
// alloc space to hold the cscope command
len = (int)(strlen(prog) + strlen(csinfo[i].fname) + 32);
cmdlen = (int)(strlen(prog) + strlen(csinfo[i].fname) + 32);
if (csinfo[i].ppath)
{
// expand the prepend path for env var's
@@ -933,13 +934,13 @@ err_closing:
}
expand_env((char_u *)csinfo[i].ppath, (char_u *)ppath, MAXPATHL);
len += (int)strlen(ppath);
cmdlen += (int)strlen(ppath);
}
if (csinfo[i].flags)
len += (int)strlen(csinfo[i].flags);
cmdlen += (int)strlen(csinfo[i].flags);
if ((cmd = alloc(len)) == NULL)
if ((cmd = alloc(cmdlen)) == NULL)
{
vim_free(prog);
vim_free(ppath);
@@ -952,17 +953,21 @@ err_closing:
}
// run the cscope command
(void)sprintf(cmd, "%s -dl -f %s", prog, csinfo[i].fname);
#ifdef UNIX
vim_snprintf(cmd, cmdlen, "/bin/sh -c \"exec %s -dl -f %s\"",
prog, csinfo[i].fname);
#else
vim_snprintf(cmd, cmdlen, "%s -dl -f %s", prog, csinfo[i].fname);
#endif
if (csinfo[i].ppath != NULL)
{
(void)strcat(cmd, " -P");
(void)strcat(cmd, csinfo[i].ppath);
len = STRLEN(cmd);
vim_snprintf(cmd + len, cmdlen - len, " -P%s", csinfo[i].ppath);
}
if (csinfo[i].flags != NULL)
{
(void)strcat(cmd, " ");
(void)strcat(cmd, csinfo[i].flags);
len = STRLEN(cmd);
vim_snprintf(cmd + len, cmdlen - len, " %s", csinfo[i].flags);
}
# ifdef UNIX
// on Win32 we still need prog