4.8.33 (#113)

* #113 - legacy owc
* #114 - warnings
* #115 - widechar handling

Author: adamyg

.github/workflows/build.yml

@@ -32,6 +32,12 @@ jobs:
            toolchain: owc20,
            toolversion: owc20
           }
+        - {
+           name: "Windows Legacy OWC",
+           os: windows-latest,
+           toolchain: owc19,
+           toolversion: owc19
+          }
 
     steps:
 
@@ -66,32 +72,42 @@ jobs:
         version: "2.0"
         location: "C:\\Watcom"
 
+    - name: OpenWatcom legacy setup
+      uses: open-watcom/setup-watcom@v0
+      if: startsWith(matrix.config.name, 'Windows Legacy OWC')
+      with:
+        version: "1.9"
+        location: "C:\\Watcom"
+
     - name: Windows extra
-      if: startsWith(matrix.config.name, 'Windows Latest MSVC') || startsWith(matrix.config.name, 'Windows Latest OWC')
+      if: contains(matrix.config.name, 'MSVC') || contains(matrix.config.name, 'OWC')
       run: |
         c:\msys64\usr\bin\pacman --noconfirm -S mingw-w64-x86_64-gettext-tools
 
     - name: Generate
-      if: startsWith(matrix.config.name, 'Windows Latest')
+      if: startsWith(matrix.config.name, 'Windows')
       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 }}"=="owc19"   call .\mcwin32\support\owc19setenv.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=%BUSYBOX% --verbose "${{ matrix.config.toolchain }}"
+        c:/Strawberry/perl/bin/perl makelib.pl --perlpath=c:/Strawberry/perl/bin --busybox=%BUSYBOX% "${{ matrix.config.toolchain }}"
 
     - name: Compile
-      if: startsWith(matrix.config.name, 'Windows Latest')
+      if: startsWith(matrix.config.name, 'Windows')
       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"   set PATH=%PATH%;c:\msys64\mingw64\bin
+        @if "${{ matrix.config.toolchain }}"=="owc19"   call .\mcwin32\support\owc19setenv.bat C:\Watcom
+        @if "${{ matrix.config.toolchain }}"=="owc19"   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
@@ -104,6 +120,7 @@ jobs:
         path: mcwin32/bin.${{ matrix.config.toolversion }}/release/*
 
     - name: Installer
+      if: startsWith(matrix.config.name, 'Windows')
       shell: cmd
       run: |
         @set PERL=c:/Strawberry/perl/bin/perl
@@ -113,6 +130,7 @@ 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')
       uses: softprops/action-gh-release@v1
       with:
         files: ./mcwin32/releases/mcwin32-build*-setup.exe

mcsrc/src/main.c

@@ -269,6 +269,10 @@ main (int argc, char *argv[])
     int exit_code = EXIT_FAILURE;
     const char *tmpdir = NULL;
 
+#if defined(WIN32)
+    WIN32_HeapInit ();
+#endif
+
     mc_global.run_from_parent_mc = !check_sid ();
 
     /* We had LC_CTYPE before, LC_ALL includes LC_TYPE as well */
@@ -590,7 +594,12 @@ main (int argc, char *argv[])
         exit_code = EXIT_FAILURE;
     }
 
-    (void) putchar ('\n');      /* Hack to make shell's prompt start at left of screen */
+    (void) putchar ('\n');    
+    /* Hack to make shell's prompt start at left of screen */
+
+#if defined(WIN32)
+    WIN32_HeapCheck ();
+#endif
 
     return exit_code;
 }

mcsrc/src/subshell/common.c

@@ -315,8 +315,11 @@ init_subshell_child (const char *pty_name)
     {
         char sid_str[BUF_SMALL];
 
-        g_snprintf (sid_str, sizeof (sid_str), "MC_SID=%ld", (long) mc_sid);
-        putenv (g_strdup (sid_str));
+      //WIN32,setenv
+      //g_snprintf (sid_str, sizeof (sid_str), "MC_SID=%ld", (long) mc_sid);
+      //putenv (g_strdup (sid_str));
+        g_snprintf (sid_str, sizeof (sid_str), "%ld", (long) mc_sid);
+        g_setenv ("MC_SID", sid_str);
     }
 
     switch (mc_global.shell->type)
@@ -334,7 +337,9 @@ init_subshell_child (const char *pty_name)
 
         /* Make MC's special commands not show up in bash's history and also suppress
          * consecutive identical commands*/
-        putenv ((char *) "HISTCONTROL=ignoreboth");
+      //WIN32,setenv
+      //putenv ((char *) "HISTCONTROL=ignoreboth");
+        g_setenv ("HISTCONTROL", "ignoreboth");
 
         /* Allow alternative readline settings for MC */
         {
@@ -382,7 +387,9 @@ init_subshell_child (const char *pty_name)
         g_setenv ("ENV", init_file, FALSE);
 
         /* Make MC's special commands not show up in history */
-        putenv ((char *) "HISTCONTROL=ignorespace");
+      //WIN32,setenv
+      //putenv ((char *) "HISTCONTROL=ignorespace");
+        g_setenv ("HISTCONTROL", "ignorespace");
 
         break;
 

mcsrc/src/vfs/shell/shell.c

@@ -1015,7 +1015,7 @@ shell_dir_load (struct vfs_class *me, struct vfs_s_inode *dir, const char *remot
 
     vfs_print_message (_("shell: Reading directory %s..."), remote_path);
 
-    dir->timestamp = g_get_monotonic_time () + shell_directory_timeout * G_USEC_PER_SEC;
+    dir->timestamp = g_get_monotonic_time () + ((gint64)shell_directory_timeout * G_USEC_PER_SEC);
 
     quoted_path = str_shell_escape (remote_path);
     (void) shell_command_v (me, super, NONE, SHELL_SUPER (super)->scr_ls, "SHELL_FILENAME=%s;\n",