X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e300ddd7d91d46e3d9fcbbefe916b0fda6fcbbc..7de5bdf4b34fb4e0d67966987bc5e6bdcd769df6:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index b246d08f7a..b372b21c34 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -29,9 +29,20 @@ #include "wx/stream.h" #ifdef HAVE_STATFS - #include +# ifdef __BSD__ +# include +# include +# else +# include +# endif #endif // HAVE_STATFS +#ifdef HAVE_STATVFS + #include + + #define statfs statvfs +#endif // HAVE_STATVFS + #if wxUSE_GUI #include "wx/unix/execute.h" #endif @@ -144,7 +155,7 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc) int err = kill((pid_t)pid, (int)sig); if ( rc ) { - switch ( err ) + switch ( errno ) { case 0: *rc = wxKILL_OK; @@ -176,7 +187,7 @@ int wxKill(long pid, wxSignal sig, wxKillError *rc) #define WXEXECUTE_NARGS 127 -long wxExecute( const wxString& command, bool sync, wxProcess *process ) +long wxExecute( const wxString& command, int flags, wxProcess *process ) { wxCHECK_MSG( !command.IsEmpty(), 0, wxT("can't exec empty command") ); @@ -236,7 +247,7 @@ long wxExecute( const wxString& command, bool sync, wxProcess *process ) argv[argc] = NULL; // do execute the command - long lRc = wxExecute(argv, sync, process); + long lRc = wxExecute(argv, flags, process); // clean up argc = 0; @@ -269,7 +280,7 @@ static wxString wxMakeShellCommand(const wxString& command) bool wxShell(const wxString& command) { - return wxExecute(wxMakeShellCommand(command), TRUE /* sync */) == 0; + return wxExecute(wxMakeShellCommand(command), wxEXEC_SYNC) == 0; } bool wxShell(const wxString& command, wxArrayString& output) @@ -283,67 +294,21 @@ bool wxShell(const wxString& command, wxArrayString& output) void wxHandleProcessTermination(wxEndProcessData *proc_data) { - int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); - - // waitpid is POSIX so should be available everywhere, however on older - // systems wait() might be used instead in a loop (until the right pid - // terminates) - int status = 0; - int rc; - - // wait for child termination and if waitpid() was interrupted, try again - do + // notify user about termination if required + if ( proc_data->process ) { - rc = waitpid(pid, &status, 0); + proc_data->process->OnTerminate(proc_data->pid, proc_data->exitcode); } - while ( rc == -1 && errno == EINTR ); - if (rc == -1) - { - // JACS: this could happen if the process was terminated and waitpid called, - // so commenting out for now. - //wxLogSysError(_("Waiting for subprocess termination failed (return code = -1)")); - } - else if (! (WIFEXITED(status))) + // clean up + if ( proc_data->pid > 0 ) { - wxLogSysError(_("Waiting for subprocess termination failed (WIFEXITED returned zero)")); - - /* 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) - */ + delete proc_data; } - else if (WIFSIGNALED(status)) + else { - wxLogSysError(_("Waiting for subprocess termination failed (signal not caught)")); - - /* 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 - { - // notify user about termination if required - if (proc_data->process) - { - 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; - } + // let wxExecute() know that the process has terminated + proc_data->pid = 0; } } @@ -554,7 +519,7 @@ wxStreamTempBuffer::~wxStreamTempBuffer() #endif // wxUSE_STREAMS long wxExecute(wxChar **argv, - bool sync, + int flags, wxProcess *process) { // for the sync execution, we return -1 to indicate failure, but for async @@ -562,7 +527,7 @@ long wxExecute(wxChar **argv, // // 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) + #define ERROR_RETURN_CODE ((flags & wxEXEC_SYNC) ? -1 : 0) wxCHECK_MSG( *argv, ERROR_RETURN_CODE, wxT("can't exec empty command") ); @@ -667,7 +632,7 @@ long wxExecute(wxChar **argv, // 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 ) + if ( !(flags & wxEXEC_SYNC) ) { for ( int fd = 0; fd < FD_SETSIZE; fd++ ) { @@ -685,6 +650,15 @@ long wxExecute(wxChar **argv, if ( fd != STDERR_FILENO ) close(fd); } + +#ifndef __VMS + if ( flags & wxEXEC_MAKE_GROUP_LEADER ) + { + // Set process group to child process' pid. Then killing -pid + // of the parent will kill the process and all of its children. + setsid(); + } +#endif } // redirect stdio, stdout and stderr @@ -745,7 +719,7 @@ long wxExecute(wxChar **argv, #if wxUSE_GUI && !defined(__WXMICROWIN__) wxEndProcessData *data = new wxEndProcessData; - if ( 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 @@ -794,7 +768,9 @@ long wxExecute(wxChar **argv, return pid; } #else // !wxUSE_GUI - wxASSERT_MSG( sync, wxT("async execution not supported yet") ); + + wxASSERT_MSG( flags & wxEXEC_SYNC, + wxT("async execution not supported yet") ); int exitcode = 0; if ( waitpid(pid, &exitcode, 0) == -1 || !WIFEXITED(exitcode) ) @@ -983,6 +959,7 @@ bool wxGetUserName(wxChar *buf, int sz) return FALSE; } +#ifndef __WXMAC__ wxString wxGetOsDescription() { #ifndef WXWIN_OS_DESCRIPTION @@ -991,6 +968,7 @@ wxString wxGetOsDescription() return WXWIN_OS_DESCRIPTION; #endif } +#endif // this function returns the GUI toolkit version in GUI programs, but OS // version in non-GUI ones @@ -1048,16 +1026,19 @@ long wxGetFreeMemory() bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) { -#ifdef HAVE_STATFS - +#if defined(HAVE_STATFS) || defined(HAVE_STATVFS) + // the case to "char *" is needed for AIX 4.3 struct statfs fs; - if ( statfs(path, &fs) != 0 ) + if ( statfs((char *)path.fn_str(), &fs) != 0 ) { wxLogSysError("Failed to get file system statistics"); return FALSE; } + // under Solaris we might have to use fs.f_frsize instead as I think it + // may be a multiple of the block size in general (TODO) + if ( pTotal ) { *pTotal = wxLongLong(fs.f_blocks) * fs.f_bsize; @@ -1096,8 +1077,10 @@ bool wxGetEnv(const wxString& var, wxString *value) bool wxSetEnv(const wxString& variable, const wxChar *value) { #if defined(HAVE_SETENV) - return setenv(variable.mb_str(), value ? wxString(value).mb_str().data() - : NULL, 1 /* overwrite */) == 0; + return setenv(variable.mb_str(), + value ? (const char *)wxString(value).mb_str() + : NULL, + 1 /* overwrite */) == 0; #elif defined(HAVE_PUTENV) wxString s = variable; if ( value ) @@ -1124,7 +1107,7 @@ bool wxSetEnv(const wxString& variable, const wxChar *value) #include -static void wxFatalSignalHandler(wxTYPE_SA_HANDLER) +extern "C" void wxFatalSignalHandler(wxTYPE_SA_HANDLER) { if ( wxTheApp ) { @@ -1193,6 +1176,8 @@ bool wxHandleFatalExceptions(bool doit) // error and debug output routines (deprecated, use wxLog) // ---------------------------------------------------------------------------- +#if WXWIN_COMPATIBILITY_2_2 + void wxDebugMsg( const char *format, ... ) { va_list ap; @@ -1219,3 +1204,5 @@ void wxFatalError( const wxString &msg, const wxString &title ) exit(3); // the same exit code as for abort() } +#endif // WXWIN_COMPATIBILITY_2_2 +