harmless unused param warning fix

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 5a3a772e1aaee2923c462847cf7df17ebc2df229..bbaea579b4ab8071d742def1926620f473ac60d7 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -15,6 +15,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+#include <pwd.h>
+

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -44,10 +46,24 @@
 
 #if wxUSE_BASE
 
 
 #if wxUSE_BASE
 

-#if defined( __MWERKS__ ) && defined(__MACH__)
-#define WXWIN_OS_DESCRIPTION "MacOS X"
-#define HAVE_NANOSLEEP
-#define HAVE_UNAME
+#if defined(__MWERKS__) && defined(__MACH__)
+    #ifndef WXWIN_OS_DESCRIPTION
+        #define WXWIN_OS_DESCRIPTION "MacOS X"
+    #endif
+    #ifndef HAVE_NANOSLEEP
+        #define HAVE_NANOSLEEP
+    #endif
+    #ifndef HAVE_UNAME
+        #define HAVE_UNAME
+    #endif
+
+    // our configure test believes we can use sigaction() if the function is
+    // available but Metrowekrs with MSL run-time does have the function but
+    // doesn't have sigaction struct so finally we can't use it...
+    #ifdef __MSL__
+        #undef wxUSE_ON_FATAL_EXCEPTION
+        #define wxUSE_ON_FATAL_EXCEPTION 0
+    #endif

 #endif
 
 // not only the statfs syscall is called differently depending on platform, but
 #endif
 
 // not only the statfs syscall is called differently depending on platform, but


@@ -90,7 +106,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>

-#include <pwd.h>

 #include <errno.h>
 #include <netdb.h>
 #include <signal.h>
 #include <errno.h>
 #include <netdb.h>
 #include <signal.h>


@@ -111,9 +126,9 @@
 // headers - please add your system here if it is the case for your OS.
 // SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this.
 #if !defined(HAVE_USLEEP) && \
 // headers - please add your system here if it is the case for your OS.
 // SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this.
 #if !defined(HAVE_USLEEP) && \

-    (defined(__SUN__) && !defined(__SunOs_5_6) && \
+    ((defined(__SUN__) && !defined(__SunOs_5_6) && \

                          !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \
                          !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \

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

     extern "C"
     {
         #ifdef __SUN__
     extern "C"
     {
         #ifdef __SUN__


@@ -149,12 +164,12 @@ void wxSleep(int nSecs)
     sleep(nSecs);
 }
 
     sleep(nSecs);
 }
 

-void wxUsleep(unsigned long milliseconds)
+void wxMicroSleep(unsigned long microseconds)

 {
 #if defined(HAVE_NANOSLEEP)
     timespec tmReq;
 {
 #if defined(HAVE_NANOSLEEP)
     timespec tmReq;

-    tmReq.tv_sec = (time_t)(milliseconds / 1000);
-    tmReq.tv_nsec = (milliseconds % 1000) * 1000 * 1000;
+    tmReq.tv_sec = (time_t)(microseconds / 1000000);
+    tmReq.tv_nsec = (microseconds % 1000000) * 1000;

 
     // we're not interested in remaining time nor in return value
     (void)nanosleep(&tmReq, (timespec *)NULL);
 
     // we're not interested in remaining time nor in return value
     (void)nanosleep(&tmReq, (timespec *)NULL);


@@ -167,22 +182,30 @@ void wxUsleep(unsigned long milliseconds)
         #error "usleep() cannot be used in MT programs under Solaris."
     #endif // Sun
 
         #error "usleep() cannot be used in MT programs under Solaris."
     #endif // Sun
 

-    usleep(milliseconds * 1000); // usleep(3) wants microseconds
+    usleep(microseconds);

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

-    sleep(milliseconds * 1000);
+    sleep(microseconds * 1000000);

 #else // !sleep function
 #else // !sleep function

-    #error "usleep() or nanosleep() function required for wxUsleep"
+    #error "usleep() or nanosleep() function required for wxMicroSleep"

 #endif // sleep function
 }
 
 #endif // sleep function
 }
 

+void wxMilliSleep(unsigned long milliseconds)
+{
+    wxMicroSleep(milliseconds*1000);
+}
+

 // ----------------------------------------------------------------------------
 // process management
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // process management
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    int err = kill((pid_t)pid, (int)sig);
+    int err = kill((pid_t) (flags & wxKILL_CHILDREN) ? -pid : pid, (int)sig);
+    if ( !err )
+       *rc = wxKILL_OK;
+    else

     if ( rc )
     {
         switch ( errno )
     if ( rc )
     {
         switch ( errno )


@@ -236,7 +259,7 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
     wxString argument;
     const wxChar *cptr = command.c_str();
     wxChar quotechar = wxT('\0'); // is arg quoted?
     wxString argument;
     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
 
     // split the command line in arguments
     do


@@ -255,14 +278,14 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
         {
             if ( *cptr == wxT('\\') && ! escaped )
             {
         {
             if ( *cptr == wxT('\\') && ! escaped )
             {

-                escaped = TRUE;
+                escaped = true;

                 cptr++;
                 continue;
             }
 
             // all other characters:
             argument += *cptr++;
                 cptr++;
                 continue;
             }
 
             // all other characters:
             argument += *cptr++;

-            escaped = FALSE;
+            escaped = false;

 
             // have we reached the end of the argument?
             if ( (*cptr == quotechar && ! escaped)
 
             // have we reached the end of the argument?
             if ( (*cptr == quotechar && ! escaped)


@@ -325,7 +348,7 @@ bool wxShell(const wxString& command)
 
 bool wxShell(const wxString& command, wxArrayString& output)
 {
 
 bool wxShell(const wxString& command, wxArrayString& output)
 {

-    wxCHECK_MSG( !!command, FALSE, _T("can't exec shell non interactively") );
+    wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") );

 
     return wxExecute(wxMakeShellCommand(command), output);
 }
 
     return wxExecute(wxMakeShellCommand(command), output);
 }


@@ -346,7 +369,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
 
         default:
             wxFAIL_MSG( _T("unknown wxShutdown() flag") );
 
         default:
             wxFAIL_MSG( _T("unknown wxShutdown() flag") );

-            return FALSE;
+            return false;

     }
 
     return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
     }
 
     return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;


@@ -362,7 +385,7 @@ bool wxShutdown(wxShutdownFlags wFlags)
 bool wxPipeInputStream::CanRead() const
 {
     if ( m_lasterror == wxSTREAM_EOF )
 bool wxPipeInputStream::CanRead() const
 {
     if ( m_lasterror == wxSTREAM_EOF )

-        return FALSE;
+        return false;

 
     // check if there is any input available
     struct timeval tv;
 
     // check if there is any input available
     struct timeval tv;


@@ -381,7 +404,7 @@ bool wxPipeInputStream::CanRead() const
             // fall through
 
         case 0:
             // fall through
 
         case 0:

-            return FALSE;
+            return false;

 
         default:
             wxFAIL_MSG(_T("unexpected select() return value"));
 
         default:
             wxFAIL_MSG(_T("unexpected select() return value"));


@@ -701,7 +724,7 @@ char *wxGetUserHome( const wxString &user )
 // private use only)
 static bool wxGetHostNameInternal(wxChar *buf, int sz)
 {
 // private use only)
 static bool wxGetHostNameInternal(wxChar *buf, int sz)
 {

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

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


@@ -719,7 +742,7 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz)
 #else // no uname, no gethostname
     wxFAIL_MSG(wxT("don't know host name for this machine"));
 
 #else // no uname, no gethostname
     wxFAIL_MSG(wxT("don't know host name for this machine"));
 

-    bool ok = FALSE;
+    bool ok = false;

 #endif // uname/gethostname
 
     if ( !ok )
 #endif // uname/gethostname
 
     if ( !ok )


@@ -762,7 +785,7 @@ bool wxGetFullHostName(wxChar *buf, int sz)
             {
                 wxLogSysError(_("Cannot get the official hostname"));
 
             {
                 wxLogSysError(_("Cannot get the official hostname"));
 

-                ok = FALSE;
+                ok = false;

             }
             else
             {
             }
             else
             {


@@ -784,10 +807,10 @@ bool wxGetUserId(wxChar *buf, int sz)
     if ((who = getpwuid(getuid ())) != NULL)
     {
         wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
     if ((who = getpwuid(getuid ())) != NULL)
     {
         wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxGetUserName(wxChar *buf, int sz)
 }
 
 bool wxGetUserName(wxChar *buf, int sz)


@@ -806,10 +829,10 @@ bool wxGetUserName(wxChar *buf, int sz)
 #else // !HAVE_PW_GECOS
        wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
 #endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
 #else // !HAVE_PW_GECOS
        wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
 #endif // HAVE_PW_GECOS/!HAVE_PW_GECOS

-       return TRUE;
+       return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 // this function is in mac/utils.cpp for wxMac
 }
 
 // this function is in mac/utils.cpp for wxMac


@@ -817,11 +840,20 @@ bool wxGetUserName(wxChar *buf, int sz)
 
 wxString wxGetOsDescription()
 {
 
 wxString wxGetOsDescription()
 {

-#ifndef WXWIN_OS_DESCRIPTION
-    #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
-#else
-    return wxString::FromAscii( WXWIN_OS_DESCRIPTION );
-#endif
+    FILE *f = popen("uname -s -r -m", "r");
+    if (f)
+    {
+        char buf[256];
+        size_t c = fread(buf, 1, sizeof(buf) - 1, f);
+        pclose(f);
+        // Trim newline from output.
+        if (c && buf[c - 1] == '\n')
+            --c;
+        buf[c] = '\0';
+        return wxString::FromAscii( buf );
+    }
+    wxFAIL_MSG( _T("uname failed") );
+    return _T("");

 }
 
 #endif // !__WXMAC__
 }
 
 #endif // !__WXMAC__


@@ -831,7 +863,7 @@ unsigned long wxGetProcessId()
     return (unsigned long)getpid();
 }
 
     return (unsigned long)getpid();
 }
 

-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()

 {
 #if defined(__LINUX__)
     // get it from /proc/meminfo
 {
 #if defined(__LINUX__)
     // get it from /proc/meminfo


@@ -849,10 +881,10 @@ long wxGetFreeMemory()
 
         fclose(fp);
 
 
         fclose(fp);
 

-        return memFree;
+        return (wxMemorySize)memFree;

     }
 #elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
     }
 #elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)

-    return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE);
+    return (wxMemorySize)(sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE));

 //#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
 #endif
 
 //#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
 #endif
 


@@ -869,7 +901,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
     {
         wxLogSysError( wxT("Failed to get file system statistics") );
 
     {
         wxLogSysError( wxT("Failed to get file system statistics") );
 

-        return FALSE;
+        return false;

     }
 
     // under Solaris we also have to use f_frsize field instead of f_bsize
     }
 
     // under Solaris we also have to use f_frsize field instead of f_bsize


@@ -890,9 +922,9 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
         *pFree = wxLongLong(fs.f_bavail) * blockSize;
     }
 
         *pFree = wxLongLong(fs.f_bavail) * blockSize;
     }
 

-    return TRUE;
+    return true;

 #else // !HAVE_STATFS && !HAVE_STATVFS
 #else // !HAVE_STATFS && !HAVE_STATVFS

-    return FALSE;
+    return false;

 #endif // HAVE_STATFS
 }
 
 #endif // HAVE_STATFS
 }
 


@@ -905,14 +937,14 @@ bool wxGetEnv(const wxString& var, wxString *value)
     // wxGetenv is defined as getenv()
     wxChar *p = wxGetenv(var);
     if ( !p )
     // wxGetenv is defined as getenv()
     wxChar *p = wxGetenv(var);
     if ( !p )

-        return FALSE;
+        return false;

 
     if ( value )
     {
         *value = p;
     }
 
 
     if ( value )
     {
         *value = p;
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)
 }
 
 bool wxSetEnv(const wxString& variable, const wxChar *value)


@@ -928,7 +960,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *value)
         s << _T('=') << value;
 
     // transform to ANSI
         s << _T('=') << value;
 
     // transform to ANSI

-    const char *p = s.mb_str();
+    const wxWX2MBbuf p = s.mb_str();

 
     // the string will be free()d by libc
     char *buf = (char *)malloc(strlen(p) + 1);
 
     // the string will be free()d by libc
     char *buf = (char *)malloc(strlen(p) + 1);


@@ -936,7 +968,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *value)
 
     return putenv(buf) == 0;
 #else // no way to set an env var
 
     return putenv(buf) == 0;
 #else // no way to set an env var

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -962,13 +994,13 @@ extern "C" void wxFatalSignalHandler(wxTYPE_SA_HANDLER)
 bool wxHandleFatalExceptions(bool doit)
 {
     // old sig handlers
 bool wxHandleFatalExceptions(bool doit)
 {
     // old sig handlers

-    static bool s_savedHandlers = FALSE;
+    static bool s_savedHandlers = false;

     static struct sigaction s_handlerFPE,
                             s_handlerILL,
                             s_handlerBUS,
                             s_handlerSEGV;
 
     static struct sigaction s_handlerFPE,
                             s_handlerILL,
                             s_handlerBUS,
                             s_handlerSEGV;
 

-    bool ok = TRUE;
+    bool ok = true;

     if ( doit && !s_savedHandlers )
     {
         // install the signal handler
     if ( doit && !s_savedHandlers )
     {
         // install the signal handler


@@ -990,7 +1022,7 @@ bool wxHandleFatalExceptions(bool doit)
             wxLogDebug(_T("Failed to install our signal handler."));
         }
 
             wxLogDebug(_T("Failed to install our signal handler."));
         }
 

-        s_savedHandlers = TRUE;
+        s_savedHandlers = true;

     }
     else if ( s_savedHandlers )
     {
     }
     else if ( s_savedHandlers )
     {


@@ -1004,7 +1036,7 @@ bool wxHandleFatalExceptions(bool doit)
             wxLogDebug(_T("Failed to uninstall our signal handler."));
         }
 
             wxLogDebug(_T("Failed to uninstall our signal handler."));
         }
 

-        s_savedHandlers = FALSE;
+        s_savedHandlers = false;

     }
     //else: nothing to do
 
     }
     //else: nothing to do
 


@@ -1101,10 +1133,12 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
 {
     wxEndProcessData *endProcData = new wxEndProcessData;
 
 {
     wxEndProcessData *endProcData = new wxEndProcessData;
 

+    const int flags = execData.flags;
+

     // wxAddProcessCallback is now (with DARWIN) allowed to call the
     // callback function directly if the process terminates before
     // the callback can be added to the run loop. Set up the endProcData.
     // wxAddProcessCallback is now (with DARWIN) allowed to call the
     // callback function directly if the process terminates before
     // the callback can be added to the run loop. Set up the endProcData.

-    if ( execData.flags & wxEXEC_SYNC )
+    if ( flags & wxEXEC_SYNC )

     {
         // we may have process for capturing the program output, but it's
         // not used in wxEndProcessData in the case of sync execution
     {
         // we may have process for capturing the program output, but it's
         // not used in wxEndProcessData in the case of sync execution


@@ -1123,7 +1157,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
     }
 
 
     }
 
 

-#if defined(__DARWIN__) && defined(__WXMAC__)
+#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))

     endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
 #else
     endProcData->tag = wxAddProcessCallback
     endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
 #else
     endProcData->tag = wxAddProcessCallback


@@ -1133,12 +1167,13 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
                 );
 
     execData.pipeEndProcDetect.Close();
                 );
 
     execData.pipeEndProcDetect.Close();

-#endif // defined(__DARWIN__) && defined(__WXMAC__)
+#endif // defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))

 
 

-    if ( execData.flags & wxEXEC_SYNC )
+    if ( flags & wxEXEC_SYNC )

     {
         wxBusyCursor bc;
     {
         wxBusyCursor bc;

-        wxWindowDisabler wd;
+        wxWindowDisabler *wd = flags & wxEXEC_NODISABLE ? NULL
+                                                        : new wxWindowDisabler;

 
         // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the
         // process terminates
 
         // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the
         // process terminates


@@ -1160,10 +1195,10 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
             }
 #endif // wxUSE_STREAMS
 
             }
 #endif // wxUSE_STREAMS
 

-            // don't consume 100% of the CPU while we're sitting this in this
+            // don't consume 100% of the CPU while we're sitting in this

             // loop
             if ( idle )
             // loop
             if ( idle )

-                wxUsleep(1);
+                wxMilliSleep(1);

 
             // give GTK+ a chance to call GTK_EndProcessDetector here and
             // also repaint the GUI
 
             // give GTK+ a chance to call GTK_EndProcessDetector here and
             // also repaint the GUI


@@ -1172,6 +1207,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
 
         int exitcode = endProcData->exitcode;
 
 
         int exitcode = endProcData->exitcode;
 

+        delete wd;

         delete endProcData;
 
         return exitcode;
         delete endProcData;
 
         return exitcode;