mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-03 00:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4527 from philix/env-refactor

Browse Source 
os/env.c: cosmetic changes, restrict pointers
This commit is contained in:
Justin M. Keyes
2016-05-15 20:03:50 -04:00
parent df376d2e49 128579f7fc
commit 3cc2a28198
1 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/nvim/os/env.c
View File

@@ -147,7 +147,7 @@ static char_u *homedir = NULL;
void init_homedir(void) void init_homedir(void)
{ {
/* In case we are called a second time (when 'encoding' changes). */ // In case we are called a second time (when 'encoding' changes).
xfree(homedir); xfree(homedir);
homedir = NULL; homedir = NULL;
@@ -176,16 +176,16 @@ void init_homedir(void)
if (var != NULL) { if (var != NULL) {
#ifdef UNIX #ifdef UNIX
/* // Change to the directory and get the actual path. This resolves
* Change to the directory and get the actual path. This resolves // links. Don't do it when we can't return.
* links. Don't do it when we can't return.
*/
if (os_dirname(NameBuff, MAXPATHL) == OK if (os_dirname(NameBuff, MAXPATHL) == OK
&& os_chdir((char *)NameBuff) == 0) { && os_chdir((char *)NameBuff) == 0) {
if (!os_chdir((char *)var) && os_dirname(IObuff, IOSIZE) == OK) if (!os_chdir((char *)var) && os_dirname(IObuff, IOSIZE) == OK) {
var = IObuff; var = IObuff;
if (os_chdir((char *)NameBuff) != 0) }
if (os_chdir((char *)NameBuff) != 0) {
EMSG(_(e_prev_dir)); EMSG(_(e_prev_dir));
}
} }
#endif #endif
homedir = vim_strsave(var); homedir = vim_strsave(var);
@@ -239,29 +239,29 @@ void expand_env(char_u *src, char_u *dst, int dstlen)
/// "~/" is also expanded, using $HOME. For Unix "~user/" is expanded. /// "~/" is also expanded, using $HOME. For Unix "~user/" is expanded.
/// Skips over "\ ", "\~" and "\$" (not for Win32 though). /// Skips over "\ ", "\~" and "\$" (not for Win32 though).
/// If anything fails no expansion is done and dst equals src. /// If anything fails no expansion is done and dst equals src.
/// startstr recognize the start of a new name, for '~' expansion. /// prefix recognize the start of a new name, for '~' expansion.
/// @param srcp Input string e.g. "$HOME/vim.hlp" /// @param srcp Input string e.g. "$HOME/vim.hlp"
/// @param dst Where to put the result /// @param dst Where to put the result
/// @param dstlen Maximum length of the result /// @param dstlen Maximum length of the result
/// @param esc Should we escape spaces in expanded variables? /// @param esc Should we escape spaces in expanded variables?
/// @param one Should we expand more than one '~'? /// @param one Should we expand more than one '~'?
/// @param startstr Common prefix for paths, can be NULL /// @param prefix Common prefix for paths, can be NULL
void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one, void expand_env_esc(char_u *restrict srcp,
char_u *startstr) char_u *restrict dst,
int dstlen,
bool esc,
bool one,
char_u *prefix)
{ {
char_u *src;
char_u *tail; char_u *tail;
int c;
char_u *var; char_u *var;
bool copy_char; bool copy_char;
bool mustfree; // var was allocated, need to free it later bool mustfree; // var was allocated, need to free it later
bool at_start = true; // at start of a name bool at_start = true; // at start of a name
int startstr_len = 0;
if (startstr != NULL) int prefix_len = (prefix == NULL) ? 0 : (int)STRLEN(prefix);
startstr_len = (int)STRLEN(startstr);
src = skipwhite(srcp); char_u *src = skipwhite(srcp);
dstlen--; // leave one char space for "\," dstlen--; // leave one char space for "\,"
while (*src && dstlen > 0) { while (*src && dstlen > 0) {
// Skip over `=expr`. // Skip over `=expr`.
@@ -281,6 +281,7 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
dstlen -= (int)len; dstlen -= (int)len;
continue; continue;
} }
copy_char = true; copy_char = true;
if ((*src == '$') || (*src == '~' && at_start)) { if ((*src == '$') || (*src == '~' && at_start)) {
mustfree = false; mustfree = false;
@@ -290,14 +291,15 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
if (*src != '~') { // environment var if (*src != '~') { // environment var
tail = src + 1; tail = src + 1;
var = dst; var = dst;
c = dstlen - 1; int c = dstlen - 1;
#ifdef UNIX #ifdef UNIX
// Unix has ${var-name} type environment vars // Unix has ${var-name} type environment vars
if (*tail == '{' && !vim_isIDc('{')) { if (*tail == '{' && !vim_isIDc('{')) {
tail++; /* ignore '{' */ tail++; // ignore '{'
while (c-- > 0 && *tail && *tail != '}') while (c-- > 0 && *tail != NUL && *tail != '}') {
*var++ = *tail++; *var++ = *tail++;
}
} else // NOLINT } else // NOLINT
#endif #endif
{ {
@@ -321,7 +323,7 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
#if defined(UNIX) #if defined(UNIX)
} }
#endif #endif
} else if ( src[1] == NUL /* home directory */ } else if (src[1] == NUL // home directory
|| vim_ispathsep(src[1]) || vim_ispathsep(src[1])
|| vim_strchr((char_u *)" ,\t\n", src[1]) != NULL) { || vim_strchr((char_u *)" ,\t\n", src[1]) != NULL) {
var = homedir; var = homedir;
@@ -331,12 +333,13 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
// Copy ~user to dst[], so we can put a NUL after it. // Copy ~user to dst[], so we can put a NUL after it.
tail = src; tail = src;
var = dst; var = dst;
c = dstlen - 1; int c = dstlen - 1;
while ( c-- > 0 while (c-- > 0
&& *tail && *tail
&& vim_isfilec(*tail) && vim_isfilec(*tail)
&& !vim_ispathsep(*tail)) && !vim_ispathsep(*tail)) {
*var++ = *tail++; *var++ = *tail++;
}
*var = NUL; *var = NUL;
// Use os_get_user_directory() to get the user directory. // Use os_get_user_directory() to get the user directory.
// If this function fails, the shell is used to // If this function fails, the shell is used to
@@ -344,8 +347,7 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
// does not support ~user (old versions of /bin/sh). // does not support ~user (old versions of /bin/sh).
var = (char_u *)os_get_user_directory((char *)dst + 1); var = (char_u *)os_get_user_directory((char *)dst + 1);
mustfree = true; mustfree = true;
if (var == NULL) if (var == NULL) {
{
expand_T xpc; expand_T xpc;
ExpandInit(&xpc); ExpandInit(&xpc);
@@ -381,8 +383,9 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
if (esc && var != NULL && vim_strpbrk(var, (char_u *)" \t") != NULL) { if (esc && var != NULL && vim_strpbrk(var, (char_u *)" \t") != NULL) {
char_u *p = vim_strsave_escaped(var, (char_u *)" \t"); char_u *p = vim_strsave_escaped(var, (char_u *)" \t");
if (mustfree) if (mustfree) {
xfree(var); xfree(var);
}
var = p; var = p;
mustfree = true; mustfree = true;
} }
@@ -391,7 +394,7 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
&& (STRLEN(var) + STRLEN(tail) + 1 < (unsigned)dstlen)) { && (STRLEN(var) + STRLEN(tail) + 1 < (unsigned)dstlen)) {
STRCPY(dst, var); STRCPY(dst, var);
dstlen -= (int)STRLEN(var); dstlen -= (int)STRLEN(var);
c = (int)STRLEN(var); int c = (int)STRLEN(var);
// if var[] ends in a path separator and tail[] starts // if var[] ends in a path separator and tail[] starts
// with it, skip a character // with it, skip a character
if (*var != NUL && after_pathsep((char *)dst, (char *)dst + c) if (*var != NUL && after_pathsep((char *)dst, (char *)dst + c)
@@ -404,8 +407,9 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
src = tail; src = tail;
copy_char = false; copy_char = false;
} }
if (mustfree) if (mustfree) {
xfree(var); xfree(var);
}
} }
if (copy_char) { // copy at least one char if (copy_char) { // copy at least one char
@@ -422,9 +426,10 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one,
*dst++ = *src++; *dst++ = *src++;
--dstlen; --dstlen;
if (startstr != NULL && src - startstr_len >= srcp if (prefix != NULL && src - prefix_len >= srcp
&& STRNCMP(src - startstr_len, startstr, startstr_len) == 0) && STRNCMP(src - prefix_len, prefix, prefix_len) == 0) {
at_start = true; at_start = true;
}
} }
} }
*dst = NUL; *dst = NUL;
@@ -451,17 +456,37 @@ static char *vim_version_dir(const char *vimdir)
return NULL; return NULL;
} }
/// If the string between "p" and "pend" ends in "name/", return "pend" minus /// If `dirname + "/"` precedes `pend` in the path, return the pointer to
/// the length of "name/". Otherwise return "pend". /// `dirname + "/" + pend`. Otherwise return `pend`.
static char *remove_tail(char *p, char *pend, char *name) ///
/// Examples (path = /usr/local/share/nvim/runtime/doc/help.txt):
///
/// pend = help.txt
/// dirname = doc
/// -> doc/help.txt
///
/// pend = doc/help.txt
/// dirname = runtime
/// -> runtime/doc/help.txt
///
/// pend = runtime/doc/help.txt
/// dirname = vim74
/// -> runtime/doc/help.txt
///
/// @param path Path to a file
/// @param pend A suffix of the path
/// @param dirname The immediate path fragment before the pend
/// @return The new pend including dirname or just pend
static char *remove_tail(char *path, char *pend, char *dirname)
{ {
size_t len = STRLEN(name) + 1; size_t len = STRLEN(dirname);
char *newend = pend - len; char *new_tail = pend - len - 1;
if (newend >= p if (new_tail >= path
&& fnamencmp((char_u *)newend, (char_u *)name, len - 1) == 0 && fnamencmp((char_u *)new_tail, (char_u *)dirname, len) == 0
&& (newend == p || after_pathsep(p, newend))) && (new_tail == path || after_pathsep(path, new_tail))) {
return newend; return new_tail;
}
return pend; return pend;
} }
@@ -745,9 +770,10 @@ void home_replace(buf_T *buf, char_u *src, char_u *dst, int dstlen, bool one)
/// @param src Input file name /// @param src Input file name
char_u * home_replace_save(buf_T *buf, char_u *src) FUNC_ATTR_NONNULL_RET char_u * home_replace_save(buf_T *buf, char_u *src) FUNC_ATTR_NONNULL_RET
{ {
size_t len = 3; /* space for "~/" and trailing NUL */ size_t len = 3; // space for "~/" and trailing NUL
if (src != NULL) /* just in case */ if (src != NULL) { // just in case
len += STRLEN(src); len += STRLEN(src);
}
char_u *dst = xmalloc(len); char_u *dst = xmalloc(len);
home_replace(buf, src, dst, (int)len, true); home_replace(buf, src, dst, (int)len, true);
return dst; return dst;
@@ -783,8 +809,7 @@ char_u *get_env_name(expand_T *xp, int idx)
STRLCPY(name, envname, ENVNAMELEN); STRLCPY(name, envname, ENVNAMELEN);
xfree(envname); xfree(envname);
return name; return name;
} else {
return NULL;
} }
return NULL;
} }