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)
diff --git a/src/os_unix.c b/src/os_unix.c
index 0a4f0e6..56ee764 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2486,8 +2486,17 @@
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)
diff --git a/src/version.c b/src/version.c
index bf33312..79f05cc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3041,
+/**/
3040,
/**/
3039,