Merge branch 'master' of https://github.com/adamyg/mcwin32

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
     steps:
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Checkout submodules
       run: |
@@ -54,7 +54,9 @@ jobs:
       run: |
         c:\msys64\usr\bin\pacman --noconfirm -S base-devel
         c:\msys64\usr\bin\pacman --noconfirm -S mingw-w64-x86_64-gcc
+        c:\msys64\usr\bin\pacman --noconfirm -S mingw-w64-x86_64-gettext-tools
         c:\msys64\usr\bin\pacman --noconfirm -S mingw-w64-i686-gcc
+        c:\msys64\usr\bin\pacman --noconfirm -S mingw-w64-i686-gettext-tools
         dir c:\msys64\usr\bin
 
     - name: OpenWatcom setup
@@ -64,36 +66,45 @@ jobs:
         version: "2.0"
         location: "C:\\Watcom"
 
+    - name: Windows extra
+      if: startsWith(matrix.config.name, 'Windows Latest MSVC') || startsWith(matrix.config.name, 'Windows Latest OWC')
+      run: |
+        c:\msys64\usr\bin\pacman --noconfirm -S mingw-w64-x86_64-gettext-tools
+
     - name: Generate
       if: startsWith(matrix.config.name, 'Windows Latest')
       shell: cmd
       run: |
         @if "${{ matrix.config.toolchain }}"=="mingw32" set PATH=c:\msys64\mingw32\bin;%PATH%
         @if "${{ matrix.config.toolchain }}"=="mingw64" set PATH=c:\msys64\mingw64\bin;%PATH%
-        @if "${{ matrix.config.toolchain }}"=="owc20"  call .\mcwin32\support\owc20setenv.bat C:\Watcom
+        @if "${{ matrix.config.toolchain }}"=="owc20"   call .\mcwin32\support\owc20setenv.bat C:\Watcom
+        @set BUSYBOX=./support/busybox
+        @if "${{ matrix.config.toolchain }}"=="mingw64" set BUSYBOX=./support/busybox64
         @set PERL=c:/Strawberry/perl/bin/perl
         cd mcwin32
-        c:/Strawberry/perl/bin/perl makelib.pl --perlpath=c:/Strawberry/perl/bin --busybox=./support/busybox --verbose "${{ matrix.config.toolchain }}"
+        c:/Strawberry/perl/bin/perl makelib.pl --perlpath=c:/Strawberry/perl/bin --busybox=%BUSYBOX% --verbose "${{ matrix.config.toolchain }}"
 
     - name: Compile
       if: startsWith(matrix.config.name, 'Windows Latest')
       shell: cmd
       run: |
         @if "${{ matrix.config.toolchain }}"=="mingw32" set PATH=c:\msys64\mingw32\bin;%PATH%
         @if "${{ matrix.config.toolchain }}"=="mingw64" set PATH=c:\msys64\mingw64\bin;%PATH%
-        @if "${{ matrix.config.toolchain }}"=="owc20"  call .\mcwin32\support\owc20setenv.bat C:\Watcom
+        @if "${{ matrix.config.toolchain }}"=="owc20"   call .\mcwin32\support\owc20setenv.bat C:\Watcom
+        @if "${{ matrix.config.toolchain }}"=="owc20"   set PATH=%PATH%;c:\msys64\mingw64\bin
+        @if "${{ matrix.config.toolchain }}"=="vc2022"  set PATH=%PATH%;c:\msys64\mingw64\bin
         @set PERL=c:/Strawberry/perl/bin/perl
         cd mcwin32
         .\support\gmake-42 release build
 
     - name: Package
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: package-${{ matrix.config.toolchain }}
         path: mcwin32/bin.${{ matrix.config.toolversion }}/release/*
 
     - name: Installer
-      if: startsWith(matrix.config.name, 'Windows Latest MSVC')
+      if: startsWith(matrix.config.name, 'Windows Latest MSVC') || startsWith(matrix.config.name, 'Windows Latest OWC')
       shell: cmd
       run: |
         @set PERL=c:/Strawberry/perl/bin/perl
@@ -103,9 +114,9 @@ jobs:
         "%programfiles(x86)%\Inno Setup 5\ISCC" -DBUILD_INFO=1 -DBUILD_TYPE=release ".\releases\mc-inno-setup.iss"
 
     - name: Release artifacts
-      if: startsWith(matrix.config.name, 'Windows Latest MSVC')
+      if: startsWith(matrix.config.name, 'Windows Latest MSVC') || startsWith(matrix.config.name, 'Windows Latest OWC')
       uses: softprops/action-gh-release@v1
       with:
         files: ./mcwin32/releases/mcwin32-build*-setup.exe
         draft: true
-        
+

mcsrc/configure.ac

@@ -654,8 +654,8 @@ src/vfs/extfs/helpers/uwim
 src/vfs/extfs/helpers/uzip
 src/vfs/extfs/helpers/uzoo
 
-src/vfs/fish/Makefile
-src/vfs/fish/helpers/Makefile
+src/vfs/shell/Makefile
+src/vfs/shell/helpers/Makefile
 
 src/vfs/ftpfs/Makefile
 

mcsrc/doc/FAQ

@@ -152,7 +152,7 @@ Frequently Asked Questions
    You need a POSIX (Unix compatible) operating system.  If you are
    running Windows, use Cygwin.
 
-   To compile any edition you need to have glib >= 2.30  installed.
+   To compile any edition you need to have glib >= 2.32  installed.
    It's available at https://download.gnome.org/sources/glib/.
 
    If you want to use mouse on the Linux console you need the gpm daemon

mcsrc/doc/HACKING

@@ -19,7 +19,7 @@ required:
 Autoconf 2.64 and above (latest is recommended)
 Automake 1.12 and above (latest is recommended)
 Gettext 0.18.2 and above
-Glib 2.30 and above
+Glib 2.32 and above
 
 Full list of requirements you can see at:
 https://www.midnight-commander.org/wiki/doc/buildAndInstall/req

mcsrc/doc/INSTALL

@@ -15,7 +15,7 @@ Build requirements for GNU Midnight Commander
 - autoconf >= 2.64
 - automake >= 1.12
 - libtool
-- glib2 >= 2.30
+- glib2 >= 2.32
 - slang2 or ncurses
 - gettext >= 0.18.2
 - libssh2 >= 1.2.8 is required only for sftp vfs
@@ -171,9 +171,9 @@ VFS options:
      (on by default)
      Support for FTP vfs
 
-`--enable-vfs-fish'
+`--enable-vfs-shell'
      (on by default)
-     Support for FISH vfs
+     Support for SHELL vfs
 
 `--enable-vfs-sftp'
      (auto)
@@ -367,8 +367,8 @@ get glib from
 
 ftp://ftp.gnome.org/pub/gnome/sources/glib/
 
-Minimal version of glib: 2.30.0
-Recommended version: 2.30.x and higher.
+Minimal version of glib: 2.32.0
+Recommended version: 2.32.x and higher.
 
 Newer versions may work, but haven't been tested.
 

mcsrc/doc/NEWS

@@ -1,3 +1,36 @@
+Version 4.8.31
+
+- Core
+
+  * Minimal version of GLib is 2.32.0.
+
+- VFS
+
+  * fish: drop support of native FISH server and protocol. Rename VFS to shell (#4232)
+  * extfs;
+    * uc1541 extfs: update up to 3.6 version (#4511)
+    * s3+: port to Python3 (#4324)
+  * Support for LZO/LZOP compression format (#4509)
+
+- Misc
+
+  * Skins: add color for non-printable characters in editor (#4433)
+
+- Fixes
+
+  * FTBFS on FreeBSD with ext2fs attribute support (#4493)
+  * Broken stickchars (-a) mode (#4498)
+  * Wrong timestamp after resuming of file copy operation (#4499)
+  * Editor: wrong deletion of marked column (#3761)
+  * Diff viewer: segfault when display of line numbers is enabled (#4500)
+  * Tar VFS: broken handling of hard links (#4494)
+  * Sftp VFS: failure establishing SSH session due hashed host names in ~/.ssh/known_hosts (#4506)
+  * Shell VFS: incorrect file names with cyrillic or diacritic symbols (#4507)
+  * mc.ext.ini: incorrect description of of how multiple sections and keys with same names are processed (#4497)
+  * mc.ext.ini: unescaped backslash \ is treated as invalid escape sequence in glib-2.77.3 and glib-2.79 (#4502)
+  * mc.ext.ini: file "Makefile.zip" is handled as Makefile not as zip-arhive (#4419)
+
+
 Version 4.8.30
 
 - Core

mcsrc/doc/README

@@ -128,7 +128,7 @@ These are hints for the text mode edition:
 
 * The Virtual File System is a cute addition to the project, you may
   browse in tar and compressed tar files as well as browsing remote
-  machines with the fish file system.
+  machines with the shell file system.
 
 * Please read the manual page.
 

mcsrc/doc/TODO

@@ -73,7 +73,7 @@ window title.
 Better date parser - don't allow seconds and year in ftp listings on the
 same line.
 
-Report errors in fish operations and recover from them.
+Report errors in shell operations and recover from them.
 
 Allow colors to be defined in the mc.lib file.  Make it possible to
 avoid using a super-long line to redefine all colors.
@@ -82,7 +82,7 @@ Filters in the editor should operate on the open file - don't close and
 reopen the file.  They don't work on VFS now.  For example, a gzipped
 files on FTP cannot be edited.
 
-ftp and fish with home != '/' - readjust directory to the home.
+ftp and shell with home != '/' - readjust directory to the home.
 
 Make "Find File" dialog more responsive.  Keep state in a structure and
 preserve it when the search is suspended.

mcsrc/doc/hints/l10n/mc.hint.be

@@ -1,10 +1,10 @@
-Падказка. «C-x t» перапісвае ў загадны радок назвы пазначаных файлаў.
+Падказка. «C-x t» перапісвае ў камандны радок назвы пазначаных файлаў.
 
-Падказка. «C-x p» перапісвае у загадны радок дзейны шлях.
+Падказка. «C-x p» перапісвае у камандны радок дзейны шлях.
 
 Падказка. «M-Tab» ці «Esc+Tab» дапаўняе набранае. Каб убачыць сьпіс, націсьніце двойчы.
 
-Падказка. «M-p» і «M-n» дае доступ да гісторыі загадаў.
+Падказка. «M-p» і «M-n» дае доступ да гісторыі каманд.
 
 Падказка. Трэба ўставіць знак літаральна? Цісьніце «Control-q» і знак.
 
@@ -36,7 +36,7 @@
 
 Падказка. Хочаце звычайную абалонку? Цісьніце «C-o», а каб вярнуцца — «C-o» яшчэ раз.
 
-Падказка. Каб хутчэй набіраць загады «cd …», вызначце зьменную «CDPATH».
+Падказка. Каб хутчэй набіраць каманды «cd …», вызначце зьменную «CDPATH».
 
 Падказка. Калі хочаце бачыць схаваныя файлы «.*», вызначце гэта ў «Настаўленьнях».
 
@@ -48,17 +48,17 @@
 
 Намінка. Шукаць файл: кнопка «На панэль» дазваляе працаваць са знойдзеным.
 
-Падказка. Калі патрэбны складаны пошук, ужывайце загад «На вонкавую панэль».
+Падказка. Калі патрэбны складаны пошук, ужывайце каманду «На вонкавую панэль».
 
-Падказка. Каб хутка зьмяніць каталёґ, калі набіраеце загад, цісьніце «M-c».
+Падказка. Каб хутка зьмяніць каталёґ, калі набіраеце каманду, цісьніце «M-c».
 
-Падказка: загады абалонкі могуць не працаваць на немясцовых файлавых сыстэмах.
+Падказка: каманды абалонкі могуць не працаваць на немясцовых файлавых сыстэмах.
 
 Падказка. «C-y» вяртае страчаны тэкст.
 
 Падказка. Пэўныя клявішы не працуюць? Зірніце «Налады» → «Вывучыць клявішы».
 
-Падказка. Каб пабачыць вывад загаду ў праглядніку, цісьніце «M-!»
+Падказка. Каб пабачыць вывад каманды ў праглядніку, цісьніце «M-!»
 
 Падказка. «F13» (або «Shift-F3») праглядае файл наўпрост.
 

mcsrc/doc/hints/l10n/mc.hint.ko

@@ -12,7 +12,7 @@
 
 힌트: 디렉터리 선택: 일치하는 패턴의 끝에 슬래시를 추가합니다.
 
-힌트: 터미널에 기능 키가 없는 경우 ESC+숫자 시퀀스를 사용합니다.
+힌트: 터미널에 기능 키가 없으면 ESC+숫자 시퀀스를 사용합니다.
 
 힌트: GNU 미드나잇 커맨더 홈페이지: https://www.midnight-commander.org
 
@@ -22,7 +22,7 @@
 
 힌트: VFS cool: tar 파일을 입력하여 내용을 검토합니다.
 
-힌트 : 우리는 또한 멋진 매뉴얼 페이지를 가지고 있습니다.
+힌트 : 멋진 매뉴얼 페이지도 있습니다.
 
 힌트 : Lynx 스타일 탐색을 원하십니까? 구성 대화 상자에서 설정하십시오.
 
@@ -44,7 +44,7 @@
 
 힌트: 완성은 모든 대화 상자의 모든 입력 라인에서 작동합니다. M-Tab을 누르면 됩니다.
 
-힌트: 느린 터미널에서 -s 플래그가 도움이 될 수 있습니다.
+힌트: 느린 터미널에는 -s 플래그가 도움이 될 수 있습니다.
 
 힌트 : 파일 찾기 : 패널 크기조정 버튼을 사용하여 찾은 파일을 작업할 수 있습니다.
 

mcsrc/doc/man/es/mc.1.in

@@ -3405,8 +3405,8 @@ de error: errdfocus, errdhotnormal, errdhotfocus, errdtitle; los colores
 de la ayuda: helpnormal, helpitalic, helpbold, helplink, helpslink,
 helptitle; los colores del visor: viewnormal, viewbold, viewunderline,
 viewselected; loc colores del editor: editnormal, editbold, editmarked,
-editwhitespace, editlinestate; los colores de los menús desplegables:
-pmenunormal, pmenusel, pmenutitle.
+editwhitespace, editnonprintable, editlinestate; los colores de los menús
+desplegables: pmenunormal, pmenusel, pmenutitle.
 .PP
 .I header
 determina el color del encabezado de los paneles, la línea con los

mcsrc/doc/man/hu/mc.1.in

@@ -2869,7 +2869,7 @@ dhotnormal, dhotfocus; Súgó színek: helpnormal, helpitalic, helpbold,
 helplink, helpslink; Fájlnéző színek: viewunderline; Speciális kijelölés
 színei: executable, directory, link, stalelink, device, special, core;
 Viewer colors are: viewnormal, viewbold, viewunderline, viewselected.
-Szerkesztő színei: editnormal, editbold, editmarked.
+Szerkesztő színei: editnormal, editbold, editmarked, editnonprintable.
 .PP
 .I input
 maghatározza a beviteli sorok színét a dialogus ablakora vonatkozóan.

mcsrc/doc/man/it/mc.1.in

@@ -2881,7 +2881,7 @@ Il colore del visualizzatore è: viewunderline.
 Colori speciali di evidenziazione: executable, directory, link, device, 
 special, core.
 I colori dell'viewer sono: viewnormal, viewbold, viewunderline, viewselected.
-I colori dell'editor sono: editnormal, editbold, editmarked.
+I colori dell'editor sono: editnormal, editbold, editmarked, editnonprintable.
 .PP
 .I input 
 determina il colore delle righe di input usate delle finestre di dialogo.

mcsrc/doc/man/mc.1.in

@@ -3138,7 +3138,7 @@ used to manipulate tar and compressed tar files; the
 .IR undelfs ,
 used to recover deleted files on ext2 file systems (the default file
 system for Linux systems),
-.I fish
+.I shell
 (for manipulating files over shell connections such as rsh and ssh).
 If the code was compiled with
 .I sftpfs
@@ -3225,10 +3225,9 @@ Examples:
 The latter specifies the full path of the tar archive.
 .\"NODE "  FIle transfer over SHell filesystem"
 .SH "  FIle transfer over SHell filesystem"
-The fish file system is a network based file system that allows you to
+The shell file system is a network based file system that allows you to
 manipulate the files in a remote machine as if they were local. To use
-this, the other side has to either run fish server, or has to have
-bash\-compatible shell.
+this, the other side has to have bash\-compatible shell.
 .PP
 To connect to a remote machine, you just need to chdir
 into a special directory which name is in the following
@@ -3514,8 +3513,8 @@ dhotnormal, dhotfocus, dtitle. Error dialog colors are: errdfocus, errdhotnormal
 errdhotfocus, errdtitle.  Help colors are: helpnormal, helpitalic, helpbold,
 helplink, helpslink, helptitle.  Viewer colors are: viewnormal, viewbold,
 viewunderline, viewselected. Editor colors are: editnormal, editbold, editmarked,
-editwhitespace, editlinestate. Popup menu colors are: pmenunormal, pmenusel,
-pmenutitle.
+editwhitespace, editnonprintable, editlinestate. Popup menu colors are: pmenunormal,
+pmenusel, pmenutitle.
 .PP
 .I header
 determines the color of panel header, the line that contains column titles
@@ -4095,7 +4094,7 @@ If this variable is on (default is off) when you browse the file system
 on a Tree panel, it will automatically reload the other panel with the
 contents of the selected directory.
 .TP
-.I fish_directory_timeout
+.I shell_directory_timeout
 This variable holds the lifetime of a directory cache entry in seconds. The
 default value is 900 seconds.
 .TP

mcsrc/doc/man/pl/mc.1.in

@@ -2542,8 +2542,8 @@ dhotfocus; Kolory pomocy: helpnormal, helpitalic, helpbold, helplink,
 helpslink; Kolory podglądu: viewunderline; Specjalne tryby podświetlenia:
 executable, directory, link, device, special. Viewer colors are: viewnormal,
 viewbold, viewunderline, viewselected. Editor colors are: editnormal, editbold,
-editmarked, editwhitespace, editlinestate. Popup menu colors are: pmenunormal,
-pmenusel, pmenutitle.
+editmarked, editwhitespace, editnonprintable, editlinestate. Popup menu colors
+are: pmenunormal, pmenusel, pmenutitle.
 [nie tłumaczyłem nazw z racji tego, że trzeba je stosować w ich angielskim
 brzmieniu \- jeśli jesteś aż tak zaawansowany, użyj słownika].
 .PP