X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/acf619a3c304992a7ec093cd95fdd6c0805cca66..1c4d458b5df83facce7cf71b39ab247eb1447491:/lib/base/console.cpp diff --git a/lib/base/console.cpp b/lib/base/console.cpp index 3f73fba1..a29772d8 100644 --- a/lib/base/console.cpp +++ b/lib/base/console.cpp @@ -5,8 +5,10 @@ #include #include #include +#include +#include -int bidirpipe(int pfd[], char *cmd , char *argv[]) +int bidirpipe(int pfd[], const char *cmd , const char * const argv[]) { int pfdin[2]; /* from child to parent */ int pfdout[2]; /* from parent to child */ @@ -16,7 +18,7 @@ int bidirpipe(int pfd[], char *cmd , char *argv[]) if ( pipe(pfdin) == -1 || pipe(pfdout) == -1 || pipe(pfderr) == -1) return(-1); - if ( ( pid = fork() ) == -1 ) + if ( ( pid = vfork() ) == -1 ) return(-1); else if (pid == 0) /* child process */ { @@ -35,7 +37,8 @@ int bidirpipe(int pfd[], char *cmd , char *argv[]) for (unsigned int i=3; i < 90; ++i ) close(i); - execvp(cmd,argv); + 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); } if (close(pfdout[0]) == -1 || close(pfdin[1]) == -1 || close(pfderr[1]) == -1) @@ -55,148 +58,107 @@ eConsoleAppContainer::eConsoleAppContainer() fd[i]=-1; } -int eConsoleAppContainer::execute( const std::string &cmd ) +static char brakets[][2] = { + { '\'','\'' }, + {'"','"'}, + {'`','`'}, + {'(',')'}, + {'{','}'}, + {'[',']'}, + {'<','>'} +}; + +static char *find_bracket(char ch) { - if (running()) - return -1; - pid=-1; - killstate=0; -// eDebug("cmd = %s", cmd.c_str() ); - int cnt=2; // path to app + terminated 0 - std::string str(cmd.length()?cmd:""); + size_t idx=0; + while (idx < sizeof(brakets)/2) { + if (brakets[idx][0] == ch) + return &brakets[idx][0]; + ++idx; + } + return NULL; +} + +int eConsoleAppContainer::execute( const char *cmd ) +{ + int cnt=0, slen=strlen(cmd); + char buf[slen+1]; + char *tmp=0, *argv[64], *path=buf, *cmds = buf; + memcpy(buf, cmd, slen+1); + +// printf("cmd = %s, len %d\n", cmd, slen); // kill spaces at beginning - unsigned int pos = str.find_first_not_of(' '); - if (pos != std::string::npos && pos) - str = str.substr(pos); + while(path[0] == ' ') { + ++path; + ++cmds; + --slen; + } // kill spaces at the end - pos = str.find_last_not_of(' '); - if (pos != std::string::npos && (pos+1) < str.length()) - str = str.erase(pos+1); + while(slen && path[slen-1] == ' ') { + path[slen-1] = 0; + --slen; + } - unsigned int slen=str.length(); if (!slen) return -2; - std::map brackets; - brackets.insert(std::pair('\'','\'')); - brackets.insert(std::pair('"','"')); - brackets.insert(std::pair('`','`')); - brackets.insert(std::pair('(',')')); - brackets.insert(std::pair('{','}')); - brackets.insert(std::pair('[',']')); - brackets.insert(std::pair('<','>')); - - unsigned int idx=str.find(' '); - std::string path = str.substr(0, idx != std::string::npos ? idx : slen ); -// eDebug("path = %s", path.c_str() ); - unsigned int plen = path.length(); - - std::string cmds = slen > plen ? str.substr( plen+1 ) : ""; - unsigned int clen = cmds.length(); -// eDebug("cmds = %s", cmds.c_str() ); - - idx = 0; - std::map::iterator it = brackets.find(cmds[idx]); - while ( (idx = cmds.find(' ',idx) ) != std::string::npos ) // count args - { - if (it != brackets.end()) - { - if (cmds[idx-1] == it->second) - it = brackets.end(); - } - if (it == brackets.end()) - { - cnt++; - it = brackets.find(cmds[idx+1]); - } - idx++; - } - -// eDebug("idx = %d, %d counted spaces", idx, cnt-2); - - if ( clen ) - { - cnt++; -// eDebug("increase cnt"); + tmp = strchr(path, ' '); + if (tmp) { + *tmp = 0; + cmds = tmp+1; + while(*cmds && *cmds == ' ') + ++cmds; } - -// eDebug("%d args", cnt-2); - char **argv = new char*[cnt]; // min two args... path and terminating 0 -// eDebug("%d args", cnt); - argv[0] = new char[ plen+1 ]; -// eDebug("new argv[0] %d bytes (%s)", plen+1, path.c_str()); - strcpy( argv[0], path.c_str() ); - argv[cnt-1] = 0; // set terminating null - - if ( cnt > 2 ) // more then default args? - { - cnt=1; // do not overwrite path in argv[0] - - it = brackets.find(cmds[0]); - idx=0; - while ( (idx = cmds.find(' ',idx)) != std::string::npos ) // parse all args.. - { - bool bracketClosed=false; - if ( it != brackets.end() ) - { - if (cmds[idx-1]==it->second) - { - it = brackets.end(); - bracketClosed=true; - } + else + cmds = path+slen; + + memset(argv, 0, sizeof(argv)); + argv[cnt++] = path; + + if (*cmds) { + char *argb=NULL, *it=NULL; + while ( (tmp = strchr(cmds, ' ')) ) { + if (!it && *cmds && (it = find_bracket(*cmds)) ) + *cmds = 'X'; // replace open braket... + if (!argb) // not arg begin + argb = cmds; + if (it && *(tmp-1) == it[1]) { + *argb = it[0]; // set old char for open braket + it = 0; } - if ( it == brackets.end() ) - { - std::string tmp = cmds.substr(0, idx); - if (bracketClosed) - { - tmp.erase(0,1); - tmp.erase(tmp.length()-1, 1); - bracketClosed=false; - } -// eDebug("new argv[%d] %d bytes (%s)", cnt, tmp.length()+1, tmp.c_str()); - argv[cnt] = new char[ tmp.length()+1 ]; -// eDebug("idx=%d, arg = %s", idx, tmp.c_str() ); - strcpy( argv[cnt++], tmp.c_str() ); - cmds.erase(0, idx+1); -// eDebug("str = %s", cmds.c_str() ); - it = brackets.find(cmds[0]); - idx=0; + if (!it) { // end of arg + *tmp = 0; + argv[cnt++] = argb; + argb=0; // reset arg begin } - else - idx++; - } - if ( it != brackets.end() ) - { - cmds.erase(0,1); - cmds.erase(cmds.length()-1, 1); + cmds = tmp+1; + while (*cmds && *cmds == ' ') + ++cmds; } - // store the last arg -// eDebug("new argv[%d] %d bytes (%s)", cnt, cmds.length()+1, cmds.c_str()); - argv[cnt] = new char[ cmds.length()+1 ]; - strcpy( argv[cnt], cmds.c_str() ); + argv[cnt++] = argb ? argb : cmds; + if (it) + *argv[cnt-1] = it[0]; // set old char for open braket } - else - cnt=1; - - // get one read ,one write and the err pipe to the prog.. // int tmp=0; // while(argv[tmp]) // eDebug("%d is %s", tmp, argv[tmp++]); - - pid = bidirpipe(fd, argv[0], argv); + return execute(argv[0], argv); +} + +int eConsoleAppContainer::execute(const char *cmdline, const char * const argv[]) +{ + if (running()) + return -1; + + pid=-1; + killstate=0; + + // get one read ,one write and the err pipe to the prog.. + pid = bidirpipe(fd, cmdline, argv); - while ( cnt >= 0 ) // release heap memory - { -// eDebug("delete argv[%d]", cnt); - delete [] argv[cnt--]; - } -// eDebug("delete argv"); - delete [] argv; - if ( pid == -1 ) return -3; @@ -208,9 +170,32 @@ int eConsoleAppContainer::execute( const std::string &cmd ) CONNECT(in->activated, eConsoleAppContainer::readyRead); CONNECT(out->activated, eConsoleAppContainer::readyWrite); CONNECT(err->activated, eConsoleAppContainer::readyErrRead); + return 0; } +int eConsoleAppContainer::execute( PyObject *cmdline, PyObject *args ) +{ + if (!PyString_Check(cmdline)) + return -1; + if (!PyList_Check(args)) + return -1; + const char *argv[PyList_Size(args) + 1]; + int i; + for (i = 0; i < PyList_Size(args); ++i) + { + PyObject *arg = PyList_GetItem(args, i); /* borrowed ref */ + if (!arg) + return -1; + if (!PyString_Check(arg)) + return -1; + argv[i] = PyString_AsString(arg); /* borrowed pointer */ + } + argv[i] = 0; + + return execute(PyString_AsString(cmdline), argv); /* borrowed pointer */ +} + eConsoleAppContainer::~eConsoleAppContainer() { kill(); @@ -222,7 +207,11 @@ void eConsoleAppContainer::kill() { eDebug("user kill(SIGKILL) console App"); killstate=-1; - ::kill(pid, SIGKILL); + /* + * Use a negative pid value, to signal the whole process group + * ('pid' might not even be running anymore at this point) + */ + ::kill(-pid, SIGKILL); closePipes(); } while( outbuf.size() ) // cleanup out buffer @@ -242,7 +231,11 @@ void eConsoleAppContainer::sendCtrlC() if ( killstate != -1 && pid != -1 ) { eDebug("user send SIGINT(Ctrl-C) to console App"); - ::kill(pid, SIGINT); + /* + * Use a negative pid value, to signal the whole process group + * ('pid' might not even be running anymore at this point) + */ + ::kill(-pid, SIGINT); } } @@ -301,7 +294,20 @@ void eConsoleAppContainer::readyRead(int what) { eDebug("child has terminated"); closePipes(); - /*emit*/ appClosed(killstate); + int childstatus; + int retval = killstate; + /* + * We have to call 'wait' on the child process, in order to avoid zombies. + * Also, this gives us the chance to provide better exit status info to appClosed. + */ + if (::waitpid(pid, &childstatus, 0) > 0) + { + if (WIFEXITED(childstatus)) + { + retval = WEXITSTATUS(childstatus); + } + } + /*emit*/ appClosed(retval); } } @@ -327,7 +333,18 @@ void eConsoleAppContainer::write( const char *data, int len ) 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)