Ticket #2496: mc-4.8.6-alt-forceexec.patch

po/ru.po

@@ -576 +576 @@
 msgid "Disables subshell support"
 msgstr "Отключить поддержку встроенной командной оболочки"
 
+msgid "Force subshell execution"
+msgstr "Принудительное выполнение во встроенной командной оболочке"
+
 msgid "Log ftp dialog to specified file"
 msgstr "Записывать диалог с FTP в заданный файл"
 

src/args.c

@@ -43 +43 @@
 #include "src/args.h"
 
 /*** external variables **************************************************************************/
+extern int force_subshell_execution;
 
 /*** global variables ****************************************************************************/
 
@@ -152 +153 @@
      N_("Disables subshell support"),
      NULL
     },
+
+    {
+     "forceexec", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
+     &force_subshell_execution,
+     N_("Force subshell execution"),
+     NULL
+    },
 #endif
 
     /* debug options */

src/execute.c

@@ -63 +63 @@
 /*** file scope functions ************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
+int force_subshell_execution = 0;
+
 static void
 edition_post_exec (void)
 {
@@ -290 +292 @@
 
 #ifdef ENABLE_SUBSHELL
     if (mc_global.tty.use_subshell)
-        if (subshell_state == INACTIVE)
+        if (subshell_state == INACTIVE || force_subshell_execution)
             do_execute (shell, cmd ? cmd : command, flags | EXECUTE_AS_SHELL);
         else
             message (D_ERROR, MSG_ERROR, _("The shell is already running a command"));

src/execute.h

@@ -28 +28 @@
 
 /*** declarations of public functions ************************************************************/
 
+/* If true message "The shell is already running a command" never */
+extern int force_subshell_execution;
+
 /* Execute functions that use the shell to execute */
 void shell_execute (const char *command, int flags);