Merge #8072 from mhinz/vim-8.0.1439

vim-patch: 8.0.1439, 8.0.1442
This commit is contained in:
Justin M. Keyes 2018-03-03 13:09:36 +01:00 committed by GitHub
commit 37b755ab47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -549,7 +549,7 @@ static void cs_reading_emsg(
static int cs_cnt_matches(size_t idx)
{
char *stok;
int nlines;
int nlines = 0;
char *buf = xmalloc(CSREAD_BUFSIZE);
for (;; ) {
@ -569,16 +569,20 @@ static int cs_cnt_matches(size_t idx)
return CSCOPE_FAILURE;
}
/*
* If the database is out of date, or there's some other problem,
* cscope will output error messages before the number-of-lines output.
* Display/discard any output that doesn't match what we want.
* Accept "\S*cscope: X lines", also matches "mlcscope".
*/
if ((stok = strtok(buf, (const char *)" ")) == NULL)
// If the database is out of date, or there's some other problem,
// cscope will output error messages before the number-of-lines output.
// Display/discard any output that doesn't match what we want.
// Accept "\S*cscope: X lines", also matches "mlcscope".
// Bail out for the "Unable to search" error.
if (strstr((const char *)buf, "Unable to search database") != NULL) {
break;
}
if ((stok = strtok(buf, (const char *)" ")) == NULL) {
continue;
if (strstr((const char *)stok, "cscope:") == NULL)
}
if (strstr((const char *)stok, "cscope:") == NULL) {
continue;
}
if ((stok = strtok(NULL, (const char *)" ")) == NULL)
continue;