author | harlekin <harlekin> | 2002-10-25 18:57:47 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-25 18:57:47 (UTC) |
commit | 1d3135677f1f49b9cc87ebf01f1c4eaab3c450f4 (patch) (side-by-side diff) | |
tree | 63599d704e4f522393a613692369ff9c4a554eef | |
parent | 4151cc12a6c37cbec4bb6883204703eec2fb8648 (diff) | |
download | opie-1d3135677f1f49b9cc87ebf01f1c4eaab3c450f4.zip opie-1d3135677f1f49b9cc87ebf01f1c4eaab3c450f4.tar.gz opie-1d3135677f1f49b9cc87ebf01f1c4eaab3c450f4.tar.bz2 |
is there is a real bash installed, take that instead of sh
-rw-r--r-- | noncore/apps/opie-console/MyPty.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp index 984e347..2570826 100644 --- a/noncore/apps/opie-console/MyPty.cpp +++ b/noncore/apps/opie-console/MyPty.cpp @@ -46,48 +46,49 @@ clearify TEPty::done vs. TEPty::~TEPty semantics. check if pty is restartable via run after done. \par Pseudo terminals Pseudo terminals are a unique feature of UNIX, and always come in form of pairs of devices (/dev/ptyXX and /dev/ttyXX), which are connected to each other by the operating system. One may think of them as two serial devices linked by a null-modem cable. Being based on devices the number of simultanous instances of this class is (globally) limited by the number of those device pairs, which is 256. Another technic are UNIX 98 PTY's. These are supported also, and prefered over the (obsolete) predecessor. There's a sinister ioctl(2), signal(2) and job control stuff nessesary to make everything work as it should. */ #include <qapplication.h> #include <qsocketnotifier.h> #include <qstring.h> +#include <qfile.h> #include <stdlib.h> #include <stdio.h> #include <signal.h> #include <fcntl.h> #include <unistd.h> #include <termios.h> #include <sys/types.h> #include <sys/ioctl.h> #include <sys/wait.h> #ifdef HAVE_OPENPTY #include <pty.h> #endif #include "procctl.h" #include "MyPty.h" #undef VERBOSE_DEBUG /* -------------------------------------------------------------------------- */ @@ -121,48 +122,53 @@ void MyPty::donePty() m_sn_e = 0l; m_sn_r = 0l; } m_cpid = 0; m_fd = -1; // emit done(status); } const char* MyPty::deviceName() { return m_ttynam; } void MyPty::error() { // This is code from the Qt DumbTerminal example donePty(); } void MyPty::start() { char* cmd = "/bin/sh"; + + if ( QFile::exists( "/bin/bash" ) ) { + char* cmd = "/bin/bash"; + } + QStrList lis; int r =run(cmd, lis, 0, 0); r = r; } /*! start the client program. */ int MyPty::run(const char* cmd, QStrList &, const char*, int) { // This is code from the Qt DumbTerminal example m_cpid = fork(); if ( !m_cpid ) { // child - exec shell on tty for (int sig = 1; sig < NSIG; sig++) signal(sig,SIG_DFL); int ttyfd = ::open(m_ttynam, O_RDWR); dup2(ttyfd, STDIN_FILENO); dup2(ttyfd, STDOUT_FILENO); dup2(ttyfd, STDERR_FILENO); // should be done with tty, so close it ::close(ttyfd); static struct termios ttmode; if ( setsid() < 0 ) perror( "failed to set process group" ); |