X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/447f908aff7763f8f5d9b6aa13c2551ce17c9b86..b3887715e49225f7022858586dae58c0bee53180:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 0581126a28..fbeb877d03 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -29,7 +29,7 @@ #include "wx/stream.h" #ifdef HAVE_STATFS -# ifdef __DARWIN__ +# ifdef __BSD__ # include # include # else @@ -37,6 +37,12 @@ # endif #endif // HAVE_STATFS +#ifdef HAVE_STATVFS + #include + + #define statfs statvfs +#endif // HAVE_STATVFS + #if wxUSE_GUI #include "wx/unix/execute.h" #endif @@ -149,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; @@ -181,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") ); @@ -241,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; @@ -274,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) @@ -284,6 +290,29 @@ bool wxShell(const wxString& command, wxArrayString& output) return wxExecute(wxMakeShellCommand(command), output); } +// Shutdown or reboot the PC +bool wxShutdown(wxShutdownFlags wFlags) +{ + wxChar level; + switch ( wFlags ) + { + case wxSHUTDOWN_POWEROFF: + level = _T('0'); + break; + + case wxSHUTDOWN_REBOOT: + level = _T('6'); + break; + + default: + wxFAIL_MSG( _T("unknown wxShutdown() flag") ); + return FALSE; + } + + return system(wxString::Format(_T("init %c"), level).mb_str()) == 0; +} + + #if wxUSE_GUI void wxHandleProcessTermination(wxEndProcessData *proc_data) @@ -513,7 +542,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 @@ -521,7 +550,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") ); @@ -626,7 +655,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++ ) { @@ -644,6 +673,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 @@ -704,7 +742,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 @@ -753,7 +791,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) ) @@ -942,6 +982,7 @@ bool wxGetUserName(wxChar *buf, int sz) return FALSE; } +#ifndef __WXMAC__ wxString wxGetOsDescription() { #ifndef WXWIN_OS_DESCRIPTION @@ -950,6 +991,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 @@ -1007,16 +1049,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; @@ -1055,8 +1100,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 ) @@ -1083,7 +1130,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 ) { @@ -1152,6 +1199,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; @@ -1178,3 +1227,5 @@ void wxFatalError( const wxString &msg, const wxString &title ) exit(3); // the same exit code as for abort() } +#endif // WXWIN_COMPATIBILITY_2_2 +