1. more C++ parser fixes - now it almost parses wx/string.h

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 4a6dbc728d69963513abe5f763d214c2d9d39fcf..a280a4c189827c7c3a9a58cf340b4d653bc7b70a 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -2,10 +2,9 @@
 // Name:        utils.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        utils.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -16,6 +15,11 @@
 #include "wx/utils.h"
 #include "wx/string.h"
 
 #include "wx/utils.h"
 #include "wx/string.h"
 

+#include "wx/intl.h"
+#include "wx/log.h"
+
+#include "wx/process.h"
+

 #include <stdarg.h>
 #include <dirent.h>
 #include <string.h>
 #include <stdarg.h>
 #include <dirent.h>
 #include <string.h>


@@ -27,9 +31,25 @@
 #include <errno.h>
 #include <netdb.h>
 #include <signal.h>
 #include <errno.h>
 #include <netdb.h>
 #include <signal.h>

+#include <fcntl.h>          // for O_WRONLY and friends
+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gtk/gtkfeatures.h"
+#include "gdk/gdkx.h"

 
 #ifdef __SVR4__
 
 #ifdef __SVR4__

-#include <sys/systeminfo.h>
+  #include <sys/systeminfo.h>
+#endif
+
+#ifdef __SOLARIS__
+// somehow missing from sys/wait.h but in the system's docs
+extern "C"
+{
+   pid_t wait4(pid_t pid, int *statusp, int options, struct rusage
+               *rusage);
+}

 #endif
 
 //------------------------------------------------------------------------
 #endif
 
 //------------------------------------------------------------------------


@@ -38,42 +58,46 @@
 
 void wxBell(void)
 {
 
 void wxBell(void)
 {

-  gdk_beep();
-};
+    gdk_beep();
+}

 
 void wxSleep(int nSecs)
 {
 
 void wxSleep(int nSecs)
 {

-  sleep(nSecs);
-};
+    sleep(nSecs);
+}

 
 int wxKill(long pid, int sig)
 {
 
 int wxKill(long pid, int sig)
 {

-  return kill(pid, sig);
-};
+    return kill(pid, sig);
+}

 
 void wxDisplaySize( int *width, int *height )
 {
 
 void wxDisplaySize( int *width, int *height )
 {

-  if (width) *width = gdk_screen_width();
-  if (height) *height = gdk_screen_height();
+    if (width) *width = gdk_screen_width();
+    if (height) *height = gdk_screen_height();

 }
 
 void wxGetMousePosition( int* x, int* y )
 {
 }
 
 void wxGetMousePosition( int* x, int* y )
 {

-  wxFAIL_MSG( "GetMousePosition not yet implemented" );
-  if (x) *x = 0;
-  if (y) *y = 0;
-};
+    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
+}

 
 bool wxColourDisplay(void)
 {
 
 bool wxColourDisplay(void)
 {

-  wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
-  return TRUE;
+    return TRUE;

 }
 
 int wxDisplayDepth(void)
 {
 }
 
 int wxDisplayDepth(void)
 {

-  wxFAIL_MSG( "wxDisplayDepth always returns 8" );
-  return 8;
+    return gdk_window_get_visual( (GdkWindow*) &gdk_root_parent )->depth;
+}
+
+int wxGetOsVersion(int *majorVsn, int *minorVsn)
+{
+  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
+  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
+
+  return wxGTK;

 }
 
 //------------------------------------------------------------------------
 }
 
 //------------------------------------------------------------------------


@@ -82,34 +106,41 @@ int wxDisplayDepth(void)
 
 const char* wxGetHomeDir( wxString *home  )
 {
 
 const char* wxGetHomeDir( wxString *home  )
 {

-  *home = wxGetUserHome( wxString() );
-  if (home->IsNull()) *home = "/";
-  return *home;
-};
+    *home = wxGetUserHome( wxString() );
+    if (home->IsNull()) *home = "/";
+    return *home;
+}

 
 char *wxGetUserHome( const wxString &user )
 {
 
 char *wxGetUserHome( const wxString &user )
 {

-  struct passwd *who = (struct passwd *) NULL;
+    struct passwd *who = (struct passwd *) NULL;

 
 

-  if (user.IsNull() || (user== "")) 
-  {
-       register char *ptr;
+    if (user.IsNull() || (user== ""))
+    {
+        register char *ptr;

 
 

-       if ((ptr = getenv("HOME")) != NULL) 
-           return ptr;
-       if ((ptr = getenv("USER")) != NULL
-       || (ptr = getenv("LOGNAME")) != NULL) {
-           who = getpwnam(ptr);
+        if ((ptr = getenv("HOME")) != NULL)
+       {
+            return ptr;

        }
        }

-       // We now make sure the the user exists!
-       if (who == NULL)
-           who = getpwuid(getuid());
-  } 
-  else
-    who = getpwnam (user);
-    
-  return who ? who->pw_dir : (char*)NULL;
-};
+        if ((ptr = getenv("USER")) != NULL || (ptr = getenv("LOGNAME")) != NULL)
+       {
+            who = getpwnam(ptr);
+        }
+
+        /* We now make sure the the user exists! */
+        if (who == NULL)
+       {
+            who = getpwuid(getuid());
+       }
+    }
+    else
+    {
+      who = getpwnam (user);
+    }
+
+    return who ? who->pw_dir : (char*)NULL;
+}

 
 //------------------------------------------------------------------------
 // id routines
 
 //------------------------------------------------------------------------
 // id routines


@@ -119,15 +150,31 @@ bool wxGetHostName(char *buf, int sz)
 {
     *buf = '\0';
 #if defined(__SVR4__) && !defined(__sgi)
 {
     *buf = '\0';
 #if defined(__SVR4__) && !defined(__sgi)

+    //KB: does this return the fully qualified host.domain name?

     return (sysinfo(SI_HOSTNAME, buf, sz) != -1);
 #else /* BSD Sockets */
     return (sysinfo(SI_HOSTNAME, buf, sz) != -1);
 #else /* BSD Sockets */

-    char name[255];
-    struct hostent *h;
+    char name[255], domain[255];
+    //struct hostent *h;

     // Get hostname
     if (gethostname(name, sizeof(name)/sizeof(char)-1) == -1)
     // Get hostname
     if (gethostname(name, sizeof(name)/sizeof(char)-1) == -1)

-       return FALSE;
+        return FALSE;
+    if (getdomainname(domain, sizeof(domain)/sizeof(char)-1) == -1)
+        return FALSE;

     // Get official full name of host
     // Get official full name of host

-    strncpy(buf, (h=gethostbyname(name))!=NULL ? h->h_name : name, sz-1);
+    // doesn't return the full qualified name, replaced by following
+    // code (KB)
+    // strncpy(buf, (h=gethostbyname(name))!=NULL ? h->h_name : name, sz-1);
+    if((unsigned)sz > strlen(name)+strlen(domain)+1)
+    {
+        strcpy(buf, name);
+        if(strcmp(domain,"(none)") == 0) // standalone machine
+        {
+            strcat(buf,".");
+            strcat(buf,domain);
+        }
+    }
+    else
+        return FALSE;

     return TRUE;
 #endif
 }
     return TRUE;
 #endif
 }


@@ -138,8 +185,8 @@ bool wxGetUserId(char *buf, int sz)
 
     *buf = '\0';
     if ((who = getpwuid(getuid ())) != NULL) {
 
     *buf = '\0';
     if ((who = getpwuid(getuid ())) != NULL) {

-       strncpy (buf, who->pw_name, sz-1);
-       return TRUE;
+        strncpy (buf, who->pw_name, sz-1);
+        return TRUE;

     }
     return FALSE;
 }
     }
     return FALSE;
 }


@@ -147,11 +194,14 @@ bool wxGetUserId(char *buf, int sz)
 bool wxGetUserName(char *buf, int sz)
 {
     struct passwd *who;
 bool wxGetUserName(char *buf, int sz)
 {
     struct passwd *who;

+    char *comma;

 
     *buf = '\0';
     if ((who = getpwuid (getuid ())) != NULL) {
 
     *buf = '\0';
     if ((who = getpwuid (getuid ())) != NULL) {

-       strncpy (buf, who->pw_gecos, sz - 1);
-       return TRUE;
+       comma = strchr(who->pw_gecos,'c');
+       if(comma) *comma = '\0'; // cut off non-name comment fields
+       strncpy (buf, who->pw_gecos, sz - 1);
+        return TRUE;

     }
     return FALSE;
 }
     }
     return FALSE;
 }


@@ -164,10 +214,10 @@ void wxDebugMsg( const char *format, ... )
 {
   va_list ap;
   va_start( ap, format );
 {
   va_list ap;
   va_start( ap, format );

-  vfprintf( stderr, format, ap ); 
+  vfprintf( stderr, format, ap );

   fflush( stderr );
   va_end(ap);
   fflush( stderr );
   va_end(ap);

-};
+}

 
 void wxError( const wxString &msg, const wxString &title )
 {
 
 void wxError( const wxString &msg, const wxString &title )
 {


@@ -175,7 +225,7 @@ void wxError( const wxString &msg, const wxString &title )
   if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
   if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
   fprintf( stderr, ".\n" );
   if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
   if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
   fprintf( stderr, ".\n" );

-};
+}

 
 void wxFatalError( const wxString &msg, const wxString &title )
 {
 
 void wxFatalError( const wxString &msg, const wxString &title )
 {


@@ -183,8 +233,8 @@ void wxFatalError( const wxString &msg, const wxString &title )
   if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
   if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
   fprintf( stderr, ".\n" );
   if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
   if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
   fprintf( stderr, ".\n" );

-  exit(1);
-};
+  exit(3); // the same exit code as for abort()
+}

 
 //------------------------------------------------------------------------
 // directory routines
 
 //------------------------------------------------------------------------
 // directory routines


@@ -192,62 +242,78 @@ void wxFatalError( const wxString &msg, const wxString &title )
 
 bool wxDirExists( const wxString& dir )
 {
 
 bool wxDirExists( const wxString& dir )
 {

-  char buf[500];
-  strcpy( buf, WXSTRINGCAST(dir) );
-  struct stat sbuf;
-  return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
-};
+    char buf[500];
+    strcpy( buf, WXSTRINGCAST(dir) );
+    struct stat sbuf;
+    return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
+}

 
 //------------------------------------------------------------------------
 // subprocess routines
 //------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------
 // subprocess routines
 //------------------------------------------------------------------------
 

-typedef struct {
-  gint pid, tag;
-  wxProcess *process;
-} wxEndProcessData;
+// 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;
+    int  exitcode;
+};

 
 static void GTK_EndProcessDetector(gpointer data, gint source,
                                    GdkInputCondition WXUNUSED(condition) )
 {
 
 static void GTK_EndProcessDetector(gpointer data, gint source,
                                    GdkInputCondition WXUNUSED(condition) )
 {

-  wxEndProcessData *proc_data = (wxEndProcessData *)data;
-  int pid;
-
-  pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
-
-  /* wait4 is not part of any standard, use at own risk 
-   * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
-   * --- offer@sgi.com */
+    wxEndProcessData *proc_data = (wxEndProcessData *)data;
+    int pid;
+
+    pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
+
+    /* wait4 is not part of any standard, use at own risk
+     * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
+     * --- offer@sgi.com */
+    // VZ: wait4() will be woken up by a signal, not wait3 - so it's quite
+    //     different (also, wait3() waits for any child, wait4() only for this
+    //     one)
+    int status = -1;

 #if !defined(__sgi)
 #if !defined(__sgi)

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

 #else
 #else

-  wait3((int *) NULL, 0, (rusage *) NULL);
+    wait3(&status, 0, (rusage *) NULL);

 #endif
 
 #endif
 

-  close(source);
-  gdk_input_remove(proc_data->tag);
+    close(source);
+    gdk_input_remove(proc_data->tag);

 
 

-  if (proc_data->process)
-    proc_data->process->OnTerminate(proc_data->pid);
+    if (proc_data->process)
+        proc_data->process->OnTerminate(proc_data->pid, status);

 
 

-  if (proc_data->pid > 0)
-    delete proc_data;
-  else
-    proc_data->pid = 0;
-};
+    if (proc_data->pid > 0)
+    {
+        delete proc_data;
+    }
+    else
+    {
+        // wxExecute() will know about it
+        proc_data->exitcode = status;
+
+        proc_data->pid = 0;
+    }
+}

 
 long wxExecute( char **argv, bool sync, wxProcess *process )
 {
     wxEndProcessData *data = new wxEndProcessData;
     int end_proc_detect[2];
 
 
 long wxExecute( char **argv, bool sync, wxProcess *process )
 {
     wxEndProcessData *data = new wxEndProcessData;
     int end_proc_detect[2];
 

-    if (*argv == NULL)
-       return 0;
+    wxCHECK_MSG( *argv, 0, "can't exec empty command" );

 
     /* Create pipes */
 
     /* Create pipes */

-    if (pipe(end_proc_detect) == -1) {
-      perror("pipe failed");
-      return 0;
+    if (pipe(end_proc_detect) == -1)
+    {
+        wxLogSysError( _("Pipe creation failed") );
+        return 0;

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


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

-    if (pid == -1) {
-       perror ("fork failed");
-       return 0;
-    } else if (pid == 0) {
-        /* Close fd not useful */
+    if (pid == -1)
+    {
+        wxLogSysError( _("Fork failed") );
+        return 0;
+    }
+    else if (pid == 0)
+    {
+        // we're in child

         close(end_proc_detect[0]); // close reading side
 
         close(end_proc_detect[0]); // close reading side
 

-       /* child */
+        // 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_WRONLY);  // stdout
+        open("/dev/null", O_WRONLY);  // stderr
+#endif
+

 #ifdef _AIX
 #ifdef _AIX

-       execvp ((const char *)*argv, (const char **)argv);
+        execvp ((const char *)*argv, (const char **)argv);

 #else
 #else

-       execvp (*argv, argv);
+        execvp (*argv, argv);

 #endif
 #endif

-       if (errno == ENOENT)
-           wxError("command not found", *argv);
-       else
-           perror (*argv);
-       wxError("could not execute", *argv);
-       _exit (-1);
-    }
-
-    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();
+        // there is no return after successful exec()
+        fprintf(stderr, _("Can't execute '%s'\n"), *argv);

 
 

-      delete data;
+        _exit(-1);

     }
     }

-
-    return pid;
-};
+    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);
+        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;
+        }
+    }
+}

 
 long wxExecute( const wxString& command, bool sync, wxProcess *process )
 {
 
 long wxExecute( const wxString& command, bool sync, wxProcess *process )
 {

-    if (command.IsNull() || command == "") return FALSE;
+    static const char *IFS = " \t\n";
+
+    wxCHECK_MSG( !command.IsEmpty(), 0, "can't exec empty command" );

 
     int argc = 0;
     char *argv[127];
 
     int argc = 0;
     char *argv[127];

-    char tmp[1024];
-    const char *IFS = " \t\n";
+    char *tmp = new char[command.Len() + 1];
+    strcpy(tmp, command);

 
 

-    strncpy (tmp, command, sizeof(tmp) / sizeof(char) - 1);
-    tmp[sizeof (tmp) / sizeof (char) - 1] = '\0';
-    argv[argc++] = strtok (tmp, IFS);
+    argv[argc++] = strtok(tmp, IFS);

     while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)
     while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)

-       /* loop */ ;
-    return wxExecute(argv, sync, process);
-};
+        /* loop */ ;
+
+    long lRc = wxExecute(argv, sync, process);

 
 

+    delete [] tmp;

 
 

+    return lRc;
+}