misc/mc: Multiple fixes

- Fix subshell functionality for csh users
- Make SFTP an option, enabled by default
- Fix SIGILL on FreeBSD 9.x
- Fix perl ls helper with fish shell

PR:		207487, 208027, 208102, 208104

4 files changed, 930 insertions, 4 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 71c472dc1a8a..6d97c57f4dec 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mc
 PORTVERSION=	4.8.16
+PORTREVISION=	1
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		http://ftp.osuosl.org/pub/midnightcommander/ \
@@ -16,8 +17,6 @@ COMMENT=	Midnight Commander, a free Norton Commander Clone
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
-
 CONFLICTS=	mc-light-4*
 
 USES=		gmake shebangfix perl5 pkgconfig tar:xz libtool
@@ -30,14 +29,15 @@ USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ZIP=${ZIP_CMD} UNZIP=${UNZIP_CMD}
 
-OPTIONS_DEFINE=	DOCS EDITOR ICONV NLS SMB SUBSHELL X11
+OPTIONS_DEFINE=	DOCS EDITOR ICONV NLS SFTP SMB SUBSHELL X11
 
 OPTIONS_SINGLE=	SCREEN
 OPTIONS_SINGLE_SCREEN=	SLANG NCURSES
 
-OPTIONS_DEFAULT=	EDITOR ICONV SLANG SMB SUBSHELL X11
+OPTIONS_DEFAULT=EDITOR ICONV SFTP SLANG SMB SUBSHELL X11
 
 EDITOR_DESC=	Build with internal editor
+SFTP_DESC=	Support for SFTP (via libssh)
 SUBSHELL_DESC=	Build with subshell support
 
 OPTIONS_SUB=	yes
@@ -54,6 +54,9 @@ NLS_USES=		gettext
 NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LDFLAGS=		-L${LOCALBASE}/lib
 
+SFTP_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SFTP_CONFIGURE_ENABLE=	vfs-sftp
+
 SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
 SLANG_CONFIGURE_ON=	--with-screen=slang --with-slang-includes=${LOCALBASE}/include
 
diff --git a/misc/mc/files/patch-upstreamticket2742-detect-csh-as-tcsh-by-name.patch b/misc/mc/files/patch-upstreamticket2742-detect-csh-as-tcsh-by-name.patch
new file mode 100644
index 000000000000..f0ad2c7e5537
--- /dev/null
+++ b/misc/mc/files/patch-upstreamticket2742-detect-csh-as-tcsh-by-name.patch
@@ -0,0 +1,15 @@
+--- lib/shell.c.orig
++++ lib/shell.c
+@@ -162,6 +162,12 @@ mc_shell_recognize_and_fill_type (mc_shell_t * mc_shell)
+         mc_shell->type = SHELL_TCSH;
+         mc_shell->name = "tcsh";
+     }
++    else if (strstr (mc_shell->path, "/csh") != NULL
++             || strstr (mc_shell->real_path, "/csh") != NULL)
++    {
++        mc_shell->type = SHELL_TCSH;
++        mc_shell->name = "csh";
++    }
+     else if (strstr (mc_shell->path, "/fish") != NULL
+              || strstr (mc_shell->real_path, "/fish") != NULL)
+     {
diff --git a/misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch b/misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch
new file mode 100644
index 000000000000..67b5da7fd521
--- /dev/null
+++ b/misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch
@@ -0,0 +1,34 @@
+From e274e58cb7dff1683480f5538fd1bfa41a85c0c7 Mon Sep 17 00:00:00 2001
+From: Andreas Mohr <and@gmx.li>
+Date: Sun, 13 Mar 2016 20:59:47 +0000
+Subject: [PATCH] Fish: fix perl ls helper
+
+With #3599 I introduce a perl warning in fish_list_perl()
+so fish_list_perl() was skipped (return code 255) and fallback ls
+function was used instead.
+
+Plus all % chars must quoted because of g_strconcat() after reading
+script file into string.
+
+Fix it!
+
+Signed-off-by: Andreas Mohr <and@gmx.li>
+---
+ src/vfs/fish/helpers/ls | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vfs/fish/helpers/ls b/src/vfs/fish/helpers/ls
+index 1284e17..909a77d 100755
+--- src/vfs/fish/helpers/ls
++++ src/vfs/fish/helpers/ls
+@@ -138,8 +138,8 @@ while((my $filename = readdir (DIR))){
+         my $linkname = readlink ("$dirname/$filename");
+         $linkname =~ $strutils_shell_escape_regex;
+         printf("R%%o %%o $uid.$gid\nS$size\nd$mloctime\n:\"%%s\" -> \"%%s\"\n\n", S_IMODE($mode), S_IFMT($mode), $e_filename, $linkname);
+-    } elseif (S_ISCHR ($mode) || S_ISBLK ($mode)) {
+-        my $minor = $rdev % 256;
++    } elsif (S_ISCHR ($mode) || S_ISBLK ($mode)) {
++        my $minor = $rdev %% 256;
+         my $major = int( $rdev / 256 );
+         printf("R%%o %%o $uid.$gid\nE$major,$minor\nd$mloctime\n:\"%%s\"\n\n", S_IMODE($mode), S_IFMT($mode), $e_filename);
+     } else {
diff --git a/misc/mc/files/patch-upstreamticket3617-mc_open-handle-varargs-mode_t-promotion-issue--v2.patch b/misc/mc/files/patch-upstreamticket3617-mc_open-handle-varargs-mode_t-promotion-issue--v2.patch
new file mode 100644
index 000000000000..cd42f61fd6a9
--- /dev/null
+++ b/misc/mc/files/patch-upstreamticket3617-mc_open-handle-varargs-mode_t-promotion-issue--v2.patch
@@ -0,0 +1,874 @@
+diff -rNu Makefile.in Makefile.in
+--- Makefile.in	2016-03-17 22:11:41.000000000 +0000
++++ Makefile.in	2016-03-17 22:23:05.000000000 +0000
+@@ -115,6 +115,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu acinclude.m4 acinclude.m4
+--- acinclude.m4	2016-03-12 16:20:56.000000000 +0000
++++ acinclude.m4	2016-03-17 22:21:38.000000000 +0000
+@@ -3,6 +3,7 @@
+ m4_include([m4.include/dx_doxygen.m4])
+ m4_include([m4.include/mc-cflags.m4])
+ m4_include([m4.include/mc-check-search-type.m4])
++m4_include([m4.include/mode_t.m4])
+ m4_include([m4.include/ls-mntd-fs.m4])
+ m4_include([m4.include/fstypename.m4])
+ m4_include([m4.include/fsusage.m4])
+diff -rNu config.h.in config.h.in
+--- config.h.in	2016-03-17 22:11:35.000000000 +0000
++++ config.h.in	2016-03-17 22:23:00.000000000 +0000
+@@ -623,6 +623,10 @@
+ /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
+ #undef PRI_MACROS_BROKEN
+ 
++/* Define to the type that is the result of default argument promotions of
++   type mode_t. */
++#undef PROMOTED_MODE_T
++
+ /* Define to select 'glib-regexp' search type */
+ #undef SEARCH_TYPE_GLIB
+ 
+diff -rNu configure configure
+--- configure	2016-03-17 22:11:37.000000000 +0000
++++ configure	2016-03-17 22:23:02.000000000 +0000
+@@ -19132,6 +19132,41 @@
+ 
+ fi
+ 
++
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
++$as_echo_n "checking for promoted mode_t type... " >&6; }
++if ${gl_cv_promoted_mode_t+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++
++                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++int
++main ()
++{
++typedef int array[2 * (sizeof (mode_t) < sizeof (int)) - 1];
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  gl_cv_promoted_mode_t='int'
++else
++  gl_cv_promoted_mode_t='mode_t'
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
++$as_echo "$gl_cv_promoted_mode_t" >&6; }
++
++cat >>confdefs.h <<_ACEOF
++#define PROMOTED_MODE_T $gl_cv_promoted_mode_t
++_ACEOF
++
++
+ ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+ if test "x$ac_cv_type_pid_t" = xyes; then :
+ 
+diff -rNu configure.ac configure.ac
+--- configure.ac	2016-03-12 16:20:56.000000000 +0000
++++ configure.ac	2016-03-17 22:21:38.000000000 +0000
+@@ -177,6 +177,7 @@
+ AC_TYPE_OFF_T
+ AC_CHECK_SIZEOF(off_t)
+ AC_TYPE_MODE_T
++gl_PROMOTED_TYPE_MODE_T
+ AC_TYPE_PID_T
+ AC_TYPE_UID_T
+ 
+diff -rNu contrib/Makefile.in contrib/Makefile.in
+--- contrib/Makefile.in	2016-03-17 22:11:41.000000000 +0000
++++ contrib/Makefile.in	2016-03-17 22:23:06.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu contrib/dist/Makefile.in contrib/dist/Makefile.in
+--- contrib/dist/Makefile.in	2016-03-17 22:11:41.000000000 +0000
++++ contrib/dist/Makefile.in	2016-03-17 22:23:06.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu contrib/dist/gentoo/Makefile.in contrib/dist/gentoo/Makefile.in
+--- contrib/dist/gentoo/Makefile.in	2016-03-17 22:11:41.000000000 +0000
++++ contrib/dist/gentoo/Makefile.in	2016-03-17 22:23:06.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu contrib/dist/redhat/Makefile.in contrib/dist/redhat/Makefile.in
+--- contrib/dist/redhat/Makefile.in	2016-03-17 22:11:42.000000000 +0000
++++ contrib/dist/redhat/Makefile.in	2016-03-17 22:23:06.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/Makefile.in doc/Makefile.in
+--- doc/Makefile.in	2016-03-17 22:11:42.000000000 +0000
++++ doc/Makefile.in	2016-03-17 22:23:06.000000000 +0000
+@@ -159,6 +159,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/hints/Makefile.in doc/hints/Makefile.in
+--- doc/hints/Makefile.in	2016-03-17 22:11:42.000000000 +0000
++++ doc/hints/Makefile.in	2016-03-17 22:23:06.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/hints/l10n/Makefile.in doc/hints/l10n/Makefile.in
+--- doc/hints/l10n/Makefile.in	2016-03-17 22:11:42.000000000 +0000
++++ doc/hints/l10n/Makefile.in	2016-03-17 22:23:06.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/hlp/Makefile.in doc/hlp/Makefile.in
+--- doc/hlp/Makefile.in	2016-03-17 22:11:42.000000000 +0000
++++ doc/hlp/Makefile.in	2016-03-17 22:23:07.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/hlp/es/Makefile.in doc/hlp/es/Makefile.in
+--- doc/hlp/es/Makefile.in	2016-03-17 22:11:42.000000000 +0000
++++ doc/hlp/es/Makefile.in	2016-03-17 22:23:07.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/hlp/hu/Makefile.in doc/hlp/hu/Makefile.in
+--- doc/hlp/hu/Makefile.in	2016-03-17 22:11:42.000000000 +0000
++++ doc/hlp/hu/Makefile.in	2016-03-17 22:23:07.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/hlp/it/Makefile.in doc/hlp/it/Makefile.in
+--- doc/hlp/it/Makefile.in	2016-03-17 22:11:43.000000000 +0000
++++ doc/hlp/it/Makefile.in	2016-03-17 22:23:07.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/hlp/pl/Makefile.in doc/hlp/pl/Makefile.in
+--- doc/hlp/pl/Makefile.in	2016-03-17 22:11:43.000000000 +0000
++++ doc/hlp/pl/Makefile.in	2016-03-17 22:23:07.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/hlp/ru/Makefile.in doc/hlp/ru/Makefile.in
+--- doc/hlp/ru/Makefile.in	2016-03-17 22:11:43.000000000 +0000
++++ doc/hlp/ru/Makefile.in	2016-03-17 22:23:07.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/hlp/sr/Makefile.in doc/hlp/sr/Makefile.in
+--- doc/hlp/sr/Makefile.in	2016-03-17 22:11:43.000000000 +0000
++++ doc/hlp/sr/Makefile.in	2016-03-17 22:23:07.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/man/Makefile.in doc/man/Makefile.in
+--- doc/man/Makefile.in	2016-03-17 22:11:43.000000000 +0000
++++ doc/man/Makefile.in	2016-03-17 22:23:08.000000000 +0000
+@@ -112,6 +112,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/man/es/Makefile.in doc/man/es/Makefile.in
+--- doc/man/es/Makefile.in	2016-03-17 22:11:43.000000000 +0000
++++ doc/man/es/Makefile.in	2016-03-17 22:23:08.000000000 +0000
+@@ -112,6 +112,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/man/hu/Makefile.in doc/man/hu/Makefile.in
+--- doc/man/hu/Makefile.in	2016-03-17 22:11:43.000000000 +0000
++++ doc/man/hu/Makefile.in	2016-03-17 22:23:08.000000000 +0000
+@@ -112,6 +112,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/man/it/Makefile.in doc/man/it/Makefile.in
+--- doc/man/it/Makefile.in	2016-03-17 22:11:44.000000000 +0000
++++ doc/man/it/Makefile.in	2016-03-17 22:23:08.000000000 +0000
+@@ -112,6 +112,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/man/pl/Makefile.in doc/man/pl/Makefile.in
+--- doc/man/pl/Makefile.in	2016-03-17 22:11:44.000000000 +0000
++++ doc/man/pl/Makefile.in	2016-03-17 22:23:08.000000000 +0000
+@@ -112,6 +112,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/man/ru/Makefile.in doc/man/ru/Makefile.in
+--- doc/man/ru/Makefile.in	2016-03-17 22:11:44.000000000 +0000
++++ doc/man/ru/Makefile.in	2016-03-17 22:23:08.000000000 +0000
+@@ -112,6 +112,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu doc/man/sr/Makefile.in doc/man/sr/Makefile.in
+--- doc/man/sr/Makefile.in	2016-03-17 22:11:44.000000000 +0000
++++ doc/man/sr/Makefile.in	2016-03-17 22:23:08.000000000 +0000
+@@ -112,6 +112,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/Makefile.in lib/Makefile.in
+--- lib/Makefile.in	2016-03-17 22:11:44.000000000 +0000
++++ lib/Makefile.in	2016-03-17 22:23:09.000000000 +0000
+@@ -117,6 +117,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/event/Makefile.in lib/event/Makefile.in
+--- lib/event/Makefile.in	2016-03-17 22:11:44.000000000 +0000
++++ lib/event/Makefile.in	2016-03-17 22:23:09.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/filehighlight/Makefile.in lib/filehighlight/Makefile.in
+--- lib/filehighlight/Makefile.in	2016-03-17 22:11:45.000000000 +0000
++++ lib/filehighlight/Makefile.in	2016-03-17 22:23:09.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/mcconfig/Makefile.in lib/mcconfig/Makefile.in
+--- lib/mcconfig/Makefile.in	2016-03-17 22:11:45.000000000 +0000
++++ lib/mcconfig/Makefile.in	2016-03-17 22:23:09.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/search/Makefile.in lib/search/Makefile.in
+--- lib/search/Makefile.in	2016-03-17 22:11:45.000000000 +0000
++++ lib/search/Makefile.in	2016-03-17 22:23:09.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/skin/Makefile.in lib/skin/Makefile.in
+--- lib/skin/Makefile.in	2016-03-17 22:11:45.000000000 +0000
++++ lib/skin/Makefile.in	2016-03-17 22:23:09.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/strutil/Makefile.in lib/strutil/Makefile.in
+--- lib/strutil/Makefile.in	2016-03-17 22:11:45.000000000 +0000
++++ lib/strutil/Makefile.in	2016-03-17 22:23:10.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/tty/Makefile.in lib/tty/Makefile.in
+--- lib/tty/Makefile.in	2016-03-17 22:11:45.000000000 +0000
++++ lib/tty/Makefile.in	2016-03-17 22:23:10.000000000 +0000
+@@ -116,6 +116,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/vfs/Makefile.in lib/vfs/Makefile.in
+--- lib/vfs/Makefile.in	2016-03-17 22:11:46.000000000 +0000
++++ lib/vfs/Makefile.in	2016-03-17 22:23:10.000000000 +0000
+@@ -114,6 +114,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu lib/vfs/interface.c lib/vfs/interface.c
+--- lib/vfs/interface.c	2016-03-12 16:20:56.000000000 +0000
++++ lib/vfs/interface.c	2016-03-17 22:21:38.000000000 +0000
+@@ -200,7 +200,10 @@
+     {
+         va_list ap;
+         va_start (ap, flags);
+-        mode = va_arg (ap, mode_t);
++        /* We have to use PROMOTED_MODE_T instead of mode_t. Doing 'va_arg (ap, mode_t)'
++         * fails on systems where 'mode_t' is smaller than 'int' because of C's "default
++         * argument promotions". */
++        mode = va_arg (ap, PROMOTED_MODE_T);
+         va_end (ap);
+     }
+ 
+diff -rNu lib/widget/Makefile.in lib/widget/Makefile.in
+--- lib/widget/Makefile.in	2016-03-17 22:11:46.000000000 +0000
++++ lib/widget/Makefile.in	2016-03-17 22:23:10.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu m4.include/mode_t.m4 m4.include/mode_t.m4
+--- m4.include/mode_t.m4	1970-01-01 00:00:00.000000000 +0000
++++ m4.include/mode_t.m4	2016-03-17 22:21:38.000000000 +0000
+@@ -0,0 +1,26 @@
++# mode_t.m4 serial 2
++dnl Copyright (C) 2009-2016 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++# For using mode_t, it's sufficient to use AC_TYPE_MODE_T and
++# include <sys/types.h>.
++
++# Define PROMOTED_MODE_T to the type that is the result of "default argument
++# promotion" (ISO C 6.5.2.2.(6)) of the type mode_t.
++AC_DEFUN([gl_PROMOTED_TYPE_MODE_T],
++[
++  AC_REQUIRE([AC_TYPE_MODE_T])
++  AC_CACHE_CHECK([for promoted mode_t type], [gl_cv_promoted_mode_t], [
++    dnl Assume mode_t promotes to 'int' if and only if it is smaller than 'int',
++    dnl and to itself otherwise. This assumption is not guaranteed by the ISO C
++    dnl standard, but we don't know of any real-world counterexamples.
++    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]],
++      [[typedef int array[2 * (sizeof (mode_t) < sizeof (int)) - 1];]])],
++      [gl_cv_promoted_mode_t='int'],
++      [gl_cv_promoted_mode_t='mode_t'])
++  ])
++  AC_DEFINE_UNQUOTED([PROMOTED_MODE_T], [$gl_cv_promoted_mode_t],
++    [Define to the type that is the result of default argument promotions of type mode_t.])
++])
+diff -rNu misc/Makefile.in misc/Makefile.in
+--- misc/Makefile.in	2016-03-17 22:11:46.000000000 +0000
++++ misc/Makefile.in	2016-03-17 22:23:10.000000000 +0000
+@@ -117,6 +117,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu misc/ext.d/Makefile.in misc/ext.d/Makefile.in
+--- misc/ext.d/Makefile.in	2016-03-17 22:11:46.000000000 +0000
++++ misc/ext.d/Makefile.in	2016-03-17 22:23:11.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu misc/macros.d/Makefile.in misc/macros.d/Makefile.in
+--- misc/macros.d/Makefile.in	2016-03-17 22:11:46.000000000 +0000
++++ misc/macros.d/Makefile.in	2016-03-17 22:23:11.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu misc/skins/Makefile.in misc/skins/Makefile.in
+--- misc/skins/Makefile.in	2016-03-17 22:11:46.000000000 +0000
++++ misc/skins/Makefile.in	2016-03-17 22:23:11.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu misc/syntax/Makefile.in misc/syntax/Makefile.in
+--- misc/syntax/Makefile.in	2016-03-17 22:11:47.000000000 +0000
++++ misc/syntax/Makefile.in	2016-03-17 22:23:11.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/Makefile.in src/Makefile.in
+--- src/Makefile.in	2016-03-17 22:11:47.000000000 +0000
++++ src/Makefile.in	2016-03-17 22:23:11.000000000 +0000
+@@ -124,6 +124,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/consaver/Makefile.in src/consaver/Makefile.in
+--- src/consaver/Makefile.in	2016-03-17 22:11:47.000000000 +0000
++++ src/consaver/Makefile.in	2016-03-17 22:23:11.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/diffviewer/Makefile.in src/diffviewer/Makefile.in
+--- src/diffviewer/Makefile.in	2016-03-17 22:11:47.000000000 +0000
++++ src/diffviewer/Makefile.in	2016-03-17 22:23:12.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/editor/Makefile.in src/editor/Makefile.in
+--- src/editor/Makefile.in	2016-03-17 22:11:47.000000000 +0000
++++ src/editor/Makefile.in	2016-03-17 22:23:12.000000000 +0000
+@@ -117,6 +117,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/filemanager/Makefile.in src/filemanager/Makefile.in
+--- src/filemanager/Makefile.in	2016-03-17 22:11:48.000000000 +0000
++++ src/filemanager/Makefile.in	2016-03-17 22:23:12.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/man2hlp/Makefile.in src/man2hlp/Makefile.in
+--- src/man2hlp/Makefile.in	2016-03-17 22:11:48.000000000 +0000
++++ src/man2hlp/Makefile.in	2016-03-17 22:23:12.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/subshell/Makefile.in src/subshell/Makefile.in
+--- src/subshell/Makefile.in	2016-03-17 22:11:48.000000000 +0000
++++ src/subshell/Makefile.in	2016-03-17 22:23:12.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/Makefile.in src/vfs/Makefile.in
+--- src/vfs/Makefile.in	2016-03-17 22:11:48.000000000 +0000
++++ src/vfs/Makefile.in	2016-03-17 22:23:12.000000000 +0000
+@@ -131,6 +131,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/cpio/Makefile.in src/vfs/cpio/Makefile.in
+--- src/vfs/cpio/Makefile.in	2016-03-17 22:11:48.000000000 +0000
++++ src/vfs/cpio/Makefile.in	2016-03-17 22:23:13.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/extfs/Makefile.in src/vfs/extfs/Makefile.in
+--- src/vfs/extfs/Makefile.in	2016-03-17 22:11:48.000000000 +0000
++++ src/vfs/extfs/Makefile.in	2016-03-17 22:23:13.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/extfs/helpers/Makefile.in src/vfs/extfs/helpers/Makefile.in
+--- src/vfs/extfs/helpers/Makefile.in	2016-03-17 22:11:49.000000000 +0000
++++ src/vfs/extfs/helpers/Makefile.in	2016-03-17 22:23:13.000000000 +0000
+@@ -114,6 +114,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/fish/Makefile.in src/vfs/fish/Makefile.in
+--- src/vfs/fish/Makefile.in	2016-03-17 22:11:49.000000000 +0000
++++ src/vfs/fish/Makefile.in	2016-03-17 22:23:13.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/fish/helpers/Makefile.in src/vfs/fish/helpers/Makefile.in
+--- src/vfs/fish/helpers/Makefile.in	2016-03-17 22:11:49.000000000 +0000
++++ src/vfs/fish/helpers/Makefile.in	2016-03-17 22:23:13.000000000 +0000
+@@ -114,6 +114,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/ftpfs/Makefile.in src/vfs/ftpfs/Makefile.in
+--- src/vfs/ftpfs/Makefile.in	2016-03-17 22:11:49.000000000 +0000
++++ src/vfs/ftpfs/Makefile.in	2016-03-17 22:23:13.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/local/Makefile.in src/vfs/local/Makefile.in
+--- src/vfs/local/Makefile.in	2016-03-17 22:11:49.000000000 +0000
++++ src/vfs/local/Makefile.in	2016-03-17 22:23:14.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/sfs/Makefile.in src/vfs/sfs/Makefile.in
+--- src/vfs/sfs/Makefile.in	2016-03-17 22:11:49.000000000 +0000
++++ src/vfs/sfs/Makefile.in	2016-03-17 22:23:14.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/sftpfs/Makefile.in src/vfs/sftpfs/Makefile.in
+--- src/vfs/sftpfs/Makefile.in	2016-03-17 22:11:50.000000000 +0000
++++ src/vfs/sftpfs/Makefile.in	2016-03-17 22:23:14.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/smbfs/Makefile.in src/vfs/smbfs/Makefile.in
+--- src/vfs/smbfs/Makefile.in	2016-03-17 22:11:50.000000000 +0000
++++ src/vfs/smbfs/Makefile.in	2016-03-17 22:23:14.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/tar/Makefile.in src/vfs/tar/Makefile.in
+--- src/vfs/tar/Makefile.in	2016-03-17 22:11:50.000000000 +0000
++++ src/vfs/tar/Makefile.in	2016-03-17 22:23:14.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/vfs/undelfs/Makefile.in src/vfs/undelfs/Makefile.in
+--- src/vfs/undelfs/Makefile.in	2016-03-17 22:11:50.000000000 +0000
++++ src/vfs/undelfs/Makefile.in	2016-03-17 22:23:14.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu src/viewer/Makefile.in src/viewer/Makefile.in
+--- src/viewer/Makefile.in	2016-03-17 22:11:50.000000000 +0000
++++ src/viewer/Makefile.in	2016-03-17 22:23:15.000000000 +0000
+@@ -113,6 +113,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/Makefile.in tests/Makefile.in
+--- tests/Makefile.in	2016-03-17 22:11:50.000000000 +0000
++++ tests/Makefile.in	2016-03-17 22:23:15.000000000 +0000
+@@ -112,6 +112,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/lib/Makefile.in tests/lib/Makefile.in
+--- tests/lib/Makefile.in	2016-03-17 22:11:51.000000000 +0000
++++ tests/lib/Makefile.in	2016-03-17 22:23:15.000000000 +0000
+@@ -118,6 +118,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/lib/mcconfig/Makefile.in tests/lib/mcconfig/Makefile.in
+--- tests/lib/mcconfig/Makefile.in	2016-03-17 22:11:51.000000000 +0000
++++ tests/lib/mcconfig/Makefile.in	2016-03-17 22:23:15.000000000 +0000
+@@ -114,6 +114,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/lib/search/Makefile.in tests/lib/search/Makefile.in
+--- tests/lib/search/Makefile.in	2016-03-17 22:11:51.000000000 +0000
++++ tests/lib/search/Makefile.in	2016-03-17 22:23:15.000000000 +0000
+@@ -118,6 +118,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/lib/strutil/Makefile.in tests/lib/strutil/Makefile.in
+--- tests/lib/strutil/Makefile.in	2016-03-17 22:11:51.000000000 +0000
++++ tests/lib/strutil/Makefile.in	2016-03-17 22:23:16.000000000 +0000
+@@ -114,6 +114,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/lib/vfs/Makefile.in tests/lib/vfs/Makefile.in
+--- tests/lib/vfs/Makefile.in	2016-03-17 22:11:52.000000000 +0000
++++ tests/lib/vfs/Makefile.in	2016-03-17 22:23:16.000000000 +0000
+@@ -124,6 +124,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/lib/widget/Makefile.in tests/lib/widget/Makefile.in
+--- tests/lib/widget/Makefile.in	2016-03-17 22:11:52.000000000 +0000
++++ tests/lib/widget/Makefile.in	2016-03-17 22:23:16.000000000 +0000
+@@ -114,6 +114,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/src/Makefile.in tests/src/Makefile.in
+--- tests/src/Makefile.in	2016-03-17 22:11:52.000000000 +0000
++++ tests/src/Makefile.in	2016-03-17 22:23:16.000000000 +0000
+@@ -120,6 +120,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/src/editor/Makefile.in tests/src/editor/Makefile.in
+--- tests/src/editor/Makefile.in	2016-03-17 22:11:52.000000000 +0000
++++ tests/src/editor/Makefile.in	2016-03-17 22:23:17.000000000 +0000
+@@ -117,6 +117,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \
+diff -rNu tests/src/filemanager/Makefile.in tests/src/filemanager/Makefile.in
+--- tests/src/filemanager/Makefile.in	2016-03-17 22:11:52.000000000 +0000
++++ tests/src/filemanager/Makefile.in	2016-03-17 22:23:17.000000000 +0000
+@@ -119,6 +119,7 @@
+ 	$(top_srcdir)/m4.include/dx_doxygen.m4 \
+ 	$(top_srcdir)/m4.include/mc-cflags.m4 \
+ 	$(top_srcdir)/m4.include/mc-check-search-type.m4 \
++	$(top_srcdir)/m4.include/mode_t.m4 \
+ 	$(top_srcdir)/m4.include/ls-mntd-fs.m4 \
+ 	$(top_srcdir)/m4.include/fstypename.m4 \
+ 	$(top_srcdir)/m4.include/fsusage.m4 \