#include <poll.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <fcntl.h>
-int bidirpipe(int pfd[], const char *cmd , const char * const argv[])
+int bidirpipe(int pfd[], const char *cmd , const char * const argv[], const char *cwd )
{
int pfdin[2]; /* from child to parent */
int pfdout[2]; /* from parent to child */
for (unsigned int i=3; i < 90; ++i )
close(i);
+ if (cwd)
+ chdir(cwd);
+
execvp(cmd, (char * const *)argv);
/* the vfork will actually suspend the parent thread until execvp is called. thus it's ok to use the shared arg/cmdline pointers here. */
_exit(0);
return NULL;
}
+int eConsoleAppContainer::setCWD( const char *path )
+{
+ struct stat dir_stat;
+
+ if (stat(path, &dir_stat) == -1)
+ return -1;
+
+ if (!S_ISDIR(dir_stat.st_mode))
+ return -2;
+
+ m_cwd = path;
+ return 0;
+}
+
int eConsoleAppContainer::execute( const char *cmd )
{
int cnt=0, slen=strlen(cmd);
killstate=0;
// get one read ,one write and the err pipe to the prog..
- pid = bidirpipe(fd, cmdline, argv);
+ pid = bidirpipe(fd, cmdline, argv, m_cwd.length() ? m_cwd.c_str() : 0);
if ( pid == -1 )
return -3;
// eDebug("pipe in = %d, out = %d, err = %d", fd[0], fd[1], fd[2]);
+ ::fcntl(fd[1], F_SETFL, O_NONBLOCK);
+ ::fcntl(fd[2], F_SETFL, O_NONBLOCK);
in = new eSocketNotifier(eApp, fd[0], eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Hungup );
out = new eSocketNotifier(eApp, fd[1], eSocketNotifier::Write, false);
err = new eSocketNotifier(eApp, fd[2], eSocketNotifier::Read|eSocketNotifier::Priority );
if (what & (eSocketNotifier::Priority|eSocketNotifier::Read))
{
// eDebug("what = %d");
- char buf[2048];
+ char buf[2049];
int rd;
- while((rd = read(fd[0], buf, 2047)) > 0)
+ while((rd = read(fd[0], buf, 2048)) > 0)
{
-/* for ( int i = 0; i < rd; i++ )
- eDebug("%d = %c (%02x)", i, buf[i], buf[i] );*/
buf[rd]=0;
/*emit*/ dataAvail(buf);
if (!hungup)
if (what & (eSocketNotifier::Priority|eSocketNotifier::Read))
{
// eDebug("what = %d");
- char buf[2048];
+ char buf[2049];
int rd;
- while((rd = read(fd[2], buf, 2047)) > 0)
+ while((rd = read(fd[2], buf, 2048)) > 0)
{
/* for ( int i = 0; i < rd; i++ )
eDebug("%d = %c (%02x)", i, buf[i], buf[i] );*/
char *tmp = new char[len];
memcpy(tmp, data, len);
outbuf.push(queue_data(tmp,len));
- out->start();
+ if (out)
+ out->start();
+}
+
+void eConsoleAppContainer::write( PyObject *data )
+{
+ char *buffer;
+ int length;
+ if (PyString_AsStringAndSize(data, &buffer, &length))
+ return;
+ if (buffer && length)
+ write(buffer, length);
}
void eConsoleAppContainer::readyWrite(int what)