fix write

[vuplus_dvbapp] / lib / base / console.h

diff --git a/lib/base/console.h b/lib/base/console.h
index 1b58dbd..3aa180e 100644 (file)
--- a/lib/base/console.h
+++ b/lib/base/console.h
@@ -1,6 +1,7 @@
 #ifndef __LIB_BASE_CONSOLE_H__
 #define __LIB_BASE_CONSOLE_H__
 
+#include "Python.h"
 #include <string>
 #include <lib/base/ebase.h>
 #include <lib/python/connections.h>
@@ -10,11 +11,12 @@
 struct queue_data
 {
        queue_data( char *data, int len )
-               :data(data), len(len)
+               :data(data), len(len), dataSent(0)
        {
        }
        char *data;
        int len;
+       int dataSent;
 };
 #endif
 
@@ -24,6 +26,7 @@ class eConsoleAppContainer: public Object
        int fd[3];
        int pid;
        int killstate;
+       std::string m_cwd;
        std::queue<struct queue_data> outbuf;
        eSocketNotifier *in, *out, *err;
        void readyRead(int what);
@@ -33,12 +36,16 @@ class eConsoleAppContainer: public Object
 #endif
 public:
        eConsoleAppContainer();
+       int setCWD( const char *path );
        int execute( const char *str );
+       int execute( const char *cmdline, const char *const argv[] );
+       int execute( PyObject *cmdline, PyObject *args );
        ~eConsoleAppContainer();
        int getPID() { return pid; }
        void kill();
        void sendCtrlC();
        void write( const char *data, int len );
+       void write( PyObject *data );
        bool running() { return (fd[0]!=-1) && (fd[1]!=-1) && (fd[2]!=-1); }
        PSignal1<void, const char*> dataAvail;
        PSignal1<void,int> dataSent;