diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/os_unix.c | 16 | ||||
-rw-r--r-- | src/os_unix.h | 1 | ||||
-rw-r--r-- | src/path.c | 16 | ||||
-rw-r--r-- | src/path.h | 1 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 8d42f54677..091bf7999e 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -2406,22 +2406,6 @@ select_eintr: return ret > 0; } -#ifndef NO_EXPANDPATH -/* - * Expand a path into all matching files and/or directories. Handles "*", - * "?", "[a-z]", "**", etc. - * "path" has backslashes before chars that are not to be expanded. - * Returns the number of matches found. - */ -int mch_expandpath(gap, path, flags) -garray_T *gap; -char_u *path; -int flags; /* EW_* flags */ -{ - return unix_expandpath(gap, path, 0, flags, FALSE); -} -#endif - /* * mch_expand_wildcards() - this code does wild-card pattern matching using * the shell diff --git a/src/os_unix.h b/src/os_unix.h index 6b35d6822b..7a3812dc5b 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -46,7 +46,6 @@ int mch_get_shellsize(void); void mch_set_shellsize(void); void mch_new_shellsize(void); int mch_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg); -int mch_expandpath(garray_T *gap, char_u *path, int flags); int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, int flags); diff --git a/src/path.c b/src/path.c index eaa4b87a02..99a4cec6cf 100644 --- a/src/path.c +++ b/src/path.c @@ -1761,3 +1761,19 @@ int pathcmp(const char *p, const char *q, int maxlen) } #endif +#ifndef NO_EXPANDPATH +/* + * Expand a path into all matching files and/or directories. Handles "*", + * "?", "[a-z]", "**", etc. + * "path" has backslashes before chars that are not to be expanded. + * Returns the number of matches found. + */ +int mch_expandpath(gap, path, flags) +garray_T *gap; +char_u *path; +int flags; /* EW_* flags */ +{ + return unix_expandpath(gap, path, 0, flags, FALSE); +} +#endif + diff --git a/src/path.h b/src/path.h index 07bd4d5588..c65367289c 100644 --- a/src/path.h +++ b/src/path.h @@ -34,4 +34,5 @@ char_u *fix_fname(char_u *fname); int after_pathsep(char_u *b, char_u *p); int same_directory(char_u *f1, char_u *f2); int pathcmp(const char *p, const char *q, int maxlen); +int mch_expandpath(garray_T *gap, char_u *path, int flags); #endif |