Merge pull request #243 from davidrg/ck-prebeta11

Merge in latest pre-beta.11 code from 6 February 2024
davidrg · Feb 16, 2024 · 99a4d3a · 99a4d3a
2 parents 321386f + 2564fc7
commit 99a4d3a
Show file tree

Hide file tree

Showing 23 changed files with 5,242 additions and 269 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,8 +46,10 @@ env:
   # along with its version. The version is only used as a cache key to ensure
   # we're not hammering the kermit website or fetching code thats newer than
   # what CKW is currently based on.
-  C_KERMIT_VERSION: 10.0b10
-  C_KERMIT_CODE: https://www.kermitproject.org/ftp/kermit/test/tar/x.tar.gz
+  C_KERMIT_VERSION: 10.0prebeta11
+  #C_KERMIT_CODE: https://www.kermitproject.org/ftp/kermit/test/tar/x.tar.gz
+  C_KERMIT_CODE: https://kermitproject.org/ftp/kermit/pretest/x.tar.gz
+
 
 jobs:
   Get-CACerts-Bundle:
@@ -117,6 +119,35 @@ jobs:
             ssh-readme.html
           retention-days: 1
 
+  Build-Wart:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Enable Developer Command Prompt
+        # You may pin to the exact commit or the version.
+        # uses: ilammy/msvc-dev-cmd@d8610e2b41c6d0f0c3b4c46dad8df0fd826c68e1
+        uses: ilammy/msvc-dev-cmd@v1.12.0
+        with:
+          arch: x86
+          toolset: 14.3
+      - name: Build ckwart
+        run: |
+          call ..\..\setenv.bat
+          nmake /nologo /e /f ckoker.mak ckwart.exe
+          if not exist ckwart.exe exit /b 1
+          move ckwart.exe ..\..\ckwart.exe
+        shell: cmd
+        working-directory: ${{ github.workspace }}\kermit\k95\
+        env:
+          ROOT: ${{ github.workspace }}
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3.1.1
+        with:
+          name: wart-x86
+          path: ${{ github.workspace }}\ckwart.exe
+          if-no-files-found: error
+          retention-days: 1
+
   ##############################################################################
   # Build with Visual C++ 14.x (2015/2017/2019/2022)                           #
   ##############################################################################
@@ -125,7 +156,7 @@ jobs:
   # and ARM64.
   Build-VisualCxx:
     runs-on: windows-latest
-    needs: [Get-CACerts-Bundle, Prepare-Docs]
+    needs: [Get-CACerts-Bundle, Prepare-Docs, Build-Wart]
     strategy:
       matrix:
         arch:
@@ -378,6 +409,13 @@ jobs:
         cd libdes\
         call mknt.bat
 
+    - name: Fetch x86 wart
+      uses: actions/download-artifact@v3
+      if: matrix.arch != 'x86' && matrix.arch != 'x64'
+      with:
+        name: wart-x86
+        path: ${{ github.workspace }}
+
       ##########################################################################
       # Build K95, K95G and other bits for redistribution                      #
       ##########################################################################
@@ -393,6 +431,13 @@ jobs:
         set PATH=%PATH%;${{github.workspace}}\tools\jom
         set MAKE=jom
         
+        REM If the target arch is incompatible with the host arch, use
+        REM the x86 version of ckwart.exe which should have been placed
+        REM in the workplace previously, rather than trying to use a
+        REM version of wart built for the target architecture.
+        if "%CKB_CROSS_COMPATIBLE%" == "no" set CKB_USE_WART=yes
+        if "%CKB_CROSS_COMPATIBLE%" == "no" set WART=${{github.workspace}}\ckwart.exe
+        
         cd p95
         call mknt.bat
         cd ..\k95
@@ -462,7 +507,7 @@ jobs:
   # OpenSSL 1.1.1t is supported however.
   Build-PSDK71:
     runs-on: windows-latest
-    needs: [Get-CACerts-Bundle, Prepare-Docs]
+    needs: [Get-CACerts-Bundle, Prepare-Docs, Build-Wart]
     strategy:
       matrix:
         arch:
@@ -631,6 +676,13 @@ jobs:
           cd libdes
           call mknt.bat
 
+      - name: Fetch x86 wart
+        uses: actions/download-artifact@v3
+        if: matrix.arch == 'ia64'
+        with:
+          name: wart-x86
+          path: ${{ github.workspace }}
+
         ##########################################################################
         # Build K95, K95G and other bits for redistribution                      #
         ##########################################################################
@@ -647,6 +699,9 @@ jobs:
           set PATH=%PATH%;${{github.workspace}}\tools\jom
           set MAKE=jom
           
+          if "%CKB_CROSS_COMPATIBLE%" == "no" set CKB_USE_WART=yes
+          if "%CKB_CROSS_COMPATIBLE%" == "no" set WART=${{github.workspace}}\ckwart.exe
+          
           echo Run Build...
           cd kermit\p95
           call mknt.bat
@@ -1459,7 +1514,7 @@ jobs:
   #
   Build-PSDK2003SP1-IA64:
     runs-on: windows-latest
-    needs: Prepare-Docs
+    needs: [Prepare-Docs, Build-Wart]
 
     steps:
       - uses: actions/checkout@v3
@@ -1518,6 +1573,13 @@ jobs:
           del *.gz
           cd ..
         shell: powershell
+
+      - name: Fetch x86 wart
+        uses: actions/download-artifact@v3
+        with:
+          name: wart-x86
+          path: ${{ github.workspace }}
+
       - name: Full Build
         run: |
           Set PATH=%VCT2003%\bin\win64;%VCT2003%\bin;%PATH%
@@ -1529,6 +1591,11 @@ jobs:
           
           call setenv.bat
           
+          REM Use the supplied x86 build of wart rather than building it for
+          REM itanium then fail to run it on the not-itanium build host
+          set CKB_USE_WART=yes
+          set WART=${{github.workspace}}\ckwart.exe
+          
           set PATH=%PATH%;${{github.workspace}}\tools\jom
           set MAKE=jom
 

diff --git a/kermit/k95/README.TXT b/kermit/k95/README.TXT
@@ -1,9 +1,9 @@
 C-KERMIT 10.0 DEVELOPMENT
 
-C-Kermit 10.0 pre-Beta.10 25 June 2023
+C-Kermit 10.0 pre-Beta.11 16 September 2023...
 
-Various fixes and a great deal of "compliance" issues
-addressed.  For details see:
+From David Goodwin: several hundred compiler warnings when 
+building for Windows with OpenWatcom 1.9 fixed; for details see:
 
   https://www.kermitproject.org/ckupdates.html 
 

diff --git a/kermit/k95/ck_ssl.c b/kermit/k95/ck_ssl.c
@@ -1,4 +1,4 @@
-char *cksslv = "SSL/TLS support, 10.0.238 03 May 2023";
+char *cksslv = "SSL/TLS support, 10.0.239 18 Sep 2023";
 /*
   C K _ S S L . C --  OpenSSL Interface for C-Kermit
 
@@ -1172,9 +1172,9 @@ int keylength;
 static void
 ssl_display_comp(SSL * ssl)
 {
-    #ifndef OPENSSL_NO_COMP
+#ifndef OPENSSL_NO_COMP
     const COMP_METHOD *method;
-    #endif
+#endif  /* OPENSSL_NO_COMP */
 
     if ( quiet )			/* fdc - Mon Nov 28 11:44:15 2005 */
         return;

diff --git a/kermit/k95/ckcdeb.h b/kermit/k95/ckcdeb.h
@@ -3,6 +3,7 @@
 /*
   For recent additions search below for "2021" and "2022" and "2023".
   Most recent updates: Sat Jul  1 10:27:16 2023 (David Goodwin, fdc)
+  More recent: Sun Feb  4 20:17:33 2024 (removed prototypes for malloc())
 
   NOTE TO CONTRIBUTORS: This file, and all the other C-Kermit files, must be
   compatible with C preprocessors that support only #ifdef, #else, #endif,
@@ -399,6 +400,9 @@
 #ifndef BSD4
 #define BSD4
 #endif /* BSD4 */
+#ifndef BIGBUFOK
+#define BIGBUFOK
+#endif /* BIGBUFOK */
 #ifndef NOSETBUF
 #define NOSETBUF
 #endif /* NOSETBUF */
@@ -4884,6 +4888,10 @@ extern int errno;
 
 #ifdef sparc				/* SPARC processors */
 #define BIGBUFOK
+#else
+#ifdef SUNOS                            /* fdc 23 September 2023 */
+#define BIGBUFOK
+#endif /* SUNOS41 */
 #endif /* sparc */
 
 #ifdef mips				/* MIPS processors */
@@ -6325,6 +6333,8 @@ extern int _flsbuf(char c,FILE *stream);
 /*
   It is essential that these are declared correctly!
   Which is not always easy.  Take malloc() for instance ...
+  NOTE: there were a bunch of protypes here for malloc() here
+  before but why???  The specs come from the header files.
 */
 #ifdef PYRAMID
 #ifdef SVR4
@@ -6333,22 +6343,9 @@ extern int _flsbuf(char c,FILE *stream);
 #endif /* __STDC__ */
 #endif /* SVR4 */
 #endif /* PYRAMID */
-/*
-  Maybe some other environments need the same treatment for malloc.
-  If so, define SIZE_T_MALLOC for them here or in compiler CFLAGS.
-*/
-#ifdef SIZE_T_MALLOC
-_PROTOTYP( void * malloc, (size_t) );
-#else
-_PROTOTYP( char * malloc, (unsigned int) );
-#endif /* SIZE_T_MALLOC */
-
-_PROTOTYP( char * getenv, (char *) );
-_PROTOTYP( long atol, (char *) );
 #endif /* !MAC */
 #endif /* SUNOS41 */
 #endif /* CK_ANSILIBS */
-
 /*
   <sys/param.h> generally picks up NULL, MAXPATHLEN, and MAXNAMLEN
   and seems to present on all Unixes going back at least to SCO Xenix

diff --git a/kermit/k95/ckcfnp.h b/kermit/k95/ckcfnp.h
@@ -2,7 +2,7 @@
   ckcfnp.h, new to C-Kermit 10.0 as of 23 March 2023.
 
     Frank da Cruz
-    Most recent update: 27 June 2023 (locate_srv_dns())
+    Most recent update: 5 February 2024 (remove locate_srv_dns())
 
   Prototypes for functions that previously were not prototyped.
   Used only for ANSI-C builds in which __STDC__ is defined.
@@ -324,11 +324,6 @@ int isword( int );
 int keepalive( int, int );
 int litcmd( char **, char **dest, int );
 int lkup( char * );
-#ifndef NOLOCAL
-#ifndef NOTCPIP
-int locate_srv_dns( char *, char *, char *, struct sockaddr **, int * );
-#endif /* NOTCPIP */
-#endif /* NOLOCAL */
 int locate_txt_rr( char *, char *, char ** );
 int lookup( struct keytab [], char *, int, int * );
 int makebuf( int, int, CHAR [], struct pktinfo * );