IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move fix_fname from buffer.c

Browse Source
This commit is contained in:
John Schmidt 2014-03-31 00:27:50 +02:00 committed by Thiago de Arruda
parent 7052b85192
commit 2cb026c65c
4 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/buffer.c
View File

@ -3620,48 +3620,6 @@ append_arg_number (
return TRUE; return TRUE;
} }
/*
* If fname is not a full path, make it a full path.
* Returns pointer to allocated memory (NULL for failure).
*/
char_u *fix_fname(char_u *fname)
{
/*
* Force expanding the path always for Unix, because symbolic links may
* mess up the full path name, even though it starts with a '/'.
* Also expand when there is ".." in the file name, try to remove it,
* because "c:/src/../README" is equal to "c:/README".
* Similarly "c:/src//file" is equal to "c:/src/file".
* For MS-Windows also expand names like "longna~1" to "longname".
*/
#ifdef UNIX
return FullName_save(fname, TRUE);
#else
if (!vim_isAbsName(fname)
|| strstr((char *)fname, "..") != NULL
|| strstr((char *)fname, "//") != NULL
# ifdef BACKSLASH_IN_FILENAME
|| strstr((char *)fname, "\\\\") != NULL
# endif
)
return FullName_save(fname, FALSE);
fname = vim_strsave(fname);
# ifdef USE_FNAME_CASE
# ifdef USE_LONG_FNAME
if (USE_LONG_FNAME)
# endif
{
if (fname != NULL)
fname_case(fname, 0); /* set correct case for file name */
}
# endif
return fname;
#endif
}
/* /*
* Make "ffname" a full file name, set "sfname" to "ffname" if not NULL. * Make "ffname" a full file name, set "sfname" to "ffname" if not NULL.
* "ffname" becomes a pointer to allocated memory (or NULL). * "ffname" becomes a pointer to allocated memory (or NULL).

1
src/buffer.h
View File

@ -54,7 +54,6 @@ int build_stl_str_hl(win_T *wp, char_u *out, size_t outlen, char_u *fmt,
struct stl_hlrec *hltab, struct stl_hlrec *hltab,
struct stl_hlrec *tabtab); struct stl_hlrec *tabtab);
void get_rel_pos(win_T *wp, char_u *buf, int buflen); void get_rel_pos(win_T *wp, char_u *buf, int buflen);
char_u *fix_fname(char_u *fname);
void fname_expand(buf_T *buf, char_u **ffname, char_u **sfname); void fname_expand(buf_T *buf, char_u **ffname, char_u **sfname);
char_u *alist_name(aentry_T *aep); char_u *alist_name(aentry_T *aep);
void do_arg_all(int count, int forceit, int keep_tabs); void do_arg_all(int count, int forceit, int keep_tabs);

42
src/path.c
View File

@ -1620,3 +1620,45 @@ vim_FullName (
return retval; return retval;
} }
/*
* If fname is not a full path, make it a full path.
* Returns pointer to allocated memory (NULL for failure).
*/
char_u *fix_fname(char_u *fname)
{
/*
* Force expanding the path always for Unix, because symbolic links may
* mess up the full path name, even though it starts with a '/'.
* Also expand when there is ".." in the file name, try to remove it,
* because "c:/src/../README" is equal to "c:/README".
* Similarly "c:/src//file" is equal to "c:/src/file".
* For MS-Windows also expand names like "longna~1" to "longname".
*/
#ifdef UNIX
return FullName_save(fname, TRUE);
#else
if (!vim_isAbsName(fname)
|| strstr((char *)fname, "..") != NULL
|| strstr((char *)fname, "//") != NULL
# ifdef BACKSLASH_IN_FILENAME
|| strstr((char *)fname, "\\\\") != NULL
# endif
)
return FullName_save(fname, FALSE);
fname = vim_strsave(fname);
# ifdef USE_FNAME_CASE
# ifdef USE_LONG_FNAME
if (USE_LONG_FNAME)
# endif
{
if (fname != NULL)
fname_case(fname, 0); /* set correct case for file name */
}
# endif
return fname;
#endif
}

1
src/path.h
View File

@ -30,4 +30,5 @@ int path_is_url(char_u *p);
int path_with_url(char_u *fname); int path_with_url(char_u *fname);
int vim_isAbsName(char_u *name); int vim_isAbsName(char_u *name);
int vim_FullName(char_u *fname, char_u *buf, int len, int force); int vim_FullName(char_u *fname, char_u *buf, int len, int force);
char_u *fix_fname(char_u *fname);
#endif #endif