#include "wx/unix/execute.h"
#endif
+// SGI signal.h defines signal handler arguments differently depending on
+// whether _LANGUAGE_C_PLUS_PLUS is set or not - do set it
+#if defined(__SGI__) && !defined(_LANGUAGE_C_PLUS_PLUS)
+ #define _LANGUAGE_C_PLUS_PLUS 1
+#endif // SGI hack
+
#include <stdarg.h>
#include <dirent.h>
#include <string.h>
bool sync,
wxProcess *process)
{
- wxCHECK_MSG( *argv, 0, wxT("can't exec empty command") );
+ // for the sync execution, we return -1 to indicate failure, but for async
+ // cse we return 0 which is never a valid PID
+ long errorRetCode = sync ? -1 : 0;
+
+ wxCHECK_MSG( *argv, errorRetCode, wxT("can't exec empty command") );
#if wxUSE_UNICODE
int mb_argc = 0;
ARGS_CLEANUP;
- return 0;
+ return errorRetCode;
}
#endif // wxUSE_GUI
- int pipeIn[2];
- int pipeOut[2];
+ // pipes for inter process communication
+ int pipeIn[2], // stdin
+ pipeOut[2], // stdout
+ pipeErr[2]; // stderr
+
pipeIn[0] = pipeIn[1] =
- pipeOut[0] = pipeOut[1] = -1;
+ pipeOut[0] = pipeOut[1] =
+ pipeErr[0] = pipeErr[1] = -1;
if ( process && process->IsRedirected() )
{
- if ( pipe(pipeIn) == -1 || pipe(pipeOut) == -1 )
+ if ( pipe(pipeIn) == -1 || pipe(pipeOut) == -1 || pipe(pipeErr) == -1 )
{
#if wxUSE_GUI
// free previously allocated resources
ARGS_CLEANUP;
- return 0;
+ return errorRetCode;
}
}
close(pipeIn[1]);
close(pipeOut[0]);
close(pipeOut[1]);
+ close(pipeErr[0]);
+ close(pipeErr[1]);
#endif // wxUSE_GUI
wxLogSysError( _("Fork failed") );
ARGS_CLEANUP;
- return 0;
+ return errorRetCode;
}
else if ( pid == 0 ) // we're in child
{
{
for ( int fd = 0; fd < FD_SETSIZE; fd++ )
{
- if ( fd == pipeIn[0] || fd == pipeOut[1]
+ if ( fd == pipeIn[0] || fd == pipeOut[1] || fd == pipeErr[1]
#if wxUSE_GUI
|| fd == end_proc_detect[1]
#endif // wxUSE_GUI
}
}
- // redirect stdio and stdout
- // (TODO: what about stderr?)
+ // redirect stdio, stdout and stderr
if ( pipeIn[0] != -1 )
{
if ( dup2(pipeIn[0], STDIN_FILENO) == -1 ||
- dup2(pipeOut[1], STDOUT_FILENO) == -1 )
+ dup2(pipeOut[1], STDOUT_FILENO) == -1 ||
+ dup2(pipeErr[1], STDERR_FILENO) == -1 )
{
- wxLogSysError(_("Failed to redirect child process "
- "input/output"));
+ wxLogSysError(_("Failed to redirect child process input/output"));
}
close(pipeIn[0]);
close(pipeOut[1]);
+ close(pipeErr[1]);
}
execvp (*mb_argv, mb_argv);
// These two streams are relative to this process.
wxOutputStream *outStream = new wxProcessFileOutputStream(pipeIn[1]);
wxInputStream *inStream = new wxProcessFileInputStream(pipeOut[0]);
+ wxInputStream *errStream = new wxProcessFileInputStream(pipeErr[0]);
+
close(pipeIn[0]); // close reading side
close(pipeOut[1]); // close writing side
+ close(pipeErr[1]); // close writing side
- process->SetPipeStreams(inStream, outStream);
+ process->SetPipeStreams(inStream, outStream, errStream);
}
#if wxUSE_GUI
return exitcode;
#endif // wxUSE_GUI
}
-
- return 0;
-
- #undef ARGS_CLEANUP
+#ifdef __VMS
+ // VMS does not recognise exit as a return and complains about
+ // a missing return
+ // I think VMS is wrong in this
+ // JJ
+ return 0;
+#endif
}
+#undef ARGS_CLEANUP
+
// ----------------------------------------------------------------------------
// file and directory functions
// ----------------------------------------------------------------------------
const wxChar* wxGetHomeDir( wxString *home )
{
*home = wxGetUserHome( wxString() );
+ wxString tmp;
if ( home->IsEmpty() )
*home = wxT("/");
-
+#ifdef __VMS
+ tmp = *home;
+ if ( tmp.Last() != wxT(']'))
+ if ( tmp.Last() != wxT('/')) *home << wxT('/');
+#endif
return home->c_str();
}
if ((who = getpwuid (getuid ())) != NULL)
{
// pw_gecos field in struct passwd is not standard
-#if HAVE_PW_GECOS
+#ifdef HAVE_PW_GECOS
char *comma = strchr(who->pw_gecos, ',');
if (comma)
*comma = '\0'; // cut off non-name comment fields
#endif
}
+// this function returns the GUI toolkit version in GUI programs, but OS
+// version in non-GUI ones
+#if !wxUSE_GUI
+
+int wxGetOsVersion(int *majorVsn, int *minorVsn)
+{
+ int major, minor;
+ char name[256];
+
+ if ( sscanf(WXWIN_OS_DESCRIPTION, "%s %d.%d", name, &major, &minor) != 3 )
+ {
+ // unreckognized uname string format
+ major = minor = -1;
+ }
+
+ if ( majorVsn )
+ *majorVsn = major;
+ if ( minorVsn )
+ *minorVsn = minor;
+
+ return wxUNIX;
+}
+
+#endif // !wxUSE_GUI
+
+long wxGetFreeMemory()
+{
+#if defined(__LINUX__)
+ // get it from /proc/meminfo
+ FILE *fp = fopen("/proc/meminfo", "r");
+ if ( fp )
+ {
+ long memFree = -1;
+
+ char buf[1024];
+ if ( fgets(buf, WXSIZEOF(buf), fp) && fgets(buf, WXSIZEOF(buf), fp) )
+ {
+ long memTotal, memUsed;
+ sscanf(buf, "Mem: %ld %ld %ld", &memTotal, &memUsed, &memFree);
+ }
+
+ fclose(fp);
+
+ return memFree;
+ }
+#elif defined(__SUN__) && defined(_SC_AVPHYS_PAGES)
+ return sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE);
+//#elif defined(__FREEBSD__) -- might use sysctl() to find it out, probably
+#endif
+
+ // can't find it out
+ return -1;
+}
+
// ----------------------------------------------------------------------------
// signal handling
// ----------------------------------------------------------------------------
#include <signal.h>
-static void wxFatalSignalHandler(int signal)
+static void wxFatalSignalHandler(wxTYPE_SA_HANDLER)
{
if ( wxTheApp )
{
projects / wxWidgets.git / blobdiff