changeset 25008:50c6b0250c04 v8.2.3041

patch 8.2.3041: detecting if the process of a swap file is running fails Commit: https://github.com/vim/vim/commit/44dea9da4b2a21dd1e03f2bd94b4f2679d4613e5 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jun 23 21:13:20 2021 +0200 patch 8.2.3041: detecting if the process of a swap file is running fails Problem: Detecting if the process of a swap file is running fails if the process is owned by another user. Solution: Check for the ESRCH error. (closes #8436)
author Bram Moolenaar <Bram@vim.org>
date Wed, 23 Jun 2021 21:15:03 +0200
parents e7ade92e9674
children 7cd37c44cad8
files src/os_unix.c src/version.c
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2486,8 +2486,17 @@ mch_get_pid(void)
     int
 mch_process_running(long pid)
 {
-    // EMX kill() not working correctly, it seems
-    return kill(pid, 0) == 0;
+    // If there is no error the process must be running.
+    if (kill(pid, 0) == 0)
+	return TRUE;
+#ifdef ESRCH
+    // If the error is ESRCH then the process is not running.
+    if (errno == ESRCH)
+	return FALSE;
+#endif
+    // If the process is running and owned by another user we get EPERM.  With
+    // other errors the process might be running, assuming it is then.
+    return TRUE;
 }
 
 #if !defined(HAVE_STRERROR) && defined(USE_GETCWD)
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3041,
+/**/
     3040,
 /**/
     3039,