some != NULL checks

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 9121c39e87e43a8d00d65267d90dc18be38aecb6..fb8c58bc9022092d6faa86f42c20a2c9caf3a4b6 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -23,8 +23,13 @@
 
 #include "wx/utils.h"
 #include "wx/process.h"
 
 #include "wx/utils.h"
 #include "wx/process.h"

+#include "wx/thread.h"

 
 

-#include "wx/unix/execute.h"
+#include "wx/stream.h"
+
+#if wxUSE_GUI
+    #include "wx/unix/execute.h"
+#endif

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


@@ -40,6 +45,8 @@
 #include <fcntl.h>          // for O_WRONLY and friends
 #include <time.h>           // nanosleep() and/or usleep()
 #include <ctype.h>          // isspace()
 #include <fcntl.h>          // for O_WRONLY and friends
 #include <time.h>           // nanosleep() and/or usleep()
 #include <ctype.h>          // isspace()

+#include <sys/time.h>       // needed for FD_SETSIZE
+

 #ifdef HAVE_UNAME
     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME
 #ifdef HAVE_UNAME
     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME


@@ -54,35 +61,28 @@
 #if !defined(HAVE_USLEEP) && \
     (defined(__SUN__) && !defined(__SunOs_5_6) && \
                          !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \
 #if !defined(HAVE_USLEEP) && \
     (defined(__SUN__) && !defined(__SunOs_5_6) && \
                          !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \

-     defined(__osf__)
+     defined(__osf__) || defined(__EMX__)

     extern "C"
     {
         #ifdef __SUN__
             int usleep(unsigned int usec);
         #else // !Sun
     extern "C"
     {
         #ifdef __SUN__
             int usleep(unsigned int usec);
         #else // !Sun

-            void usleep(unsigned long usec);
-        #endif // Sun/!Sun
+            #ifdef __EMX__
+                /* I copied this from the XFree86 diffs. AV. */
+                #define INCL_DOSPROCESS
+                #include <os2.h>
+                inline void usleep(unsigned long delay)
+                {
+                    DosSleep(delay ? (delay/1000l) : 1l);
+                }
+            #else // !Sun && !EMX
+                void usleep(unsigned long usec);
+            #endif
+        #endif // Sun/EMX/Something else

     };
     };

-#endif // Unices without usleep()

 
 

-// many versions of Unices have this function, but it is not defined in system
-// headers - please add your system here if it is the case for your OS.
-// SunOS (and Solaris) and DG-UX are like this.
-#ifdef HAVE_WAIT4
-  #if defined(__SOLARIS__) || defined(__osf__)
-    extern "C"
-    {
-        pid_t wait4(pid_t pid, int *statusp, int options,
-                    struct rusage *rusage);
-    }
-  #endif
-
-  #define wxWait4(pid, stat, flags, rusage) wait4(pid, stat, flags, rusage)
-#else
-    // no wait4() at all on these systems
-    // TODO verify whether wait3() really works in this situation
-    #define wxWait4(pid, stat, flags, rusage) wait3(stat, flags, rusage)
-#endif // HAVE_WAIT4
+    #define HAVE_USLEEP 1
+#endif // Unices without usleep()

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -101,7 +101,7 @@ void wxUsleep(unsigned long milliseconds)
 {
 #if defined(HAVE_NANOSLEEP)
     timespec tmReq;
 {
 #if defined(HAVE_NANOSLEEP)
     timespec tmReq;

-    tmReq.tv_sec = milliseconds / 1000;
+    tmReq.tv_sec = (time_t)(milliseconds / 1000);

     tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
 
     // we're not interested in remaining time nor in return value
     tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
 
     // we're not interested in remaining time nor in return value


@@ -111,11 +111,14 @@ void wxUsleep(unsigned long milliseconds)
     // 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
     // documented as MT-Safe
     // 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
     // documented as MT-Safe

-    #if defined(__SUN__) && defined(wxUSE_THREADS)
+    #if defined(__SUN__) && wxUSE_THREADS

         #error "usleep() cannot be used in MT programs under Solaris."
     #endif // Sun
 
     usleep(milliseconds * 1000); // usleep(3) wants microseconds
         #error "usleep() cannot be used in MT programs under Solaris."
     #endif // Sun
 
     usleep(milliseconds * 1000); // usleep(3) wants microseconds

+#elif defined(HAVE_SLEEP)
+    // under BeOS sleep() takes seconds (what about other platforms, if any?)
+    sleep(milliseconds * 1000);

 #else // !sleep function
     #error "usleep() or nanosleep() function required for wxUsleep"
 #endif // sleep function
 #else // !sleep function
     #error "usleep() or nanosleep() function required for wxUsleep"
 #endif // sleep function


@@ -125,116 +128,336 @@ void wxUsleep(unsigned long milliseconds)
 // process management
 // ----------------------------------------------------------------------------
 
 // process management
 // ----------------------------------------------------------------------------
 

-int wxKill(long pid, int sig)
+int wxKill(long pid, wxSignal sig)

 {
 {

-    return kill(pid, sig);
+    return kill((pid_t)pid, (int)sig);

 }
 
 #define WXEXECUTE_NARGS   127
 
 long wxExecute( const wxString& command, bool sync, wxProcess *process )
 {
 }
 
 #define WXEXECUTE_NARGS   127
 
 long wxExecute( const wxString& command, bool sync, wxProcess *process )
 {

-    wxCHECK_MSG( !command.IsEmpty(), 0, "can't exec empty command" );
+    wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") );

 
     int argc = 0;
 
     int argc = 0;

-    char *argv[WXEXECUTE_NARGS];
+    wxChar *argv[WXEXECUTE_NARGS];

     wxString argument;
     wxString argument;

-    const char *cptr = command.c_str();
-    char quotechar = '\0'; // is arg quoted?
+    const wxChar *cptr = command.c_str();
+    wxChar quotechar = wxT('\0'); // is arg quoted?

     bool escaped = FALSE;
 
     bool escaped = FALSE;
 

+    // split the command line in arguments

     do
     {
     do
     {

-        argument="";
-        quotechar = '\0';
+        argument=wxT("");
+        quotechar = wxT('\0');
+

         // eat leading whitespace:
         // eat leading whitespace:

-        while(*cptr && isspace(*cptr))
+        while ( wxIsspace(*cptr) )

             cptr++;
             cptr++;

-        if(*cptr == '\'' || *cptr == '"')
+
+        if ( *cptr == wxT('\'') || *cptr == wxT('"') )

             quotechar = *cptr++;
             quotechar = *cptr++;

+

         do
         {
         do
         {

-            if(*cptr == '\\' && ! escaped)
+            if ( *cptr == wxT('\\') && ! escaped )

             {
                 escaped = TRUE;
                 cptr++;
                 continue;
             }
             {
                 escaped = TRUE;
                 cptr++;
                 continue;
             }

+

             // all other characters:
             // all other characters:

-            argument += *cptr ++;
+            argument += *cptr++;

             escaped = FALSE;
             escaped = FALSE;

-            // Have we reached the end of the argument?
-            if((*cptr == quotechar && ! escaped)
-               || (quotechar == '\0' && isspace(*cptr))
-               || *cptr == '\0')
+
+            // have we reached the end of the argument?
+            if ( (*cptr == quotechar && ! escaped)
+                 || (quotechar == wxT('\0') && wxIsspace(*cptr))
+                 || *cptr == wxT('\0') )

             {
             {

-                wxASSERT(argc < WXEXECUTE_NARGS);
-                argv[argc] = new char[argument.Len()+1];
-                strcpy(argv[argc], argument.c_str());
+                wxASSERT_MSG( argc < WXEXECUTE_NARGS,
+                              wxT("too many arguments in wxExecute") );
+
+                argv[argc] = new wxChar[argument.length() + 1];
+                wxStrcpy(argv[argc], argument.c_str());

                 argc++;
                 argc++;

+

                 // if not at end of buffer, swallow last character:
                 // if not at end of buffer, swallow last character:

-                if(*cptr) cptr++;
+                if(*cptr)
+                    cptr++;
+

                 break; // done with this one, start over
             }
                 break; // done with this one, start over
             }

-        }while(*cptr);
-    }while(*cptr);
+        } while(*cptr);
+    } while(*cptr);

     argv[argc] = NULL;
     argv[argc] = NULL;

-    
+
+    // do execute the command

     long lRc = wxExecute(argv, sync, process);
 
     long lRc = wxExecute(argv, sync, process);
 

+    // clean up

     argc = 0;
     argc = 0;

-    while(argv[argc])
+    while( argv[argc] )

         delete [] argv[argc++];
 
     return lRc;
 }
 
         delete [] argv[argc++];
 
     return lRc;
 }
 

-bool wxShell(const wxString& command)
+// ----------------------------------------------------------------------------
+// wxShell
+// ----------------------------------------------------------------------------
+
+static wxString wxMakeShellCommand(const wxString& command)

 {
     wxString cmd;
 {
     wxString cmd;

-    if ( !!command )
-        cmd.Printf("xterm -e %s", command.c_str());
+    if ( !command )
+    {
+        // just an interactive shell
+        cmd = _T("xterm");
+    }

     else
     else

-        cmd = command;
+    {
+        // execute command in a shell
+        cmd << _T("/bin/sh -c '") << command << _T('\'');
+    }
+
+    return cmd;
+}
+
+bool wxShell(const wxString& command)
+{
+    return wxExecute(wxMakeShellCommand(command), TRUE /* sync */) == 0;
+}
+
+bool wxShell(const wxString& command, wxArrayString& output)
+{
+    wxCHECK_MSG( !!command, FALSE, _T("can't exec shell non interactively") );

 
 

-    return wxExecute(cmd) != 0;
+    return wxExecute(wxMakeShellCommand(command), output);

 }
 
 }
 

+#if wxUSE_GUI
+

 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {
     int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
 
 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {
     int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);
 

+    // waitpid is POSIX so should be available everywhere, however on older
+    // systems wait() might be used instead in a loop (until the right pid
+    // terminates)

     int status = 0;
     int status = 0;

-    wxWait4(pid, &status, 0, (rusage *) NULL);
+    int rc;
+
+    // wait for child termination and if waitpid() was interrupted, try again
+    do
+    {
+       rc = waitpid(pid, &status, 0);
+    }
+    while ( rc == -1 && errno == EINTR );

 
 

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

 
 

-    if (proc_data->pid > 0)
+    if( rc == -1 || ! (WIFEXITED(status) || WIFSIGNALED(status)) )

     {
     {

-        delete proc_data;
+       wxLogSysError(_("Waiting for subprocess termination failed"));
+       /* AFAIK, this can only happen if something went wrong within
+          wxGTK, i.e. due to a race condition or some serious bug.
+          After having fixed the order of statements in
+          GTK_EndProcessDetector(). (KB)
+       */

     }
     else
     {
     }
     else
     {

-        // wxExecute() will know about it
-        proc_data->exitcode = status;
+        // notify user about termination if required
+        if (proc_data->process)
+        {
+            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;
+        }
+    }
+}
+
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// wxStream classes to support IO redirection in wxExecute
+// ----------------------------------------------------------------------------
+
+class wxProcessFileInputStream : public wxInputStream
+{
+public:
+    wxProcessFileInputStream(int fd) { m_fd = fd; }
+    ~wxProcessFileInputStream() { close(m_fd); }
+
+    virtual bool Eof() const;
+
+protected:
+    size_t OnSysRead(void *buffer, size_t bufsize);
+
+protected:
+    int m_fd;
+};
+
+class wxProcessFileOutputStream : public wxOutputStream
+{
+public:
+    wxProcessFileOutputStream(int fd) { m_fd = fd; }
+    ~wxProcessFileOutputStream() { close(m_fd); }
+
+protected:
+    size_t OnSysWrite(const void *buffer, size_t bufsize);
+
+protected:
+    int m_fd;
+};
+
+bool wxProcessFileInputStream::Eof() const
+{
+    if ( m_lasterror == wxSTREAM_EOF )
+        return TRUE;
+
+    // check if there is any input available
+    struct timeval tv;
+    tv.tv_sec = 0;
+    tv.tv_usec = 0;
+
+    fd_set readfds;
+    FD_ZERO(&readfds);
+    FD_SET(m_fd, &readfds);
+    switch ( select(m_fd + 1, &readfds, NULL, NULL, &tv) )
+    {
+        case -1:
+            wxLogSysError(_("Impossible to get child process input"));
+            // fall through
+
+        case 0:
+            return TRUE;

 
 

-        proc_data->pid = 0;
+        default:
+            wxFAIL_MSG(_T("unexpected select() return value"));
+            // still fall through
+
+        case 1:
+            // input available: check if there is any
+            return wxInputStream::Eof();

     }
 }
 
     }
 }
 

-long wxExecute( char **argv, bool sync, wxProcess *process )
+size_t wxProcessFileInputStream::OnSysRead(void *buffer, size_t bufsize)

 {
 {

-    wxCHECK_MSG( *argv, 0, "can't exec empty command" );
+    int ret = read(m_fd, buffer, bufsize);
+    if ( ret == 0 )
+    {
+        m_lasterror = wxSTREAM_EOF;
+    }
+    else if ( ret == -1 )
+    {
+        m_lasterror = wxSTREAM_READ_ERROR;
+        ret = 0;
+    }
+    else
+    {
+        m_lasterror = wxSTREAM_NOERROR;
+    }

 
 

-    int end_proc_detect[2];
+    return ret;
+}

 
 

+size_t wxProcessFileOutputStream::OnSysWrite(const void *buffer, size_t bufsize)
+{
+    int ret = write(m_fd, buffer, bufsize);
+    if ( ret == -1 )
+    {
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+        ret = 0;
+    }
+    else
+    {
+        m_lasterror = wxSTREAM_NOERROR;
+    }
+
+    return ret;
+}
+
+long wxExecute(wxChar **argv,
+               bool sync,
+               wxProcess *process)
+{
+    wxCHECK_MSG( *argv, 0, wxT("can't exec empty command") );
+
+#if wxUSE_UNICODE
+    int mb_argc = 0;
+    char *mb_argv[WXEXECUTE_NARGS];
+
+    while (argv[mb_argc])
+    {
+        wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]);
+        mb_argv[mb_argc] = strdup(mb_arg);
+        mb_argc++;
+    }
+    mb_argv[mb_argc] = (char *) NULL;
+
+    // this macro will free memory we used above
+    #define ARGS_CLEANUP                                 \
+        for ( mb_argc = 0; mb_argv[mb_argc]; mb_argc++ ) \
+            free(mb_argv[mb_argc])
+#else // ANSI
+    // no need for cleanup
+    #define ARGS_CLEANUP
+
+    wxChar **mb_argv = argv;
+#endif // Unicode/ANSI
+
+#if wxUSE_GUI

     // create pipes
     // create pipes

-    if (pipe(end_proc_detect) == -1)
+    int end_proc_detect[2];
+    if ( pipe(end_proc_detect) == -1 )

     {
         wxLogSysError( _("Pipe creation failed") );
     {
         wxLogSysError( _("Pipe creation failed") );

+        wxLogError( _("Failed to execute '%s'\n"), *argv );
+
+        ARGS_CLEANUP;
+

         return 0;
     }
         return 0;
     }

+#endif // wxUSE_GUI
+
+    int pipeIn[2];
+    int pipeOut[2];
+    pipeIn[0] = pipeIn[1] =
+    pipeOut[0] = pipeOut[1] = -1;
+
+    if ( process && process->IsRedirected() )
+    {
+        if ( pipe(pipeIn) == -1 || pipe(pipeOut) == -1 )
+        {
+#if wxUSE_GUI
+            // free previously allocated resources
+            close(end_proc_detect[0]);
+            close(end_proc_detect[1]);
+#endif // wxUSE_GUI
+
+            wxLogSysError( _("Pipe creation failed") );
+            wxLogError( _("Failed to execute '%s'\n"), *argv );
+
+            ARGS_CLEANUP;
+
+            return 0;
+        }
+    }

 
     // fork the process
 #ifdef HAVE_VFORK
 
     // fork the process
 #ifdef HAVE_VFORK


@@ -242,62 +465,107 @@ 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 )     // error?

     {
     {

+#if wxUSE_GUI
+        close(end_proc_detect[0]);
+        close(end_proc_detect[1]);
+        close(pipeIn[0]);
+        close(pipeIn[1]);
+        close(pipeOut[0]);
+        close(pipeOut[1]);
+#endif // wxUSE_GUI
+

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

+
+        ARGS_CLEANUP;
+

         return 0;
     }
         return 0;
     }

-    else if (pid == 0)
+    else if ( pid == 0 )  // we're in child

     {
     {

-        // we're in child
+#if wxUSE_GUI

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

+#endif // wxUSE_GUI

 
 

-        // These three lines close the open file descriptors to to avoid any
+        // These lines close the open file descriptors to to avoid any

         // input/output which might block the process or irritate the user. If
         // 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.
-        if (sync == 0)
+        // one wants proper IO for the subprocess, the right thing to do is to
+        // start an xterm executing it.
+        if ( !sync )

         {
         {

-            // leave stderr opened, it won't do any hurm

             for ( int fd = 0; fd < FD_SETSIZE; fd++ )
             {
             for ( int fd = 0; fd < FD_SETSIZE; fd++ )
             {

-                if ( fd != end_proc_detect[1] && fd != STDERR_FILENO )
+                if ( fd == pipeIn[0] || fd == pipeOut[1]
+#if wxUSE_GUI
+                     || fd == end_proc_detect[1]
+#endif // wxUSE_GUI
+                   )
+                {
+                    // don't close this one, we still need it
+                    continue;
+                }
+
+                // leave stderr opened too, it won't do any hurm
+                if ( fd != STDERR_FILENO )

                     close(fd);
             }
         }
 
                     close(fd);
             }
         }
 

-#if 0
-        close(STDERR_FILENO);
+        // redirect stdio and stdout
+        // (TODO: what about stderr?)
+        if ( pipeIn[0] != -1 )
+        {
+            if ( dup2(pipeIn[0], STDIN_FILENO) == -1 ||
+                 dup2(pipeOut[1], STDOUT_FILENO) == -1 )
+            {
+                wxLogSysError(_("Failed to redirect child process "
+                                "input/output"));
+            }

 
 

-        // 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
+            close(pipeIn[0]);
+            close(pipeOut[1]);
+        }

 
 

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

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

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

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

-    else
+    else // we're in parent

     {
     {

-        // we're in parent
-        close(end_proc_detect[1]); // close writing side
+        ARGS_CLEANUP;
+
+        // pipe initialization: construction of the wxStreams
+        if ( process && process->IsRedirected() )
+        {
+            // These two streams are relative to this process.
+            wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]);
+            wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]);
+            close(pipeIn[0]); // close reading side
+            close(pipeOut[1]); // close writing side

 
 

+            process->SetPipeStreams(inStream, outStream);
+        }
+
+#if wxUSE_GUI

         wxEndProcessData *data = new wxEndProcessData;
         wxEndProcessData *data = new wxEndProcessData;

-        data->tag = wxAddProcessCallback(data, end_proc_detect[0]);

 
         if ( sync )
         {
 
         if ( sync )
         {

-            wxASSERT_MSG( !process, "wxProcess param ignored for sync exec" );
+            // we may have process for capturing the program output, but it's
+            // not used in wxEndProcessData in the case of sync execution

             data->process = NULL;
 
             // sync execution: indicate it by negating the pid
             data->pid = -pid;
             data->process = NULL;
 
             // sync execution: indicate it by negating the pid
             data->pid = -pid;

+            data->tag = wxAddProcessCallback(data, end_proc_detect[0]);
+
+            close(end_proc_detect[1]); // close writing side
+
+            wxBusyCursor bc;
+            wxWindowDisabler wd;

 
             // it will be set to 0 from GTK_EndProcessDetector
             while (data->pid != 0)
 
             // it will be set to 0 from GTK_EndProcessDetector
             while (data->pid != 0)


@@ -309,47 +577,69 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
 
             return exitcode;
         }
 
             return exitcode;
         }

-        else
+        else // async execution

         {
             // async execution, nothing special to do - caller will be
         {
             // 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
             // will be deleted in GTK_EndProcessDetector

-            data->process = process;
-            data->pid = pid;
+            data->process  = process;
+            data->pid      = pid;
+            data->tag      = wxAddProcessCallback(data, end_proc_detect[0]);
+
+            close(end_proc_detect[1]); // close writing side

 
             return pid;
         }
 
             return pid;
         }

+#else // !wxUSE_GUI
+        wxASSERT_MSG( sync, wxT("async execution not supported yet") );
+
+        int exitcode = 0;
+        if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) )
+        {
+            wxLogSysError(_("Waiting for subprocess termination failed"));
+        }
+
+        return exitcode;
+#endif // wxUSE_GUI

     }
     }

+
+    return 0;
+
+    #undef ARGS_CLEANUP

 }
 
 // ----------------------------------------------------------------------------
 // file and directory functions
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // file and directory functions
 // ----------------------------------------------------------------------------
 

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

 {
     *home = wxGetUserHome( wxString() );
     if ( home->IsEmpty() )
 {
     *home = wxGetUserHome( wxString() );
     if ( home->IsEmpty() )

-        *home = "/";
+        *home = wxT("/");

 
     return home->c_str();
 }
 
 
     return home->c_str();
 }
 

+#if wxUSE_UNICODE
+const wxMB2WXbuf wxGetUserHome( const wxString &user )
+#else // just for binary compatibility -- there is no 'const' here

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

+#endif

 {
     struct passwd *who = (struct passwd *) NULL;
 
 {
     struct passwd *who = (struct passwd *) NULL;
 

-    if (user.IsNull() || (user== ""))
+    if ( !user )

     {
     {

-        register char *ptr;
+        wxChar *ptr;

 
 

-        if ((ptr = getenv("HOME")) != NULL)
+        if ((ptr = wxGetenv(wxT("HOME"))) != NULL)

         {
             return ptr;
         }
         {
             return ptr;
         }

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

         {
         {

-            who = getpwnam(ptr);
+            who = getpwnam(wxConvertWX2MB(ptr));

         }
 
         // We now make sure the the user exists!
         }
 
         // We now make sure the the user exists!


@@ -360,21 +650,24 @@ char *wxGetUserHome( const wxString &user )
     }
     else
     {
     }
     else
     {

-      who = getpwnam (user);
+      who = getpwnam (user.mb_str());

     }
 
     }
 

-    return who ? who->pw_dir : (char*)NULL;
+    return wxConvertMB2WX(who ? who->pw_dir : 0);

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

-// id routines
+// network and user id routines

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool wxGetHostName(char *buf, int sz)
+// retrieve either the hostname or FQDN depending on platform (caller must
+// check whether it's one or the other, this is why this function is for
+// private use only)
+static bool wxGetHostNameInternal(wxChar *buf, int sz)

 {
 {

-    wxCHECK_MSG( buf, FALSE, "NULL pointer in wxGetHostName" );
+    wxCHECK_MSG( buf, FALSE, wxT("NULL pointer in wxGetHostNameInternal") );

 
 

-    *buf = '\0';
+    *buf = wxT('\0');

 
     // we're using uname() which is POSIX instead of less standard sysinfo()
 #if defined(HAVE_UNAME)
 
     // we're using uname() which is POSIX instead of less standard sysinfo()
 #if defined(HAVE_UNAME)


@@ -382,16 +675,16 @@ bool wxGetHostName(char *buf, int sz)
     bool ok = uname(&uts) != -1;
     if ( ok )
     {
     bool ok = uname(&uts) != -1;
     if ( ok )
     {

-        strncpy(buf, uts.nodename, sz - 1);
-        buf[sz] = '\0';
+        wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1);
+        buf[sz] = wxT('\0');

     }
 #elif defined(HAVE_GETHOSTNAME)
     bool ok = gethostname(buf, sz) != -1;
     }
 #elif defined(HAVE_GETHOSTNAME)
     bool ok = gethostname(buf, sz) != -1;

-#else
-    wxFAIL_MSG("don't know host name for this machibe");
+#else // no uname, no gethostname
+    wxFAIL_MSG(wxT("don't know host name for this machine"));

 
     bool ok = FALSE;
 
     bool ok = FALSE;

-#endif
+#endif // uname/gethostname

 
     if ( !ok )
     {
 
     if ( !ok )
     {


@@ -401,37 +694,97 @@ bool wxGetHostName(char *buf, int sz)
     return ok;
 }
 
     return ok;
 }
 

-bool wxGetUserId(char *buf, int sz)
+bool wxGetHostName(wxChar *buf, int sz)
+{
+    bool ok = wxGetHostNameInternal(buf, sz);
+
+    if ( ok )
+    {
+        // BSD systems return the FQDN, we only want the hostname, so extract
+        // it (we consider that dots are domain separators)
+        wxChar *dot = wxStrchr(buf, wxT('.'));
+        if ( dot )
+        {
+            // nuke it
+            *dot = wxT('\0');
+        }
+    }
+
+    return ok;
+}
+
+bool wxGetFullHostName(wxChar *buf, int sz)
+{
+    bool ok = wxGetHostNameInternal(buf, sz);
+
+    if ( ok )
+    {
+        if ( !wxStrchr(buf, wxT('.')) )
+        {
+            struct hostent *host = gethostbyname(wxConvertWX2MB(buf));
+            if ( !host )
+            {
+                wxLogSysError(_("Cannot get the official hostname"));
+
+                ok = FALSE;
+            }
+            else
+            {
+                // the canonical name
+                wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz);
+            }
+        }
+        //else: it's already a FQDN (BSD behaves this way)
+    }
+
+    return ok;
+}
+
+bool wxGetUserId(wxChar *buf, int sz)

 {
     struct passwd *who;
 
 {
     struct passwd *who;
 

-    *buf = '\0';
+    *buf = wxT('\0');

     if ((who = getpwuid(getuid ())) != NULL)
     {
     if ((who = getpwuid(getuid ())) != NULL)
     {

-        strncpy (buf, who->pw_name, sz - 1);
+        wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);

         return TRUE;
     }
 
     return FALSE;
 }
 
         return TRUE;
     }
 
     return FALSE;
 }
 

-bool wxGetUserName(char *buf, int sz)
+bool wxGetUserName(wxChar *buf, int sz)

 {
     struct passwd *who;
 {
     struct passwd *who;

-    char *comma;

 
 

-    *buf = '\0';
-    if ((who = getpwuid (getuid ())) != NULL) {
-       comma = strchr(who->pw_gecos, ',');
+    *buf = wxT('\0');
+    if ((who = getpwuid (getuid ())) != NULL)
+    {
+        // pw_gecos field in struct passwd is not standard
+#if HAVE_PW_GECOS
+       char *comma = strchr(who->pw_gecos, ',');

        if (comma)
            *comma = '\0'; // cut off non-name comment fields
        if (comma)
            *comma = '\0'; // cut off non-name comment fields

-       strncpy (buf, who->pw_gecos, sz - 1);
+       wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);
+#else // !HAVE_PW_GECOS
+       wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
+#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS

        return TRUE;
     }
 
     return FALSE;
 }
 
        return TRUE;
     }
 
     return FALSE;
 }
 

+wxString wxGetOsDescription()
+{
+#ifndef WXWIN_OS_DESCRIPTION
+    #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
+#else
+    return WXWIN_OS_DESCRIPTION;
+#endif
+}
+

 // ----------------------------------------------------------------------------
 // error and debug output routines (deprecated, use wxLog)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // error and debug output routines (deprecated, use wxLog)
 // ----------------------------------------------------------------------------


@@ -447,29 +800,18 @@ void wxDebugMsg( const char *format, ... )
 
 void wxError( const wxString &msg, const wxString &title )
 {
 
 void wxError( const wxString &msg, const wxString &title )
 {

-  fprintf( stderr, _("Error ") );
-  if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
-  if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
-  fprintf( stderr, ".\n" );
+  wxFprintf( stderr, _("Error ") );
+  if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) );
+  if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) );
+  wxFprintf( stderr, wxT(".\n") );

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

-  fprintf( stderr, _("Error ") );
-  if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
-  if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
-  fprintf( stderr, ".\n" );
+  wxFprintf( stderr, _("Error ") );
+  if (!title.IsNull()) wxFprintf( stderr, wxT("%s "), WXSTRINGCAST(title) );
+  if (!msg.IsNull()) wxFprintf( stderr, wxT(": %s"), WXSTRINGCAST(msg) );
+  wxFprintf( stderr, wxT(".\n") );

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

-//------------------------------------------------------------------------
-// directory routines
-//------------------------------------------------------------------------
-
-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);
-}