Репозитории ALT
S: | 4.8.30-alt3 |
5.1: | 4.8.11-alt0.M51.1 |
4.1: | 4.6.2-alt7.pre1 |
4.0: | 4.6.1r-alt9 |
3.0: | 4.6.1r-alt3 |
Группа :: Работа с файлами
Пакет: mc
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: mc-4.8.8-alt-forceexec.patch
Скачать
Скачать
diff -Nur mc-4.8.8.orig/po/ru.po mc-4.8.8/po/ru.po
--- mc-4.8.8.orig/po/ru.po 2013-04-07 23:44:55.000000000 +0400
+++ mc-4.8.8/po/ru.po 2013-04-08 01:53:41.782957844 +0400
@@ -573,6 +573,9 @@
msgid "Disables subshell support"
msgstr "п·я┌п╨п╩я▌я┤п╦я┌я▄ п©п╬п╢п╢п╣я─п╤п╨я┐ п╡я│я┌я─п╬п╣п╫п╫п╬п╧ п╨п╬п╪п╟п╫п╢п╫п╬п╧ п╬п╠п╬п╩п╬я┤п╨п╦"
+msgid "Force subshell execution"
+msgstr "п÷я─п╦п╫я┐п╢п╦я┌п╣п╩я▄п╫п╬п╣ п╡я▀п©п╬п╩п╫п╣п╫п╦п╣ п╡п╬ п╡я│я┌я─п╬п╣п╫п╫п╬п╧ п╨п╬п╪п╟п╫п╢п╫п╬п╧ п╬п╠п╬п╩п╬я┤п╨п╣"
+
msgid "Log ftp dialog to specified file"
msgstr "п≈п╟п©п╦я│я▀п╡п╟я┌я▄ п╢п╦п╟п╩п╬пЁ я│ FTP п╡ п╥п╟п╢п╟п╫п╫я▀п╧ я└п╟п╧п╩"
diff -Nur mc-4.8.8.orig/src/args.c mc-4.8.8/src/args.c
--- mc-4.8.8.orig/src/args.c 2013-04-07 23:44:55.000000000 +0400
+++ mc-4.8.8/src/args.c 2013-04-08 01:53:41.782957844 +0400
@@ -43,6 +43,7 @@
#include "src/args.h"
/*** external variables **************************************************************************/
+extern int force_subshell_execution;
/*** global variables ****************************************************************************/
@@ -152,6 +153,13 @@
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 */
diff -Nur mc-4.8.8.orig/src/execute.c mc-4.8.8/src/execute.c
--- mc-4.8.8.orig/src/execute.c 2013-04-07 23:44:55.000000000 +0400
+++ mc-4.8.8/src/execute.c 2013-04-08 01:55:46.098952945 +0400
@@ -72,6 +72,8 @@
/* --------------------------------------------------------------------------------------------- */
+int force_subshell_execution = 0;
+
static void
edition_post_exec (void)
{
@@ -422,7 +424,7 @@
#ifdef ENABLE_SUBSHELL
if (mc_global.tty.use_subshell)
- if (subshell_state == INACTIVE)
+ if (subshell_state == INACTIVE || force_subshell_execution)
do_execute (mc_global.tty.shell, cmd ? cmd : command, flags | EXECUTE_AS_SHELL);
else
message (D_ERROR, MSG_ERROR, _("The shell is already running a command"));
diff -Nur mc-4.8.8.orig/src/execute.h mc-4.8.8/src/execute.h
--- mc-4.8.8.orig/src/execute.h 2013-04-07 23:44:55.000000000 +0400
+++ mc-4.8.8/src/execute.h 2013-04-08 01:53:41.786957885 +0400
@@ -28,6 +28,9 @@
/*** 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);