More small fixes

[wxWidgets.git] / src / unix / utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index a03b0596c4d4bf613e118d047616b63a74c32254..a93c05a3be1d07e5e4b10cc731bfb360de67318b 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -135,9 +135,39 @@ void wxUsleep(unsigned long milliseconds)
 // process management
 // ----------------------------------------------------------------------------
 
 // process management
 // ----------------------------------------------------------------------------
 

-int wxKill(long pid, wxSignal sig)
+int wxKill(long pid, wxSignal sig, wxKillError *rc)

 {
 {

-    return kill((pid_t)pid, (int)sig);
+    int err = kill((pid_t)pid, (int)sig);
+    if ( rc )
+    {
+        switch ( err )
+        {
+            case 0:
+                *rc = wxKILL_OK;
+                break;
+
+            case EINVAL:
+                *rc = wxKILL_BAD_SIGNAL;
+                break;
+
+            case EPERM:
+                *rc = wxKILL_ACCESS_DENIED;
+                break;
+
+            case ESRCH:
+                *rc = wxKILL_NO_PROCESS;
+                break;
+
+            default:
+                // this goes against Unix98 docs so log it
+                wxLogDebug(_T("unexpected kill(2) return value %d"), err);
+
+                // something else...
+                *rc = wxKILL_ERROR;
+        }
+    }
+
+    return err;

 }
 
 #define WXEXECUTE_NARGS   127
 }
 
 #define WXEXECUTE_NARGS   127


@@ -303,6 +333,8 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
 // wxStream classes to support IO redirection in wxExecute
 // ----------------------------------------------------------------------------
 
 // wxStream classes to support IO redirection in wxExecute
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STREAMS
+

 class wxProcessFileInputStream : public wxInputStream
 {
 public:
 class wxProcessFileInputStream : public wxInputStream
 {
 public:


@@ -399,15 +431,20 @@ size_t wxProcessFileOutputStream::OnSysWrite(const void *buffer, size_t bufsize)
     return ret;
 }
 
     return ret;
 }
 

+#endif // wxUSE_STREAMS
+

 long wxExecute(wxChar **argv,
                bool sync,
                wxProcess *process)
 {
     // for the sync execution, we return -1 to indicate failure, but for async
 long wxExecute(wxChar **argv,
                bool sync,
                wxProcess *process)
 {
     // for the sync execution, we return -1 to indicate failure, but for async

-    // cse we return 0 which is never a valid PID
-    long errorRetCode = sync ? -1 : 0;
+    // case we return 0 which is never a valid PID
+    //
+    // we define this as a macro, not a variable, to avoid compiler warnings
+    // about "ERROR_RETURN_CODE value may be clobbered by fork()"
+    #define ERROR_RETURN_CODE ((sync) ? -1 : 0)

 
 

-    wxCHECK_MSG( *argv, errorRetCode, wxT("can't exec empty command") );
+    wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") );

 
 #if wxUSE_UNICODE
     int mb_argc = 0;
 
 #if wxUSE_UNICODE
     int mb_argc = 0;


@@ -442,7 +479,7 @@ long wxExecute(wxChar **argv,
 
         ARGS_CLEANUP;
 
 
         ARGS_CLEANUP;
 

-        return errorRetCode;
+        return ERROR_RETURN_CODE;

     }
 #endif // wxUSE_GUI
 
     }
 #endif // wxUSE_GUI
 


@@ -470,7 +507,7 @@ long wxExecute(wxChar **argv,
 
             ARGS_CLEANUP;
 
 
             ARGS_CLEANUP;
 

-            return errorRetCode;
+            return ERROR_RETURN_CODE;

         }
     }
 
         }
     }
 


@@ -498,7 +535,7 @@ long wxExecute(wxChar **argv,
 
         ARGS_CLEANUP;
 
 
         ARGS_CLEANUP;
 

-        return errorRetCode;
+        return ERROR_RETURN_CODE;

     }
     else if ( pid == 0 )  // we're in child
     {
     }
     else if ( pid == 0 )  // we're in child
     {


@@ -557,16 +594,18 @@ long wxExecute(wxChar **argv,
         // pipe initialization: construction of the wxStreams
         if ( process && process->IsRedirected() )
         {
         // pipe initialization: construction of the wxStreams
         if ( process && process->IsRedirected() )
         {

+#if wxUSE_STREAMS

             // These two streams are relative to this process.
             wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]);
             wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]);
             wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]);
 
             // These two streams are relative to this process.
             wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]);
             wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]);
             wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]);
 

+            process->SetPipeStreams(inStream, outStream, errStream);
+#endif // wxUSE_STREAMS
+

             close(pipeIn[0]); // close reading side
             close(pipeOut[1]); // close writing side
             close(pipeErr[1]); // close writing side
             close(pipeIn[0]); // close reading side
             close(pipeOut[1]); // close writing side
             close(pipeErr[1]); // close writing side

-
-            process->SetPipeStreams(inStream, outStream, errStream);

         }
 
 #if wxUSE_GUI
         }
 
 #if wxUSE_GUI


@@ -631,6 +670,7 @@ long wxExecute(wxChar **argv,
 #endif
 }
 
 #endif
 }
 

+#undef ERROR_RETURN_CODE

 #undef ARGS_CLEANUP
 
 // ----------------------------------------------------------------------------
 #undef ARGS_CLEANUP
 
 // ----------------------------------------------------------------------------