Add vim_gettempdir(), remove global vim_tempdir

vim_gettempdir() and vim_maketempdir() was extracted from
vim_tempname().

3 files changed, 49 insertions, 39 deletions

diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 37210e447c..be4a923d14 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -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
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index b8adff3bca..23609ab92f 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -5156,9 +5156,42 @@ 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.
  */
 void vim_deltempdir(void)
@@ -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);
   }
 
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 436ddb768d..cdfa882a3e 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -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).