Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxExecute() fix (running console programs doesn't cause X errors any more)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-17 20:26:38 +00:00
parent b8ecf3e993
commit 220a0f42d4
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gtk/utilsgtk.cpp
View File

@@ -301,7 +301,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
/* Create pipes */ /* Create pipes */
if (pipe(end_proc_detect) == -1) if (pipe(end_proc_detect) == -1)
{ {
wxLogSysError( "Pipe creation failed" ); wxLogSysError( _("Pipe creation failed") );
return 0; return 0;
} }
@@ -313,7 +313,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
#endif #endif
if (pid == -1) if (pid == -1)
{ {
wxLogSysError( "Fork failed" ); wxLogSysError( _("Fork failed") );
return 0; return 0;
} }
else if (pid == 0) else if (pid == 0)
@@ -321,21 +321,23 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
// we're in child // we're in child
close(end_proc_detect[0]); // close reading side close(end_proc_detect[0]); // close reading side
// These three lines close the open file descriptors to // These three lines close the open file descriptors to to avoid any
// to avoid any input/output which might block the process // input/output which might block the process or irritate the user. If
// or irritate the user. If one wants proper IO for the sub- // one wants proper IO for the subprocess, the "right thing to do is
// process, the "right thing to do" is to start an xterm executing // to start an xterm executing it.
// it.
close(STDIN_FILENO); close(STDIN_FILENO);
close(STDOUT_FILENO); close(STDOUT_FILENO);
// leave stderr opened, it won't do any hurm
#if 0
close(STDERR_FILENO); close(STDERR_FILENO);
// some programs complain about sterr not being open, so // some programs complain about stderr not being open, so redirect
// redirect them: // them:
open("/dev/null", O_RDONLY); // stdin open("/dev/null", O_RDONLY); // stdin
open("/dev/null", O_WRONLY); // stdout open("/dev/null", O_WRONLY); // stdout
open("/dev/null", O_WRONLY); // stderr open("/dev/null", O_WRONLY); // stderr
#endif
#ifdef _AIX #ifdef _AIX
execvp ((const char *)*argv, (const char **)argv); execvp ((const char *)*argv, (const char **)argv);
@@ -344,7 +346,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
#endif #endif
// there is no return after successful exec() // there is no return after successful exec()
wxLogSysError( "Can't execute '%s'", *argv); fprintf(stderr, _("Can't execute '%s'\n"), *argv);
_exit(-1); _exit(-1);
} }
@@ -353,7 +355,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
// we're in parent // we're in parent
close(end_proc_detect[1]); // close writing side close(end_proc_detect[1]); // close writing side
data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ, data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ,
GTK_EndProcessDetector, (gpointer)data); GTK_EndProcessDetector, (gpointer)data);
data->pid = pid; data->pid = pid;
if (!sync) if (!sync)
{ {
@@ -361,7 +363,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
} }
else else
{ {
data->process = (wxProcess *) NULL; data->process = process;
data->pid = -(data->pid); data->pid = -(data->pid);
while (data->pid != 0) while (data->pid != 0)

28
src/gtk1/utilsgtk.cpp
View File

@@ -301,7 +301,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
/* Create pipes */ /* Create pipes */
if (pipe(end_proc_detect) == -1) if (pipe(end_proc_detect) == -1)
{ {
wxLogSysError( "Pipe creation failed" ); wxLogSysError( _("Pipe creation failed") );
return 0; return 0;
} }
@@ -313,7 +313,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
#endif #endif
if (pid == -1) if (pid == -1)
{ {
wxLogSysError( "Fork failed" ); wxLogSysError( _("Fork failed") );
return 0; return 0;
} }
else if (pid == 0) else if (pid == 0)
@@ -321,21 +321,23 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
// we're in child // we're in child
close(end_proc_detect[0]); // close reading side close(end_proc_detect[0]); // close reading side
// These three lines close the open file descriptors to // These three lines close the open file descriptors to to avoid any
// to avoid any input/output which might block the process // input/output which might block the process or irritate the user. If
// or irritate the user. If one wants proper IO for the sub- // one wants proper IO for the subprocess, the "right thing to do is
// process, the "right thing to do" is to start an xterm executing // to start an xterm executing it.
// it.
close(STDIN_FILENO); close(STDIN_FILENO);
close(STDOUT_FILENO); close(STDOUT_FILENO);
// leave stderr opened, it won't do any hurm
#if 0
close(STDERR_FILENO); close(STDERR_FILENO);
// some programs complain about sterr not being open, so // some programs complain about stderr not being open, so redirect
// redirect them: // them:
open("/dev/null", O_RDONLY); // stdin open("/dev/null", O_RDONLY); // stdin
open("/dev/null", O_WRONLY); // stdout open("/dev/null", O_WRONLY); // stdout
open("/dev/null", O_WRONLY); // stderr open("/dev/null", O_WRONLY); // stderr
#endif
#ifdef _AIX #ifdef _AIX
execvp ((const char *)*argv, (const char **)argv); execvp ((const char *)*argv, (const char **)argv);
@@ -344,7 +346,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
#endif #endif
// there is no return after successful exec() // there is no return after successful exec()
wxLogSysError( "Can't execute '%s'", *argv); fprintf(stderr, _("Can't execute '%s'\n"), *argv);
_exit(-1); _exit(-1);
} }
@@ -353,7 +355,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
// we're in parent // we're in parent
close(end_proc_detect[1]); // close writing side close(end_proc_detect[1]); // close writing side
data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ, data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ,
GTK_EndProcessDetector, (gpointer)data); GTK_EndProcessDetector, (gpointer)data);
data->pid = pid; data->pid = pid;
if (!sync) if (!sync)
{ {
@@ -361,7 +363,7 @@ long wxExecute( char **argv, bool sync, wxProcess *process )
} }
else else
{ {
data->process = (wxProcess *) NULL; data->process = process;
data->pid = -(data->pid); data->pid = -(data->pid);
while (data->pid != 0) while (data->pid != 0)