mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 23:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

option: Prepare for all environment variables being NULL.

Browse Source
This commit is contained in:
ZyX
2015-08-01 18:53:39 +03:00
parent ee95f818a6
commit ab2944f46c
1 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/nvim/option.c
View File

@@ -310,36 +310,47 @@ static void set_runtimepath_default(void)
char *const vimruntime = vim_getenv("VIMRUNTIME"); char *const vimruntime = vim_getenv("VIMRUNTIME");
char *const data_dirs = vim_getenv("XDG_DATA_DIRS"); char *const data_dirs = vim_getenv("XDG_DATA_DIRS");
char *const config_dirs = vim_getenv("XDG_CONFIG_DIRS"); char *const config_dirs = vim_getenv("XDG_CONFIG_DIRS");
assert(data_home != NULL);
assert(config_home != NULL);
assert(vimruntime != NULL);
assert(data_dirs != NULL);
assert(config_dirs != NULL);
#define NVIM_SIZE (sizeof("/nvim") - 1) #define NVIM_SIZE (sizeof("/nvim") - 1)
#define SITE_SIZE (sizeof("/site") - 1) #define SITE_SIZE (sizeof("/site") - 1)
#define AFTER_SIZE (sizeof("/after") - 1) #define AFTER_SIZE (sizeof("/after") - 1)
const size_t data_len = strlen(data_home); size_t data_len;
const size_t config_len = strlen(config_home); size_t config_len;
const size_t vimruntime_len = strlen(vimruntime); size_t vimruntime_len;
rtp_size += ((data_len + NVIM_SIZE + SITE_SIZE) * 2 + AFTER_SIZE) + 2; if (data_home != NULL) {
rtp_size += ((config_len + NVIM_SIZE) * 2 + AFTER_SIZE) + 2; data_len = strlen(data_home);
rtp_size += vimruntime_len; rtp_size += ((data_len + NVIM_SIZE + SITE_SIZE) * 2 + AFTER_SIZE) + 2;
}
if (config_home != NULL) {
config_len = strlen(config_home);
rtp_size += ((config_len + NVIM_SIZE) * 2 + AFTER_SIZE) + 2;
}
if (vimruntime != NULL) {
vimruntime_len = strlen(vimruntime);
rtp_size += vimruntime_len + 1;
}
#define COMPUTE_COLON_LEN(rtp_size, additional_size, val) \ #define COMPUTE_COLON_LEN(rtp_size, additional_size, val) \
do { \ do { \
const void *iter = NULL; \ if (val != NULL) { \
do { \ const void *iter = NULL; \
size_t dir_len; \ do { \
const char *dir; \ size_t dir_len; \
iter = vim_colon_env_iter(val, iter, &dir, &dir_len); \ const char *dir; \
if (dir != NULL && dir_len > 0) { \ iter = vim_colon_env_iter(val, iter, &dir, &dir_len); \
rtp_size += ((dir_len + NVIM_SIZE + additional_size) * 2 \ if (dir != NULL && dir_len > 0) { \
+ AFTER_SIZE) + 2; \ rtp_size += ((dir_len + NVIM_SIZE + additional_size) * 2 \
} \ + AFTER_SIZE) + 2; \
} while (iter != NULL); \ } \
} while (iter != NULL); \
} \
} while (0) } while (0)
COMPUTE_COLON_LEN(rtp_size, SITE_SIZE, data_dirs); COMPUTE_COLON_LEN(rtp_size, SITE_SIZE, data_dirs);
COMPUTE_COLON_LEN(rtp_size, 0, config_dirs); COMPUTE_COLON_LEN(rtp_size, 0, config_dirs);
#undef COMPUTE_COLON_LEN #undef COMPUTE_COLON_LEN
if (rtp_size == 0) {
return;
}
// All additions were including comma.
rtp_size--;
char *const rtp = xmallocz(rtp_size); char *const rtp = xmallocz(rtp_size);
char *rtp_cur = rtp; char *rtp_cur = rtp;
#define ADD_STRING(tgt, src, len) \ #define ADD_STRING(tgt, src, len) \
@@ -348,31 +359,46 @@ static void set_runtimepath_default(void)
ADD_STRING(tgt, str, sizeof(str) - 1) ADD_STRING(tgt, str, sizeof(str) - 1)
#define ADD_COLON_DIRS(tgt, val, suffix, revsuffix) \ #define ADD_COLON_DIRS(tgt, val, suffix, revsuffix) \
do { \ do { \
const void *iter = NULL; \ if (val != NULL) { \
do { \ const void *iter = NULL; \
size_t dir_len; \ do { \
const char *dir; \ size_t dir_len; \
iter = vim_colon_env_iter##revsuffix(val, iter, &dir, &dir_len); \ const char *dir; \
if (dir != NULL && dir_len > 0) { \ iter = vim_colon_env_iter##revsuffix(val, iter, &dir, &dir_len); \
ADD_STRING(rtp_cur, dir, dir_len); \ if (dir != NULL && dir_len > 0) { \
ADD_STATIC_STRING(rtp_cur, "/nvim" suffix ","); \ ADD_STRING(rtp_cur, dir, dir_len); \
} \ ADD_STATIC_STRING(rtp_cur, "/nvim" suffix ","); \
} while (iter != NULL); \ } \
} while (iter != NULL); \
} \
} while (0) } while (0)
ADD_STRING(rtp_cur, config_home, config_len); if (config_home != NULL) {
ADD_STATIC_STRING(rtp_cur, "/nvim,"); ADD_STRING(rtp_cur, config_home, config_len);
ADD_STATIC_STRING(rtp_cur, "/nvim,");
}
ADD_COLON_DIRS(rtp_cur, config_dirs, "", ); ADD_COLON_DIRS(rtp_cur, config_dirs, "", );
ADD_STRING(rtp_cur, data_home, data_len); if (data_home != NULL) {
ADD_STATIC_STRING(rtp_cur, "/nvim/site,"); ADD_STRING(rtp_cur, data_home, data_len);
ADD_STATIC_STRING(rtp_cur, "/nvim/site,");
}
ADD_COLON_DIRS(rtp_cur, data_dirs, "/site", ); ADD_COLON_DIRS(rtp_cur, data_dirs, "/site", );
ADD_STRING(rtp_cur, vimruntime, vimruntime_len); if (vimruntime != NULL) {
*rtp_cur++ = ','; ADD_STRING(rtp_cur, vimruntime, vimruntime_len);
*rtp_cur++ = ',';
}
ADD_COLON_DIRS(rtp_cur, data_dirs, "/site/after", _rev); ADD_COLON_DIRS(rtp_cur, data_dirs, "/site/after", _rev);
ADD_STRING(rtp_cur, data_home, data_len); if (data_home != NULL) {
ADD_STATIC_STRING(rtp_cur, "/nvim/site/after,"); ADD_STRING(rtp_cur, data_home, data_len);
ADD_STATIC_STRING(rtp_cur, "/nvim/site/after,");
}
ADD_COLON_DIRS(rtp_cur, config_dirs, "/after", _rev); ADD_COLON_DIRS(rtp_cur, config_dirs, "/after", _rev);
ADD_STRING(rtp_cur, config_home, config_len); if (config_home != NULL) {
ADD_STATIC_STRING(rtp_cur, "/nvim/after"); ADD_STRING(rtp_cur, config_home, config_len);
ADD_STATIC_STRING(rtp_cur, "/nvim/after");
} else {
// Strip trailing comma.
rtp[rtp_size - 1] = NUL;
}
#undef ADD_COLON_DIRS #undef ADD_COLON_DIRS
#undef ADD_STATIC_STRING #undef ADD_STATIC_STRING
#undef ADD_STRING #undef ADD_STRING