mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-25 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move gettail_dir more closely to its usage.

Browse Source
This commit is contained in:
Thomas Wienecke
2014-03-30 14:12:25 +02:00
committed by Thiago de Arruda
parent 98b1f73c3f
commit df78edbc92
1 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/path.c
View File

@@ -115,37 +115,6 @@ char_u *gettail(char_u *fname)
return p1; return p1;
} }
static char_u *gettail_dir(char_u *fname);
/*
* Return the end of the directory name, on the first path
* separator:
* "/path/file", "/path/dir/", "/path//dir", "/file"
* ^ ^ ^ ^
*/
static char_u *gettail_dir(char_u *fname)
{
char_u *dir_end = fname;
char_u *next_dir_end = fname;
int look_for_sep = TRUE;
char_u *p;
for (p = fname; *p != NUL; ) {
if (vim_ispathsep(*p)) {
if (look_for_sep) {
next_dir_end = p;
look_for_sep = FALSE;
}
} else {
if (!look_for_sep)
dir_end = next_dir_end;
look_for_sep = TRUE;
}
mb_ptr_adv(p);
}
return dir_end;
}
/* /*
* Get pointer to tail of "fname", including path separators. Putting a NUL * Get pointer to tail of "fname", including path separators. Putting a NUL
* here leaves the directory name. Takes care of "c:/" and "//". * here leaves the directory name. Takes care of "c:/" and "//".
@@ -785,6 +754,8 @@ static char_u *get_path_cutoff(char_u *fname, garray_T *gap)
return cutoff; return cutoff;
} }
static char_u *gettail_dir(char_u *fname);
/* /*
* Sorts, removes duplicates and modifies all the fullpath names in "gap" so * Sorts, removes duplicates and modifies all the fullpath names in "gap" so
* that they are unique with respect to each other while conserving the part * that they are unique with respect to each other while conserving the part
@@ -936,6 +907,36 @@ theend:
ga_remove_duplicate_strings(gap); ga_remove_duplicate_strings(gap);
} }
/*
* Return the end of the directory name, on the first path
* separator:
* "/path/file", "/path/dir/", "/path//dir", "/file"
* ^ ^ ^ ^
*/
static char_u *gettail_dir(char_u *fname)
{
char_u *dir_end = fname;
char_u *next_dir_end = fname;
int look_for_sep = TRUE;
char_u *p;
for (p = fname; *p != NUL; ) {
if (vim_ispathsep(*p)) {
if (look_for_sep) {
next_dir_end = p;
look_for_sep = FALSE;
}
} else {
if (!look_for_sep)
dir_end = next_dir_end;
look_for_sep = TRUE;
}
mb_ptr_adv(p);
}
return dir_end;
}
/* /*
* Calls globpath() with 'path' values for the given pattern and stores the * Calls globpath() with 'path' values for the given pattern and stores the
* result in "gap". * result in "gap".