/////////////////////////////////////////////////////////////////////////////
-// Name: unix/utilsunx.cpp
+// Name: src/unix/utilsunx.cpp
// Purpose: generic Unix implementation of many wx functions
// Author: Vadim Zeitlin
// Id: $Id$
// headers
// ----------------------------------------------------------------------------
-#include "wx/defs.h"
-#include "wx/string.h"
-
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/app.h"
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/utils.h"
+
+#define USE_PUTENV (!defined(HAVE_SETENV) && defined(HAVE_PUTENV))
+
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/wxcrtvararg.h"
+ #if USE_PUTENV
+ #include "wx/module.h"
+ #include "wx/hashmap.h"
+ #endif
+#endif
+
+#include "wx/apptrait.h"
+
#include "wx/process.h"
#include "wx/thread.h"
#include "wx/wfstream.h"
#include "wx/unix/execute.h"
+#include "wx/unix/private.h"
+
+#ifdef wxHAS_GENERIC_PROCESS_CALLBACK
+#include "wx/private/fdiodispatcher.h"
+#endif
-#ifdef __WXBASE__
+#include <pwd.h>
+#include <sys/wait.h> // waitpid()
+
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+
+#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"
-#if defined( __MWERKS__ ) && defined(__MACH__)
-#define WXWIN_OS_DESCRIPTION "MacOS X"
-#define HAVE_NANOSLEEP
+#endif // HAS_PIPE_INPUT_STREAM
+
+#if wxUSE_BASE
+
+#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 // __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
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
-#include <pwd.h>
#include <errno.h>
#include <netdb.h>
#include <signal.h>
#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
// ----------------------------------------------------------------------------
// 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(__osf__) || defined(__EMX__)
+ defined(__osf__) || defined(__EMX__))
extern "C"
{
- #ifdef __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 // Unix
int usleep(unsigned int usec);
- #else // !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 // __EMX__/Unix
};
#define HAVE_USLEEP 1
sleep(nSecs);
}
-void wxUsleep(unsigned long milliseconds)
+void wxMicroSleep(unsigned long microseconds)
{
#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);
#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?)
- sleep(milliseconds * 1000);
+ sleep(microseconds * 1000000);
#else // !sleep function
- #error "usleep() or nanosleep() function required for wxUsleep"
+ #error "usleep() or nanosleep() function required for wxMicroSleep"
#endif // sleep function
}
+void wxMilliSleep(unsigned long milliseconds)
+{
+ wxMicroSleep(milliseconds*1000);
+}
+
// ----------------------------------------------------------------------------
// 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 ( rc )
{
- switch ( errno )
+ switch ( err ? errno : 0 )
{
case 0:
*rc = wxKILL_OK;
#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 )
{
- wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") );
+ wxCHECK_MSG( !command.empty(), 0, wxT("can't exec empty command") );
+
+ wxLogTrace(wxT("exec"), wxT("Executing \"%s\""), command.c_str());
#if wxUSE_THREADS
// fork() doesn't mix well with POSIX threads: on many systems the program
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
{
- argument=wxT("");
+ argument = wxEmptyString;
quotechar = wxT('\0');
// eat leading whitespace:
{
if ( *cptr == wxT('\\') && ! escaped )
{
- escaped = TRUE;
+ escaped = true;
cptr++;
continue;
}
// all other characters:
argument += *cptr++;
- escaped = FALSE;
+ escaped = false;
// have we reached the end of the argument?
if ( (*cptr == quotechar && ! escaped)
} 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
- long lRc = wxExecute(argv, flags, process);
+ lRc = wxExecute(argv, flags, process);
// clean up
argc = 0;
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);
}
default:
wxFAIL_MSG( _T("unknown wxShutdown() flag") );
- return FALSE;
+ return false;
}
return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
}
-
// ----------------------------------------------------------------------------
// wxStream classes to support IO redirection in wxExecute
// ----------------------------------------------------------------------------
-#if wxUSE_STREAMS
-
-// ----------------------------------------------------------------------------
-// wxPipeInputStream: stream for reading from a pipe
-// ----------------------------------------------------------------------------
-
-class wxPipeInputStream : public wxFileInputStream
-{
-public:
- wxPipeInputStream(int fd) : wxFileInputStream(fd) { }
-
- // return TRUE if the pipe is still opened
- bool IsOpened() const { return !Eof(); }
-
- // return TRUE if we have anything to read, don't block
- virtual bool CanRead() const;
-};
+#if HAS_PIPE_INPUT_STREAM
bool wxPipeInputStream::CanRead() const
{
if ( m_lasterror == wxSTREAM_EOF )
- return FALSE;
+ return false;
// check if there is any input available
struct timeval tv;
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:
// fall through
case 0:
- return FALSE;
+ return false;
default:
wxFAIL_MSG(_T("unexpected select() return value"));
}
}
-// 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
// ----------------------------------------------------------------------------
// 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
while (argv[mb_argc])
{
- wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]);
+ wxWX2MBbuf mb_arg = wxSafeConvertWX2MB(argv[mb_argc]);
mb_argv[mb_argc] = strdup(mb_arg);
mb_argc++;
}
// start an xterm executing it.
if ( !(flags & wxEXEC_SYNC) )
{
- for ( int fd = 0; fd < FD_SETSIZE; fd++ )
+ // FD_SETSIZE is unsigned under BSD, signed under other platforms
+ // so we need a cast to avoid warnings on all platforms
+ for ( int fd = 0; fd < (int)FD_SETSIZE; fd++ )
{
if ( fd == pipeIn[wxPipe::Read]
|| fd == pipeOut[wxPipe::Write]
{
ARGS_CLEANUP;
+ // save it for WaitForChild() use
+ execData.pid = pid;
+
// 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;
-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_INPUT_STREAM
if ( process && process->IsRedirected() )
{
-#if wxUSE_STREAMS
+#if HAS_PIPE_INPUT_STREAM
wxOutputStream *inStream =
new wxFileOutputStream(pipeIn.Detach(wxPipe::Write));
execData.bufOut = &bufOut;
execData.bufErr = &bufErr;
-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_INPUT_STREAM
}
if ( pipeIn.IsOk() )
return traits->WaitForChild(execData);
}
+#if !defined(__VMS) && !defined(__INTEL_COMPILER)
return ERROR_RETURN_CODE;
-}
-
-#ifdef __VMS
- #pragma message enable codeunreachable
#endif
+}
#undef ERROR_RETURN_CODE
#undef ARGS_CLEANUP
const wxChar* wxGetHomeDir( wxString *home )
{
- *home = wxGetUserHome( wxString() );
+ *home = wxGetUserHome();
wxString tmp;
- if ( home->IsEmpty() )
+ if ( home->empty() )
*home = wxT("/");
#ifdef __VMS
tmp = *home;
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 )
-#endif
+wxString wxGetUserHome( const wxString &user )
{
struct passwd *who = (struct passwd *) NULL;
if ((ptr = wxGetenv(wxT("HOME"))) != NULL)
{
-#if wxUSE_UNICODE
- wxWCharBuffer buffer( ptr );
- return buffer;
-#else
return ptr;
-#endif
}
- if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL)
+
+ if ((ptr = wxGetenv(wxT("USER"))) != NULL ||
+ (ptr = wxGetenv(wxT("LOGNAME"))) != NULL)
{
- who = getpwnam(wxConvertWX2MB(ptr));
+ who = getpwnam(wxSafeConvertWX2MB(ptr));
}
- // We now make sure the the user exists!
- if (who == NULL)
+ // make sure the user exists!
+ if ( !who )
{
who = getpwuid(getuid());
}
who = getpwnam (user.mb_str());
}
- return wxConvertMB2WX(who ? who->pw_dir : 0);
+ return wxSafeConvertMB2WX(who ? who->pw_dir : 0);
}
// ----------------------------------------------------------------------------
// 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)
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');
bool ok = uname(&uts) != -1;
if ( ok )
{
- wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1);
+ wxStrncpy(buf, wxSafeConvertMB2WX(uts.nodename), sz - 1);
buf[sz] = wxT('\0');
}
#elif defined(HAVE_GETHOSTNAME)
- bool ok = gethostname(buf, sz) != -1;
+ char cbuf[sz];
+ bool ok = gethostname(cbuf, sz) != -1;
+ if ( ok )
+ {
+ wxStrncpy(buf, wxSafeConvertMB2WX(cbuf), sz - 1);
+ buf[sz] = wxT('\0');
+ }
#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 )
{
if ( !wxStrchr(buf, wxT('.')) )
{
- struct hostent *host = gethostbyname(wxConvertWX2MB(buf));
+ struct hostent *host = gethostbyname(wxSafeConvertWX2MB(buf));
if ( !host )
{
wxLogSysError(_("Cannot get the official hostname"));
- ok = FALSE;
+ ok = false;
}
else
{
// the canonical name
- wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz);
+ wxStrncpy(buf, wxSafeConvertMB2WX(host->h_name), sz);
}
}
//else: it's already a FQDN (BSD behaves this way)
*buf = wxT('\0');
if ((who = getpwuid(getuid ())) != NULL)
{
- wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
- return TRUE;
+ wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_name), sz - 1);
+ return true;
}
- return FALSE;
+ return false;
}
bool wxGetUserName(wxChar *buf, int sz)
{
+#ifdef HAVE_PW_GECOS
struct passwd *who;
*buf = wxT('\0');
if ((who = getpwuid (getuid ())) != NULL)
{
- // pw_gecos field in struct passwd is not standard
-#ifdef HAVE_PW_GECOS
char *comma = strchr(who->pw_gecos, ',');
if (comma)
*comma = '\0'; // cut off non-name comment fields
- wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1);
+ wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_gecos), sz - 1);
+ return true;
+ }
+
+ return false;
#else // !HAVE_PW_GECOS
- wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1);
+ return wxGetUserId(buf, sz);
#endif // HAVE_PW_GECOS/!HAVE_PW_GECOS
- return TRUE;
- }
+}
+
+bool wxIsPlatform64Bit()
+{
+ const wxString machine = wxGetCommandOutput(wxT("uname -m"));
- return FALSE;
+ // the test for "64" is obviously not 100% reliable but seems to work fine
+ // in practice
+ return machine.Contains(wxT("64")) ||
+ machine.Contains(wxT("alpha"));
}
-// this function is in mac/utils.cpp for wxMac
+// these functions are in mac/utils.cpp for wxMac
#ifndef __WXMAC__
-wxString wxGetOsDescription()
+wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
{
-#ifndef WXWIN_OS_DESCRIPTION
- #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
-#else
- return wxString::FromAscii( WXWIN_OS_DESCRIPTION );
-#endif
-}
+ // get OS version
+ int major, minor;
+ wxString release = wxGetCommandOutput(wxT("uname -r"));
+ if ( release.empty() ||
+ wxSscanf(release.c_str(), wxT("%d.%d"), &major, &minor) != 2 )
+ {
+ // failed to get version string or unrecognized format
+ major =
+ minor = -1;
+ }
-#endif // !__WXMAC__
+ if ( verMaj )
+ *verMaj = major;
+ if ( verMin )
+ *verMin = minor;
-int wxGetOsVersion(int *verMaj, int *verMin)
-{
- // we want this function to work even if there is no wxApp
- wxConsoleAppTraits traitsConsole;
- wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
- if ( ! traits )
- traits = &traitsConsole;
+ // 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);
+}
- return traits->GetOSVersion(verMaj, verMin);
+wxString wxGetOsDescription()
+{
+ return wxGetCommandOutput(wxT("uname -s -r -m"));
}
+#endif // !__WXMAC__
+
unsigned long wxGetProcessId()
{
return (unsigned long)getpid();
}
-long wxGetFreeMemory()
+wxMemorySize wxGetFreeMemory()
{
#if defined(__LINUX__)
// get it from /proc/meminfo
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);
- return memFree;
+ return (wxMemorySize)memFree;
}
-#elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
- return 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(_SC_AVPHYS_PAGES)
+ return ((wxMemorySize)sysconf(_SC_AVPHYS_PAGES))*sysconf(_SC_PAGESIZE);
//#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
#endif
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
{
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
// 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
- wxLongLong blockSize = fs.f_bsize;
+ wxDiskspaceSize_t blockSize = fs.f_bsize;
#endif // HAVE_STATVFS/HAVE_STATFS
if ( pTotal )
{
- *pTotal = wxLongLong(fs.f_blocks) * blockSize;
+ *pTotal = wxDiskspaceSize_t(fs.f_blocks) * blockSize;
}
if ( pFree )
{
- *pFree = wxLongLong(fs.f_bavail) * blockSize;
+ *pFree = wxDiskspaceSize_t(fs.f_bavail) * blockSize;
}
- return TRUE;
+ return true;
#else // !HAVE_STATFS && !HAVE_STATVFS
- return FALSE;
+ return false;
#endif // HAVE_STATFS
}
// env vars
// ----------------------------------------------------------------------------
+#if USE_PUTENV
+
+WX_DECLARE_STRING_HASH_MAP(char *, wxEnvVars);
+
+static wxEnvVars gs_envVars;
+
+class wxSetEnvModule : public wxModule
+{
+public:
+ virtual bool OnInit() { return true; }
+ virtual void OnExit()
+ {
+ for ( wxEnvVars::const_iterator i = gs_envVars.begin();
+ i != gs_envVars.end();
+ ++i )
+ {
+ free(i->second);
+ }
+
+ gs_envVars.clear();
+ }
+
+ DECLARE_DYNAMIC_CLASS(wxSetEnvModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxSetEnvModule, wxModule)
+
+#endif // USE_PUTENV
+
bool wxGetEnv(const wxString& var, wxString *value)
{
// wxGetenv is defined as getenv()
- wxChar *p = wxGetenv(var);
+ char *p = wxGetenv(var);
if ( !p )
- return FALSE;
+ return false;
if ( value )
{
*value = p;
}
- return TRUE;
+ return true;
}
-bool wxSetEnv(const wxString& variable, const wxChar *value)
+static bool wxDoSetEnv(const wxString& variable, const char *value)
{
#if defined(HAVE_SETENV)
- return setenv(variable.mb_str(),
- value ? (const char *)wxString(value).mb_str()
- : NULL,
- 1 /* overwrite */) == 0;
+ if ( !value )
+ {
+#ifdef HAVE_UNSETENV
+ // don't test unsetenv() return value: it's void on some systems (at
+ // least Darwin)
+ unsetenv(variable.mb_str());
+ return true;
+#else
+ value = ""; // we can't pass NULL to setenv()
+#endif
+ }
+
+ return setenv(variable.mb_str(), value, 1 /* overwrite */) == 0;
#elif defined(HAVE_PUTENV)
wxString s = variable;
if ( value )
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);
strcpy(buf, p);
+ // store the string to free() it later
+ wxEnvVars::iterator i = gs_envVars.find(variable);
+ if ( i != gs_envVars.end() )
+ {
+ free(i->second);
+ i->second = buf;
+ }
+ else // this variable hadn't been set before
+ {
+ gs_envVars[variable] = buf;
+ }
+
return putenv(buf) == 0;
#else // no way to set an env var
- return FALSE;
+ return false;
#endif
}
+bool wxSetEnv(const wxString& variable, const wxString& value)
+{
+ return wxDoSetEnv(variable, value.mb_str());
+}
+
+bool wxUnsetEnv(const wxString& variable)
+{
+ return wxDoSetEnv(variable, NULL);
+}
+
// ----------------------------------------------------------------------------
// signal handling
// ----------------------------------------------------------------------------
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;
- bool ok = TRUE;
+ bool ok = true;
if ( doit && !s_savedHandlers )
{
// install the signal handler
wxLogDebug(_T("Failed to install our signal handler."));
}
- s_savedHandlers = TRUE;
+ s_savedHandlers = true;
}
else if ( s_savedHandlers )
{
wxLogDebug(_T("Failed to uninstall our signal handler."));
}
- s_savedHandlers = FALSE;
+ s_savedHandlers = false;
}
//else: nothing to do
#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 // __WXBASE__
+#endif // wxUSE_BASE
#if wxUSE_GUI
+#ifdef __DARWIN__
+ #include <sys/errno.h>
+#endif
// ----------------------------------------------------------------------------
// wxExecute support
// ----------------------------------------------------------------------------
-// Darwin doesn't use the same process end detection mechanisms so we don't
-// need wxExecute-related helpers for it
-#if !(defined(__DARWIN__) && defined(__WXMAC__))
+/*
+ NOTE: If this proves not to work well for wxMac then move back to the old
+ behavior. If, however, it proves to work just fine, nuke all of the code
+ for the old behavior. I strongly suggest backporting this to 2.8 as well.
+ However, beware that while you can nuke the old code here, you cannot
+ nuke the wxAddProcessCallbackForPid from the 2.8 branch (found in
+ utilsexc_cf since it's an exported symbol).
+ */
+// #define USE_OLD_DARWIN_END_PROCESS_DETECT (defined(__DARWIN__) && defined(__WXMAC__))
+#define USE_OLD_DARWIN_END_PROCESS_DETECT 0
+
+// wxMac/wxCocoa don't use the same process end detection mechanisms so we don't
+// need wxExecute-related helpers for them
+#if !USE_OLD_DARWIN_END_PROCESS_DETECT
bool wxGUIAppTraits::CreateEndProcessPipe(wxExecuteData& execData)
{
bool wxGUIAppTraits::IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd)
{
- return fd == execData.pipeEndProcDetect[wxPipe::Write]
+ return fd == (execData.pipeEndProcDetect)[wxPipe::Write];
}
void wxGUIAppTraits::DetachWriteFDOfEndProcessPipe(wxExecuteData& execData)
{
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.
- 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
}
-#if defined(__DARWIN__) && defined(__WXMAC__)
- endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
+ if ( !(flags & wxEXEC_NOEVENTS) )
+ {
+#if USE_OLD_DARWIN_END_PROCESS_DETECT
+ endProcData->tag = wxAddProcessCallbackForPid(endProcData, execData.pid);
#else
- endProcData->tag = wxAddProcessCallback
- (
- endProcData,
- execData.pipeEndProcDetect.Detach(wxPipe::Read)
- );
-
- execData.pipeEndProcDetect.Close();
-#endif // defined(__DARWIN__) && defined(__WXMAC__)
+ endProcData->tag = wxAddProcessCallback
+ (
+ endProcData,
+ execData.pipeEndProcDetect.Detach(wxPipe::Read)
+ );
+
+ execData.pipeEndProcDetect.Close();
+#endif // USE_OLD_DARWIN_END_PROCESS_DETECT
+ }
- if ( execData.flags & wxEXEC_SYNC )
+ if ( flags & wxEXEC_SYNC )
{
wxBusyCursor bc;
- wxWindowDisabler wd;
+ int exitcode = 0;
- // endProcData->pid will be set to 0 from GTK_EndProcessDetector when the
- // process terminates
- while ( endProcData->pid != 0 )
+ wxWindowDisabler *wd = flags & (wxEXEC_NODISABLE | wxEXEC_NOEVENTS)
+ ? NULL
+ : new wxWindowDisabler;
+
+ if ( flags & wxEXEC_NOEVENTS )
{
-#if wxUSE_STREAMS
- if ( execData.bufOut )
- execData.bufOut->Update();
+ // just block waiting for the child to exit
+ int status = 0;
+
+ int result = waitpid(execData.pid, &status, 0);
+#ifdef __DARWIN__
+ /* DE: waitpid manpage states that waitpid can fail with EINTR
+ if the call is interrupted by a caught signal. I suppose
+ that means that this ought to be a while loop.
+
+ The odd thing is that it seems to fail EVERY time. It fails
+ with a quickly exiting process (e.g. echo), and fails with a
+ slowly exiting process (e.g. sleep 2) but clearly after
+ having waited for the child to exit. Maybe it's a bug in
+ my particular version.
+
+ It works, however, from the CFSocket callback without this
+ trick but in that case it's used only after CFSocket calls
+ the callback and with the WNOHANG flag which would seem to
+ preclude it from being interrupted or at least make it much
+ less likely since it would not then be waiting.
+
+ If Darwin's man page is to be believed then this is definitely
+ necessary. It's just weird that I've never seen it before
+ and apparently no one else has either or you'd think they'd
+ have reported it by now. Perhaps blocking the GUI while
+ waiting for a child process to exit is simply not that common.
+ */
+ if(result == -1 && errno == EINTR)
+ {
+ result = waitpid(execData.pid, &status, 0);
+ }
- if ( execData.bufErr )
- execData.bufErr->Update();
-#endif // wxUSE_STREAMS
+#endif
- // give GTK+ a chance to call GTK_EndProcessDetector here and
- // also repaint the GUI
- wxYield();
+ if ( result == -1 )
+ {
+ wxLogLastError(_T("waitpid"));
+ exitcode = -1;
+ }
+ else
+ {
+ wxASSERT_MSG( result == execData.pid,
+ _T("unexpected waitpid() return value") );
+
+ if ( WIFEXITED(status) )
+ {
+ exitcode = WEXITSTATUS(status);
+ }
+ else // abnormal termination?
+ {
+ wxASSERT_MSG( WIFSIGNALED(status),
+ _T("unexpected child wait status") );
+ exitcode = -1;
+ }
+ }
}
+ else // !wxEXEC_NOEVENTS
+ {
+ // endProcData->pid will be set to 0 from
+ // wxHandleProcessTermination when the process terminates
+ while ( endProcData->pid != 0 )
+ {
+ bool idle = true;
+
+#if HAS_PIPE_INPUT_STREAM
+ if ( execData.bufOut )
+ {
+ execData.bufOut->Update();
+ idle = false;
+ }
- int exitcode = endProcData->exitcode;
+ if ( execData.bufErr )
+ {
+ execData.bufErr->Update();
+ idle = false;
+ }
+#endif // HAS_PIPE_INPUT_STREAM
+
+ // don't consume 100% of the CPU while we're sitting in this
+ // loop
+ if ( idle )
+ wxMilliSleep(1);
+
+ // give GTK+ a chance to call GTK_EndProcessDetector here and
+ // also repaint the GUI
+ wxYield();
+ }
+ exitcode = endProcData->exitcode;
+ }
+
+ delete wd;
delete endProcData;
return exitcode;
}
}
+#ifdef wxHAS_GENERIC_PROCESS_CALLBACK
+struct wxEndProcessFDIOHandler : public wxFDIOHandler
+{
+ wxEndProcessFDIOHandler(wxEndProcessData *data, int fd)
+ : m_data(data), m_fd(fd)
+ {}
+
+ virtual void OnReadWaiting()
+ { wxFAIL_MSG("this isn't supposed to happen"); }
+ virtual void OnWriteWaiting()
+ { wxFAIL_MSG("this isn't supposed to happen"); }
+
+ virtual void OnExceptionWaiting()
+ {
+ int pid = (m_data->pid > 0) ? m_data->pid : -(m_data->pid);
+ int status = 0;
+
+ // has the process really terminated?
+ int rc = waitpid(pid, &status, WNOHANG);
+ if ( rc == 0 )
+ {
+ // This can only happen if the child application closes our dummy
+ // pipe that is used to monitor its lifetime; in that case, our
+ // best bet is to pretend the process did terminate, because
+ // otherwise wxExecute() would hang indefinitely
+ // (OnExceptionWaiting() won't be called again, the descriptor
+ // is closed now).
+ wxLogDebug("Child process (PID %i) still alive, even though notification was received that it terminated.", pid);
+ }
+ else if ( rc == -1 )
+ {
+ // As above, if waitpid() fails, the best we can do is to log the
+ // error and pretend the child terminated:
+ wxLogSysError(_("Failed to check child process' status"));
+ }
+
+ // set exit code to -1 if something bad happened
+ m_data->exitcode = (rc > 0 && WIFEXITED(status))
+ ? WEXITSTATUS(status)
+ : -1;
+
+ wxLogTrace("exec",
+ "Child process (PID %i) terminated with exit code %i",
+ pid, m_data->exitcode);
+
+ // child exited, end waiting
+ wxFDIODispatcher::Get()->UnregisterFD(m_fd);
+ close(m_fd);
+
+ m_data->fdioHandler = NULL;
+ wxHandleProcessTermination(m_data);
+
+ delete this;
+ }
+
+ wxEndProcessData *m_data;
+ int m_fd;
+};
+
+int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
+{
+ proc_data->fdioHandler = new wxEndProcessFDIOHandler(proc_data, fd);
+ wxFDIODispatcher::Get()->RegisterFD
+ (
+ fd,
+ proc_data->fdioHandler,
+ wxFDIO_EXCEPTION
+ );
+ return fd; // unused, but return something unique for the tag
+}
+#endif // wxHAS_GENERIC_PROCESS_CALLBACK
+
+#endif // wxUSE_GUI
+#if wxUSE_BASE
+
void wxHandleProcessTermination(wxEndProcessData *proc_data)
{
// notify user about termination if required
}
}
-#endif // wxUSE_GUI
-
+#endif // wxUSE_BASE
projects / wxWidgets.git / blobdiff