1 files changed, 41 insertions, 0 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index fdf1973719..6bad91e959 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -65,6 +65,11 @@
 #include "nvim/undo.h"
 #include "nvim/vim.h"
 
+#if defined(HAVE_FLOCK) && defined(HAVE_DIRFD)
+# include <dirent.h>
+# include <sys/file.h>
+#endif
+
 #ifdef OPEN_CHR_FILES
 # include "nvim/charset.h"
 #endif
@@ -5167,6 +5172,9 @@ void forward_slash(char_u *fname)
 
 /// Path to Nvim's own temp dir. Ends in a slash.
 static char *vim_tempdir = NULL;
+#if defined(HAVE_FLOCK) && defined(HAVE_DIRFD)
+DIR *vim_tempdir_dp = NULL;  ///< File descriptor of temp dir
+#endif
 
 /// Creates a directory for private use by this instance of Nvim, trying each of
 /// `TEMP_DIR_NAMES` until one succeeds.
@@ -5331,10 +5339,40 @@ int delete_recursive(const char *name)
   return result;
 }
 
+#if defined(HAVE_FLOCK) && defined(HAVE_DIRFD)
+/// Open temporary directory and take file lock to prevent
+/// to be auto-cleaned.
+static void vim_opentempdir(void)
+{
+  if (vim_tempdir_dp != NULL) {
+    return;
+  }
+
+  DIR *dp = opendir(vim_tempdir);
+
+  if (dp != NULL) {
+    vim_tempdir_dp = dp;
+    flock(dirfd(vim_tempdir_dp), LOCK_SH);
+  }
+}
+
+/// Close temporary directory - it automatically release file lock.
+static void vim_closetempdir(void)
+{
+  if (vim_tempdir_dp != NULL) {
+    closedir(vim_tempdir_dp);
+    vim_tempdir_dp = NULL;
+  }
+}
+#endif
+
 /// Delete the temp directory and all files it contains.
 void vim_deltempdir(void)
 {
   if (vim_tempdir != NULL) {
+#if defined(HAVE_FLOCK) && defined(HAVE_DIRFD)
+    vim_closetempdir();
+#endif
     // remove the trailing path separator
     path_tail(vim_tempdir)[-1] = NUL;
     delete_recursive(vim_tempdir);
@@ -5370,6 +5408,9 @@ static bool vim_settempdir(char *tempdir)
   vim_FullName(tempdir, buf, MAXPATHL, false);
   add_pathsep(buf);
   vim_tempdir = xstrdup(buf);
+#if defined(HAVE_FLOCK) && defined(HAVE_DIRFD)
+  vim_opentempdir();
+#endif
   xfree(buf);
   return true;
 }