Ticket #3748: mc-mksh-subshell.patch

lib/shell.c

@@ -66 +66 @@
     /* 3rd choice: look for existing shells supported as MC subshells.  */
     if (access ("/bin/bash", X_OK) == 0)
         mc_shell->path = g_strdup ("/bin/bash");
+    else if (access ("/usr/local/bin/mksh", X_OK) == 0)
+        mc_shell->path = g_strdup ("/usr/local/bin/mksh");
+    else if (access ("/bin/mksh", X_OK) == 0)
+        mc_shell->path = g_strdup ("/bin/mksh");
     else if (access ("/bin/ash", X_OK) == 0)
         mc_shell->path = g_strdup ("/bin/ash");
     else if (access ("/bin/dash", X_OK) == 0)
@@ -149 +153 @@
         mc_shell->type = SHELL_ZSH;
         mc_shell->name = "zsh";
     }
+    else if (strstr (mc_shell->path, "/mksh") != NULL
+             || strstr (mc_shell->real_path, "/mksh") != NULL)
+    {
+        mc_shell->type = SHELL_MKSH;
+        mc_shell->name = "mksh";
+    }
     else if (strstr (mc_shell->path, "/tcsh") != NULL
              || strstr (mc_shell->real_path, "/tcsh") != NULL)
     {

lib/shell.h

@@ -12 +12 @@
 typedef enum
 {
     SHELL_NONE,
+    SHELL_MKSH,
     SHELL_SH,
     SHELL_BASH,
     SHELL_ASH_BUSYBOX,          /* BusyBox default shell (ash) */

src/subshell/common.c

@@ -320 +320 @@
 
         break;
 
+    case SHELL_MKSH:
+        init_file = g_strdup (".profile");
+        putenv_str = g_strconcat ("ENV=", init_file, (char *) NULL);
+        putenv (putenv_str);
+        break;
+
         /* TODO: Find a way to pass initfile to TCSH, ZSH and FISH */
     case SHELL_TCSH:
     case SHELL_ZSH:
@@ -367 +373 @@
 
     case SHELL_ASH_BUSYBOX:
     case SHELL_DASH:
+    case SHELL_MKSH:
     case SHELL_TCSH:
     case SHELL_FISH:
         execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL);
@@ -801 +808 @@
                     "PS1='\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]);
         break;
 
+    case SHELL_MKSH:
+        g_snprintf (precmd, buff_size,
+                    "PS1='$(pwd>&%d; kill -STOP $$)'\"$((( USER_ID )) && print '$ ' || print '# ')\"\n", subshell_pipe[WRITE]);
+        break;
+
     case SHELL_ASH_BUSYBOX:
         /* BusyBox ash needs a somewhat complicated precmd emulation via PS1, and it is vital
          * that BB be built with active CONFIG_ASH_EXPAND_PRMT, but this is the default anyway.