Alter embeddedkonsole to obey SHELL env var if set, otherwise use the user's default shell, falling back to /bin/sh.

1 files changed, 17 insertions, 5 deletions

diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp
index 167b009..91199eb 100644
--- a/core/apps/embeddedkonsole/main.cpp
+++ b/core/apps/embeddedkonsole/main.cpp
@@ -30,4 +30,7 @@
 #include <stdlib.h>
 
+#include <pwd.h>
+#include <sys/types.h>
+
 
 /* --| main |------------------------------------------------------ */
@@ -49,11 +52,20 @@ int main(int argc, char* argv[])
   QStrList tmp;
   const char* shell = getenv("SHELL");
-  if (shell == NULL || *shell == '\0')
+
+  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();
+  }
 
-  // sh is completely broken on familiar. Let's try to get something better
-  if ( qstrcmp( shell, "/bin/shell" ) == 0 && QFile::exists( "/bin/bash" ) )
-      shell = "/bin/bash";
-  
  if( putenv((char*)"COLORTERM=") !=0)
      qDebug("putenv failed"); // to trigger mc's color detection