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

updated for version 7.1-256

Browse Source
This commit is contained in:
Bram Moolenaar
2008-02-20 11:24:52 +00:00
parent 5360af919e
commit 4d0ec16687
5 changed files with 252 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/eval.c
View File

@@ -9203,13 +9203,13 @@ f_filewritable(argvars, rettv)
rettv->vval.v_number = filewritable(get_tv_string(&argvars[0])); rettv->vval.v_number = filewritable(get_tv_string(&argvars[0]));
} }
static void findfilendir __ARGS((typval_T *argvars, typval_T *rettv, int dir)); static void findfilendir __ARGS((typval_T *argvars, typval_T *rettv, int find_what));
static void static void
findfilendir(argvars, rettv, dir) findfilendir(argvars, rettv, find_what)
typval_T *argvars; typval_T *argvars;
typval_T *rettv; typval_T *rettv;
int dir; int find_what;
{ {
#ifdef FEAT_SEARCHPATH #ifdef FEAT_SEARCHPATH
char_u *fname; char_u *fname;
@@ -9254,8 +9254,11 @@ findfilendir(argvars, rettv, dir)
vim_free(fresult); vim_free(fresult);
fresult = find_file_in_path_option(first ? fname : NULL, fresult = find_file_in_path_option(first ? fname : NULL,
first ? (int)STRLEN(fname) : 0, first ? (int)STRLEN(fname) : 0,
0, first, path, dir, curbuf->b_ffname, 0, first, path,
dir ? (char_u *)"" : curbuf->b_p_sua); find_what,
curbuf->b_ffname,
find_what == FINDFILE_DIR
? (char_u *)"" : curbuf->b_p_sua);
first = FALSE; first = FALSE;
if (fresult != NULL && rettv->v_type == VAR_LIST) if (fresult != NULL && rettv->v_type == VAR_LIST)
@@ -9445,7 +9448,7 @@ f_finddir(argvars, rettv)
typval_T *argvars; typval_T *argvars;
typval_T *rettv; typval_T *rettv;
{ {
findfilendir(argvars, rettv, TRUE); findfilendir(argvars, rettv, FINDFILE_DIR);
} }
/* /*
@@ -9456,7 +9459,7 @@ f_findfile(argvars, rettv)
typval_T *argvars; typval_T *argvars;
typval_T *rettv; typval_T *rettv;
{ {
findfilendir(argvars, rettv, FALSE); findfilendir(argvars, rettv, FINDFILE_FILE);
} }
/* /*

450
src/misc2.c
View File

@@ -3777,9 +3777,9 @@ typedef struct ff_stack
char_u ffs_filearray_cur; /* needed for partly handled dirs */ char_u ffs_filearray_cur; /* needed for partly handled dirs */
/* to store status of partly handled directories /* to store status of partly handled directories
* 0: we work the on this directory for the first time * 0: we work on this directory for the first time
* 1: this directory was partly searched in an earlier step * 1: this directory was partly searched in an earlier step
*/ */
int ffs_stage; int ffs_stage;
/* How deep are we in the directory tree? /* How deep are we in the directory tree?
@@ -3848,6 +3848,7 @@ typedef struct ff_visited_list_hdr
* Set the default maximum depth. * Set the default maximum depth.
*/ */
#define FF_MAX_STAR_STAR_EXPAND ((char_u)30) #define FF_MAX_STAR_STAR_EXPAND ((char_u)30)
/* /*
* The search context: * The search context:
* ffsc_stack_ptr: the stack for the dirs to search * ffsc_stack_ptr: the stack for the dirs to search
@@ -3862,7 +3863,7 @@ typedef struct ff_visited_list_hdr
* ffsc_wc_path: the part of the given path containing wildcards * ffsc_wc_path: the part of the given path containing wildcards
* ffsc_level: how many levels of dirs to search downwards * ffsc_level: how many levels of dirs to search downwards
* ffsc_stopdirs_v: array of stop directories for upward search * ffsc_stopdirs_v: array of stop directories for upward search
* ffsc_need_dir: TRUE if we search for a directory * ffsc_find_what: FINDFILE_BOTH, FINDFILE_DIR or FINDFILE_FILE
*/ */
typedef struct ff_search_ctx_T typedef struct ff_search_ctx_T
{ {
@@ -3879,11 +3880,9 @@ typedef struct ff_search_ctx_T
int ffsc_level; int ffsc_level;
char_u **ffsc_stopdirs_v; char_u **ffsc_stopdirs_v;
#endif #endif
int ffsc_need_dir; int ffsc_find_what;
} ff_search_ctx_T; } ff_search_ctx_T;
static ff_search_ctx_T *ff_search_ctx = NULL;
/* locally needed functions */ /* locally needed functions */
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
static int ff_check_visited __ARGS((ff_visited_T **, char_u *, char_u *)); static int ff_check_visited __ARGS((ff_visited_T **, char_u *, char_u *));
@@ -3897,10 +3896,10 @@ static ff_visited_list_hdr_T* ff_get_visited_list __ARGS((char_u *, ff_visited_l
static int ff_wc_equal __ARGS((char_u *s1, char_u *s2)); static int ff_wc_equal __ARGS((char_u *s1, char_u *s2));
#endif #endif
static void ff_push __ARGS((ff_stack_T *)); static void ff_push __ARGS((ff_search_ctx_T *search_ctx, ff_stack_T *stack_ptr));
static ff_stack_T * ff_pop __ARGS((void)); static ff_stack_T *ff_pop __ARGS((ff_search_ctx_T *search_ctx));
static void ff_clear __ARGS((void)); static void ff_clear __ARGS((ff_search_ctx_T *search_ctx));
static void ff_free_stack_element __ARGS((ff_stack_T *)); static void ff_free_stack_element __ARGS((ff_stack_T *stack_ptr));
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
static ff_stack_T *ff_create_stack_element __ARGS((char_u *, char_u *, int, int)); static ff_stack_T *ff_create_stack_element __ARGS((char_u *, char_u *, int, int));
#else #else
@@ -3961,6 +3960,9 @@ vim_findnext()
* not related to restricts given to the '**' wildcard. If 'level' is 100 * not related to restricts given to the '**' wildcard. If 'level' is 100
* and you use '**200' vim_findfile() will stop after 100 levels. * and you use '**200' vim_findfile() will stop after 100 levels.
* *
* 'filename' cannot contain wildcards! It is used as-is, no backslashes to
* escape special characters.
*
* If 'stopdirs' is not NULL and nothing is found downward, the search is * If 'stopdirs' is not NULL and nothing is found downward, the search is
* restarted on the next higher directory level. This is repeated until the * restarted on the next higher directory level. This is repeated until the
* start-directory of a search is contained in 'stopdirs'. 'stopdirs' has the * start-directory of a search is contained in 'stopdirs'. 'stopdirs' has the
@@ -3980,74 +3982,74 @@ vim_findnext()
* The list of visited files/dirs can also be cleared with the function * The list of visited files/dirs can also be cleared with the function
* vim_findfile_free_visited(). * vim_findfile_free_visited().
* *
* Set the parameter 'need_dir' to TRUE if you want to search for a directory * Set the parameter 'find_what' to FINDFILE_DIR if you want to search for
* instead of a file. * directories only, FINDFILE_FILE for files only, FINDFILE_BOTH for both.
* *
* A search context returned by a previous call to vim_findfile_init() can be * A search context returned by a previous call to vim_findfile_init() can be
* passed in the parameter 'search_ctx'. This context is than reused and * passed in the parameter "search_ctx_arg". This context is reused and
* reinitialized with the new parameters. The list of already viseted * reinitialized with the new parameters. The list of already visited
* directories from this context is only deleted if the parameter * directories from this context is only deleted if the parameter
* 'free_visited' is true. Be aware that the passed search_context is freed if * "free_visited" is true. Be aware that the passed "search_ctx_arg" is freed
* the reinitialization fails. * if the reinitialization fails.
* *
* If you don't have a search context from a previous call 'search_ctx' must be * If you don't have a search context from a previous call "search_ctx_arg"
* NULL. * must be NULL.
* *
* This function silently ignores a few errors, vim_findfile() will have * This function silently ignores a few errors, vim_findfile() will have
* limited functionality then. * limited functionality then.
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
void * void *
vim_findfile_init(path, filename, stopdirs, level, free_visited, need_dir, vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
search_ctx, tagfile, rel_fname) search_ctx_arg, tagfile, rel_fname)
char_u *path; char_u *path;
char_u *filename; char_u *filename;
char_u *stopdirs; char_u *stopdirs;
int level; int level;
int free_visited; int free_visited;
int need_dir; int find_what;
void *search_ctx; void *search_ctx_arg;
int tagfile; int tagfile;
char_u *rel_fname; /* file name to use for "." */ char_u *rel_fname; /* file name to use for "." */
{ {
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
char_u *wc_part; char_u *wc_part;
#endif #endif
ff_stack_T *sptr; ff_stack_T *sptr;
ff_search_ctx_T *search_ctx;
/* If a search context is given by the caller, reuse it, else allocate a /* If a search context is given by the caller, reuse it, else allocate a
* new one. * new one.
*/ */
if (search_ctx != NULL) if (search_ctx_arg != NULL)
ff_search_ctx = search_ctx; search_ctx = search_ctx_arg;
else else
{ {
ff_search_ctx = (ff_search_ctx_T*)alloc( search_ctx = (ff_search_ctx_T*)alloc((unsigned)sizeof(ff_search_ctx_T));
(unsigned)sizeof(ff_search_ctx_T)); if (search_ctx == NULL)
if (ff_search_ctx == NULL)
goto error_return; goto error_return;
memset(ff_search_ctx, 0, sizeof(ff_search_ctx_T)); memset(search_ctx, 0, sizeof(ff_search_ctx_T));
} }
search_ctx->ffsc_find_what = find_what;
/* clear the search context, but NOT the visited lists */ /* clear the search context, but NOT the visited lists */
ff_clear(); ff_clear(search_ctx);
/* clear visited list if wanted */ /* clear visited list if wanted */
if (free_visited == TRUE) if (free_visited == TRUE)
vim_findfile_free_visited(ff_search_ctx); vim_findfile_free_visited(search_ctx);
else else
{ {
/* Reuse old visited lists. Get the visited list for the given /* Reuse old visited lists. Get the visited list for the given
* filename. If no list for the current filename exists, creates a new * filename. If no list for the current filename exists, creates a new
* one. * one. */
*/ search_ctx->ffsc_visited_list = ff_get_visited_list(filename,
ff_search_ctx->ffsc_visited_list = ff_get_visited_list(filename, &search_ctx->ffsc_visited_lists_list);
&ff_search_ctx->ffsc_visited_lists_list); if (search_ctx->ffsc_visited_list == NULL)
if (ff_search_ctx->ffsc_visited_list == NULL)
goto error_return; goto error_return;
ff_search_ctx->ffsc_dir_visited_list = ff_get_visited_list(filename, search_ctx->ffsc_dir_visited_list = ff_get_visited_list(filename,
&ff_search_ctx->ffsc_dir_visited_lists_list); &search_ctx->ffsc_dir_visited_lists_list);
if (ff_search_ctx->ffsc_dir_visited_list == NULL) if (search_ctx->ffsc_dir_visited_list == NULL)
goto error_return; goto error_return;
} }
@@ -4071,12 +4073,11 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, need_dir,
{ {
/* Make the start dir an absolute path name. */ /* Make the start dir an absolute path name. */
vim_strncpy(ff_expand_buffer, rel_fname, len); vim_strncpy(ff_expand_buffer, rel_fname, len);
ff_search_ctx->ffsc_start_dir = FullName_save(ff_expand_buffer, search_ctx->ffsc_start_dir = FullName_save(ff_expand_buffer, FALSE);
FALSE);
} }
else else
ff_search_ctx->ffsc_start_dir = vim_strnsave(rel_fname, len); search_ctx->ffsc_start_dir = vim_strnsave(rel_fname, len);
if (ff_search_ctx->ffsc_start_dir == NULL) if (search_ctx->ffsc_start_dir == NULL)
goto error_return; goto error_return;
if (*++path != NUL) if (*++path != NUL)
++path; ++path;
@@ -4101,8 +4102,8 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, need_dir,
if (mch_dirname(ff_expand_buffer, MAXPATHL) == FAIL) if (mch_dirname(ff_expand_buffer, MAXPATHL) == FAIL)
goto error_return; goto error_return;
ff_search_ctx->ffsc_start_dir = vim_strsave(ff_expand_buffer); search_ctx->ffsc_start_dir = vim_strsave(ff_expand_buffer);
if (ff_search_ctx->ffsc_start_dir == NULL) if (search_ctx->ffsc_start_dir == NULL)
goto error_return; goto error_return;
#ifdef BACKSLASH_IN_FILENAME #ifdef BACKSLASH_IN_FILENAME
@@ -4110,8 +4111,8 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, need_dir,
* directory (but not for "//machine/dir"). Only use the drive name. */ * directory (but not for "//machine/dir"). Only use the drive name. */
if ((*path == '/' || *path == '\\') if ((*path == '/' || *path == '\\')
&& path[1] != path[0] && path[1] != path[0]
&& ff_search_ctx->ffsc_start_dir[1] == ':') && search_ctx->ffsc_start_dir[1] == ':')
ff_search_ctx->ffsc_start_dir[2] = NUL; search_ctx->ffsc_start_dir[2] = NUL;
#endif #endif
} }
@@ -4121,7 +4122,7 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, need_dir,
* If this fails (mem allocation), there is no upward search at all or a * If this fails (mem allocation), there is no upward search at all or a
* stop directory is not recognized -> continue silently. * stop directory is not recognized -> continue silently.
* If stopdirs just contains a ";" or is empty, * If stopdirs just contains a ";" or is empty,
* ff_search_ctx->ffsc_stopdirs_v will only contain a NULL pointer. This * search_ctx->ffsc_stopdirs_v will only contain a NULL pointer. This
* is handled as unlimited upward search. See function * is handled as unlimited upward search. See function
* ff_path_in_stoplist() for details. * ff_path_in_stoplist() for details.
*/ */
@@ -4134,10 +4135,10 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, need_dir,
walker++; walker++;
dircount = 1; dircount = 1;
ff_search_ctx->ffsc_stopdirs_v = search_ctx->ffsc_stopdirs_v =
(char_u **)alloc((unsigned)sizeof(char_u *)); (char_u **)alloc((unsigned)sizeof(char_u *));
if (ff_search_ctx->ffsc_stopdirs_v != NULL) if (search_ctx->ffsc_stopdirs_v != NULL)
{ {
do do
{ {
@@ -4145,37 +4146,37 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, need_dir,
void *ptr; void *ptr;
helper = walker; helper = walker;
ptr = vim_realloc(ff_search_ctx->ffsc_stopdirs_v, ptr = vim_realloc(search_ctx->ffsc_stopdirs_v,
(dircount + 1) * sizeof(char_u *)); (dircount + 1) * sizeof(char_u *));
if (ptr) if (ptr)
ff_search_ctx->ffsc_stopdirs_v = ptr; search_ctx->ffsc_stopdirs_v = ptr;
else else
/* ignore, keep what we have and continue */ /* ignore, keep what we have and continue */
break; break;
walker = vim_strchr(walker, ';'); walker = vim_strchr(walker, ';');
if (walker) if (walker)
{ {
ff_search_ctx->ffsc_stopdirs_v[dircount-1] = search_ctx->ffsc_stopdirs_v[dircount-1] =
vim_strnsave(helper, (int)(walker - helper)); vim_strnsave(helper, (int)(walker - helper));
walker++; walker++;
} }
else else
/* this might be "", which means ascent till top /* this might be "", which means ascent till top
* of directory tree. * of directory tree.
*/ */
ff_search_ctx->ffsc_stopdirs_v[dircount-1] = search_ctx->ffsc_stopdirs_v[dircount-1] =
vim_strsave(helper); vim_strsave(helper);
dircount++; dircount++;
} while (walker != NULL); } while (walker != NULL);
ff_search_ctx->ffsc_stopdirs_v[dircount-1] = NULL; search_ctx->ffsc_stopdirs_v[dircount-1] = NULL;
} }
} }
#endif #endif
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
ff_search_ctx->ffsc_level = level; search_ctx->ffsc_level = level;
/* split into: /* split into:
* -fix path * -fix path
@@ -4189,8 +4190,7 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, need_dir,
char *errpt; char *errpt;
/* save the fix part of the path */ /* save the fix part of the path */
ff_search_ctx->ffsc_fix_path = vim_strnsave(path, search_ctx->ffsc_fix_path = vim_strnsave(path, (int)(wc_part - path));
(int)(wc_part - path));
/* /*
* copy wc_path and add restricts to the '**' wildcard. * copy wc_path and add restricts to the '**' wildcard.
@@ -4229,47 +4229,47 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, need_dir,
ff_expand_buffer[len++] = *wc_part++; ff_expand_buffer[len++] = *wc_part++;
} }
ff_expand_buffer[len] = NUL; ff_expand_buffer[len] = NUL;
ff_search_ctx->ffsc_wc_path = vim_strsave(ff_expand_buffer); search_ctx->ffsc_wc_path = vim_strsave(ff_expand_buffer);
if (ff_search_ctx->ffsc_wc_path == NULL) if (search_ctx->ffsc_wc_path == NULL)
goto error_return; goto error_return;
} }
else else
#endif #endif
ff_search_ctx->ffsc_fix_path = vim_strsave(path); search_ctx->ffsc_fix_path = vim_strsave(path);
if (ff_search_ctx->ffsc_start_dir == NULL) if (search_ctx->ffsc_start_dir == NULL)
{ {
/* store the fix part as startdir. /* store the fix part as startdir.
* This is needed if the parameter path is fully qualified. * This is needed if the parameter path is fully qualified.
*/ */
ff_search_ctx->ffsc_start_dir = vim_strsave(ff_search_ctx->ffsc_fix_path); search_ctx->ffsc_start_dir = vim_strsave(search_ctx->ffsc_fix_path);
if (ff_search_ctx->ffsc_start_dir) if (search_ctx->ffsc_start_dir)
ff_search_ctx->ffsc_fix_path[0] = NUL; search_ctx->ffsc_fix_path[0] = NUL;
} }
/* create an absolute path */ /* create an absolute path */
STRCPY(ff_expand_buffer, ff_search_ctx->ffsc_start_dir); STRCPY(ff_expand_buffer, search_ctx->ffsc_start_dir);
add_pathsep(ff_expand_buffer); add_pathsep(ff_expand_buffer);
STRCAT(ff_expand_buffer, ff_search_ctx->ffsc_fix_path); STRCAT(ff_expand_buffer, search_ctx->ffsc_fix_path);
add_pathsep(ff_expand_buffer); add_pathsep(ff_expand_buffer);
sptr = ff_create_stack_element(ff_expand_buffer, sptr = ff_create_stack_element(ff_expand_buffer,
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
ff_search_ctx->ffsc_wc_path, search_ctx->ffsc_wc_path,
#endif #endif
level, 0); level, 0);
if (sptr == NULL) if (sptr == NULL)
goto error_return; goto error_return;
ff_push(sptr); ff_push(search_ctx, sptr);
ff_search_ctx->ffsc_file_to_search = vim_strsave(filename); search_ctx->ffsc_file_to_search = vim_strsave(filename);
if (ff_search_ctx->ffsc_file_to_search == NULL) if (search_ctx->ffsc_file_to_search == NULL)
goto error_return; goto error_return;
return ff_search_ctx; return search_ctx;
error_return: error_return:
/* /*
@@ -4277,7 +4277,7 @@ error_return:
* Even when the caller gave us a (perhaps valid) context we free it here, * Even when the caller gave us a (perhaps valid) context we free it here,
* as we might have already destroyed it. * as we might have already destroyed it.
*/ */
vim_findfile_cleanup(ff_search_ctx); vim_findfile_cleanup(search_ctx);
return NULL; return NULL;
} }
@@ -4314,7 +4314,9 @@ vim_findfile_stopdir(buf)
} }
#endif #endif
/* Clean up the given search context. Can handle a NULL pointer */ /*
* Clean up the given search context. Can handle a NULL pointer.
*/
void void
vim_findfile_cleanup(ctx) vim_findfile_cleanup(ctx)
void *ctx; void *ctx;
@@ -4322,12 +4324,9 @@ vim_findfile_cleanup(ctx)
if (ctx == NULL) if (ctx == NULL)
return; return;
ff_search_ctx = ctx;
vim_findfile_free_visited(ctx); vim_findfile_free_visited(ctx);
ff_clear(); ff_clear(ctx);
vim_free(ctx); vim_free(ctx);
ff_search_ctx = NULL;
} }
/* /*
@@ -4343,15 +4342,15 @@ vim_findfile_cleanup(ctx)
* top of the list). * top of the list).
*/ */
char_u * char_u *
vim_findfile(search_ctx) vim_findfile(search_ctx_arg)
void *search_ctx; void *search_ctx_arg;
{ {
char_u *file_path; char_u *file_path;
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
char_u *rest_of_wildcards; char_u *rest_of_wildcards;
char_u *path_end = NULL; char_u *path_end = NULL;
#endif #endif
ff_stack_T *ctx; ff_stack_T *stackp;
#if defined(FEAT_SEARCHPATH) || defined(FEAT_PATH_EXTRA) #if defined(FEAT_SEARCHPATH) || defined(FEAT_PATH_EXTRA)
int len; int len;
#endif #endif
@@ -4360,11 +4359,12 @@ vim_findfile(search_ctx)
#ifdef FEAT_SEARCHPATH #ifdef FEAT_SEARCHPATH
char_u *suf; char_u *suf;
#endif #endif
ff_search_ctx_T *search_ctx;
if (search_ctx == NULL) if (search_ctx_arg == NULL)
return NULL; return NULL;
ff_search_ctx = (ff_search_ctx_T*)search_ctx; search_ctx = (ff_search_ctx_T *)search_ctx_arg;
/* /*
* filepath is used as buffer for various actions and as the storage to * filepath is used as buffer for various actions and as the storage to
@@ -4375,8 +4375,9 @@ vim_findfile(search_ctx)
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
/* store the end of the start dir -- needed for upward search */ /* store the end of the start dir -- needed for upward search */
if (ff_search_ctx->ffsc_start_dir != NULL) if (search_ctx->ffsc_start_dir != NULL)
path_end = &ff_search_ctx->ffsc_start_dir[STRLEN(ff_search_ctx->ffsc_start_dir)]; path_end = &search_ctx->ffsc_start_dir[
STRLEN(search_ctx->ffsc_start_dir)];
#endif #endif
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
@@ -4393,8 +4394,8 @@ vim_findfile(search_ctx)
break; break;
/* get directory to work on from stack */ /* get directory to work on from stack */
ctx = ff_pop(); stackp = ff_pop(search_ctx);
if (ctx == NULL) if (stackp == NULL)
break; break;
/* /*
@@ -4414,14 +4415,14 @@ vim_findfile(search_ctx)
* /etc/rc.d/init.d is linked to /etc/rc.d -> endless loop) * /etc/rc.d/init.d is linked to /etc/rc.d -> endless loop)
* *
* This check is only needed for directories we work on for the * This check is only needed for directories we work on for the
* first time (hence ctx->ff_filearray == NULL) * first time (hence stackp->ff_filearray == NULL)
*/ */
if (ctx->ffs_filearray == NULL if (stackp->ffs_filearray == NULL
&& ff_check_visited(&ff_search_ctx->ffsc_dir_visited_list && ff_check_visited(&search_ctx->ffsc_dir_visited_list
->ffvl_visited_list, ->ffvl_visited_list,
ctx->ffs_fix_path stackp->ffs_fix_path
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
, ctx->ffs_wc_path , stackp->ffs_wc_path
#endif #endif
) == FAIL) ) == FAIL)
{ {
@@ -4430,13 +4431,13 @@ vim_findfile(search_ctx)
{ {
verbose_enter_scroll(); verbose_enter_scroll();
smsg((char_u *)"Already Searched: %s (%s)", smsg((char_u *)"Already Searched: %s (%s)",
ctx->ffs_fix_path, ctx->ffs_wc_path); stackp->ffs_fix_path, stackp->ffs_wc_path);
/* don't overwrite this either */ /* don't overwrite this either */
msg_puts((char_u *)"\n"); msg_puts((char_u *)"\n");
verbose_leave_scroll(); verbose_leave_scroll();
} }
#endif #endif
ff_free_stack_element(ctx); ff_free_stack_element(stackp);
continue; continue;
} }
#ifdef FF_VERBOSE #ifdef FF_VERBOSE
@@ -4444,7 +4445,7 @@ vim_findfile(search_ctx)
{ {
verbose_enter_scroll(); verbose_enter_scroll();
smsg((char_u *)"Searching: %s (%s)", smsg((char_u *)"Searching: %s (%s)",
ctx->ffs_fix_path, ctx->ffs_wc_path); stackp->ffs_fix_path, stackp->ffs_wc_path);
/* don't overwrite this either */ /* don't overwrite this either */
msg_puts((char_u *)"\n"); msg_puts((char_u *)"\n");
verbose_leave_scroll(); verbose_leave_scroll();
@@ -4452,9 +4453,9 @@ vim_findfile(search_ctx)
#endif #endif
/* check depth */ /* check depth */
if (ctx->ffs_level <= 0) if (stackp->ffs_level <= 0)
{ {
ff_free_stack_element(ctx); ff_free_stack_element(stackp);
continue; continue;
} }
@@ -4466,7 +4467,7 @@ vim_findfile(search_ctx)
* and all possible expands are returned in one array. We use this * and all possible expands are returned in one array. We use this
* to handle the expansion of '**' into an empty string. * to handle the expansion of '**' into an empty string.
*/ */
if (ctx->ffs_filearray == NULL) if (stackp->ffs_filearray == NULL)
{ {
char_u *dirptrs[2]; char_u *dirptrs[2];
@@ -4477,19 +4478,19 @@ vim_findfile(search_ctx)
dirptrs[1] = NULL; dirptrs[1] = NULL;
/* if we have a start dir copy it in */ /* if we have a start dir copy it in */
if (!vim_isAbsName(ctx->ffs_fix_path) if (!vim_isAbsName(stackp->ffs_fix_path)
&& ff_search_ctx->ffsc_start_dir) && search_ctx->ffsc_start_dir)
{ {
STRCPY(file_path, ff_search_ctx->ffsc_start_dir); STRCPY(file_path, search_ctx->ffsc_start_dir);
add_pathsep(file_path); add_pathsep(file_path);
} }
/* append the fix part of the search path */ /* append the fix part of the search path */
STRCAT(file_path, ctx->ffs_fix_path); STRCAT(file_path, stackp->ffs_fix_path);
add_pathsep(file_path); add_pathsep(file_path);
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
rest_of_wildcards = ctx->ffs_wc_path; rest_of_wildcards = stackp->ffs_wc_path;
if (*rest_of_wildcards != NUL) if (*rest_of_wildcards != NUL)
{ {
len = (int)STRLEN(file_path); len = (int)STRLEN(file_path);
@@ -4516,11 +4517,11 @@ vim_findfile(search_ctx)
else else
rest_of_wildcards += 3; rest_of_wildcards += 3;
if (ctx->ffs_star_star_empty == 0) if (stackp->ffs_star_star_empty == 0)
{ {
/* if not done before, expand '**' to empty */ /* if not done before, expand '**' to empty */
ctx->ffs_star_star_empty = 1; stackp->ffs_star_star_empty = 1;
dirptrs[1] = ctx->ffs_fix_path; dirptrs[1] = stackp->ffs_fix_path;
} }
} }
@@ -4547,30 +4548,31 @@ vim_findfile(search_ctx)
*/ */
if (path_with_url(dirptrs[0])) if (path_with_url(dirptrs[0]))
{ {
ctx->ffs_filearray = (char_u **) stackp->ffs_filearray = (char_u **)
alloc((unsigned)sizeof(char *)); alloc((unsigned)sizeof(char *));
if (ctx->ffs_filearray != NULL if (stackp->ffs_filearray != NULL
&& (ctx->ffs_filearray[0] && (stackp->ffs_filearray[0]
= vim_strsave(dirptrs[0])) != NULL) = vim_strsave(dirptrs[0])) != NULL)
ctx->ffs_filearray_size = 1; stackp->ffs_filearray_size = 1;
else else
ctx->ffs_filearray_size = 0; stackp->ffs_filearray_size = 0;
} }
else else
expand_wildcards((dirptrs[1] == NULL) ? 1 : 2, dirptrs, expand_wildcards((dirptrs[1] == NULL) ? 1 : 2, dirptrs,
&ctx->ffs_filearray_size, &stackp->ffs_filearray_size,
&ctx->ffs_filearray, &stackp->ffs_filearray,
EW_DIR|EW_ADDSLASH|EW_SILENT); EW_DIR|EW_ADDSLASH|EW_SILENT);
ctx->ffs_filearray_cur = 0; stackp->ffs_filearray_cur = 0;
ctx->ffs_stage = 0; stackp->ffs_stage = 0;
} }
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
else else
rest_of_wildcards = &ctx->ffs_wc_path[STRLEN(ctx->ffs_wc_path)]; rest_of_wildcards = &stackp->ffs_wc_path[
STRLEN(stackp->ffs_wc_path)];
#endif #endif
if (ctx->ffs_stage == 0) if (stackp->ffs_stage == 0)
{ {
/* this is the first time we work on this directory */ /* this is the first time we work on this directory */
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
@@ -4581,18 +4583,18 @@ vim_findfile(search_ctx)
* we don't have further wildcards to expand, so we have to * we don't have further wildcards to expand, so we have to
* check for the final file now * check for the final file now
*/ */
for (i = ctx->ffs_filearray_cur; for (i = stackp->ffs_filearray_cur;
i < ctx->ffs_filearray_size; ++i) i < stackp->ffs_filearray_size; ++i)
{ {
if (!path_with_url(ctx->ffs_filearray[i]) if (!path_with_url(stackp->ffs_filearray[i])
&& !mch_isdir(ctx->ffs_filearray[i])) && !mch_isdir(stackp->ffs_filearray[i]))
continue; /* not a directory */ continue; /* not a directory */
/* prepare the filename to be checked for existance /* prepare the filename to be checked for existance
* below */ * below */
STRCPY(file_path, ctx->ffs_filearray[i]); STRCPY(file_path, stackp->ffs_filearray[i]);
add_pathsep(file_path); add_pathsep(file_path);
STRCAT(file_path, ff_search_ctx->ffsc_file_to_search); STRCAT(file_path, search_ctx->ffsc_file_to_search);
/* /*
* Try without extra suffix and then with suffixes * Try without extra suffix and then with suffixes
@@ -4606,12 +4608,15 @@ vim_findfile(search_ctx)
{ {
/* if file exists and we didn't already find it */ /* if file exists and we didn't already find it */
if ((path_with_url(file_path) if ((path_with_url(file_path)
|| (mch_getperm(file_path) >= 0 || (mch_getperm(file_path) >= 0
&& (!ff_search_ctx->ffsc_need_dir && (search_ctx->ffsc_find_what
|| mch_isdir(file_path)))) == FINDFILE_BOTH
|| ((search_ctx->ffsc_find_what
== FINDFILE_DIR)
== mch_isdir(file_path)))))
#ifndef FF_VERBOSE #ifndef FF_VERBOSE
&& (ff_check_visited( && (ff_check_visited(
&ff_search_ctx->ffsc_visited_list->ffvl_visited_list, &search_ctx->ffsc_visited_list->ffvl_visited_list,
file_path file_path
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
, (char_u *)"" , (char_u *)""
@@ -4622,7 +4627,7 @@ vim_findfile(search_ctx)
{ {
#ifdef FF_VERBOSE #ifdef FF_VERBOSE
if (ff_check_visited( if (ff_check_visited(
&ff_search_ctx->ffsc_visited_list->ffvl_visited_list, &search_ctx->ffsc_visited_list->ffvl_visited_list,
file_path file_path
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
, (char_u *)"" , (char_u *)""
@@ -4643,8 +4648,8 @@ vim_findfile(search_ctx)
#endif #endif
/* push dir to examine rest of subdirs later */ /* push dir to examine rest of subdirs later */
ctx->ffs_filearray_cur = i + 1; stackp->ffs_filearray_cur = i + 1;
ff_push(ctx); ff_push(search_ctx, stackp);
simplify_filename(file_path); simplify_filename(file_path);
if (mch_dirname(ff_expand_buffer, MAXPATHL) if (mch_dirname(ff_expand_buffer, MAXPATHL)
@@ -4686,19 +4691,22 @@ vim_findfile(search_ctx)
* still wildcards left, push the directories for further * still wildcards left, push the directories for further
* search * search
*/ */
for (i = ctx->ffs_filearray_cur; for (i = stackp->ffs_filearray_cur;
i < ctx->ffs_filearray_size; ++i) i < stackp->ffs_filearray_size; ++i)
{ {
if (!mch_isdir(ctx->ffs_filearray[i])) if (!mch_isdir(stackp->ffs_filearray[i]))
continue; /* not a directory */ continue; /* not a directory */
ff_push(ff_create_stack_element(ctx->ffs_filearray[i], ff_push(search_ctx,
rest_of_wildcards, ctx->ffs_level - 1, 0)); ff_create_stack_element(
stackp->ffs_filearray[i],
rest_of_wildcards,
stackp->ffs_level - 1, 0));
} }
} }
#endif #endif
ctx->ffs_filearray_cur = 0; stackp->ffs_filearray_cur = 0;
ctx->ffs_stage = 1; stackp->ffs_stage = 1;
} }
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
@@ -4706,23 +4714,25 @@ vim_findfile(search_ctx)
* if wildcards contains '**' we have to descent till we reach the * if wildcards contains '**' we have to descent till we reach the
* leaves of the directory tree. * leaves of the directory tree.
*/ */
if (STRNCMP(ctx->ffs_wc_path, "**", 2) == 0) if (STRNCMP(stackp->ffs_wc_path, "**", 2) == 0)
{ {
for (i = ctx->ffs_filearray_cur; for (i = stackp->ffs_filearray_cur;
i < ctx->ffs_filearray_size; ++i) i < stackp->ffs_filearray_size; ++i)
{ {
if (fnamecmp(ctx->ffs_filearray[i], ctx->ffs_fix_path) == 0) if (fnamecmp(stackp->ffs_filearray[i],
stackp->ffs_fix_path) == 0)
continue; /* don't repush same directory */ continue; /* don't repush same directory */
if (!mch_isdir(ctx->ffs_filearray[i])) if (!mch_isdir(stackp->ffs_filearray[i]))
continue; /* not a directory */ continue; /* not a directory */
ff_push(ff_create_stack_element(ctx->ffs_filearray[i], ff_push(search_ctx,
ctx->ffs_wc_path, ctx->ffs_level - 1, 1)); ff_create_stack_element(stackp->ffs_filearray[i],
stackp->ffs_wc_path, stackp->ffs_level - 1, 1));
} }
} }
#endif #endif
/* we are done with the current directory */ /* we are done with the current directory */
ff_free_stack_element(ctx); ff_free_stack_element(stackp);
} }
@@ -4730,40 +4740,40 @@ vim_findfile(search_ctx)
/* If we reached this, we didn't find anything downwards. /* If we reached this, we didn't find anything downwards.
* Let's check if we should do an upward search. * Let's check if we should do an upward search.
*/ */
if (ff_search_ctx->ffsc_start_dir if (search_ctx->ffsc_start_dir
&& ff_search_ctx->ffsc_stopdirs_v != NULL && !got_int) && search_ctx->ffsc_stopdirs_v != NULL && !got_int)
{ {
ff_stack_T *sptr; ff_stack_T *sptr;
/* is the last starting directory in the stop list? */ /* is the last starting directory in the stop list? */
if (ff_path_in_stoplist(ff_search_ctx->ffsc_start_dir, if (ff_path_in_stoplist(search_ctx->ffsc_start_dir,
(int)(path_end - ff_search_ctx->ffsc_start_dir), (int)(path_end - search_ctx->ffsc_start_dir),
ff_search_ctx->ffsc_stopdirs_v) == TRUE) search_ctx->ffsc_stopdirs_v) == TRUE)
break; break;
/* cut of last dir */ /* cut of last dir */
while (path_end > ff_search_ctx->ffsc_start_dir while (path_end > search_ctx->ffsc_start_dir
&& vim_ispathsep(*path_end)) && vim_ispathsep(*path_end))
path_end--; path_end--;
while (path_end > ff_search_ctx->ffsc_start_dir while (path_end > search_ctx->ffsc_start_dir
&& !vim_ispathsep(path_end[-1])) && !vim_ispathsep(path_end[-1]))
path_end--; path_end--;
*path_end = 0; *path_end = 0;
path_end--; path_end--;
if (*ff_search_ctx->ffsc_start_dir == 0) if (*search_ctx->ffsc_start_dir == 0)
break; break;
STRCPY(file_path, ff_search_ctx->ffsc_start_dir); STRCPY(file_path, search_ctx->ffsc_start_dir);
add_pathsep(file_path); add_pathsep(file_path);
STRCAT(file_path, ff_search_ctx->ffsc_fix_path); STRCAT(file_path, search_ctx->ffsc_fix_path);
/* create a new stack entry */ /* create a new stack entry */
sptr = ff_create_stack_element(file_path, sptr = ff_create_stack_element(file_path,
ff_search_ctx->ffsc_wc_path, ff_search_ctx->ffsc_level, 0); search_ctx->ffsc_wc_path, search_ctx->ffsc_level, 0);
if (sptr == NULL) if (sptr == NULL)
break; break;
ff_push(sptr); ff_push(search_ctx, sptr);
} }
else else
break; break;
@@ -4779,16 +4789,17 @@ vim_findfile(search_ctx)
* Can handle it if the passed search_context is NULL; * Can handle it if the passed search_context is NULL;
*/ */
void void
vim_findfile_free_visited(search_ctx) vim_findfile_free_visited(search_ctx_arg)
void *search_ctx; void *search_ctx_arg;
{ {
if (search_ctx == NULL) ff_search_ctx_T *search_ctx;
if (search_ctx_arg == NULL)
return; return;
ff_search_ctx = (ff_search_ctx_T *)search_ctx; search_ctx = (ff_search_ctx_T *)search_ctx_arg;
vim_findfile_free_visited_list(&search_ctx->ffsc_visited_lists_list);
vim_findfile_free_visited_list(&ff_search_ctx->ffsc_visited_lists_list); vim_findfile_free_visited_list(&search_ctx->ffsc_dir_visited_lists_list);
vim_findfile_free_visited_list(&ff_search_ctx->ffsc_dir_visited_lists_list);
} }
static void static void
@@ -5103,33 +5114,35 @@ ff_create_stack_element(fix_part,
} }
/* /*
* push a dir on the directory stack * Push a dir on the directory stack.
*/ */
static void static void
ff_push(ctx) ff_push(search_ctx, stack_ptr)
ff_stack_T *ctx; ff_search_ctx_T *search_ctx;
ff_stack_T *stack_ptr;
{ {
/* check for NULL pointer, not to return an error to the user, but /* check for NULL pointer, not to return an error to the user, but
* to prevent a crash */ * to prevent a crash */
if (ctx != NULL) if (stack_ptr != NULL)
{ {
ctx->ffs_prev = ff_search_ctx->ffsc_stack_ptr; stack_ptr->ffs_prev = search_ctx->ffsc_stack_ptr;
ff_search_ctx->ffsc_stack_ptr = ctx; search_ctx->ffsc_stack_ptr = stack_ptr;
} }
} }
/* /*
* pop a dir from the directory stack * Pop a dir from the directory stack.
* returns NULL if stack is empty * Returns NULL if stack is empty.
*/ */
static ff_stack_T * static ff_stack_T *
ff_pop() ff_pop(search_ctx)
ff_search_ctx_T *search_ctx;
{ {
ff_stack_T *sptr; ff_stack_T *sptr;
sptr = ff_search_ctx->ffsc_stack_ptr; sptr = search_ctx->ffsc_stack_ptr;
if (ff_search_ctx->ffsc_stack_ptr != NULL) if (search_ctx->ffsc_stack_ptr != NULL)
ff_search_ctx->ffsc_stack_ptr = ff_search_ctx->ffsc_stack_ptr->ffs_prev; search_ctx->ffsc_stack_ptr = search_ctx->ffsc_stack_ptr->ffs_prev;
return sptr; return sptr;
} }
@@ -5138,62 +5151,63 @@ ff_pop()
* free the given stack element * free the given stack element
*/ */
static void static void
ff_free_stack_element(ctx) ff_free_stack_element(stack_ptr)
ff_stack_T *ctx; ff_stack_T *stack_ptr;
{ {
/* vim_free handles possible NULL pointers */ /* vim_free handles possible NULL pointers */
vim_free(ctx->ffs_fix_path); vim_free(stack_ptr->ffs_fix_path);
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
vim_free(ctx->ffs_wc_path); vim_free(stack_ptr->ffs_wc_path);
#endif #endif
if (ctx->ffs_filearray != NULL) if (stack_ptr->ffs_filearray != NULL)
FreeWild(ctx->ffs_filearray_size, ctx->ffs_filearray); FreeWild(stack_ptr->ffs_filearray_size, stack_ptr->ffs_filearray);
vim_free(ctx); vim_free(stack_ptr);
} }
/* /*
* clear the search context * Clear the search context, but NOT the visited list.
*/ */
static void static void
ff_clear() ff_clear(search_ctx)
ff_search_ctx_T *search_ctx;
{ {
ff_stack_T *sptr; ff_stack_T *sptr;
/* clear up stack */ /* clear up stack */
while ((sptr = ff_pop()) != NULL) while ((sptr = ff_pop(search_ctx)) != NULL)
ff_free_stack_element(sptr); ff_free_stack_element(sptr);
vim_free(ff_search_ctx->ffsc_file_to_search); vim_free(search_ctx->ffsc_file_to_search);
vim_free(ff_search_ctx->ffsc_start_dir); vim_free(search_ctx->ffsc_start_dir);
vim_free(ff_search_ctx->ffsc_fix_path); vim_free(search_ctx->ffsc_fix_path);
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
vim_free(ff_search_ctx->ffsc_wc_path); vim_free(search_ctx->ffsc_wc_path);
#endif #endif
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
if (ff_search_ctx->ffsc_stopdirs_v != NULL) if (search_ctx->ffsc_stopdirs_v != NULL)
{ {
int i = 0; int i = 0;
while (ff_search_ctx->ffsc_stopdirs_v[i] != NULL) while (search_ctx->ffsc_stopdirs_v[i] != NULL)
{ {
vim_free(ff_search_ctx->ffsc_stopdirs_v[i]); vim_free(search_ctx->ffsc_stopdirs_v[i]);
i++; i++;
} }
vim_free(ff_search_ctx->ffsc_stopdirs_v); vim_free(search_ctx->ffsc_stopdirs_v);
} }
ff_search_ctx->ffsc_stopdirs_v = NULL; search_ctx->ffsc_stopdirs_v = NULL;
#endif #endif
/* reset everything */ /* reset everything */
ff_search_ctx->ffsc_file_to_search = NULL; search_ctx->ffsc_file_to_search = NULL;
ff_search_ctx->ffsc_start_dir = NULL; search_ctx->ffsc_start_dir = NULL;
ff_search_ctx->ffsc_fix_path = NULL; search_ctx->ffsc_fix_path = NULL;
#ifdef FEAT_PATH_EXTRA #ifdef FEAT_PATH_EXTRA
ff_search_ctx->ffsc_wc_path = NULL; search_ctx->ffsc_wc_path = NULL;
ff_search_ctx->ffsc_level = 0; search_ctx->ffsc_level = 0;
#endif #endif
} }
@@ -5242,7 +5256,7 @@ ff_path_in_stoplist(path, path_len, stopdirs_v)
#if defined(FEAT_SEARCHPATH) || defined(PROTO) #if defined(FEAT_SEARCHPATH) || defined(PROTO)
/* /*
* Find the file name "ptr[len]" in the path. * Find the file name "ptr[len]" in the path. Also finds directory names.
* *
* On the first call set the parameter 'first' to TRUE to initialize * On the first call set the parameter 'first' to TRUE to initialize
* the search. For repeating calls to FALSE. * the search. For repeating calls to FALSE.
@@ -5276,7 +5290,7 @@ find_file_in_path(ptr, len, options, first, rel_fname)
{ {
return find_file_in_path_option(ptr, len, options, first, return find_file_in_path_option(ptr, len, options, first,
*curbuf->b_p_path == NUL ? p_path : curbuf->b_p_path, *curbuf->b_p_path == NUL ? p_path : curbuf->b_p_path,
FALSE, rel_fname, curbuf->b_p_sua); FINDFILE_BOTH, rel_fname, curbuf->b_p_sua);
} }
static char_u *ff_file_to_find = NULL; static char_u *ff_file_to_find = NULL;
@@ -5309,17 +5323,17 @@ find_directory_in_path(ptr, len, options, rel_fname)
char_u *rel_fname; /* file name searching relative to */ char_u *rel_fname; /* file name searching relative to */
{ {
return find_file_in_path_option(ptr, len, options, TRUE, p_cdpath, return find_file_in_path_option(ptr, len, options, TRUE, p_cdpath,
TRUE, rel_fname, (char_u *)""); FINDFILE_DIR, rel_fname, (char_u *)"");
} }
char_u * char_u *
find_file_in_path_option(ptr, len, options, first, path_option, need_dir, rel_fname, suffixes) find_file_in_path_option(ptr, len, options, first, path_option, find_what, rel_fname, suffixes)
char_u *ptr; /* file name */ char_u *ptr; /* file name */
int len; /* length of file name */ int len; /* length of file name */
int options; int options;
int first; /* use count'th matching file name */ int first; /* use count'th matching file name */
char_u *path_option; /* p_path or p_cdpath */ char_u *path_option; /* p_path or p_cdpath */
int need_dir; /* looking for directory name */ int find_what; /* FINDFILE_FILE, _DIR or _BOTH */
char_u *rel_fname; /* file name we are looking relative to. */ char_u *rel_fname; /* file name we are looking relative to. */
char_u *suffixes; /* list of suffixes, 'suffixesadd' option */ char_u *suffixes; /* list of suffixes, 'suffixesadd' option */
{ {
@@ -5421,12 +5435,14 @@ find_file_in_path_option(ptr, len, options, first, path_option, need_dir, rel_fn
#ifdef DJGPP #ifdef DJGPP
/* "C:" by itself will fail for mch_getperm(), /* "C:" by itself will fail for mch_getperm(),
* assume it's always valid. */ * assume it's always valid. */
(need_dir && NameBuff[0] != NUL (find_what != FINDFILE_FILE && NameBuff[0] != NUL
&& NameBuff[1] == ':' && NameBuff[1] == ':'
&& NameBuff[2] == NUL) || && NameBuff[2] == NUL) ||
#endif #endif
(mch_getperm(NameBuff) >= 0 (mch_getperm(NameBuff) >= 0
&& (!need_dir || mch_isdir(NameBuff)))) && (find_what == FINDFILE_BOTH
|| ((find_what == FINDFILE_DIR)
== mch_isdir(NameBuff)))))
{ {
file_name = vim_strsave(NameBuff); file_name = vim_strsave(NameBuff);
goto theend; goto theend;
@@ -5457,9 +5473,7 @@ find_file_in_path_option(ptr, len, options, first, path_option, need_dir, rel_fn
{ {
if (did_findfile_init) if (did_findfile_init)
{ {
ff_search_ctx->ffsc_need_dir = need_dir;
file_name = vim_findfile(fdip_search_ctx); file_name = vim_findfile(fdip_search_ctx);
ff_search_ctx->ffsc_need_dir = FALSE;
if (file_name != NULL) if (file_name != NULL)
break; break;
@@ -5492,7 +5506,7 @@ find_file_in_path_option(ptr, len, options, first, path_option, need_dir, rel_fn
r_ptr = NULL; r_ptr = NULL;
#endif #endif
fdip_search_ctx = vim_findfile_init(buf, ff_file_to_find, fdip_search_ctx = vim_findfile_init(buf, ff_file_to_find,
r_ptr, 100, FALSE, TRUE, r_ptr, 100, FALSE, find_what,
fdip_search_ctx, FALSE, rel_fname); fdip_search_ctx, FALSE, rel_fname);
if (fdip_search_ctx != NULL) if (fdip_search_ctx != NULL)
did_findfile_init = TRUE; did_findfile_init = TRUE;
@@ -5504,7 +5518,7 @@ find_file_in_path_option(ptr, len, options, first, path_option, need_dir, rel_fn
{ {
if (first == TRUE) if (first == TRUE)
{ {
if (need_dir) if (find_what == FINDFILE_DIR)
EMSG2(_("E344: Can't find directory \"%s\" in cdpath"), EMSG2(_("E344: Can't find directory \"%s\" in cdpath"),
ff_file_to_find); ff_file_to_find);
else else
@@ -5513,7 +5527,7 @@ find_file_in_path_option(ptr, len, options, first, path_option, need_dir, rel_fn
} }
else else
{ {
if (need_dir) if (find_what == FINDFILE_DIR)
EMSG2(_("E346: No more directory \"%s\" found in cdpath"), EMSG2(_("E346: No more directory \"%s\" found in cdpath"),
ff_file_to_find); ff_file_to_find);
else else

5
src/tag.c
View File

@@ -2669,8 +2669,8 @@ get_tagfname(tnp, first, buf)
tnp->tn_search_ctx = vim_findfile_init(buf, filename, tnp->tn_search_ctx = vim_findfile_init(buf, filename,
r_ptr, 100, r_ptr, 100,
FALSE, /* don't free visited list */ FALSE, /* don't free visited list */
FALSE, /* we search for a file */ FINDFILE_FILE, /* we search for a file */
tnp->tn_search_ctx, TRUE, curbuf->b_ffname); tnp->tn_search_ctx, TRUE, curbuf->b_ffname);
if (tnp->tn_search_ctx != NULL) if (tnp->tn_search_ctx != NULL)
tnp->tn_did_filefind_init = TRUE; tnp->tn_did_filefind_init = TRUE;
@@ -2691,6 +2691,7 @@ tagname_free(tnp)
{ {
vim_free(tnp->tn_tags); vim_free(tnp->tn_tags);
vim_findfile_cleanup(tnp->tn_search_ctx); vim_findfile_cleanup(tnp->tn_search_ctx);
tnp->tn_search_ctx = NULL;
ga_clear_strings(&tag_fnames); ga_clear_strings(&tag_fnames);
} }

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 */
/**/
256,
/**/ /**/
255, 255,
/**/ /**/

5
src/vim.h
View File

@@ -721,6 +721,11 @@ extern char *(*dyn_libintl_textdomain)(const char *domainname);
/* Note: mostly EW_NOTFOUND and EW_SILENT are mutually exclusive: EW_NOTFOUND /* Note: mostly EW_NOTFOUND and EW_SILENT are mutually exclusive: EW_NOTFOUND
* is used when executing commands and EW_SILENT for interactive expanding. */ * is used when executing commands and EW_SILENT for interactive expanding. */
/* Flags for find_file_*() functions. */
#define FINDFILE_FILE 0 /* only files */
#define FINDFILE_DIR 1 /* only directories */
#define FINDFILE_BOTH 2 /* files and directories */
#ifdef FEAT_VERTSPLIT #ifdef FEAT_VERTSPLIT
# define W_WINCOL(wp) (wp->w_wincol) # define W_WINCOL(wp) (wp->w_wincol)
# define W_WIDTH(wp) (wp->w_width) # define W_WIDTH(wp) (wp->w_width)