execute /bin/bash --login now

1 files changed, 50 insertions, 49 deletions

diff --git a/core/apps/embeddedkonsole/MyPty.cpp b/core/apps/embeddedkonsole/MyPty.cpp
index 3622d48..6421ab0 100644
--- a/core/apps/embeddedkonsole/MyPty.cpp
+++ b/core/apps/embeddedkonsole/MyPty.cpp
@@ -10,7 +10,7 @@
 /* -------------------------------------------------------------------------- */
-/*									      */
+/*                        */
 /* Ported Konsole to Qt/Embedded                                              */
-/*									      */
+/*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
-/*									      */
+/*                        */
 /* -------------------------------------------------------------------------- */
@@ -115,4 +115,4 @@ void MyPty::donePty()
     if (cpid) {
-	kill(cpid, SIGHUP);
-	waitpid(cpid, &status, 0);
+  kill(cpid, SIGHUP);
+  waitpid(cpid, &status, 0);
     }
@@ -141,3 +141,3 @@ int MyPty::run(const char* cmd, QStrList &, const char*, int)
 {
-    // This is code from the Qt DumbTerminal example
+      // This is code from the Qt DumbTerminal example
     cpid = fork();
@@ -145,32 +145,33 @@ int MyPty::run(const char* cmd, QStrList &, const char*, int)
     if ( !cpid ) {
-	// child - exec shell on tty
-	for (int sig = 1; sig < NSIG; sig++) signal(sig,SIG_DFL);
-	int ttyfd = open(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" );
+  // child - exec shell on tty
+  for (int sig = 1; sig < NSIG; sig++) signal(sig,SIG_DFL);
+  int ttyfd = open(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);
+  // 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","vt100",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);
+  tcgetattr( STDIN_FILENO, &ttmode );
+  ttmode.c_cc[VINTR] = 3;
+  ttmode.c_cc[VERASE] = 8;
+  tcsetattr( STDIN_FILENO, TCSANOW, &ttmode );
+  setenv("TERM","vt100",1);
+  setenv("COLORTERM","0",1);
+
+  if (getuid() == 0) {
+      char msg[] = "WARNING: You are running this shell as root!\n";
+      write(ttyfd, msg, sizeof(msg));
+  }
+; //creates a login shell
+  execl(cmd, cmd, "--login", 0);
+
+  donePty();
+  exit(-1);
     }
@@ -194,17 +195,17 @@ int MyPty::openPty()
     if ( openpty(&ptyfd,&ttyfd,ttynam,0,0) )
-	ptyfd = -1;
+  ptyfd = -1;
     else
-	close(ttyfd); // we open the ttynam ourselves.
+  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(ptynam,"/dev/pty%c%c",*c0,*c1);
-	    sprintf(ttynam,"/dev/tty%c%c",*c0,*c1);
-	    if ((ptyfd = ::open(ptynam,O_RDWR)) >= 0) {
-		if (geteuid() != 0 && !access(ttynam,R_OK|W_OK) == 0) {
-		    ::close(ptyfd);
-		    ptyfd = -1;
-		}
-	    }
-	}
+  for (const char* c1 = "0123456789abcdef"; ptyfd < 0 && *c1 != 0; c1++) {
+      sprintf(ptynam,"/dev/pty%c%c",*c0,*c1);
+      sprintf(ttynam,"/dev/tty%c%c",*c0,*c1);
+      if ((ptyfd = ::open(ptynam,O_RDWR)) >= 0) {
+    if (geteuid() != 0 && !access(ttynam,R_OK|W_OK) == 0) {
+        ::close(ptyfd);
+        ptyfd = -1;
+    }
+      }
+  }
     }
@@ -213,4 +214,4 @@ int MyPty::openPty()
     if ( ptyfd < 0 ) {
-	qApp->exit(1);
-	return -1;
+  qApp->exit(1);
+  return -1;
     }
@@ -251,3 +252,3 @@ void MyPty::send_bytes(const char* s, int len)
 
-  ::write(fd, s, len);	
+  ::write(fd, s, len);  
 }