patch 7.4.1381

Problem:    Exit value not available on MS-Windows.
Solution:   Set the exit value.

diff --git a/src/os_win32.c b/src/os_win32.c
index 631f88e49584f9d6995c58f4d7a3ee8c7630f2b9..047045047e32c10d20ec7fcadc18d8abeb8c47c7 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5127,6 +5127,7 @@ mch_job_status(job_T *job)
            || dwExitCode != STILL_ACTIVE)
     {
        job->jv_status = JOB_ENDED;
+       job->jv_exitval = (int)dwExitCode;
        return "dead";
     }
     return "run";

diff --git a/src/structs.h b/src/structs.h
index b67f48a855213fb04db8855d887814f84ee0b233..e1720ce38911b470c92db9f2cc1a818d747d87e1 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1257,7 +1257,6 @@ struct jobvar_S
     job_T      *jv_prev;
 #ifdef UNIX
     pid_t      jv_pid;
-    int                jv_exitval;
 #endif
 #ifdef WIN32
     PROCESS_INFORMATION        jv_proc_info;
@@ -1265,6 +1264,7 @@ struct jobvar_S
 #endif
     jobstatus_T        jv_status;
     char_u     *jv_stoponexit; /* allocated */
+    int                jv_exitval;
     char_u     *jv_exit_cb;    /* allocated */
 
     int                jv_refcount;    /* reference count */

diff --git a/src/version.c b/src/version.c
index b6153549c97ede3f9fecea9d09add3a669dbd780..144dc18b78c67b7b32557ccbe886734383ff9ab9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1381,
 /**/
     1380,
 /**/