X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8b04eb349f772582534d3e466983ada85f2460d..9806a0e71eb2190827e93cd463e9682a3b939eee:/src/unix/utilsunx.cpp?ds=sidebyside diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 1ecee5f029..a93c05a3be 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -20,11 +20,23 @@ #include "wx/intl.h" #include "wx/log.h" +#include "wx/app.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 + +// SGI signal.h defines signal handler arguments differently depending on +// whether _LANGUAGE_C_PLUS_PLUS is set or not - do set it +#if defined(__SGI__) && !defined(_LANGUAGE_C_PLUS_PLUS) + #define _LANGUAGE_C_PLUS_PLUS 1 +#endif // SGI hack #include #include @@ -40,11 +52,9 @@ #include // for O_WRONLY and friends #include // nanosleep() and/or usleep() #include // isspace() +#include // needed for FD_SETSIZE -// JACS: needed for FD_SETSIZE -#include - -#if HAVE_UNAME +#ifdef HAVE_UNAME #include // for uname() #endif // HAVE_UNAME @@ -64,20 +74,21 @@ #ifdef __SUN__ int usleep(unsigned int usec); #else // !Sun - #ifdef __EMX - /* I copied this from the XFree86 diffs. AV. */ - #define INCL_DOSPROCESS - #include - void usleep(unsigned long delay) - { - DosSleep(delay ? (delay/1000l) : 1l); - } - #else - void usleep(unsigned long usec); - #endif + #ifdef __EMX__ + /* I copied this from the XFree86 diffs. AV. */ + #define INCL_DOSPROCESS + #include + 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 }; -#define HAVE_USLEEP 1 + + #define HAVE_USLEEP 1 #endif // Unices without usleep() // ============================================================================ @@ -95,14 +106,14 @@ void wxSleep(int nSecs) void wxUsleep(unsigned long milliseconds) { -#if HAVE_NANOSLEEP +#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 (void)nanosleep(&tmReq, (timespec *)NULL); -#elif HAVE_USLEEP +#elif defined(HAVE_USLEEP) // uncomment this if you feel brave or if you are sure that your version // 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 @@ -112,6 +123,9 @@ void wxUsleep(unsigned long milliseconds) #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 @@ -121,40 +135,70 @@ void wxUsleep(unsigned long milliseconds) // process management // ---------------------------------------------------------------------------- -int wxKill(long pid, wxSignal sig) +int wxKill(long pid, wxSignal sig, wxKillError *rc) { - return kill(pid, (int)sig); + int err = kill((pid_t)pid, (int)sig); + if ( rc ) + { + switch ( err ) + { + case 0: + *rc = wxKILL_OK; + break; + + case EINVAL: + *rc = wxKILL_BAD_SIGNAL; + break; + + case EPERM: + *rc = wxKILL_ACCESS_DENIED; + break; + + case ESRCH: + *rc = wxKILL_NO_PROCESS; + break; + + default: + // this goes against Unix98 docs so log it + wxLogDebug(_T("unexpected kill(2) return value %d"), err); + + // something else... + *rc = wxKILL_ERROR; + } + } + + return err; } #define WXEXECUTE_NARGS 127 long wxExecute( const wxString& command, bool sync, wxProcess *process ) { - wxCHECK_MSG( !command.IsEmpty(), 0, _T("can't exec empty command") ); + wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") ); int argc = 0; wxChar *argv[WXEXECUTE_NARGS]; wxString argument; const wxChar *cptr = command.c_str(); - wxChar quotechar = _T('\0'); // is arg quoted? + wxChar quotechar = wxT('\0'); // is arg quoted? bool escaped = FALSE; // split the command line in arguments do { - argument=_T(""); - quotechar = _T('\0'); + argument=wxT(""); + quotechar = wxT('\0'); // eat leading whitespace: while ( wxIsspace(*cptr) ) cptr++; - if ( *cptr == _T('\'') || *cptr == _T('"') ) + if ( *cptr == wxT('\'') || *cptr == wxT('"') ) quotechar = *cptr++; do { - if ( *cptr == _T('\\') && ! escaped ) + if ( *cptr == wxT('\\') && ! escaped ) { escaped = TRUE; cptr++; @@ -167,11 +211,11 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) // have we reached the end of the argument? if ( (*cptr == quotechar && ! escaped) - || (quotechar == _T('\0') && wxIsspace(*cptr)) - || *cptr == _T('\0') ) + || (quotechar == wxT('\0') && wxIsspace(*cptr)) + || *cptr == wxT('\0') ) { wxASSERT_MSG( argc < WXEXECUTE_NARGS, - _T("too many arguments in wxExecute") ); + wxT("too many arguments in wxExecute") ); argv[argc] = new wxChar[argument.length() + 1]; wxStrcpy(argv[argc], argument.c_str()); @@ -198,17 +242,41 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) return lRc; } -bool wxShell(const wxString& command) +// ---------------------------------------------------------------------------- +// wxShell +// ---------------------------------------------------------------------------- + +static wxString wxMakeShellCommand(const wxString& command) { wxString cmd; - if ( !!command ) - cmd.Printf(_T("xterm -e %s"), command.c_str()); + if ( !command ) + { + // just an interactive shell + cmd = _T("xterm"); + } 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); @@ -217,9 +285,24 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) // systems wait() might be used instead in a loop (until the right pid // terminates) int status = 0; - if ( waitpid(pid, &status, 0) == -1 || !WIFEXITED(status) ) + int rc; + + // wait for child termination and if waitpid() was interrupted, try again + do { - wxLogSysError(_("Waiting for subprocess termination failed")); + rc = waitpid(pid, &status, 0); + } + while ( rc == -1 && errno == EINTR ); + + + if( rc == -1 || ! (WIFEXITED(status) || WIFSIGNALED(status)) ) + { + 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 { @@ -229,126 +312,319 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) 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; + } } +} - // clean up - if ( proc_data->pid > 0 ) +#endif // wxUSE_GUI + +// ---------------------------------------------------------------------------- +// wxStream classes to support IO redirection in wxExecute +// ---------------------------------------------------------------------------- + +#if wxUSE_STREAMS + +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) ) { - delete proc_data; + case -1: + wxLogSysError(_("Impossible to get child process input")); + // fall through + + case 0: + return TRUE; + + default: + wxFAIL_MSG(_T("unexpected select() return value")); + // still fall through + + case 1: + // input available: check if there is any + return wxInputStream::Eof(); + } +} + +size_t wxProcessFileInputStream::OnSysRead(void *buffer, size_t bufsize) +{ + 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 { - // wxExecute() will know about it - proc_data->exitcode = status; + m_lasterror = wxSTREAM_NOERROR; + } + + return ret; +} - proc_data->pid = 0; +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 ) +#endif // wxUSE_STREAMS + +long wxExecute(wxChar **argv, + bool sync, + wxProcess *process) { - wxCHECK_MSG( *argv, 0, _T("can't exec empty command") ); + // for the sync execution, we return -1 to indicate failure, but for async + // case we return 0 which is never a valid PID + // + // we define this as a macro, not a variable, to avoid compiler warnings + // about "ERROR_RETURN_CODE value may be clobbered by fork()" + #define ERROR_RETURN_CODE ((sync) ? -1 : 0) + + wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") ); - int end_proc_detect[2]; #if wxUSE_UNICODE int mb_argc = 0; char *mb_argv[WXEXECUTE_NARGS]; - while (argv[mb_argc]) { - wxWX2MBbuf mb_arg = wxConvCurrent->cWX2MB(argv[mb_argc]); - mb_argv[mb_argc] = strdup(mb_arg); - mb_argc++; + 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; -#else + + // 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 +#endif // Unicode/ANSI +#if wxUSE_GUI // create pipes - if (pipe(end_proc_detect) == -1) + int end_proc_detect[2]; + if ( pipe(end_proc_detect) == -1 ) { wxLogSysError( _("Pipe creation failed") ); -#if wxUSE_UNICODE - mb_argc = 0; - while (mb_argv[mb_argc]) - free(mb_argv[mb_argc++]); -#endif - return 0; + wxLogError( _("Failed to execute '%s'\n"), *argv ); + + ARGS_CLEANUP; + + return ERROR_RETURN_CODE; + } +#endif // wxUSE_GUI + + // pipes for inter process communication + int pipeIn[2], // stdin + pipeOut[2], // stdout + pipeErr[2]; // stderr + + pipeIn[0] = pipeIn[1] = + pipeOut[0] = pipeOut[1] = + pipeErr[0] = pipeErr[1] = -1; + + if ( process && process->IsRedirected() ) + { + if ( pipe(pipeIn) == -1 || pipe(pipeOut) == -1 || pipe(pipeErr) == -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 ERROR_RETURN_CODE; + } } // fork the process -#if HAVE_VFORK +#ifdef HAVE_VFORK pid_t pid = vfork(); #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]); + close(pipeErr[0]); + close(pipeErr[1]); +#endif // wxUSE_GUI + wxLogSysError( _("Fork failed") ); -#if wxUSE_UNICODE - mb_argc = 0; - while (mb_argv[mb_argc]) - free(mb_argv[mb_argc++]); -#endif - return 0; + + ARGS_CLEANUP; + + return ERROR_RETURN_CODE; } - 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 +#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 - // 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++ ) { - if ( fd != end_proc_detect[1] && fd != STDERR_FILENO ) + if ( fd == pipeIn[0] || fd == pipeOut[1] || fd == pipeErr[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); } } -#if 0 - close(STDERR_FILENO); + // redirect stdio, stdout and stderr + if ( pipeIn[0] != -1 ) + { + if ( dup2(pipeIn[0], STDIN_FILENO) == -1 || + dup2(pipeOut[1], STDOUT_FILENO) == -1 || + dup2(pipeErr[1], STDERR_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]); + close(pipeErr[1]); + } execvp (*mb_argv, mb_argv); // there is no return after successful exec() - wxFprintf(stderr, _("Can't execute '%s'\n"), *argv); - _exit(-1); } - else + else // we're in parent { - // we're in parent - close(end_proc_detect[1]); // close writing side + ARGS_CLEANUP; - wxEndProcessData *data = new wxEndProcessData; - data->tag = wxAddProcessCallback(data, end_proc_detect[0]); + // pipe initialization: construction of the wxStreams + if ( process && process->IsRedirected() ) + { +#if wxUSE_STREAMS + // These two streams are relative to this process. + wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]); + wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]); + wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]); + + process->SetPipeStreams(inStream, outStream, errStream); +#endif // wxUSE_STREAMS + + close(pipeIn[0]); // close reading side + close(pipeOut[1]); // close writing side + close(pipeErr[1]); // close writing side + } -#if wxUSE_UNICODE - mb_argc = 0; - while (mb_argv[mb_argc]) - free(mb_argv[mb_argc++]); -#endif +#if wxUSE_GUI + wxEndProcessData *data = new wxEndProcessData; if ( sync ) { - wxASSERT_MSG( !process, _T("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->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) @@ -360,19 +636,43 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) return exitcode; } - else + else // async execution { // 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 - 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; } +#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 } +#ifdef __VMS + // VMS does not recognise exit as a return and complains about + // a missing return + // I think VMS is wrong in this + // JJ + return 0; +#endif } +#undef ERROR_RETURN_CODE +#undef ARGS_CLEANUP + // ---------------------------------------------------------------------------- // file and directory functions // ---------------------------------------------------------------------------- @@ -380,15 +680,20 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) const wxChar* wxGetHomeDir( wxString *home ) { *home = wxGetUserHome( wxString() ); + wxString tmp; if ( home->IsEmpty() ) - *home = _T("/"); - + *home = wxT("/"); +#ifdef __VMS + tmp = *home; + if ( tmp.Last() != wxT(']')) + if ( tmp.Last() != wxT('/')) *home << wxT('/'); +#endif return home->c_str(); } #if wxUSE_UNICODE const wxMB2WXbuf wxGetUserHome( const wxString &user ) -#else // just for binary compatibility +#else // just for binary compatibility -- there is no 'const' here char *wxGetUserHome( const wxString &user ) #endif { @@ -396,15 +701,15 @@ char *wxGetUserHome( const wxString &user ) if ( !user ) { - register wxChar *ptr; + wxChar *ptr; - if ((ptr = wxGetenv(_T("HOME"))) != NULL) + if ((ptr = wxGetenv(wxT("HOME"))) != NULL) { return ptr; } - if ((ptr = wxGetenv(_T("USER"))) != NULL || (ptr = wxGetenv(_T("LOGNAME"))) != NULL) + if ((ptr = wxGetenv(wxT("USER"))) != NULL || (ptr = wxGetenv(wxT("LOGNAME"))) != NULL) { - who = getpwnam(wxConvCurrent->cWX2MB(ptr)); + who = getpwnam(wxConvertWX2MB(ptr)); } // We now make sure the the user exists! @@ -418,11 +723,7 @@ char *wxGetUserHome( const wxString &user ) who = getpwnam (user.mb_str()); } -#if wxUSE_UNICODE - return who ? wxConvCurrent->cMB2WX(who->pw_dir) : (wxMB2WXbuf)((wxChar*)NULL); -#else - return who ? who->pw_dir : ((char*)NULL); -#endif + return wxConvertMB2WX(who ? who->pw_dir : 0); } // ---------------------------------------------------------------------------- @@ -434,9 +735,9 @@ char *wxGetUserHome( const wxString &user ) // private use only) static bool wxGetHostNameInternal(wxChar *buf, int sz) { - wxCHECK_MSG( buf, FALSE, _T("NULL pointer in wxGetHostNameInternal") ); + wxCHECK_MSG( buf, FALSE, wxT("NULL pointer in wxGetHostNameInternal") ); - *buf = _T('\0'); + *buf = wxT('\0'); // we're using uname() which is POSIX instead of less standard sysinfo() #if defined(HAVE_UNAME) @@ -444,13 +745,13 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz) bool ok = uname(&uts) != -1; if ( ok ) { - wxStrncpy(buf, wxConvCurrent->cMB2WX(uts.nodename), sz - 1); - buf[sz] = _T('\0'); + wxStrncpy(buf, wxConvertMB2WX(uts.nodename), sz - 1); + buf[sz] = wxT('\0'); } #elif defined(HAVE_GETHOSTNAME) bool ok = gethostname(buf, sz) != -1; #else // no uname, no gethostname - wxFAIL_MSG(_T("don't know host name for this machine")); + wxFAIL_MSG(wxT("don't know host name for this machine")); bool ok = FALSE; #endif // uname/gethostname @@ -471,11 +772,11 @@ bool wxGetHostName(wxChar *buf, int sz) { // BSD systems return the FQDN, we only want the hostname, so extract // it (we consider that dots are domain separators) - wxChar *dot = wxStrchr(buf, _T('.')); + wxChar *dot = wxStrchr(buf, wxT('.')); if ( dot ) { // nuke it - *dot = _T('\0'); + *dot = wxT('\0'); } } @@ -488,9 +789,9 @@ bool wxGetFullHostName(wxChar *buf, int sz) if ( ok ) { - if ( !wxStrchr(buf, _T('.')) ) + if ( !wxStrchr(buf, wxT('.')) ) { - struct hostent *host = gethostbyname(wxConvCurrent->cWX2MB(buf)); + struct hostent *host = gethostbyname(wxConvertWX2MB(buf)); if ( !host ) { wxLogSysError(_("Cannot get the official hostname")); @@ -500,7 +801,7 @@ bool wxGetFullHostName(wxChar *buf, int sz) else { // the canonical name - wxStrncpy(buf, wxConvCurrent->cMB2WX(host->h_name), sz); + wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz); } } //else: it's already a FQDN (BSD behaves this way) @@ -513,10 +814,10 @@ bool wxGetUserId(wxChar *buf, int sz) { struct passwd *who; - *buf = _T('\0'); + *buf = wxT('\0'); if ((who = getpwuid(getuid ())) != NULL) { - wxStrncpy (buf, wxConvCurrent->cMB2WX(who->pw_name), sz - 1); + wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); return TRUE; } @@ -526,295 +827,230 @@ bool wxGetUserId(wxChar *buf, int sz) bool wxGetUserName(wxChar *buf, int sz) { struct passwd *who; - char *comma; - *buf = _T('\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 +#ifdef HAVE_PW_GECOS + char *comma = strchr(who->pw_gecos, ','); if (comma) *comma = '\0'; // cut off non-name comment fields - wxStrncpy (buf, wxConvCurrent->cMB2WX(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; } -// ---------------------------------------------------------------------------- -// error and debug output routines (deprecated, use wxLog) -// ---------------------------------------------------------------------------- - -void wxDebugMsg( const char *format, ... ) +wxString wxGetOsDescription() { - va_list ap; - va_start( ap, format ); - vfprintf( stderr, format, ap ); - fflush( stderr ); - va_end(ap); +#ifndef WXWIN_OS_DESCRIPTION + #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure +#else + return WXWIN_OS_DESCRIPTION; +#endif } -void wxError( const wxString &msg, const wxString &title ) -{ - wxFprintf( stderr, _("Error ") ); - if (!title.IsNull()) wxFprintf( stderr, _T("%s "), WXSTRINGCAST(title) ); - if (!msg.IsNull()) wxFprintf( stderr, _T(": %s"), WXSTRINGCAST(msg) ); - wxFprintf( stderr, _T(".\n") ); -} +// this function returns the GUI toolkit version in GUI programs, but OS +// version in non-GUI ones +#if !wxUSE_GUI -void wxFatalError( const wxString &msg, const wxString &title ) +int wxGetOsVersion(int *majorVsn, int *minorVsn) { - wxFprintf( stderr, _("Error ") ); - if (!title.IsNull()) wxFprintf( stderr, _T("%s "), WXSTRINGCAST(title) ); - if (!msg.IsNull()) wxFprintf( stderr, _T(": %s"), WXSTRINGCAST(msg) ); - wxFprintf( stderr, _T(".\n") ); - exit(3); // the same exit code as for abort() -} + int major, minor; + char name[256]; -// ---------------------------------------------------------------------------- -// font-related functions -// ---------------------------------------------------------------------------- - -// define the functions to create and destroy native fonts for this toolkit -#ifdef __X__ - static inline wxNativeFont wxLoadFont(const wxString& fontSpec) + if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 ) { - return XLoadQueryFont((Display *)wxGetDisplay(), fontSpec); + // unreckognized uname string format + major = minor = -1; } - static inline void wxFreeFont(wxNativeFont font) - { - XFreeFont((Display *)wxGetDisplay(), font); - } -#elif defined(__WXGTK__) + if ( majorVsn ) + *majorVsn = major; + if ( minorVsn ) + *minorVsn = minor; - #include "gdk/gdk.h" + return wxUNIX; +} - static inline wxNativeFont wxLoadFont(const wxString& fontSpec) - { - return gdk_font_load( wxConvCurrent->cWX2MB(fontSpec) ); - } +#endif // !wxUSE_GUI - static inline void wxFreeFont(wxNativeFont font) +long wxGetFreeMemory() +{ +#if defined(__LINUX__) + // get it from /proc/meminfo + FILE *fp = fopen("/proc/meminfo", "r"); + if ( fp ) { - gdk_font_unref(font); + long memFree = -1; + + 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); + } + + fclose(fp); + + return memFree; } -#else - #error "Unknown GUI toolkit" +#elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES) + return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE); +//#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably #endif -// returns TRUE if there are any fonts matching this font spec -static bool wxTestFontSpec(const wxString& fontspec) + // can't find it out + return -1; +} + +// ---------------------------------------------------------------------------- +// env vars +// ---------------------------------------------------------------------------- + +bool wxGetEnv(const wxString& var, wxString *value) { - wxNativeFont test = wxLoadFont(fontspec); - if ( test ) - { - wxFreeFont(test); + // wxGetenv is defined as getenv() + wxChar *p = wxGetenv(var); + if ( !p ) + return FALSE; - return TRUE; - } - else + if ( value ) { - return FALSE; + *value = p; } + + return TRUE; } -// TODO encoding test logic should be moved to wxLoadQueryNearestFont() -static wxNativeFont wxLoadQueryFont(int pointSize, - int family, - int style, - int weight, - bool WXUNUSED(underlined), - const wxString &facename, - wxFontEncoding encoding ) +bool wxSetEnv(const wxString& variable, const wxChar *value) { - wxString xfamily; - switch (family) - { - case wxDECORATIVE: xfamily = _T("lucida"); break; - case wxROMAN: xfamily = _T("times"); break; - case wxMODERN: xfamily = _T("courier"); break; - case wxSWISS: xfamily = _T("helvetica"); break; - case wxTELETYPE: xfamily = _T("lucidatypewriter"); break; - case wxSCRIPT: xfamily = _T("utopia"); break; - default: xfamily = _T("*"); - } +#if defined(HAVE_SETENV) + return setenv(variable.mb_str(), value ? wxString(value).mb_str().data() + : NULL, 1 /* overwrite */) == 0; +#elif defined(HAVE_PUTENV) + wxString s = variable; + if ( value ) + s << _T('=') << value; + + // transform to ANSI + const char *p = s.mb_str(); + + // the string will be free()d by libc + char *buf = (char *)malloc(strlen(p) + 1); + strcpy(buf, p); + + return putenv(buf) == 0; +#else // no way to set an env var + return FALSE; +#endif +} - wxString fontSpec; - if (!facename.IsEmpty()) - { - fontSpec.Printf(_T("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"), - facename.c_str()); +// ---------------------------------------------------------------------------- +// signal handling +// ---------------------------------------------------------------------------- - if ( wxTestFontSpec(fontSpec) ) - { - xfamily = facename; - } - //else: no such family, use default one instead - } +#if wxUSE_ON_FATAL_EXCEPTION - wxString xstyle; - switch (style) - { - case wxITALIC: xstyle = _T("i"); break; - case wxSLANT: xstyle = _T("o"); break; - case wxNORMAL: xstyle = _T("r"); break; - default: xstyle = _T("*"); break; - } +#include - wxString xweight; - switch (weight) +static void wxFatalSignalHandler(wxTYPE_SA_HANDLER) +{ + if ( wxTheApp ) { - case wxBOLD: xweight = _T("bold"); break; - case wxLIGHT: - case wxNORMAL: xweight = _T("medium"); break; - default: xweight = _T("*"); break; + // give the user a chance to do something special about this + wxTheApp->OnFatalException(); } - wxString xregistry, xencoding; - if ( encoding == wxFONTENCODING_DEFAULT ) - { - // use the apps default - encoding = wxFont::GetDefaultEncoding(); - } + abort(); +} - bool test = TRUE; // should we test for availability of encoding? - switch ( encoding ) +bool wxHandleFatalExceptions(bool doit) +{ + // old sig handlers + static bool s_savedHandlers = FALSE; + static struct sigaction s_handlerFPE, + s_handlerILL, + s_handlerBUS, + s_handlerSEGV; + + bool ok = TRUE; + if ( doit && !s_savedHandlers ) { - case wxFONTENCODING_ISO8859_1: - case wxFONTENCODING_ISO8859_2: - case wxFONTENCODING_ISO8859_3: - case wxFONTENCODING_ISO8859_4: - case wxFONTENCODING_ISO8859_5: - case wxFONTENCODING_ISO8859_6: - case wxFONTENCODING_ISO8859_7: - case wxFONTENCODING_ISO8859_8: - case wxFONTENCODING_ISO8859_9: - case wxFONTENCODING_ISO8859_10: - case wxFONTENCODING_ISO8859_11: - case wxFONTENCODING_ISO8859_13: - case wxFONTENCODING_ISO8859_14: - case wxFONTENCODING_ISO8859_15: - { - int cp = encoding - wxFONTENCODING_ISO8859_1 + 1; - xregistry = _T("iso8859"); - xencoding.Printf(_T("%d"), cp); - } - break; - - case wxFONTENCODING_KOI8: - xregistry = _T("koi8"); - if ( wxTestFontSpec(_T("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) ) - { - xencoding = _T("1"); + // install the signal handler + struct sigaction act; - // test passed, no need to do it once more - test = FALSE; - } - else - { - xencoding = _T("*"); - } - break; + // some systems extend it with non std fields, so zero everything + memset(&act, 0, sizeof(act)); - case wxFONTENCODING_CP1250: - case wxFONTENCODING_CP1251: - case wxFONTENCODING_CP1252: - { - int cp = encoding - wxFONTENCODING_CP1250 + 1250; - fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"), - cp); - if ( wxTestFontSpec(fontSpec) ) - { - xregistry = _T("microsoft"); - xencoding.Printf(_T("cp%d"), cp); + act.sa_handler = wxFatalSignalHandler; + sigemptyset(&act.sa_mask); + act.sa_flags = 0; - // test passed, no need to do it once more - test = FALSE; - } - else - { - // fall back to LatinX - xregistry = _T("iso8859"); - xencoding.Printf(_T("%d"), cp - 1249); - } - } - break; + ok &= sigaction(SIGFPE, &act, &s_handlerFPE) == 0; + ok &= sigaction(SIGILL, &act, &s_handlerILL) == 0; + ok &= sigaction(SIGBUS, &act, &s_handlerBUS) == 0; + ok &= sigaction(SIGSEGV, &act, &s_handlerSEGV) == 0; + if ( !ok ) + { + wxLogDebug(_T("Failed to install our signal handler.")); + } - case wxFONTENCODING_SYSTEM: - default: - test = FALSE; - xregistry = - xencoding = _T("*"); + s_savedHandlers = TRUE; } - - if ( test ) + else if ( s_savedHandlers ) { - fontSpec.Printf(_T("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"), - xregistry.c_str(), xencoding.c_str()); - if ( !wxTestFontSpec(fontSpec) ) + // uninstall the signal handler + ok &= sigaction(SIGFPE, &s_handlerFPE, NULL) == 0; + ok &= sigaction(SIGILL, &s_handlerILL, NULL) == 0; + ok &= sigaction(SIGBUS, &s_handlerBUS, NULL) == 0; + ok &= sigaction(SIGSEGV, &s_handlerSEGV, NULL) == 0; + if ( !ok ) { - // this encoding isn't available - what to do? - xregistry = - xencoding = _T("*"); + wxLogDebug(_T("Failed to uninstall our signal handler.")); } - } - // construct the X font spec from our data - fontSpec.Printf(_T("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"), - xfamily.c_str(), xweight.c_str(), xstyle.c_str(), - pointSize, xregistry.c_str(), xencoding.c_str()); + s_savedHandlers = FALSE; + } + //else: nothing to do - return wxLoadFont(fontSpec); + return ok; } -wxNativeFont wxLoadQueryNearestFont(int pointSize, - int family, - int style, - int weight, - bool underlined, - const wxString &facename, - wxFontEncoding encoding) -{ - wxNativeFont font = wxLoadQueryFont( pointSize, family, style, weight, - underlined, facename, encoding ); - - if (!font) - { - // search up and down by stepsize 10 - int max_size = pointSize + 20 * (1 + (pointSize/180)); - int min_size = pointSize - 20 * (1 + (pointSize/180)); +#endif // wxUSE_ON_FATAL_EXCEPTION - int i; - - // Search for smaller size (approx.) - for ( i = pointSize - 10; !font && i >= 10 && i >= min_size; i -= 10 ) - { - font = wxLoadQueryFont(i, family, style, weight, underlined, - facename, encoding ); - } - - // Search for larger size (approx.) - for ( i = pointSize + 10; !font && i <= max_size; i += 10 ) - { - font = wxLoadQueryFont( i, family, style, weight, underlined, - facename, encoding ); - } +// ---------------------------------------------------------------------------- +// error and debug output routines (deprecated, use wxLog) +// ---------------------------------------------------------------------------- - // Try default family - if ( !font && family != wxDEFAULT ) - { - font = wxLoadQueryFont( pointSize, wxDEFAULT, style, weight, - underlined, facename, encoding ); - } +void wxDebugMsg( const char *format, ... ) +{ + va_list ap; + va_start( ap, format ); + vfprintf( stderr, format, ap ); + fflush( stderr ); + va_end(ap); +} - // Bogus font - if ( !font ) - { - font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL, - underlined, facename, encoding ); - } - } +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") ); +} - return font; +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() }