cough

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index 2570826..534f79a 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -52,193 +52,193 @@
     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
 
 
 /* -------------------------------------------------------------------------- */
 
 /*!
    Informs the client program about the
    actual size of the window.
 */
 
 void MyPty::setSize(int lines, int columns)
 {
     qWarning("setting size");
   struct winsize wsize;
   wsize.ws_row = (unsigned short)lines;
   wsize.ws_col = (unsigned short)columns;
   if(m_fd < 0) return;
   ioctl(m_fd,TIOCSWINSZ,(char *)&wsize);
 }
 
 
 void MyPty::donePty()
 {
     // This is code from the Qt DumbTerminal example
 
     ::close(m_fd);
 
     if (m_cpid) {
         kill(m_cpid, SIGHUP);
         //waitpid(m_cpid, &status, 0);
         delete m_sn_e;
         delete m_sn_r;
         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";
+        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" );
 #if defined (TIOCSCTTY)
         // grabbed from APUE by Stevens
         ioctl(STDIN_FILENO, TIOCSCTTY, 0);
 #endif
         tcgetattr( STDIN_FILENO, &ttmode );
         ttmode.c_cc[VINTR] = 3;
         ttmode.c_cc[VERASE] = 8;
         tcsetattr( STDIN_FILENO, TCSANOW, &ttmode );
         setenv("TERM",m_term,1);
         setenv("COLORTERM","0",1);
 
         if (getuid() == 0) {
             char msg[] = "WARNING: You are running this shell as root!\n";
             write(ttyfd, msg, sizeof(msg));
         }
         execl(cmd, cmd, 0);
 
         donePty();
         exit(-1);
     }
 
     // parent - continue as a widget
     delete m_sn_r;
     m_sn_r = new QSocketNotifier(m_fd,QSocketNotifier::Read,this);
     delete m_sn_e;
     m_sn_e = new QSocketNotifier(m_fd,QSocketNotifier::Exception,this);
     connect(m_sn_r,SIGNAL(activated(int)),this,SLOT(readPty()));
     connect(m_sn_e,SIGNAL(activated(int)),this,SLOT(error()));
 
     return 0;
 }
 
 int MyPty::openPty()
 {
     // This is code from the Qt DumbTerminal example
     int ptyfd = -1;
 
 #ifdef HAVE_OPENPTY
     int ttyfd;
     if ( openpty(&ptyfd,&ttyfd,ttynam,0,0) )
         ptyfd = -1;
     else
         close(ttyfd); // we open the ttynam ourselves.
 #else
     for (const char* c0 = "pqrstuvwxyzabcde"; ptyfd < 0 && *c0 != 0; c0++) {
         for (const char* c1 = "0123456789abcdef"; ptyfd < 0 && *c1 != 0; c1++) {
             sprintf(m_ptynam,"/dev/pty%c%c",*c0,*c1);
             sprintf(m_ttynam,"/dev/tty%c%c",*c0,*c1);
             if ((ptyfd = ::open(m_ptynam,O_RDWR)) >= 0) {
                 if (geteuid() != 0 && !access(m_ttynam,R_OK|W_OK) == 0) {
                     ::close(ptyfd);
                     ptyfd = -1;
                 }
             }
         }
     }
 #endif
 
     if ( ptyfd < 0 ) {
         //qApp->exit(1);
         return -1;
     }
 
     return ptyfd;
 }
 
 /*!
     Create an instance.
 */
 MyPty::MyPty(const Profile& prof) : m_cpid(0)