#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
#include <stdarg.h>
#include <dirent.h>
#include <fcntl.h> // for O_WRONLY and friends
#include <time.h> // nanosleep() and/or usleep()
#include <ctype.h> // isspace()
+#include <sys/time.h> // needed for FD_SETSIZE
-// JACS: needed for FD_SETSIZE
-#include <sys/time.h>
-
-#if HAVE_UNAME
+#ifdef HAVE_UNAME
#include <sys/utsname.h> // for uname()
#endif // HAVE_UNAME
#ifdef __SUN__
int usleep(unsigned int usec);
#else // !Sun
- #ifdef __EMX
- /* I copied this from the XFree86 diffs. AV. */
- #define INCL_DOSPROCESS
- #include <os2.h>
- 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 <os2.h>
+ 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()
// ============================================================================
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
#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
int wxKill(long pid, wxSignal sig)
{
- return kill(pid, (int)sig);
+ return kill((pid_t)pid, (int)sig);
}
#define WXEXECUTE_NARGS 127
return lRc;
}
-bool wxShell(const wxString& command)
+// ----------------------------------------------------------------------------
+// wxShell
+// ----------------------------------------------------------------------------
+
+static wxString wxMakeShellCommand(const wxString& command)
{
wxString cmd;
- if ( !!command )
- cmd.Printf(wxT("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);
// 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
{
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
+// ----------------------------------------------------------------------------
+
+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) )
+ {
+ 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 )
{
- delete proc_data;
+ 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 )
+long wxExecute(wxChar **argv,
+ bool sync,
+ wxProcess *process)
{
wxCHECK_MSG( *argv, 0, wxT("can't exec empty command") );
while (argv[mb_argc])
{
- wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]);
- mb_argv[mb_argc] = strdup(mb_arg);
- mb_argc++;
+ wxWX2MBbuf mb_arg = wxConvertWX2MB(argv[mb_argc]);
+ mb_argv[mb_argc] = strdup(mb_arg);
+ mb_argc++;
}
mb_argv[mb_argc] = (char *) NULL;
// this macro will free memory we used above
#define ARGS_CLEANUP \
- for ( mb_argc = 0; mb_argb[mb_argc]; mb_argc++ ) \
+ for ( mb_argc = 0; mb_argv[mb_argc]; mb_argc++ ) \
free(mb_argv[mb_argc])
#else // ANSI
// no need for cleanup
#if wxUSE_GUI
// create pipes
int end_proc_detect[2];
- if (pipe(end_proc_detect) == -1)
+ if ( pipe(end_proc_detect) == -1 )
{
wxLogSysError( _("Pipe creation failed") );
+ wxLogError( _("Failed to execute '%s'\n"), *argv );
ARGS_CLEANUP;
}
#endif // wxUSE_GUI
+ int pipeIn[2];
+ int pipeOut[2];
+ pipeIn[0] = pipeIn[1] =
+ pipeOut[0] = pipeOut[1] = -1;
+
+ if ( process && process->IsRedirected() )
+ {
+ if ( pipe(pipeIn) == -1 || pipe(pipeOut) == -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 0;
+ }
+ }
+
// 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]);
+#endif // wxUSE_GUI
+
wxLogSysError( _("Fork failed") );
ARGS_CLEANUP;
return 0;
}
- else if (pid == 0)
+ else if ( pid == 0 ) // we're in child
{
#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
+ // 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 == pipeIn[0] || fd == pipeOut[1]
#if wxUSE_GUI
- if ( fd == end_proc_detect[1] )
- continue;
+ || 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 and stdout
+ // (TODO: what about stderr?)
+ if ( pipeIn[0] != -1 )
+ {
+ if ( dup2(pipeIn[0], STDIN_FILENO) == -1 ||
+ dup2(pipeOut[1], STDOUT_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]);
+ }
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
{
-#if wxUSE_GUI
- // 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() )
+ {
+ // These two streams are relative to this process.
+ wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]);
+ wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]);
+ close(pipeIn[0]); // close reading side
+ close(pipeOut[1]); // close writing side
- ARGS_CLEANUP;
+ process->SetPipeStreams(inStream, outStream);
+ }
+
+#if wxUSE_GUI
+ wxEndProcessData *data = new wxEndProcessData;
if ( sync )
{
- wxASSERT_MSG( !process, wxT("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)
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;
}
#endif // wxUSE_GUI
}
+ return 0;
+
#undef ARGS_CLEANUP
}
who = getpwnam (user.mb_str());
}
- return wxConvertMB2WX(who ? who->pw_dir : NULL);
+ return wxConvertMB2WX(who ? who->pw_dir : 0);
}
// ----------------------------------------------------------------------------
bool wxGetUserName(wxChar *buf, int sz)
{
struct passwd *who;
- char *comma;
*buf = wxT('\0');
- if ((who = getpwuid (getuid ())) != NULL) {
- comma = strchr(who->pw_gecos, ',');
+ if ((who = getpwuid (getuid ())) != NULL)
+ {
+ // pw_gecos field in struct passwd is not standard
+#if HAVE_PW_GECOS
+ char *comma = strchr(who->pw_gecos, ',');
if (comma)
*comma = '\0'; // cut off non-name comment fields
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;
}
-#if wxUSE_GUI
+wxString wxGetOsDescription()
+{
+#ifndef WXWIN_OS_DESCRIPTION
+ #error WXWIN_OS_DESCRIPTION should be defined in config.h by configure
+#else
+ return WXWIN_OS_DESCRIPTION;
+#endif
+}
// ----------------------------------------------------------------------------
// error and debug output routines (deprecated, use wxLog)
exit(3); // the same exit code as for abort()
}
-// ----------------------------------------------------------------------------
-// font-related functions
-// ----------------------------------------------------------------------------
-
-// define the functions to create and destroy native fonts for this toolkit
-#ifdef __X__
- static inline wxNativeFont wxLoadFont(const wxString& fontSpec)
- {
- return XLoadQueryFont((Display *)wxGetDisplay(), fontSpec);
- }
-
- static inline void wxFreeFont(wxNativeFont font)
- {
- XFreeFont((Display *)wxGetDisplay(), font);
- }
-#elif defined(__WXGTK__)
-
- #include "gdk/gdk.h"
-
- static inline wxNativeFont wxLoadFont(const wxString& fontSpec)
- {
- return gdk_font_load( wxConvertWX2MB(fontSpec) );
- }
-
- static inline void wxFreeFont(wxNativeFont font)
- {
- gdk_font_unref(font);
- }
-#else
- #error "Unknown GUI toolkit"
-#endif
-
-// returns TRUE if there are any fonts matching this font spec
-static bool wxTestFontSpec(const wxString& fontspec)
-{
- wxNativeFont test = wxLoadFont(fontspec);
- if ( test )
- {
- wxFreeFont(test);
-
- return TRUE;
- }
- else
- {
- return FALSE;
- }
-}
-
-// 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 )
-{
- wxString xfamily;
- switch (family)
- {
- case wxDECORATIVE: xfamily = wxT("lucida"); break;
- case wxROMAN: xfamily = wxT("times"); break;
- case wxMODERN: xfamily = wxT("courier"); break;
- case wxSWISS: xfamily = wxT("helvetica"); break;
- case wxTELETYPE: xfamily = wxT("lucidatypewriter"); break;
- case wxSCRIPT: xfamily = wxT("utopia"); break;
- default: xfamily = wxT("*");
- }
-
- wxString fontSpec;
- if (!facename.IsEmpty())
- {
- fontSpec.Printf(wxT("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"),
- facename.c_str());
-
- if ( wxTestFontSpec(fontSpec) )
- {
- xfamily = facename;
- }
- //else: no such family, use default one instead
- }
-
- wxString xstyle;
- switch (style)
- {
- case wxITALIC: xstyle = wxT("i"); break;
- case wxSLANT: xstyle = wxT("o"); break;
- case wxNORMAL: xstyle = wxT("r"); break;
- default: xstyle = wxT("*"); break;
- }
-
- wxString xweight;
- switch (weight)
- {
- case wxBOLD: xweight = wxT("bold"); break;
- case wxLIGHT:
- case wxNORMAL: xweight = wxT("medium"); break;
- default: xweight = wxT("*"); break;
- }
-
- wxString xregistry, xencoding;
- if ( encoding == wxFONTENCODING_DEFAULT )
- {
- // use the apps default
- encoding = wxFont::GetDefaultEncoding();
- }
-
- bool test = TRUE; // should we test for availability of encoding?
- switch ( encoding )
- {
- 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 = wxT("iso8859");
- xencoding.Printf(wxT("%d"), cp);
- }
- break;
-
- case wxFONTENCODING_KOI8:
- xregistry = wxT("koi8");
- if ( wxTestFontSpec(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-koi8-1")) )
- {
- xencoding = wxT("1");
-
- // test passed, no need to do it once more
- test = FALSE;
- }
- else
- {
- xencoding = wxT("*");
- }
- break;
-
- case wxFONTENCODING_CP1250:
- case wxFONTENCODING_CP1251:
- case wxFONTENCODING_CP1252:
- {
- int cp = encoding - wxFONTENCODING_CP1250 + 1250;
- fontSpec.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-microsoft-cp%d"),
- cp);
- if ( wxTestFontSpec(fontSpec) )
- {
- xregistry = wxT("microsoft");
- xencoding.Printf(wxT("cp%d"), cp);
-
- // test passed, no need to do it once more
- test = FALSE;
- }
- else
- {
- // fall back to LatinX
- xregistry = wxT("iso8859");
- xencoding.Printf(wxT("%d"), cp - 1249);
- }
- }
- break;
-
- case wxFONTENCODING_SYSTEM:
- default:
- test = FALSE;
- xregistry =
- xencoding = wxT("*");
- }
-
- if ( test )
- {
- fontSpec.Printf(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-%s-%s"),
- xregistry.c_str(), xencoding.c_str());
- if ( !wxTestFontSpec(fontSpec) )
- {
- // this encoding isn't available - what to do?
- xregistry =
- xencoding = wxT("*");
- }
- }
-
- // construct the X font spec from our data
- fontSpec.Printf(wxT("-*-%s-%s-%s-normal-*-*-%d-*-*-*-*-%s-%s"),
- xfamily.c_str(), xweight.c_str(), xstyle.c_str(),
- pointSize, xregistry.c_str(), xencoding.c_str());
-
- return wxLoadFont(fontSpec);
-}
-
-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));
-
- 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 );
- }
-
- // Try default family
- if ( !font && family != wxDEFAULT )
- {
- font = wxLoadQueryFont( pointSize, wxDEFAULT, style, weight,
- underlined, facename, encoding );
- }
-
- // Bogus font
- if ( !font )
- {
- font = wxLoadQueryFont(120, wxDEFAULT, wxNORMAL, wxNORMAL,
- underlined, facename, encoding );
- }
- }
-
- return font;
-}
-
-#endif // wxUSE_GUI
projects / wxWidgets.git / blobdiff