/////////////////////////////////////////////////////////////////////////////
// Name: src/unix/utilsunx.cpp
-// Purpose: generic Unix implementation of many wx functions
+// Purpose: generic Unix implementation of many wx functions (for wxBase)
// Author: Vadim Zeitlin
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin
#include "wx/process.h"
#include "wx/thread.h"
+#include "wx/cmdline.h"
+
#include "wx/wfstream.h"
#include "wx/private/selectdispatcher.h"
# include <sys/select.h>
#endif
-#define HAS_PIPE_INPUT_STREAM (wxUSE_STREAMS && wxUSE_FILE)
+#define HAS_PIPE_STREAMS (wxUSE_STREAMS && wxUSE_FILE)
-#if HAS_PIPE_INPUT_STREAM
+#if HAS_PIPE_STREAMS
// define this to let wxexec.cpp know that we know what we're doing
#define _WX_USED_BY_WXEXECUTE_
#include "../common/execcmn.cpp"
-#endif // HAS_PIPE_INPUT_STREAM
-
-#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
+#endif // HAS_PIPE_STREAMS
// not only the statfs syscall is called differently depending on platform, but
// one of its incarnations, statvfs(), takes different arguments under
#include <sys/sysinfo.h> // for SAGET and MINFO structures
#endif
+#ifdef HAVE_SETPRIORITY
+ #include <sys/resource.h> // for setpriority()
+#endif
+
// ----------------------------------------------------------------------------
// conditional compilation
// ----------------------------------------------------------------------------
tmReq.tv_nsec = (microseconds % 1000000) * 1000;
// we're not interested in remaining time nor in return value
- (void)nanosleep(&tmReq, (timespec *)NULL);
+ (void)nanosleep(&tmReq, NULL);
#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()
default:
// this goes against Unix98 docs so log it
- wxLogDebug(_T("unexpected kill(2) return value %d"), err);
+ wxLogDebug(wxT("unexpected kill(2) return value %d"), err);
// something else...
*rc = wxKILL_ERROR;
return err;
}
-#define WXEXECUTE_NARGS 127
+// Shutdown or reboot the PC
+bool wxShutdown(int flags)
+{
+ flags &= ~wxSHUTDOWN_FORCE;
-#if defined(__DARWIN__)
-long wxMacExecute(wxChar **argv,
- int flags,
- wxProcess *process);
-#endif
+ wxChar level;
+ switch ( flags )
+ {
+ case wxSHUTDOWN_POWEROFF:
+ level = wxT('0');
+ break;
-long wxExecute( const wxString& command, int flags, wxProcess *process )
-{
- wxCHECK_MSG( !command.empty(), 0, wxT("can't exec empty command") );
+ case wxSHUTDOWN_REBOOT:
+ level = wxT('6');
+ break;
- wxLogTrace(wxT("exec"), wxT("Executing \"%s\""), command.c_str());
+ case wxSHUTDOWN_LOGOFF:
+ // TODO: use dcop to log off?
+ return false;
-#if wxUSE_THREADS
- // fork() doesn't mix well with POSIX threads: on many systems the program
- // deadlocks or crashes for some reason. Probably our code is buggy and
- // doesn't do something which must be done to allow this to work, but I
- // don't know what yet, so for now just warn the user (this is the least we
- // can do) about it
- wxASSERT_MSG( wxThread::IsMain(),
- _T("wxExecute() can be called only from the main thread") );
-#endif // wxUSE_THREADS
+ default:
+ wxFAIL_MSG( wxT("unknown wxShutdown() flag") );
+ return false;
+ }
- int argc = 0;
- wxChar *argv[WXEXECUTE_NARGS];
- wxString argument;
- const wxChar *cptr = command.c_str();
- wxChar quotechar = wxT('\0'); // is arg quoted?
- bool escaped = false;
+ return system(wxString::Format("init %c", level).mb_str()) == 0;
+}
- // split the command line in arguments
- do
- {
- argument = wxEmptyString;
- quotechar = wxT('\0');
+// ----------------------------------------------------------------------------
+// wxStream classes to support IO redirection in wxExecute
+// ----------------------------------------------------------------------------
- // eat leading whitespace:
- while ( wxIsspace(*cptr) )
- cptr++;
+#if HAS_PIPE_STREAMS
- if ( *cptr == wxT('\'') || *cptr == wxT('"') )
- quotechar = *cptr++;
+bool wxPipeInputStream::CanRead() const
+{
+ if ( m_lasterror == wxSTREAM_EOF )
+ return false;
- do
- {
- if ( *cptr == wxT('\\') && ! escaped )
- {
- escaped = true;
- cptr++;
- continue;
- }
+ // check if there is any input available
+ struct timeval tv;
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
- // all other characters:
- argument += *cptr++;
- escaped = false;
+ const int fd = m_file->fd();
- // have we reached the end of the argument?
- if ( (*cptr == quotechar && ! escaped)
- || (quotechar == wxT('\0') && wxIsspace(*cptr))
- || *cptr == wxT('\0') )
- {
- wxASSERT_MSG( argc < WXEXECUTE_NARGS,
- wxT("too many arguments in wxExecute") );
+ fd_set readfds;
- argv[argc] = new wxChar[argument.length() + 1];
- wxStrcpy(argv[argc], argument.c_str());
- argc++;
+ wxFD_ZERO(&readfds);
+ wxFD_SET(fd, &readfds);
- // if not at end of buffer, swallow last character:
- if(*cptr)
- cptr++;
+ switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
+ {
+ case -1:
+ wxLogSysError(_("Impossible to get child process input"));
+ // fall through
- break; // done with this one, start over
- }
- } while(*cptr);
- } while(*cptr);
- argv[argc] = NULL;
+ case 0:
+ return false;
- 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
+ default:
+ wxFAIL_MSG(wxT("unexpected select() return value"));
+ // still fall through
+
+ case 1:
+ // input available -- or maybe not, as select() returns 1 when a
+ // read() will complete without delay, but it could still not read
+ // anything
+ return !Eof();
+ }
+}
- // do execute the command
- lRc = wxExecute(argv, flags, process);
+size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+ // We need to suppress error logging here, because on writing to a pipe
+ // which is full, wxFile::Write reports a system error. However, this is
+ // not an extraordinary situation, and it should not be reported to the
+ // user (but if really needed, the program can recognize it by checking
+ // whether LastRead() == 0.) Other errors will be reported below.
+ size_t ret;
+ {
+ wxLogNull logNo;
+ ret = m_file->Write(buffer, size);
+ }
- // clean up
- argc = 0;
- while( argv[argc] )
- delete [] argv[argc++];
+ switch ( m_file->GetLastError() )
+ {
+ // pipe is full
+#ifdef EAGAIN
+ case EAGAIN:
+#endif
+#if defined(EWOULDBLOCK) && (EWOULDBLOCK != EAGAIN)
+ case EWOULDBLOCK:
+#endif
+ // do not treat it as an error
+ m_file->ClearLastError();
+ // fall through
+
+ // no error
+ case 0:
+ break;
+
+ // some real error
+ default:
+ wxLogSysError(_("Can't write to child process's stdin"));
+ m_lasterror = wxSTREAM_WRITE_ERROR;
+ }
- return lRc;
+ return ret;
}
+#endif // HAS_PIPE_STREAMS
+
// ----------------------------------------------------------------------------
// wxShell
// ----------------------------------------------------------------------------
if ( !command )
{
// just an interactive shell
- cmd = _T("xterm");
+ cmd = wxT("xterm");
}
else
{
// execute command in a shell
- cmd << _T("/bin/sh -c '") << command << _T('\'');
+ cmd << wxT("/bin/sh -c '") << command << wxT('\'');
}
return cmd;
bool wxShell(const wxString& command, wxArrayString& output)
{
- wxCHECK_MSG( !command.empty(), false, _T("can't exec shell non interactively") );
+ wxCHECK_MSG( !command.empty(), false, wxT("can't exec shell non interactively") );
return wxExecute(wxMakeShellCommand(command), output);
}
-// Shutdown or reboot the PC
-bool wxShutdown(wxShutdownFlags wFlags)
+namespace
{
- wxChar level;
- switch ( wFlags )
+
+// helper class for storing arguments as char** array suitable for passing to
+// execvp(), whatever form they were passed to us
+class ArgsArray
+{
+public:
+ ArgsArray(const wxArrayString& args)
{
- case wxSHUTDOWN_POWEROFF:
- level = _T('0');
- break;
+ Init(args.size());
- case wxSHUTDOWN_REBOOT:
- level = _T('6');
- break;
+ for ( int i = 0; i < m_argc; i++ )
+ {
+ m_argv[i] = wxStrdup(args[i]);
+ }
+ }
- default:
- wxFAIL_MSG( _T("unknown wxShutdown() flag") );
- return false;
+#if wxUSE_UNICODE
+ ArgsArray(wchar_t **wargv)
+ {
+ int argc = 0;
+ while ( wargv[argc] )
+ argc++;
+
+ Init(argc);
+
+ for ( int i = 0; i < m_argc; i++ )
+ {
+ m_argv[i] = wxSafeConvertWX2MB(wargv[i]).release();
+ }
}
+#endif // wxUSE_UNICODE
- return system(wxString::Format(_T("init %c"), level).mb_str()) == 0;
-}
+ ~ArgsArray()
+ {
+ for ( int i = 0; i < m_argc; i++ )
+ {
+ free(m_argv[i]);
+ }
-// ----------------------------------------------------------------------------
-// wxStream classes to support IO redirection in wxExecute
-// ----------------------------------------------------------------------------
+ delete [] m_argv;
+ }
-#if HAS_PIPE_INPUT_STREAM
+ operator char**() const { return m_argv; }
-bool wxPipeInputStream::CanRead() const
-{
- if ( m_lasterror == wxSTREAM_EOF )
- return false;
+private:
+ void Init(int argc)
+ {
+ m_argc = argc;
+ m_argv = new char *[m_argc + 1];
+ m_argv[m_argc] = NULL;
+ }
- // check if there is any input available
- struct timeval tv;
- tv.tv_sec = 0;
- tv.tv_usec = 0;
+ int m_argc;
+ char **m_argv;
- const int fd = m_file->fd();
+ wxDECLARE_NO_COPY_CLASS(ArgsArray);
+};
- fd_set readfds;
+} // anonymous namespace
- wxFD_ZERO(&readfds);
- wxFD_SET(fd, &readfds);
+// ----------------------------------------------------------------------------
+// wxExecute implementations
+// ----------------------------------------------------------------------------
- switch ( select(fd + 1, &readfds, NULL, NULL, &tv) )
- {
- case -1:
- wxLogSysError(_("Impossible to get child process input"));
- // fall through
+#if defined(__DARWIN__)
+bool wxMacLaunch(char **argv);
+#endif
- case 0:
- return false;
+long wxExecute(const wxString& command, int flags, wxProcess *process,
+ const wxExecuteEnv *env)
+{
+ ArgsArray argv(wxCmdLineParser::ConvertStringToArgs(command,
+ wxCMD_LINE_SPLIT_UNIX));
- default:
- wxFAIL_MSG(_T("unexpected select() return value"));
- // still fall through
+ return wxExecute(argv, flags, process, env);
+}
- case 1:
- // input available -- or maybe not, as select() returns 1 when a
- // read() will complete without delay, but it could still not read
- // anything
- return !Eof();
- }
+#if wxUSE_UNICODE
+
+long wxExecute(wchar_t **wargv, int flags, wxProcess *process,
+ const wxExecuteEnv *env)
+{
+ ArgsArray argv(wargv);
+
+ return wxExecute(argv, flags, process, env);
}
-#endif // HAS_PIPE_INPUT_STREAM
+#endif // wxUSE_UNICODE
-// ----------------------------------------------------------------------------
// wxExecute: the real worker function
-// ----------------------------------------------------------------------------
-
-long wxExecute(wxChar **argv, int flags, wxProcess *process)
+long wxExecute(char **argv, int flags, wxProcess *process,
+ const wxExecuteEnv *env)
{
// for the sync execution, we return -1 to indicate failure, but for async
// case we return 0 which is never a valid PID
wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") );
-#if wxUSE_UNICODE
- int mb_argc = 0;
- char *mb_argv[WXEXECUTE_NARGS];
+#if wxUSE_THREADS
+ // fork() doesn't mix well with POSIX threads: on many systems the program
+ // deadlocks or crashes for some reason. Probably our code is buggy and
+ // doesn't do something which must be done to allow this to work, but I
+ // don't know what yet, so for now just warn the user (this is the least we
+ // can do) about it
+ wxASSERT_MSG( wxThread::IsMain(),
+ wxT("wxExecute() can be called only from the main thread") );
+#endif // wxUSE_THREADS
- while (argv[mb_argc])
+#if defined(__WXCOCOA__) || ( defined(__WXOSX_MAC__) && wxOSX_USE_COCOA_OR_CARBON )
+ // wxMacLaunch() only executes app bundles and only does it asynchronously.
+ // It returns false if the target is not an app bundle, thus falling
+ // through to the regular code for non app bundles.
+ if ( !(flags & wxEXEC_SYNC) && wxMacLaunch(argv) )
{
- wxWX2MBbuf mb_arg = wxSafeConvertWX2MB(argv[mb_argc]);
- mb_argv[mb_argc] = strdup(mb_arg);
- mb_argc++;
+ // we don't have any PID to return so just make up something non null
+ return -1;
}
- mb_argv[mb_argc] = (char *) NULL;
-
- // this macro will free memory we used above
- #define ARGS_CLEANUP \
- for ( mb_argc = 0; mb_argv[mb_argc]; mb_argc++ ) \
- free(mb_argv[mb_argc])
-#else // ANSI
- // no need for cleanup
- #define ARGS_CLEANUP
-
- wxChar **mb_argv = argv;
-#endif // Unicode/ANSI
-
- // we want this function to work even if there is no wxApp so ensure that
- // we have a valid traits pointer
- wxConsoleAppTraits traitsConsole;
- wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
- if ( !traits )
- traits = &traitsConsole;
-
- // this struct contains all information which we pass to and from
- // wxAppTraits methods
+#endif // __DARWIN__
+
+
+ // this struct contains all information which we use for housekeeping
wxExecuteData execData;
execData.flags = flags;
execData.process = process;
{
wxLogError( _("Failed to execute '%s'\n"), *argv );
- ARGS_CLEANUP;
-
return ERROR_RETURN_CODE;
}
{
wxLogError( _("Failed to execute '%s'\n"), *argv );
- ARGS_CLEANUP;
-
return ERROR_RETURN_CODE;
}
}
+ // priority: we need to map wxWidgets priority which is in the range 0..100
+ // to Unix nice value which is in the range -20..19. As there is an odd
+ // number of elements in our range and an even number in the Unix one, we
+ // have to do it in this rather ugly way to guarantee that:
+ // 1. wxPRIORITY_{MIN,DEFAULT,MAX} map to -20, 0 and 19 respectively.
+ // 2. The mapping is monotonously increasing.
+ // 3. The mapping is onto the target range.
+ int prio = process ? process->GetPriority() : 0;
+ if ( prio <= 50 )
+ prio = (2*prio)/5 - 20;
+ else if ( prio < 55 )
+ prio = 1;
+ else
+ prio = (2*prio)/5 - 21;
+
// fork the process
//
// NB: do *not* use vfork() here, it completely breaks this code for some
{
wxLogSysError( _("Fork failed") );
- ARGS_CLEANUP;
-
return ERROR_RETURN_CODE;
}
else if ( pid == 0 ) // we're in child
{
- // 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 ( !(flags & wxEXEC_SYNC) )
- {
- // 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]
- || fd == pipeErr[wxPipe::Write]
- || fd == (execData.pipeEndProcDetect)[wxPipe::Write] )
- {
- // don't close this one, we still need it
- continue;
- }
-
- // leave stderr opened too, it won't do any harm
- if ( fd != STDERR_FILENO )
- close(fd);
- }
- }
+ // NB: we used to close all the unused descriptors of the child here
+ // but this broke some programs which relied on e.g. FD 1 being
+ // always opened so don't do it any more, after all there doesn't
+ // seem to be any real problem with keeping them opened
#if !defined(__VMS) && !defined(__EMX__)
if ( flags & wxEXEC_MAKE_GROUP_LEADER )
}
#endif // !__VMS
- // reading side can be safely closed but we should keep the write one
- // opened, it will be only closed when the process terminates resulting
- // in a read notification to the parent
- execData.pipeEndProcDetect.Detach(wxPipe::Write);
- execData.pipeEndProcDetect.Close();
+#if defined(HAVE_SETPRIORITY)
+ if ( prio && setpriority(PRIO_PROCESS, 0, prio) != 0 )
+ {
+ wxLogSysError(_("Failed to set process priority"));
+ }
+#endif // HAVE_SETPRIORITY
// redirect stdin, stdout and stderr
if ( pipeIn.IsOk() )
pipeErr.Close();
}
- execvp (*mb_argv, mb_argv);
+ // Close all (presumably accidentally) inherited file descriptors to
+ // avoid descriptor leaks. This means that we don't allow inheriting
+ // them purposefully but this seems like a lesser evil in wx code.
+ // Ideally we'd provide some flag to indicate that none (or some?) of
+ // the descriptors do not need to be closed but for now this is better
+ // than never closing them at all as wx code never used FD_CLOEXEC.
+
+ // Note that while the reading side of the end process detection pipe
+ // can be safely closed, we should keep the write one opened, it will
+ // be only closed when the process terminates resulting in a read
+ // notification to the parent
+ const int fdEndProc = execData.pipeEndProcDetect.Detach(wxPipe::Write);
+ execData.pipeEndProcDetect.Close();
+
+ // TODO: Iterating up to FD_SETSIZE is both inefficient (because it may
+ // be quite big) and incorrect (because in principle we could
+ // have more opened descriptions than this number). Unfortunately
+ // there is no good portable solution for closing all descriptors
+ // above a certain threshold but non-portable solutions exist for
+ // most platforms, see [http://stackoverflow.com/questions/899038/
+ // getting-the-highest-allocated-file-descriptor]
+ for ( int fd = 0; fd < (int)FD_SETSIZE; ++fd )
+ {
+ if ( fd != STDIN_FILENO &&
+ fd != STDOUT_FILENO &&
+ fd != STDERR_FILENO &&
+ fd != fdEndProc )
+ {
+ close(fd);
+ }
+ }
+
+
+ // Process additional options if we have any
+ if ( env )
+ {
+ // Change working directory if it is specified
+ if ( !env->cwd.empty() )
+ wxSetWorkingDirectory(env->cwd);
+
+ // Change environment if needed.
+ //
+ // NB: We can't use execve() currently because we allow using
+ // non full paths to wxExecute(), i.e. we want to search for
+ // the program in PATH. However it just might be simpler/better
+ // to do the search manually and use execve() envp parameter to
+ // set up the environment of the child process explicitly
+ // instead of doing what we do below.
+ if ( !env->env.empty() )
+ {
+ wxEnvVariableHashMap oldenv;
+ wxGetEnvMap(&oldenv);
+
+ // Remove unwanted variables
+ wxEnvVariableHashMap::const_iterator it;
+ for ( it = oldenv.begin(); it != oldenv.end(); ++it )
+ {
+ if ( env->env.find(it->first) == env->env.end() )
+ wxUnsetEnv(it->first);
+ }
+
+ // And add the new ones (possibly replacing the old values)
+ for ( it = env->env.begin(); it != env->env.end(); ++it )
+ wxSetEnv(it->first, it->second);
+ }
+ }
+
+ execvp(*argv, argv);
fprintf(stderr, "execvp(");
- // CS changed ppc to ppc_ as ppc is not available under mac os CW Mach-O
- for ( char **ppc_ = mb_argv; *ppc_; ppc_++ )
- fprintf(stderr, "%s%s", ppc_ == mb_argv ? "" : ", ", *ppc_);
+ for ( char **a = argv; *a; a++ )
+ fprintf(stderr, "%s%s", a == argv ? "" : ", ", *a);
fprintf(stderr, ") failed with error %d!\n", errno);
// there is no return after successful exec()
}
else // we're in parent
{
- ARGS_CLEANUP;
-
// save it for WaitForChild() use
execData.pid = pid;
+ if (execData.process)
+ execData.process->SetPid(pid); // and also in the wxProcess
// prepare for IO redirection
-#if HAS_PIPE_INPUT_STREAM
+#if HAS_PIPE_STREAMS
// the input buffer bufOut is connected to stdout, this is why it is
// called bufOut and not bufIn
wxStreamTempInputBuffer bufOut,
if ( process && process->IsRedirected() )
{
+ // Avoid deadlocks which could result from trying to write to the
+ // child input pipe end while the child itself is writing to its
+ // output end and waiting for us to read from it.
+ if ( !pipeIn.MakeNonBlocking(wxPipe::Write) )
+ {
+ // This message is not terrible useful for the user but what
+ // else can we do? Also, should we fail here or take the risk
+ // to continue and deadlock? Currently we choose the latter but
+ // it might not be the best idea.
+ wxLogSysError(_("Failed to set up non-blocking pipe, "
+ "the program might hang."));
+#if wxUSE_LOG
+ wxLog::FlushActive();
+#endif
+ }
+
wxOutputStream *inStream =
- new wxFileOutputStream(pipeIn.Detach(wxPipe::Write));
+ new wxPipeOutputStream(pipeIn.Detach(wxPipe::Write));
const int fdOut = pipeOut.Detach(wxPipe::Read);
wxPipeInputStream *outStream = new wxPipeInputStream(fdOut);
execData.fdOut = fdOut;
execData.fdErr = fdErr;
}
-#endif // HAS_PIPE_INPUT_STREAM
+#endif // HAS_PIPE_STREAMS
if ( pipeIn.IsOk() )
{
pipeErr.Close();
}
+ // we want this function to work even if there is no wxApp so ensure
+ // that we have a valid traits pointer
+ wxConsoleAppTraits traitsConsole;
+ wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+ if ( !traits )
+ traits = &traitsConsole;
+
return traits->WaitForChild(execData);
}
}
#undef ERROR_RETURN_CODE
-#undef ARGS_CLEANUP
// ----------------------------------------------------------------------------
// file and directory functions
// the trailing newline
static wxString wxGetCommandOutput(const wxString &cmd)
{
- FILE *f = popen(cmd.ToAscii(), "r");
+ // Suppress stderr from the shell to avoid outputting errors if the command
+ // doesn't exist.
+ FILE *f = popen((cmd + " 2>/dev/null").ToAscii(), "r");
if ( !f )
{
- wxLogSysError(_T("Executing \"%s\" failed"), cmd.c_str());
- return wxEmptyString;
+ // Notice that this doesn't happen simply if the command doesn't exist,
+ // but only in case of some really catastrophic failure inside popen()
+ // so we should really notify the user about this as this is not normal.
+ wxLogSysError(wxT("Executing \"%s\" failed"), cmd);
+ return wxString();
}
wxString s;
pclose(f);
- if ( !s.empty() && s.Last() == _T('\n') )
+ if ( !s.empty() && s.Last() == wxT('\n') )
s.RemoveLast();
return s;
bool ok = uname(&uts) != -1;
if ( ok )
{
- wxStrncpy(buf, wxSafeConvertMB2WX(uts.nodename), sz - 1);
- buf[sz] = wxT('\0');
+ wxStrlcpy(buf, wxSafeConvertMB2WX(uts.nodename), sz);
}
#elif defined(HAVE_GETHOSTNAME)
char cbuf[sz];
bool ok = gethostname(cbuf, sz) != -1;
if ( ok )
{
- wxStrncpy(buf, wxSafeConvertMB2WX(cbuf), sz - 1);
- buf[sz] = wxT('\0');
+ wxStrlcpy(buf, wxSafeConvertMB2WX(cbuf), sz);
}
#else // no uname, no gethostname
wxFAIL_MSG(wxT("don't know host name for this machine"));
else
{
// the canonical name
- wxStrncpy(buf, wxSafeConvertMB2WX(host->h_name), sz);
+ wxStrlcpy(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, wxSafeConvertMB2WX(who->pw_name), sz - 1);
+ wxStrlcpy (buf, wxSafeConvertMB2WX(who->pw_name), sz);
return true;
}
char *comma = strchr(who->pw_gecos, ',');
if (comma)
*comma = '\0'; // cut off non-name comment fields
- wxStrncpy (buf, wxSafeConvertMB2WX(who->pw_gecos), sz - 1);
+ wxStrlcpy(buf, wxSafeConvertMB2WX(who->pw_gecos), sz);
return true;
}
machine.Contains(wxT("alpha"));
}
-// these functions are in mac/utils.cpp for wxMac
-#ifndef __WXMAC__
+#ifdef __LINUX__
+wxLinuxDistributionInfo wxGetLinuxDistributionInfo()
+{
+ const wxString id = wxGetCommandOutput(wxT("lsb_release --id"));
+ const wxString desc = wxGetCommandOutput(wxT("lsb_release --description"));
+ const wxString rel = wxGetCommandOutput(wxT("lsb_release --release"));
+ const wxString codename = wxGetCommandOutput(wxT("lsb_release --codename"));
+
+ wxLinuxDistributionInfo ret;
+
+ id.StartsWith("Distributor ID:\t", &ret.Id);
+ desc.StartsWith("Description:\t", &ret.Description);
+ rel.StartsWith("Release:\t", &ret.Release);
+ codename.StartsWith("Codename:\t", &ret.CodeName);
+
+ return ret;
+}
+#endif
+
+// these functions are in src/osx/utilsexc_base.cpp for wxMac
+#ifndef __DARWIN__
wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
{
return wxGetCommandOutput(wxT("uname -s -r -m"));
}
-#endif // !__WXMAC__
+#endif // !__DARWIN__
unsigned long wxGetProcessId()
{
#elif defined(HAVE_PUTENV)
wxString s = variable;
if ( value )
- s << _T('=') << value;
+ s << wxT('=') << value;
// transform to ANSI
const wxWX2MBbuf p = s.mb_str();
ok &= sigaction(SIGSEGV, &act, &s_handlerSEGV) == 0;
if ( !ok )
{
- wxLogDebug(_T("Failed to install our signal handler."));
+ wxLogDebug(wxT("Failed to install our signal handler."));
}
s_savedHandlers = true;
ok &= sigaction(SIGSEGV, &s_handlerSEGV, NULL) == 0;
if ( !ok )
{
- wxLogDebug(_T("Failed to uninstall our signal handler."));
+ wxLogDebug(wxT("Failed to uninstall our signal handler."));
}
s_savedHandlers = false;
bool wxAppTraits::CheckForRedirectedIO(wxExecuteData& execData)
{
-#if HAS_PIPE_INPUT_STREAM
+#if HAS_PIPE_STREAMS
bool hasIO = false;
if ( execData.bufOut && execData.bufOut->Update() )
hasIO = true;
return hasIO;
-#else // !HAS_PIPE_INPUT_STREAM
+#else // !HAS_PIPE_STREAMS
+ wxUnusedVar(execData);
+
return false;
-#endif // HAS_PIPE_INPUT_STREAM/!HAS_PIPE_INPUT_STREAM
+#endif // HAS_PIPE_STREAMS/!HAS_PIPE_STREAMS
}
+// helper classes/functions used by WaitForChild()
+namespace
+{
+
+// convenient base class for IO handlers which are registered for read
+// notifications only and which also stores the FD we're reading from
+//
+// the derived classes still have to implement OnReadWaiting()
class wxReadFDIOHandler : public wxFDIOHandler
{
public:
disp.RegisterFD(fd, this, wxFDIO_INPUT);
}
- int GetFD() const { return m_fd; }
-
virtual void OnWriteWaiting() { wxFAIL_MSG("unreachable"); }
virtual void OnExceptionWaiting() { wxFAIL_MSG("unreachable"); }
-private:
+protected:
const int m_fd;
- DECLARE_NO_COPY_CLASS(wxReadFDIOHandler)
+ wxDECLARE_NO_COPY_CLASS(wxReadFDIOHandler);
};
+// class for monitoring our end of the process detection pipe, simply sets a
+// flag when input on the pipe (which must be due to EOF) is detected
class wxEndHandler : public wxReadFDIOHandler
{
public:
private:
bool m_terminated;
- DECLARE_NO_COPY_CLASS(wxEndHandler)
+ wxDECLARE_NO_COPY_CLASS(wxEndHandler);
};
-#if wxUSE_STREAMS
+#if HAS_PIPE_STREAMS
+// class for monitoring our ends of child stdout/err, should be constructed
+// with the FD and stream from wxExecuteData and will do nothing if they're
+// invalid
+//
+// unlike wxEndHandler this class registers itself with the provided dispatcher
class wxRedirectedIOHandler : public wxReadFDIOHandler
{
public:
private:
wxStreamTempInputBuffer * const m_buf;
- DECLARE_NO_COPY_CLASS(wxRedirectedIOHandler)
+ wxDECLARE_NO_COPY_CLASS(wxRedirectedIOHandler);
};
-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_STREAMS
// helper function which calls waitpid() and analyzes the result
-namespace
-{
-
int DoWaitForChild(int pid, int flags = 0)
{
wxASSERT_MSG( pid > 0, "invalid PID" );
{
wxASSERT_MSG( rc == pid, "unexpected waitpid() return value" );
+ // notice that the caller expects the exit code to be signed, e.g. -1
+ // instead of 255 so don't assign WEXITSTATUS() to an int
+ signed char exitcode;
if ( WIFEXITED(status) )
- return WEXITSTATUS(status);
+ exitcode = WEXITSTATUS(status);
else if ( WIFSIGNALED(status) )
- return -WTERMSIG(status);
+ exitcode = -WTERMSIG(status);
else
{
wxLogError("Child process (PID %d) exited for unknown reason, "
"status = %d", pid, status);
+ exitcode = -1;
}
+
+ return exitcode;
}
return -1;
{
if ( !(execData.flags & wxEXEC_SYNC) )
{
- // asynchronous execution: just launch the process and return
+ // asynchronous execution: just launch the process and return,
+ // endProcData will be destroyed when it terminates (currently we leak
+ // it if the process doesn't terminate before we do and this should be
+ // fixed but it's not a real leak so it's not really very high
+ // priority)
wxEndProcessData *endProcData = new wxEndProcessData;
- endProcData->process = execData.process;
- endProcData->pid = execData.pid;
+ endProcData->process = execData.process;
+ endProcData->pid = execData.pid;
endProcData->tag = AddProcessCallback
(
endProcData,
execData.GetEndProcReadFD()
);
+ endProcData->async = true;
return execData.pid;
}
+ //else: synchronous execution case
-#if wxUSE_STREAMS
+#if HAS_PIPE_STREAMS && wxUSE_SOCKETS
wxProcess * const process = execData.process;
if ( process && process->IsRedirected() )
{
}
}
//else: no IO redirection, just block waiting for the child to exit
-#endif // wxUSE_STREAMS
+#endif // HAS_PIPE_STREAMS
return DoWaitForChild(execData.pid);
}
data->process->OnTerminate(data->pid, data->exitcode);
}
- // this function is only called for asynchronously executing children, now
- // that we have received the notification about their termination there is
- // no need to keep it around any longer
- delete data;
+ if ( data->async )
+ {
+ // in case of asynchronous execution we don't need this data any more
+ // after the child terminates
+ delete data;
+ }
+ else // sync execution
+ {
+ // let wxExecute() know that the process has terminated
+ data->pid = 0;
+ }
}
projects / wxWidgets.git / blobdiff