X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beba2fc73283f5b750227459da57e66bcd475f5..f6b77239295c92072f13e88d49284fb647f79971:/src/unix/utilsunx.cpp?ds=inline

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index c4a312efbd..c8bdafd3bf 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -44,7 +44,7 @@
 // JACS: needed for FD_SETSIZE
 #include <sys/time.h>
 
-#if HAVE_UNAME
+#ifdef HAVE_UNAME
     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME
 
@@ -64,7 +64,7 @@
         #ifdef __SUN__
             int usleep(unsigned int usec);
         #else // !Sun
-        #ifdef __EMX
+        #ifdef __EMX__
             /* I copied this from the XFree86 diffs. AV. */
             #define INCL_DOSPROCESS
             #include <os2.h>
@@ -95,14 +95,14 @@ void wxSleep(int nSecs)
 
 void wxUsleep(unsigned long milliseconds)
 {
-#if HAVE_NANOSLEEP
+#ifdef HAVE_NANOSLEEP
     timespec tmReq;
     tmReq.tv_sec = milliseconds / 1000;
     tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
 
     // we're not interested in remaining time nor in return value
     (void)nanosleep(&tmReq, (timespec *)NULL);
-#elif HAVE_USLEEP
+#elif defined( HAVE_USLEEP )
     // uncomment this if you feel brave or if you are sure that your version
     // of Solaris has a safe usleep() function but please notice that usleep()
     // is known to lead to crashes in MT programs in Solaris 2.[67] and is not
@@ -217,9 +217,22 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
     // systems wait() might be used instead in a loop (until the right pid
     // terminates)
     int status = 0;
-    if ( waitpid(pid, &status, 0) == -1 || !WIFEXITED(status) )
+    int rc;
+
+    do
+       rc = waitpid(pid, &status, 0);
+    while(rc == -1 && ( /* errno == ERESTARTSYS || */ errno == EINTR) );
+    // waitpid() was interrupted, try again
+
+       
+    if( rc == -1 || ! (WIFEXITED(status) || WIFSIGNALED(status)) )
     {
-        wxLogSysError(_("Waiting for subprocess termination failed"));
+       wxLogSysError(_("Waiting for subprocess termination failed"));
+       /* AFAIK, this can only happen if something went wrong within
+          wxGTK, i.e. due to a racecondition or some serious bug.
+          After having fixed the order of statements in
+          GTK_EndProcessDetector(). (KB)
+       */
     }
     else
     {
@@ -229,19 +242,18 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
             proc_data->process->OnTerminate(proc_data->pid,
                                             WEXITSTATUS(status));
         }
-    }
-
-    // clean up
-    if ( proc_data->pid > 0 )
-    {
-        delete proc_data;
-    }
-    else
-    {
-        // wxExecute() will know about it
-        proc_data->exitcode = status;
-
-        proc_data->pid = 0;
+        // clean up
+        if ( proc_data->pid > 0 )
+        {
+           delete proc_data;
+        }
+        else
+        {
+           // wxExecute() will know about it
+           proc_data->exitcode = status;
+           
+           proc_data->pid = 0;
+        }
     }
 }
 
@@ -286,7 +298,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
 #endif // wxUSE_GUI
 
     // fork the process
-#if HAVE_VFORK
+#ifdef HAVE_VFORK
     pid_t pid = vfork();
 #else
     pid_t pid = fork();
@@ -345,11 +357,8 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
     else
     {
 #if wxUSE_GUI
-        // we're in parent
-        close(end_proc_detect[1]); // close writing side
-
         wxEndProcessData *data = new wxEndProcessData;
-        data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
+
 
         ARGS_CLEANUP;
 
@@ -360,6 +369,9 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
 
             // sync execution: indicate it by negating the pid
             data->pid = -pid;
+            data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
+            // we're in parent
+            close(end_proc_detect[1]); // close writing side
 
             // it will be set to 0 from GTK_EndProcessDetector
             while (data->pid != 0)
@@ -374,10 +386,13 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
         else
         {
             // async execution, nothing special to do - caller will be
-            // notified about the process terminationif process != NULL, data
+            // notified about the process termination if process != NULL, data
             // will be deleted in GTK_EndProcessDetector
             data->process = process;
             data->pid = pid;
+            data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
+            // we're in parent
+            close(end_proc_detect[1]); // close writing side
 
             return pid;
         }
@@ -393,6 +408,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
         return exitcode;
 #endif // wxUSE_GUI
     }
+   return 0;
 
     #undef ARGS_CLEANUP
 }
@@ -550,10 +566,14 @@ bool wxGetUserName(wxChar *buf, int sz)
 
     *buf = wxT('\0');
     if ((who = getpwuid (getuid ())) != NULL) {
+#ifndef __VMS__
        comma = strchr(who->pw_gecos, ',');
        if (comma)
            *comma = '\0'; // cut off non-name comment fields
        wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);
+#else
+       wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
+#endif
        return TRUE;
     }