aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.4.684

Browse Source 
Problem:    When starting several Vim instances in diff mode, the temp files
            used may not be unique. (Issue 353)
Solution:   Add an argument to vim_tempname() to keep the file.
This commit is contained in:
Bram Moolenaar
2015-03-31 13:33:08 +02:00
parent 1ca2e361a8
commit e5c421cfd7
13 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/fileio.c
View File

@@ -2872,7 +2872,7 @@ readfile_charconvert(fname, fenc, fdp)
char_u *tmpname;
char_u *errmsg = NULL;
tmpname = vim_tempname('r');
tmpname = vim_tempname('r', FALSE);
if (tmpname == NULL)
errmsg = (char_u *)_("Can't find temp file for conversion");
else
@@ -4288,7 +4288,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
*/
if (*p_ccv != NUL)
{
wfname = vim_tempname('w');
wfname = vim_tempname('w', FALSE);
if (wfname == NULL) /* Can't write without a tempfile! */
{
errmsg = (char_u *)_("E214: Can't find temp file for writing");
@@ -7344,14 +7344,16 @@ vim_settempdir(tempdir)
/*
* vim_tempname(): Return a unique name that can be used for a temp file.
*
* The temp file is NOT created.
* The temp file is NOT garanteed to be created. If "keep" is FALSE it is
* garanteed to NOT be created.
*
* The returned pointer is to allocated memory.
* The returned pointer is NULL if no valid name was found.
*/
char_u *
vim_tempname(extra_char)
vim_tempname(extra_char, keep)
int extra_char UNUSED; /* char to use in the name instead of '?' */
int keep UNUSED;
{
#ifdef USE_TMPNAM
char_u itmp[L_tmpnam]; /* use tmpnam() */
@@ -7487,8 +7489,9 @@ vim_tempname(extra_char)
buf4[2] = extra_char; /* make it "VIa", "VIb", etc. */
if (GetTempFileName(szTempFile, buf4, 0, itmp) == 0)
return NULL;
/* GetTempFileName() will create the file, we don't want that */
(void)DeleteFile(itmp);
if (!keep)
/* GetTempFileName() will create the file, we don't want that */
(void)DeleteFile(itmp);
/* Backslashes in a temp file name cause problems when filtering with
* "sh". NOTE: This also checks 'shellcmdflag' to help those people who