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

Add vim_gettempdir(), remove global vim_tempdir

Browse Source 
vim_gettempdir() and vim_maketempdir() was extracted from
vim_tempname().
This commit is contained in:
Pavel Platto 2014-06-21 14:07:51 +03:00 committed by Nicolas Hillegeer
parent 29e0cd1571
commit 8cfa7b3d15
3 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/diff.c
View File

@ -893,11 +893,11 @@ void ex_diffpatch(exarg_T *eap)
|| (os_chdir((char *)dirbuf) != 0)) {
dirbuf[0] = NUL;
} else {
if (vim_tempdir != NULL) {
ignored = os_chdir((char *)vim_tempdir);
} else {
ignored = os_chdir("/tmp");
char *tempdir = (char *)vim_gettempdir();
if (tempdir == NULL) {
tempdir = "/tmp";
}
os_chdir(tempdir);
shorten_fnames(TRUE);
}
#endif // ifdef UNIX

77
src/nvim/fileio.c
View File

@ -5156,8 +5156,41 @@ void write_lnum_adjust(linenr_T offset)
curbuf->b_no_eol_lnum += offset;
}
/* Name of Vim's own temp dir. Ends in a slash. */
static char_u *vim_tempdir = NULL;
static uint32_t temp_count = 0; /* Temp filename counter. */
/*
* This will create a directory for private use by this instance of Vim.
* This is done once, and the same directory is used for all temp files.
* This method avoids security problems because of symlink attacks et al.
* It's also a bit faster, because we only need to check for an existing
* file when creating the directory and not for each temp file.
*/
static void vim_maketempdir(void)
{
static const char *temp_dirs[] = TEMP_DIR_NAMES;
int i;
/*
* Try the entries in `TEMP_DIR_NAMES` to create the temp directory.
*/
char_u itmp[TEMP_FILE_PATH_MAXLEN];
for (i = 0; i < (int)(sizeof(temp_dirs) / sizeof(char *)); ++i) {
/* expand $TMP, leave room for "/nvimXXXXXX/999999999" */
expand_env((char_u *)temp_dirs[i], itmp, TEMP_FILE_PATH_MAXLEN - 22);
if (os_isdir(itmp)) { /* directory exists */
add_pathsep(itmp);
/* Leave room for filename */
STRCAT(itmp, "nvimXXXXXX");
if (os_mkdtemp((char *)itmp) != NULL)
vim_settempdir(itmp);
if (vim_tempdir != NULL)
break;
}
}
}
/*
* Delete the temp directory and all files it contains.
*/
@ -5183,6 +5216,15 @@ void vim_deltempdir(void)
}
}
char_u *vim_gettempdir(void)
{
if (vim_tempdir == NULL) {
vim_maketempdir();
}
return vim_tempdir;
}
/*
* Directory "tempdir" was created. Expand this name to a full path and put
* it in "vim_tempdir". This avoids that using ":cd" would confuse us.
@ -5212,40 +5254,11 @@ char_u *vim_tempname(void)
{
char_u itmp[TEMP_FILE_PATH_MAXLEN];
static const char *temp_dirs[] = TEMP_DIR_NAMES;
int i;
/*
* This will create a directory for private use by this instance of Vim.
* This is done once, and the same directory is used for all temp files.
* This method avoids security problems because of symlink attacks et al.
* It's also a bit faster, because we only need to check for an existing
* file when creating the directory and not for each temp file.
*/
if (vim_tempdir == NULL) {
/*
* Try the entries in `TEMP_DIR_NAMES` to create the temp directory.
*/
for (i = 0; i < (int)(sizeof(temp_dirs) / sizeof(char *)); ++i) {
/* expand $TMP, leave room for "/nvimXXXXXX/999999999" */
expand_env((char_u *)temp_dirs[i], itmp, TEMP_FILE_PATH_MAXLEN - 22);
if (os_isdir(itmp)) { /* directory exists */
add_pathsep(itmp);
/* Leave room for filename */
STRCAT(itmp, "nvimXXXXXX");
if (os_mkdtemp((char *)itmp) != NULL)
vim_settempdir(itmp);
if (vim_tempdir != NULL)
break;
}
}
}
if (vim_tempdir != NULL) {
char_u *tempdir = vim_gettempdir();
if (tempdir != NULL) {
/* There is no need to check if the file exists, because we own the
* directory and nobody else creates a file in it. */
sprintf((char *)itmp, "%s%" PRIu32, vim_tempdir, temp_count++);
sprintf((char *)itmp, "%s%" PRIu32, tempdir, temp_count++);
return vim_strsave(itmp);
}

3
src/nvim/globals.h
View File

@ -536,9 +536,6 @@ EXTERN int ru_col; /* column for ruler */
EXTERN int ru_wid; /* 'rulerfmt' width of ruler when non-zero */
EXTERN int sc_col; /* column for shown command */
EXTERN char_u *vim_tempdir INIT(= NULL); /* Name of Vim's own temp dir.
Ends in a slash. */
/*
* When starting or exiting some things are done differently (e.g. screen
* updating).