From 1a59dd467d210703b69d2d694f95988f2e97c27f Mon Sep 17 00:00:00 2001 From: zecke Date: Sun, 29 Feb 2004 18:39:07 +0000 Subject: from the branch to find the best shell or fallback to /bin/sh --- diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index eafc12e..084c39d 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp @@ -23,6 +23,9 @@ // enhancements added by Phillip Kuhn #include +#include +#include +#include #ifdef QT_QWS_OPIE #include @@ -220,11 +223,49 @@ static const char *commonCmds[] = }; +static void konsoleInit(const char** shell) { + if(setuid(getuid()) !=0) qDebug("setuid failed"); + if(setgid(getgid()) != 0) qDebug("setgid failed"); // drop privileges + + +// QPEApplication::grabKeyboard(); // for CTRL and ALT + + qDebug("keyboard grabbed"); +#ifdef FAKE_CTRL_AND_ALT + qDebug("Fake Ctrl and Alt defined"); + QPEApplication::grabKeyboard(); // for CTRL and ALT +#endif + + *shell = getenv("SHELL"); + qWarning("SHell initially is %s", *shell ); + + if (shell == NULL || *shell == '\0') { + struct passwd *ent = 0; + uid_t me = getuid(); + *shell = "/bin/sh"; + + while ( (ent = getpwent()) != 0 ) { + if (ent->pw_uid == me) { + if (ent->pw_shell != "") + *shell = ent->pw_shell; + break; + } + } + endpwent(); + } + + if( putenv((char*)"COLORTERM=") !=0) + qDebug("putenv failed"); // to trigger mc's color detection +} + + Konsole::Konsole(QWidget* parent, const char* name, WFlags fl) : QMainWindow(parent, name, fl) { - QStrList args; - init("/bin/bash",args); + QStrList tmp; const char* shell; + + konsoleInit( &shell); + init(shell,tmp); } Konsole::Konsole(const char* name, const char* _pgm, QStrList & _args, int) -- cgit v0.9.0.2