From 29e0cd1571b773feb7fd61118930cdac7d83e38c Mon Sep 17 00:00:00 2001
From: Pavel Platto <hinidu@gmail.com>
Date: Thu, 19 Jun 2014 23:46:51 +0300
Subject: Refactor vim_tempname

- temp_count is uint32_t now instead of long because it supposed to be
  at most 999999999 (comment on line 5227) temporary files. The most
  probably it was a long for compatibility with systems where int is
  16-bit.
- Use "nvim" as prefix for temp folder name instead of "v"
- Remove unused parameter from vim_tempname
---
 src/nvim/eval.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'src/nvim/eval.c')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index eafdd2446c..7dc95bcded 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -14030,7 +14030,7 @@ static void f_system(typval_T *argvars, typval_T *rettv)
      * Write the string to a temp file, to be used for input of the shell
      * command.
      */
-    if ((infile = vim_tempname('i')) == NULL) {
+    if ((infile = vim_tempname()) == NULL) {
       EMSG(_(e_notmp));
       goto done;
     }
@@ -14231,22 +14231,8 @@ static void f_taglist(typval_T *argvars, typval_T *rettv)
  */
 static void f_tempname(typval_T *argvars, typval_T *rettv)
 {
-  static int x = 'A';
-
   rettv->v_type = VAR_STRING;
-  rettv->vval.v_string = vim_tempname(x);
-
-  /* Advance 'x' to use A-Z and 0-9, so that there are at least 34 different
-   * names.  Skip 'I' and 'O', they are used for shell redirection. */
-  do {
-    if (x == 'Z')
-      x = '0';
-    else if (x == '9')
-      x = 'A';
-    else {
-      ++x;
-    }
-  } while (x == 'I' || x == 'O');
+  rettv->vval.v_string = vim_tempname();
 }
 
 /*
-- 
cgit 


From 286ce271e730a2e6883c244912b36bca007f6ddc Mon Sep 17 00:00:00 2001
From: Pavel Platto <hinidu@gmail.com>
Date: Sun, 22 Jun 2014 13:03:08 +0300
Subject: Extract `tempfile` module from fileio

Though this module is relatively small it has very clear boundaries.
The last argument for extracting `tempfile` was the errors which I got
when I was writing unittests for it: `cimport './src/nvim/fileio.h'`
does not work for some reason.
---
 src/nvim/eval.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/nvim/eval.c')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 7dc95bcded..3459b5c4a0 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -68,6 +68,7 @@
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/tag.h"
+#include "nvim/tempfile.h"
 #include "nvim/term.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
-- 
cgit