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

updated for version 7.1-087

Browse Source
This commit is contained in:
Bram Moolenaar
2007-08-21 16:03:51 +00:00
parent 3a36cf7bca
commit d2ac984a1e
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/if_cscope.c
View File

@@ -73,6 +73,8 @@ static int cs_show __ARGS((exarg_T *eap));
static csinfo_T csinfo[CSCOPE_MAX_CONNECTIONS]; static csinfo_T csinfo[CSCOPE_MAX_CONNECTIONS];
static int eap_arg_len; /* length of eap->arg, set in
cs_lookup_cmd() */
static cscmd_T cs_cmds[] = static cscmd_T cs_cmds[] =
{ {
{ "add", cs_add, { "add", cs_add,
@@ -260,14 +262,7 @@ cs_fgets(buf, size)
if ((p = cs_manage_matches(NULL, NULL, -1, Get)) == NULL) if ((p = cs_manage_matches(NULL, NULL, -1, Get)) == NULL)
return TRUE; return TRUE;
vim_strncpy(buf, (char_u *)p, size - 1);
if ((int)strlen(p) > size)
{
strncpy((char *)buf, p, size - 1);
buf[size] = '\0';
}
else
(void)strcpy((char *)buf, p);
return FALSE; return FALSE;
} /* cs_fgets */ } /* cs_fgets */
@@ -386,7 +381,7 @@ cs_connection(num, dbpath, ppath)
* PRIVATE: cs_add * PRIVATE: cs_add
* *
* add cscope database or a directory name (to look for cscope.out) * add cscope database or a directory name (to look for cscope.out)
* the the cscope connection list * to the cscope connection list
* *
* MAXPATHL 256 * MAXPATHL 256
*/ */
@@ -966,7 +961,7 @@ cs_find(eap)
} }
pat = opt + strlen(opt) + 1; pat = opt + strlen(opt) + 1;
if (pat == NULL || (pat != NULL && pat[0] == '\0')) if (pat >= (char *)eap->arg + eap_arg_len)
{ {
cs_usage_msg(Find); cs_usage_msg(Find);
return FALSE; return FALSE;
@@ -1317,7 +1312,7 @@ cs_insert_filelist(fname, ppath, flags, sb)
#else #else
/* compare pathnames first */ /* compare pathnames first */
&& ((fullpathcmp(csinfo[j].fname, fname, FALSE) & FPC_SAME) && ((fullpathcmp(csinfo[j].fname, fname, FALSE) & FPC_SAME)
/* if not Windows 9x, test index file atributes too */ /* if not Windows 9x, test index file attributes too */
|| (!mch_windows95() || (!mch_windows95()
&& csinfo[j].nVolume == bhfi.dwVolumeSerialNumber && csinfo[j].nVolume == bhfi.dwVolumeSerialNumber
&& csinfo[j].nIndexHigh == bhfi.nFileIndexHigh && csinfo[j].nIndexHigh == bhfi.nFileIndexHigh
@@ -1401,6 +1396,9 @@ cs_lookup_cmd(eap)
if (eap->arg == NULL) if (eap->arg == NULL)
return NULL; return NULL;
/* Store length of eap->arg before it gets modified by strtok(). */
eap_arg_len = STRLEN(eap->arg);
if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL) if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL)
return NULL; return NULL;
@@ -2195,7 +2193,7 @@ cs_reset(eap)
cs_add_common(dblist[i], pplist[i], fllist[i]); cs_add_common(dblist[i], pplist[i], fllist[i]);
if (p_csverbose) if (p_csverbose)
{ {
/* dont' use smsg_attr because want to display /* don't use smsg_attr() because we want to display the
* connection number in the same line as * connection number in the same line as
* "Added cscope database..." * "Added cscope database..."
*/ */

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
87,
/**/ /**/
86, 86,
/**/ /**/