wxSplitPath() bugs corrected and it's documented

[wxWidgets.git] / src / gtk / utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index ba3988e15479b2fabbb1d0fdf3240d4d1c35c6df..a280a4c189827c7c3a9a58cf340b4d653bc7b70a 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -96,7 +96,7 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
   if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
   if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
 {
   if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
   if (minorVsn) *minorVsn = GTK_MINOR_VERSION;

-  
+

   return wxGTK;
 }
 
   return wxGTK;
 }
 


@@ -123,11 +123,11 @@ char *wxGetUserHome( const wxString &user )
        {
             return ptr;
        }
        {
             return ptr;
        }

-        if ((ptr = getenv("USER")) != NULL || (ptr = getenv("LOGNAME")) != NULL) 
+        if ((ptr = getenv("USER")) != NULL || (ptr = getenv("LOGNAME")) != NULL)

        {
             who = getpwnam(ptr);
         }
        {
             who = getpwnam(ptr);
         }

-       
+

         /* We now make sure the the user exists! */
         if (who == NULL)
        {
         /* We now make sure the the user exists! */
         if (who == NULL)
        {


@@ -252,10 +252,14 @@ bool wxDirExists( const wxString& dir )
 // subprocess routines
 //------------------------------------------------------------------------
 
 // subprocess routines
 //------------------------------------------------------------------------
 

+// if pid > 0, the execution is async and the data is freed in
+// GTK_EndProcessDetector, if pid < 0, the execution is synchronous and the
+// caller (wxExecute) frees the data

 struct wxEndProcessData
 {
     gint pid, tag;
     wxProcess *process;
 struct wxEndProcessData
 {
     gint pid, tag;
     wxProcess *process;

+    int  exitcode;

 };
 
 static void GTK_EndProcessDetector(gpointer data, gint source,
 };
 
 static void GTK_EndProcessDetector(gpointer data, gint source,


@@ -274,7 +278,7 @@ static void GTK_EndProcessDetector(gpointer data, gint source,
     //     one)
     int status = -1;
 #if !defined(__sgi)
     //     one)
     int status = -1;
 #if !defined(__sgi)

-    wait4(proc_data->pid, &status, 0, (rusage *) NULL);
+    wait4(pid, &status, 0, (rusage *) NULL);

 #else
     wait3(&status, 0, (rusage *) NULL);
 #endif
 #else
     wait3(&status, 0, (rusage *) NULL);
 #endif


@@ -286,9 +290,16 @@ static void GTK_EndProcessDetector(gpointer data, gint source,
         proc_data->process->OnTerminate(proc_data->pid, status);
 
     if (proc_data->pid > 0)
         proc_data->process->OnTerminate(proc_data->pid, status);
 
     if (proc_data->pid > 0)

+    {

         delete proc_data;
         delete proc_data;

+    }

     else
     else

+    {
+        // wxExecute() will know about it
+        proc_data->exitcode = status;
+

         proc_data->pid = 0;
         proc_data->pid = 0;

+    }

 }
 
 long wxExecute( char **argv, bool sync, wxProcess *process )
 }
 
 long wxExecute( char **argv, bool sync, wxProcess *process )


@@ -299,10 +310,10 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
     wxCHECK_MSG( *argv, 0, "can't exec empty command" );
 
     /* Create pipes */
     wxCHECK_MSG( *argv, 0, "can't exec empty command" );
 
     /* Create pipes */

-    if (pipe(end_proc_detect) == -1) 
+    if (pipe(end_proc_detect) == -1)

     {
     {

-      wxLogSysError( "Pipe creation failed" );
-      return 0;
+        wxLogSysError( _("Pipe creation failed") );
+        return 0;

     }
 
     /* fork the process */
     }
 
     /* fork the process */


@@ -311,65 +322,79 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
 #else
     pid_t pid = fork();
 #endif
 #else
     pid_t pid = fork();
 #endif

-    if (pid == -1) 
+    if (pid == -1)

     {
     {

-        wxLogSysError( "Fork failed" );
+        wxLogSysError( _("Fork failed") );

         return 0;
     }
         return 0;
     }

-    else if (pid == 0) 
+    else if (pid == 0)

     {
         // we're in child
         close(end_proc_detect[0]); // close reading side
     {
         // we're in child
         close(end_proc_detect[0]); // close reading side

-       // These three lines close the open file descriptors to
-       // to avoid any input/output which might block the process
-       // or irritate the user. If one wants proper IO for the sub-
-       // process, the "right thing to do" is to start an xterm executing
-       // it.
-       close(STDIN_FILENO);
-       close(STDOUT_FILENO);
-       close(STDERR_FILENO);
-        // some programs complain about sterr not being open, so
-        // redirect them:
+
+        // These three lines close the open file descriptors to to avoid any
+        // input/output which might block the process or irritate the user. If
+        // one wants proper IO for the subprocess, the "right thing to do is
+        // to start an xterm executing it.
+        close(STDIN_FILENO);
+        close(STDOUT_FILENO);
+
+        // leave stderr opened, it won't do any hurm
+#if 0
+        close(STDERR_FILENO);
+
+        // some programs complain about stderr not being open, so redirect
+        // them:

         open("/dev/null", O_RDONLY);  // stdin
         open("/dev/null", O_RDONLY);  // stdin

-       open("/dev/null", O_WRONLY);  // stdout
-       open("/dev/null", O_WRONLY);  // stderr
-        
+        open("/dev/null", O_WRONLY);  // stdout
+        open("/dev/null", O_WRONLY);  // stderr
+#endif

 
 #ifdef _AIX
         execvp ((const char *)*argv, (const char **)argv);
 #else
         execvp (*argv, argv);
 #endif
 
 #ifdef _AIX
         execvp ((const char *)*argv, (const char **)argv);
 #else
         execvp (*argv, argv);
 #endif

+

         // there is no return after successful exec()
         // there is no return after successful exec()

-        wxLogSysError( "Can't execute '%s'", *argv);
+        fprintf(stderr, _("Can't execute '%s'\n"), *argv);

 
         _exit(-1);
     }
 
         _exit(-1);
     }

-    else 
+    else

     {
     {

-      // we're in parent
-      close(end_proc_detect[1]); // close writing side
-      data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ,
-                                GTK_EndProcessDetector, (gpointer)data);
-      data->pid = pid;
-      if (!sync) 
-      {
-        data->process = process;
-      }
-      else 
-      {
-        data->process = (wxProcess *) NULL;
-        data->pid = -(data->pid);
-
-        while (data->pid != 0)
-          wxYield();
-
-        delete data;
-      }
-
-      // @@@ our return value indicates success even if execvp() in the child
-      //     failed!
-      return pid;
+        // we're in parent
+        close(end_proc_detect[1]); // close writing side
+        data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ,
+                                  GTK_EndProcessDetector, (gpointer)data);
+        if ( sync )
+        {
+            wxASSERT_MSG( !process, "wxProcess param ignored for sync exec" );
+            data->process = NULL;
+
+            // sync execution: indicate it by negating the pid
+            data->pid = -pid;
+
+            // it will be set to 0 from GTK_EndProcessDetector
+            while (data->pid != 0)
+                wxYield();
+
+            int exitcode = data->exitcode;
+
+            delete data;
+
+            return exitcode;
+        }
+        else
+        {
+            // async execution, nothing special to do - caller will be
+            // notified about the process terminationif process != NULL, data
+            // will be deleted in GTK_EndProcessDetector
+            data->process = process;
+            data->pid = pid;
+
+            return pid;
+        }

     }
 }
 
     }
 }
 


@@ -389,7 +414,7 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process )
         /* loop */ ;
 
     long lRc = wxExecute(argv, sync, process);
         /* loop */ ;
 
     long lRc = wxExecute(argv, sync, process);

-    
+

     delete [] tmp;
 
     return lRc;
     delete [] tmp;
 
     return lRc;