fixes

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

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index d829d20532dd501acfa09e4170e463e2015292f0..086ef60b6b34b614285bf896fca7a31a5e40970d 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/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,9 @@
 #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 <stdarg.h>
 #include <dirent.h>
 #include <string.h>
 #include <stdarg.h>
 #include <dirent.h>
 #include <string.h>


@@ -28,8 +30,9 @@
 #include <netdb.h>
 #include <signal.h>
 
 #include <netdb.h>
 #include <signal.h>
 

+

 #ifdef __SVR4__
 #ifdef __SVR4__

-#include <sys/systeminfo.h>
+  #include <sys/systeminfo.h>

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


@@ -57,42 +60,57 @@ void wxDisplaySize( int *width, int *height )
   if (height) *height = gdk_screen_height();
 }
 
   if (height) *height = gdk_screen_height();
 }
 

+void wxGetMousePosition( int* x, int* y )
+{
+  wxFAIL_MSG( "GetMousePosition not yet implemented" );
+  if (x) *x = 0;
+  if (y) *y = 0;
+};
+
+bool wxColourDisplay(void)
+{
+  wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
+  return TRUE;
+}
+
+int wxDisplayDepth(void)
+{
+  wxFAIL_MSG( "wxDisplayDepth always returns 8" );
+  return 8;
+}
+

 //------------------------------------------------------------------------
 // user and home routines
 //------------------------------------------------------------------------
 
 //------------------------------------------------------------------------
 // user and home routines
 //------------------------------------------------------------------------
 

-char* wxGetHomeDir( char *dest )
+const char* wxGetHomeDir( wxString *home  )

 {
 {

-  wxString tmp = wxGetUserHome( wxString() );
-  if (tmp.IsNull())
-    strcpy( wxBuffer, "/" );
-  else
-    strcpy( wxBuffer, tmp );
-  if (dest) strcpy( dest, WXSTRINGCAST tmp );
-  return wxBuffer;
+  *home = wxGetUserHome( wxString() );
+  if (home->IsNull()) *home = "/";
+  return *home;

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

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

 
 

-  if (user.IsNull() || (user== "")) 
+  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);
-       }
-       // We now make sure the the user exists!
-       if (who == NULL)
-           who = getpwuid(getuid());
-  } 
+        register char *ptr;
+
+        if ((ptr = getenv("HOME")) != NULL)
+            return ptr;
+        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);
   else
     who = getpwnam (user);

-    
+

   return who ? who->pw_dir : (char*)NULL;
 };
 
   return who ? who->pw_dir : (char*)NULL;
 };
 


@@ -104,15 +122,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
 }


@@ -123,8 +157,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;
 }


@@ -132,11 +166,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;
 }


@@ -149,7 +186,7 @@ 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);
 };


@@ -168,7 +205,7 @@ 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()

 };
 
 //------------------------------------------------------------------------
 };
 
 //------------------------------------------------------------------------


@@ -183,170 +220,15 @@ bool wxDirExists( const wxString& dir )
   return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
 };
 
   return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
 };
 

-//------------------------------------------------------------------------
-// wild character routines
-//------------------------------------------------------------------------
-
-bool wxIsWild( const wxString& pattern )
-{
-  wxString tmp = pattern;
-  char *pat = WXSTRINGCAST(tmp);
-    while (*pat) {
-       switch (*pat++) {
-       case '?': case '*': case '[': case '{':
-           return TRUE;
-       case '\\':
-           if (!*pat++)
-               return FALSE;
-       }
-    }
-    return FALSE;
-};
-
-
-bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
-{
-  wxString tmp1 = pat;
-  char *pattern = WXSTRINGCAST(tmp1);
-  wxString tmp2 = text;
-  char *str = WXSTRINGCAST(tmp2);
-    char c;
-    char *cp;
-    bool done = FALSE, ret_code, ok;
-    // Below is for vi fans
-    const char OB = '{', CB = '}';
-
-    // dot_special means '.' only matches '.'
-    if (dot_special && *str == '.' && *pattern != *str)
-       return FALSE;
-
-    while ((*pattern != '\0') && (!done)
-    && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {
-       switch (*pattern) {
-       case '\\':
-           pattern++;
-           if (*pattern != '\0')
-               pattern++;
-           break;
-       case '*':
-           pattern++;
-           ret_code = FALSE;
-           while ((*str!='\0')
-           && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
-               /*loop*/;
-           if (ret_code) {
-               while (*str != '\0')
-                   str++;
-               while (*pattern != '\0')
-                   pattern++;
-           }
-           break;
-       case '[':
-           pattern++;
-         repeat:
-           if ((*pattern == '\0') || (*pattern == ']')) {
-               done = TRUE;
-               break;
-           }
-           if (*pattern == '\\') {
-               pattern++;
-               if (*pattern == '\0') {
-                   done = TRUE;
-                   break;
-               }
-           }
-           if (*(pattern + 1) == '-') {
-               c = *pattern;
-               pattern += 2;
-               if (*pattern == ']') {
-                   done = TRUE;
-                   break;
-               }
-               if (*pattern == '\\') {
-                   pattern++;
-                   if (*pattern == '\0') {
-                       done = TRUE;
-                       break;
-                   }
-               }
-               if ((*str < c) || (*str > *pattern)) {
-                   pattern++;
-                   goto repeat;
-               }
-           } else if (*pattern != *str) {
-               pattern++;
-               goto repeat;
-           }
-           pattern++;
-           while ((*pattern != ']') && (*pattern != '\0')) {
-               if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
-                   pattern++;
-               pattern++;
-           }
-           if (*pattern != '\0') {
-               pattern++, str++;
-           }
-           break;
-       case '?':
-           pattern++;
-           str++;
-           break;
-       case OB:
-           pattern++;
-           while ((*pattern != CB) && (*pattern != '\0')) {
-               cp = str;
-               ok = TRUE;
-               while (ok && (*cp != '\0') && (*pattern != '\0')
-               &&  (*pattern != ',') && (*pattern != CB)) {
-                   if (*pattern == '\\')
-                       pattern++;
-                   ok = (*pattern++ == *cp++);
-               }
-               if (*pattern == '\0') {
-                   ok = FALSE;
-                   done = TRUE;
-                   break;
-               } else if (ok) {
-                   str = cp;
-                   while ((*pattern != CB) && (*pattern != '\0')) {
-                       if (*++pattern == '\\') {
-                           if (*++pattern == CB)
-                               pattern++;
-                       }
-                   }
-               } else {
-                   while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
-                       if (*++pattern == '\\') {
-                            if (*++pattern == CB || *pattern == ',')
-                               pattern++;
-                       }
-                   }
-               }
-               if (*pattern != '\0')
-                   pattern++;
-           }
-           break;
-       default:
-           if (*str == *pattern) {
-               str++, pattern++;
-           } else {
-               done = TRUE;
-           }
-       }
-    }
-    while (*pattern == '*')
-       pattern++;
-    return ((*str == '\0') && (*pattern == '\0'));
-};
-

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

-typedef struct {
+struct wxEndProcessData
+{

   gint pid, tag;
   wxProcess *process;
   gint pid, tag;
   wxProcess *process;

-} wxEndProcessData;
+};

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


@@ -356,7 +238,14 @@ static void GTK_EndProcessDetector(gpointer data, gint source,
 
   pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->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 */
+#if !defined(__sgi)

   wait4(proc_data->pid, NULL, 0, NULL);
   wait4(proc_data->pid, NULL, 0, NULL);

+#else
+  wait3((int *) NULL, 0, (rusage *) NULL);
+#endif

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


@@ -375,12 +264,11 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
     wxEndProcessData *data = new wxEndProcessData;
     int end_proc_detect[2];
 
     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 */
     if (pipe(end_proc_detect) == -1) {
 
     /* Create pipes */
     if (pipe(end_proc_detect) == -1) {

-      perror("pipe failed");
+      wxLogSysError(_("Pipe creation failed"));

       return 0;
     }
 
       return 0;
     }
 


@@ -391,60 +279,67 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
     pid_t pid = fork();
 #endif
     if (pid == -1) {
     pid_t pid = fork();
 #endif
     if (pid == -1) {

-       perror ("fork failed");
-       return 0;
-    } else if (pid == 0) {
-        /* Close fd not useful */
+        // error
+        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 */

 #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 = NULL;
-      data->pid = -(data->pid);
-
-      while (data->pid != 0)
-        wxYield();
+        // there is no return after successful exec()
+        wxLogSysError(_("Can't execute '%s'"), *argv);

 
 

-      delete data;
+        _exit(-1);
+    }
+    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;

     }
     }

-
-    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";
-
-    strncpy (tmp, command, sizeof(tmp) / sizeof(char) - 1);
-    tmp[sizeof (tmp) / sizeof (char) - 1] = '\0';
-    argv[argc++] = strtok (tmp, IFS);
-    while ((argv[argc++] = strtok(NULL, IFS)) != NULL)
-       /* loop */ ;
-    return wxExecute(argv, sync, process);
-};
+    char *tmp = new char[command.Len() + 1];
+    strcpy(tmp, command);

 
 

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

 
 

+    long lRc = wxExecute(argv, sync, process);
+    
+    delete [] tmp;
+
+    return lRc;
+};