X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fbecd9925bd4bfb4751b722577605779e1d7dd7..742ff1e12fe845a79db772285dea63a227d867b7:/src/unix/utilsunx.cpp diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index bb8b4b33e9..e721318d5b 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -44,7 +44,7 @@ // JACS: needed for FD_SETSIZE #include -#if HAVE_UNAME +#ifdef HAVE_UNAME #include // for uname() #endif // HAVE_UNAME @@ -58,15 +58,26 @@ #if !defined(HAVE_USLEEP) && \ (defined(__SUN__) && !defined(__SunOs_5_6) && \ !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \ - defined(__osf__) + defined(__osf__) || defined(__EMX__) extern "C" { #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 // Sun/!Sun + #endif + #endif // Sun/EMX/Something else }; +#define HAVE_USLEEP 1 #endif // Unices without usleep() // ============================================================================ @@ -84,14 +95,14 @@ void wxSleep(int nSecs) void wxUsleep(unsigned long milliseconds) { -#if HAVE_NANOSLEEP +#ifdef HAVE_NANOSLEEP timespec tmReq; tmReq.tv_sec = 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 @@ -119,31 +130,31 @@ int wxKill(long pid, wxSignal sig) 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++; @@ -156,11 +167,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()); @@ -191,7 +202,7 @@ bool wxShell(const wxString& command) { wxString cmd; if ( !!command ) - cmd.Printf(_T("xterm -e %s"), command.c_str()); + cmd.Printf(wxT("xterm -e %s"), command.c_str()); else cmd = command; @@ -236,34 +247,43 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data) long wxExecute( wxChar **argv, bool sync, wxProcess *process ) { - wxCHECK_MSG( *argv, 0, _T("can't exec empty command") ); + wxCHECK_MSG( *argv, 0, 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 = wxConv_libc.cWX2MB(argv[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 + 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 + + ARGS_CLEANUP; + return 0; } +#endif // wxUSE_GUI // fork the process #ifdef HAVE_VFORK @@ -274,17 +294,17 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) if (pid == -1) { wxLogSysError( _("Fork failed") ); -#if wxUSE_UNICODE - mb_argc = 0; - while (mb_argv[mb_argc]) - free(mb_argv[mb_argc++]); -#endif + + ARGS_CLEANUP; + return 0; } else if (pid == 0) { +#if wxUSE_GUI // we're in child close(end_proc_detect[0]); // close reading side +#endif // wxUSE_GUI // These three lines close the open file descriptors to to avoid any // input/output which might block the process or irritate the user. If @@ -295,7 +315,12 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) // 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 wxUSE_GUI + if ( fd == end_proc_detect[1] ) + continue; +#endif // wxUSE_GUI + + if ( fd != STDERR_FILENO ) close(fd); } } @@ -319,21 +344,18 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) } else { +#if wxUSE_GUI // we're in parent close(end_proc_detect[1]); // close writing side wxEndProcessData *data = new wxEndProcessData; data->tag = wxAddProcessCallback(data, end_proc_detect[0]); -#if wxUSE_UNICODE - mb_argc = 0; - while (mb_argv[mb_argc]) - free(mb_argv[mb_argc++]); -#endif + ARGS_CLEANUP; if ( sync ) { - wxASSERT_MSG( !process, _T("wxProcess param ignored for sync exec") ); + wxASSERT_MSG( !process, wxT("wxProcess param ignored for sync exec") ); data->process = NULL; // sync execution: indicate it by negating the pid @@ -359,7 +381,20 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process ) 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 } + + #undef ARGS_CLEANUP } // ---------------------------------------------------------------------------- @@ -370,14 +405,14 @@ const wxChar* wxGetHomeDir( wxString *home ) { *home = wxGetUserHome( wxString() ); if ( home->IsEmpty() ) - *home = _T("/"); + *home = wxT("/"); 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 { @@ -385,15 +420,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(wxConv_libc.cWX2MB(ptr)); + who = getpwnam(wxConvertWX2MB(ptr)); } // We now make sure the the user exists! @@ -407,11 +442,7 @@ char *wxGetUserHome( const wxString &user ) who = getpwnam (user.mb_str()); } -#if wxUSE_UNICODE - return who ? wxConv_libc.cMB2WX(who->pw_dir) : (wxMB2WXbuf)((wxChar*)NULL); -#else - return who ? who->pw_dir : ((char*)NULL); -#endif + return wxConvertMB2WX(who ? who->pw_dir : 0); } // ---------------------------------------------------------------------------- @@ -423,9 +454,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) @@ -433,13 +464,13 @@ static bool wxGetHostNameInternal(wxChar *buf, int sz) bool ok = uname(&uts) != -1; if ( ok ) { - wxStrncpy(buf, wxConv_libc.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 @@ -460,11 +491,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'); } } @@ -477,9 +508,9 @@ bool wxGetFullHostName(wxChar *buf, int sz) if ( ok ) { - if ( !wxStrchr(buf, _T('.')) ) + if ( !wxStrchr(buf, wxT('.')) ) { - struct hostent *host = gethostbyname(wxConv_libc.cWX2MB(buf)); + struct hostent *host = gethostbyname(wxConvertWX2MB(buf)); if ( !host ) { wxLogSysError(_("Cannot get the official hostname")); @@ -489,7 +520,7 @@ bool wxGetFullHostName(wxChar *buf, int sz) else { // the canonical name - wxStrncpy(buf, wxConv_libc.cMB2WX(host->h_name), sz); + wxStrncpy(buf, wxConvertMB2WX(host->h_name), sz); } } //else: it's already a FQDN (BSD behaves this way) @@ -502,10 +533,10 @@ bool wxGetUserId(wxChar *buf, int sz) { struct passwd *who; - *buf = _T('\0'); + *buf = wxT('\0'); if ((who = getpwuid(getuid ())) != NULL) { - wxStrncpy (buf, wxConv_libc.cMB2WX(who->pw_name), sz - 1); + wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); return TRUE; } @@ -517,12 +548,16 @@ bool wxGetUserName(wxChar *buf, int sz) struct passwd *who; char *comma; - *buf = _T('\0'); + *buf = wxT('\0'); if ((who = getpwuid (getuid ())) != NULL) { +#ifndef __VMS__ comma = strchr(who->pw_gecos, ','); if (comma) *comma = '\0'; // cut off non-name comment fields - wxStrncpy (buf, wxConv_libc.cMB2WX(who->pw_gecos), sz - 1); + wxStrncpy (buf, wxConvertMB2WX(who->pw_gecos), sz - 1); +#else + wxStrncpy (buf, wxConvertMB2WX(who->pw_name), sz - 1); +#endif return TRUE; } @@ -545,16 +580,17 @@ void wxDebugMsg( const char *format, ... ) 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") ); + 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, _T("%s "), WXSTRINGCAST(title) ); - if (!msg.IsNull()) wxFprintf( stderr, _T(": %s"), WXSTRINGCAST(msg) ); - wxFprintf( stderr, _T(".\n") ); + 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() } +