correct access for virtual

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

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index bbaea579b4ab8071d742def1926620f473ac60d7..67a97b734a772385b86ca09736ea3b15a391d27e 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        unix/utilsunx.cpp
+// Name:        src/unix/utilsunx.cpp

 // Purpose:     generic Unix implementation of many wx functions
 // Author:      Vadim Zeitlin
 // Id:          $Id$
 // Purpose:     generic Unix implementation of many wx functions
 // Author:      Vadim Zeitlin
 // Id:          $Id$


@@ -15,34 +15,43 @@
 // 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"
 

-#include "wx/defs.h"
-#include "wx/string.h"
+#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif

 
 

-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/app.h"

 #include "wx/apptrait.h"
 
 #include "wx/apptrait.h"
 

-#include "wx/utils.h"

 #include "wx/process.h"
 #include "wx/thread.h"
 
 #include "wx/wfstream.h"
 
 #include "wx/unix/execute.h"
 #include "wx/process.h"
 #include "wx/thread.h"
 
 #include "wx/wfstream.h"
 
 #include "wx/unix/execute.h"

+#include "wx/unix/private.h"
+
+#include <pwd.h>
+
+#ifdef HAVE_SYS_SELECT_H
+#   include <sys/select.h>
+#endif

 
 

-#if wxUSE_STREAMS
+#define HAS_PIPE_INPUT_STREAM (wxUSE_STREAMS && wxUSE_FILE)
+
+#if HAS_PIPE_INPUT_STREAM

 
 // define this to let wxexec.cpp know that we know what we're doing
 #define _WX_USED_BY_WXEXECUTE_
 #include "../common/execcmn.cpp"
 
 
 // define this to let wxexec.cpp know that we know what we're doing
 #define _WX_USED_BY_WXEXECUTE_
 #include "../common/execcmn.cpp"
 

-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_INPUT_STREAM

 
 #if wxUSE_BASE
 
 
 #if wxUSE_BASE
 


@@ -80,6 +89,11 @@
     #endif // __BSD__/!__BSD__
 
     #define wxStatfs statfs
     #endif // __BSD__/!__BSD__
 
     #define wxStatfs statfs

+
+    #ifndef HAVE_STATFS_DECL
+        // some systems lack statfs() prototype in the system headers (AIX 4)
+        extern "C" int statfs(const char *path, struct statfs *buf);
+    #endif

 #endif // HAVE_STATFS
 
 #ifdef HAVE_STATVFS
 #endif // HAVE_STATFS
 
 #ifdef HAVE_STATVFS


@@ -118,6 +132,12 @@
     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME
 
     #include <sys/utsname.h> // for uname()
 #endif // HAVE_UNAME
 

+// Used by wxGetFreeMemory().
+#ifdef __SGI__
+    #include <sys/sysmp.h>
+    #include <sys/sysinfo.h>   // for SAGET and MINFO structures
+#endif
+

 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------


@@ -203,12 +223,9 @@ void wxMilliSleep(unsigned long milliseconds)
 int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags)
 {
     int err = kill((pid_t) (flags & wxKILL_CHILDREN) ? -pid : pid, (int)sig);
 int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags)
 {
     int err = kill((pid_t) (flags & wxKILL_CHILDREN) ? -pid : pid, (int)sig);

-    if ( !err )
-       *rc = wxKILL_OK;
-    else

     if ( rc )
     {
     if ( rc )
     {

-        switch ( errno )
+        switch ( err ? errno : 0 )

         {
             case 0:
                 *rc = wxKILL_OK;
         {
             case 0:
                 *rc = wxKILL_OK;


@@ -240,9 +257,16 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc, int flags)
 
 #define WXEXECUTE_NARGS   127
 
 
 #define WXEXECUTE_NARGS   127
 

+#if defined(__DARWIN__)
+long wxMacExecute(wxChar **argv,
+               int flags,
+               wxProcess *process);
+#endif
+

 long wxExecute( const wxString& command, int flags, wxProcess *process )
 {
 long wxExecute( const wxString& command, int flags, wxProcess *process )
 {

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

 
 #if wxUSE_THREADS
     // fork() doesn't mix well with POSIX threads: on many systems the program
 
 #if wxUSE_THREADS
     // fork() doesn't mix well with POSIX threads: on many systems the program


@@ -264,7 +288,7 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
     // split the command line in arguments
     do
     {
     // split the command line in arguments
     do
     {

-        argument=wxT("");
+        argument = wxEmptyString;

         quotechar = wxT('\0');
 
         // eat leading whitespace:
         quotechar = wxT('\0');
 
         // eat leading whitespace:


@@ -309,8 +333,18 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
     } while(*cptr);
     argv[argc] = NULL;
 
     } while(*cptr);
     argv[argc] = NULL;
 

+    long lRc;
+#if defined(__DARWIN__)
+    // wxMacExecute only executes app bundles.
+    // It returns an error code if the target is not an app bundle, thus falling
+    // through to the regular wxExecute for non app bundles.
+    lRc = wxMacExecute(argv, flags, process);
+    if( lRc != ((flags & wxEXEC_SYNC) ? -1 : 0))
+        return lRc;
+#endif
+

     // do execute the command
     // do execute the command

-    long lRc = wxExecute(argv, flags, process);
+    lRc = wxExecute(argv, flags, process);

 
     // clean up
     argc = 0;
 
     // clean up
     argc = 0;


@@ -375,12 +409,11 @@ bool wxShutdown(wxShutdownFlags wFlags)
     return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
 }
 
     return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
 }
 

-

 // ----------------------------------------------------------------------------
 // wxStream classes to support IO redirection in wxExecute
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxStream classes to support IO redirection in wxExecute
 // ----------------------------------------------------------------------------
 

-#if wxUSE_STREAMS
+#if HAS_PIPE_INPUT_STREAM

 
 bool wxPipeInputStream::CanRead() const
 {
 
 bool wxPipeInputStream::CanRead() const
 {


@@ -395,8 +428,10 @@ bool wxPipeInputStream::CanRead() const
     const int fd = m_file->fd();
 
     fd_set readfds;
     const int fd = m_file->fd();
 
     fd_set readfds;

-    FD_ZERO(&readfds);
-    FD_SET(fd, &readfds);
+
+    wxFD_ZERO(&readfds);
+    wxFD_SET(fd, &readfds);
+

     switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
     {
         case -1:
     switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
     {
         case -1:


@@ -418,19 +453,13 @@ bool wxPipeInputStream::CanRead() const
     }
 }
 
     }
 }
 

-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_INPUT_STREAM

 
 // ----------------------------------------------------------------------------
 // wxExecute: the real worker function
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxExecute: the real worker function
 // ----------------------------------------------------------------------------
 

-#ifdef __VMS
-    #pragma message disable codeunreachable
-#endif
-
-long wxExecute(wxChar **argv,
-               int flags,
-               wxProcess *process)
+long wxExecute(wxChar **argv, int flags, wxProcess *process)

 {
     // for the sync execution, we return -1 to indicate failure, but for async
     // case we return 0 which is never a valid PID
 {
     // for the sync execution, we return -1 to indicate failure, but for async
     // case we return 0 which is never a valid PID


@@ -608,16 +637,16 @@ long wxExecute(wxChar **argv,
 
         // prepare for IO redirection
 
 
         // prepare for IO redirection
 

-#if wxUSE_STREAMS
+#if HAS_PIPE_INPUT_STREAM

         // the input buffer bufOut is connected to stdout, this is why it is
         // called bufOut and not bufIn
         wxStreamTempInputBuffer bufOut,
                                 bufErr;
         // the input buffer bufOut is connected to stdout, this is why it is
         // called bufOut and not bufIn
         wxStreamTempInputBuffer bufOut,
                                 bufErr;

-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_INPUT_STREAM

 
         if ( process && process->IsRedirected() )
         {
 
         if ( process && process->IsRedirected() )
         {

-#if wxUSE_STREAMS
+#if HAS_PIPE_INPUT_STREAM

             wxOutputStream *inStream =
                 new wxFileOutputStream(pipeIn.Detach(wxPipe::Write));
 
             wxOutputStream *inStream =
                 new wxFileOutputStream(pipeIn.Detach(wxPipe::Write));
 


@@ -634,7 +663,7 @@ long wxExecute(wxChar **argv,
 
             execData.bufOut = &bufOut;
             execData.bufErr = &bufErr;
 
             execData.bufOut = &bufOut;
             execData.bufErr = &bufErr;

-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_INPUT_STREAM

         }
 
         if ( pipeIn.IsOk() )
         }
 
         if ( pipeIn.IsOk() )


@@ -647,12 +676,10 @@ long wxExecute(wxChar **argv,
         return traits->WaitForChild(execData);
     }
 
         return traits->WaitForChild(execData);
     }
 

+#if !defined(__VMS) && !defined(__INTEL_COMPILER)

     return ERROR_RETURN_CODE;
     return ERROR_RETURN_CODE;

-}
-
-#ifdef __VMS
-    #pragma message enable codeunreachable

 #endif
 #endif

+}

 
 #undef ERROR_RETURN_CODE
 #undef ARGS_CLEANUP
 
 #undef ERROR_RETURN_CODE
 #undef ARGS_CLEANUP


@@ -663,9 +690,9 @@ long wxExecute(wxChar **argv,
 
 const wxChar* wxGetHomeDir( wxString *home  )
 {
 
 const wxChar* wxGetHomeDir( wxString *home  )
 {

-    *home = wxGetUserHome( wxString() );
+    *home = wxGetUserHome( wxEmptyString );

     wxString tmp;
     wxString tmp;

-    if ( home->IsEmpty() )
+    if ( home->empty() )

         *home = wxT("/");
 #ifdef __VMS
     tmp = *home;
         *home = wxT("/");
 #ifdef __VMS
     tmp = *home;


@@ -719,6 +746,35 @@ char *wxGetUserHome( const wxString &user )
 // network and user id routines
 // ----------------------------------------------------------------------------
 
 // network and user id routines
 // ----------------------------------------------------------------------------
 

+// private utility function which returns output of the given command, removing
+// the trailing newline
+static wxString wxGetCommandOutput(const wxString &cmd)
+{
+    FILE *f = popen(cmd.ToAscii(), "r");
+    if ( !f )
+    {
+        wxLogSysError(_T("Executing \"%s\" failed"), cmd.c_str());
+        return wxEmptyString;
+    }
+
+    wxString s;
+    char buf[256];
+    while ( !feof(f) )
+    {
+        if ( !fgets(buf, sizeof(buf), f) )
+            break;
+
+        s += wxString::FromAscii(buf);
+    }
+
+    pclose(f);
+
+    if ( !s.empty() && s.Last() == _T('\n') )
+        s.RemoveLast();
+
+    return s;
+}
+

 // 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)
 // 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)


@@ -835,25 +891,54 @@ bool wxGetUserName(wxChar *buf, int sz)
     return false;
 }
 
     return false;
 }
 

-// this function is in mac/utils.cpp for wxMac
+bool wxIsPlatform64Bit()
+{
+    wxString machine = wxGetCommandOutput(wxT("uname -m"));
+
+    // NOTE: these tests are not 100% reliable!
+    return machine.Contains(wxT("AMD64")) ||
+           machine.Contains(wxT("IA64")) ||
+           machine.Contains(wxT("x64")) ||
+           machine.Contains(wxT("X64")) ||
+           machine.Contains(wxT("alpha")) ||
+           machine.Contains(wxT("hppa64")) ||
+           machine.Contains(wxT("ppc64"));
+}
+
+// these functions are in mac/utils.cpp for wxMac

 #ifndef __WXMAC__
 
 #ifndef __WXMAC__
 

-wxString wxGetOsDescription()
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)

 {
 {

-    FILE *f = popen("uname -s -r -m", "r");
-    if (f)
+    // get OS version
+    int major, minor;
+    wxString release = wxGetCommandOutput(wxT("uname -r"));
+    if ( !release.empty() && wxSscanf(release, wxT("%d.%d"), &major, &minor) != 2 )

     {
     {

-        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 );
+        // unrecognized uname string format
+        major =
+        minor = -1;

     }
     }

-    wxFAIL_MSG( _T("uname failed") );
-    return _T("");
+
+    if ( verMaj )
+        *verMaj = major;
+    if ( verMin )
+        *verMin = minor;
+
+    // try to understand which OS are we running
+    wxString kernel = wxGetCommandOutput(wxT("uname -s"));
+    if ( kernel.empty() )
+        kernel = wxGetCommandOutput(wxT("uname -o"));
+
+    if ( kernel.empty() )
+        return wxOS_UNKNOWN;
+
+    return wxPlatformInfo::GetOperatingSystemId(kernel);
+}
+
+wxString wxGetOsDescription()
+{
+    return wxGetCommandOutput(wxT("uname -s -r -m"));

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


@@ -875,8 +960,31 @@ wxMemorySize wxGetFreeMemory()
         char buf[1024];
         if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) )
         {
         char buf[1024];
         if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) )
         {

-            long memTotal, memUsed;
-            sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree);
+            // /proc/meminfo changed its format in kernel 2.6
+            if ( wxPlatformInfo().CheckOSVersion(2, 6) )
+            {
+                unsigned long cached, buffers;
+                sscanf(buf, "MemFree: %ld", &memFree);
+
+                fgets(buf, WXSIZEOF(buf), fp);
+                sscanf(buf, "Buffers: %lu", &buffers);
+
+                fgets(buf, WXSIZEOF(buf), fp);
+                sscanf(buf, "Cached: %lu", &cached);
+
+                // add to "MemFree" also the "Buffers" and "Cached" values as
+                // free(1) does as otherwise the value never makes sense: for
+                // kernel 2.6 it's always almost 0
+                memFree += buffers + cached;
+
+                // values here are always expressed in kB and we want bytes
+                memFree *= 1024;
+            }
+            else // Linux 2.4 (or < 2.6, anyhow)
+            {
+                long memTotal, memUsed;
+                sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree);
+            }

         }
 
         fclose(fp);
         }
 
         fclose(fp);


@@ -885,6 +993,10 @@ wxMemorySize wxGetFreeMemory()
     }
 #elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
     return (wxMemorySize)(sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE));
     }
 #elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
     return (wxMemorySize)(sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE));

+#elif defined(__SGI__)
+    struct rminfo realmem;
+    if ( sysmp(MP_SAGET, MPSA_RMINFO, &realmem, sizeof realmem) == 0 )
+        return ((wxMemorySize)realmem.physmem * 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
 


@@ -892,7 +1004,7 @@ wxMemorySize wxGetFreeMemory()
     return -1;
 }
 
     return -1;
 }
 

-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)

 {
 #if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
     // the case to "char *" is needed for AIX 4.3
 {
 #if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
     // the case to "char *" is needed for AIX 4.3


@@ -907,19 +1019,19 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
     // under Solaris we also have to use f_frsize field instead of f_bsize
     // which is in general a multiple of f_frsize
 #ifdef HAVE_STATVFS
     // under Solaris we also have to use f_frsize field instead of f_bsize
     // which is in general a multiple of f_frsize
 #ifdef HAVE_STATVFS

-    wxLongLong blockSize = fs.f_frsize;
+    wxDiskspaceSize_t blockSize = fs.f_frsize;

 #else // HAVE_STATFS
 #else // HAVE_STATFS

-    wxLongLong blockSize = fs.f_bsize;
+    wxDiskspaceSize_t blockSize = fs.f_bsize;

 #endif // HAVE_STATVFS/HAVE_STATFS
 
     if ( pTotal )
     {
 #endif // HAVE_STATVFS/HAVE_STATFS
 
     if ( pTotal )
     {

-        *pTotal = wxLongLong(fs.f_blocks) * blockSize;
+        *pTotal = wxDiskspaceSize_t(fs.f_blocks) * blockSize;

     }
 
     if ( pFree )
     {
     }
 
     if ( pFree )
     {

-        *pFree = wxLongLong(fs.f_bavail) * blockSize;
+        *pFree = wxDiskspaceSize_t(fs.f_bavail) * blockSize;

     }
 
     return true;
     }
 
     return true;


@@ -1045,40 +1157,6 @@ bool wxHandleFatalExceptions(bool doit)
 
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 
 #endif // wxUSE_ON_FATAL_EXCEPTION
 

-// ----------------------------------------------------------------------------
-// error and debug output routines (deprecated, use wxLog)
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_2
-
-void wxDebugMsg( const char *format, ... )
-{
-  va_list ap;
-  va_start( ap, format );
-  vfprintf( stderr, format, ap );
-  fflush( stderr );
-  va_end(ap);
-}
-
-void wxError( const wxString &msg, const wxString &title )
-{
-  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 )
-{
-  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()
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-

 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI


@@ -1181,7 +1259,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
         {
             bool idle = true;
 
         {
             bool idle = true;
 

-#if wxUSE_STREAMS
+#if HAS_PIPE_INPUT_STREAM

             if ( execData.bufOut )
             {
                 execData.bufOut->Update();
             if ( execData.bufOut )
             {
                 execData.bufOut->Update();


@@ -1193,7 +1271,7 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
                 execData.bufErr->Update();
                 idle = false;
             }
                 execData.bufErr->Update();
                 idle = false;
             }

-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_INPUT_STREAM

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