sth fixes - one memory crash and some formatting and build options

.github/workflows/build.yml

@@ -15,10 +15,12 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - name: Configure
         run: |
           if [ "$RUNNER_OS" == "macOS" ]; then
-              brew install openssl
+              brew install openssl cyrus-sasl autoconf
               sudo ln -s /usr/local/opt/openssl /usr/local/openssl 
           fi
           sh bootstrap.sh

Makefile.in

@@ -249,8 +249,10 @@ lsort: libsnet/libsnet.la ${LSORT_OBJ}
 
 FRC :
 
+# build of universal library (lipo) fails on macOS if jobs > 1
+# Scott Hannahs <[email protected]>
 libsnet/libsnet.la : FRC
-	cd libsnet; ${MAKE}
+	cd libsnet; ${MAKE} -j 1
 
 VERSION=	$(shell date +%Y%m%d%H%M)
 DISTDIR=	radmind-${VERSION}
@@ -394,7 +396,7 @@ clean :
 	rm -rf tmp
 
 distclean: clean
-	rm -f config.log config.status Makefile config.h
-	rm -rf autom4te.cache
+	rm -f config.log config.status config.cache Makefile config.h configure
+	rm -rf autom4te.cache profiled
 	rm -rf .#*
 	cd libsnet; make distclean

README.md

@@ -90,16 +90,30 @@ brew install openssl
 sudo ln -s /usr/local/opt/openssl /usr/local/openssl 
 ```
 
-Last tested on 10.14 (using fink)
+Last tested on MacOS 13.6 (using fink)
 
 - Install [Xcode](https://developer.apple.com/xcode/).
 - Install [fink](https://finkproject.org).
 
-Run these commands as an admin user.
+Run these commands as and admin user.
 
+If making universal binaries -use lipo after fink, to create universal binaries, for libsasl2.3.dylib, libssl.1.1.dylib, and libcrypto.1.1.dylib)
+For example if you have another architecture mounted remotely
+```
+cd /opt/sw/lib
+sudo lipo -create -output libsasl2.3.dylib libsasl2.3.dylib /Volumes/<remote with other arch>/opt/sw/lib/libsasl2.3.dylib
 ```
-fink install autoconf
-fink install openssl
+Will create the library on the local volume for the libsasl, the other 2 libraries can be merged the same way.
+
+```
+fink install autoconf2.6 openssl110-dev cyrus-sasl2.3-dev
+
+cd libsnet
+autoconf
+cd ..
+autoconf
+./configure LDFLAGS='-L/opt/sw/lib -lsasl2' CFLAGS='-I/opt/sw/include' --with-zlib=/opt/sw/lib/ --enable-universal-binaries
+make all
 ```
 
 ### Configuring for Raspbian Stretch (Debian 9)

aclocal.m4

@@ -112,6 +112,13 @@ AC_DEFUN([CHECK_UNIVERSAL_BINARIES],
 	    LDFLAGS="$LDFLAGS -L/Developer/SDKs/$macosx_sdk/usr/lib"
 	    ;;
 
+	  darwin22*|darwin21*|darwin20*)
+	    dep_target="-mmacosx-version-min=10.9"
+	    arches="-arch x86_64 -arch arm64"
+	    macosx_sdk="`xcrun --show-sdk-path`"
+	    LDFLAGS="$LDFLAGS -L$macosx_sdk/usr/lib"
+	    ;;
+
 	  *)
             AC_MSG_ERROR([Building universal binaries on ${host_os} is not supported])
 	    ;;
@@ -120,7 +127,7 @@ AC_DEFUN([CHECK_UNIVERSAL_BINARIES],
 	echo ===========================================================
 	echo Setting up universal binaries for ${host_os}
 	echo ===========================================================
-	OPTOPTS="$OPTOPTS -isysroot /Developer/SDKs/$macosx_sdk $dep_target $arches"
+	OPTOPTS="$OPTOPTS -isysroot $macosx_sdk $dep_target $arches"
     fi
 ])
 

argcargv.c

@@ -45,6 +45,7 @@ acav_parse( ACAV *acav, char *line, char **argv[] )
 {
     int		ac;
     int		state;
+    char *      pline = line;
 
     if ( acav == NULL ) {
 	if ( acavg == NULL ) {
@@ -60,14 +61,21 @@ acav_parse( ACAV *acav, char *line, char **argv[] )
 
     for ( ; *line != '\0'; line++ ) {
 	switch ( *line ) {
-	case ' ' :
 	case '\t' :
 	case '\n' :
 	    if ( state == ACV_WORD ) {
 		*line = '\0';
 		state = ACV_WHITE;
 	    }
 	    break;
+	case ' ' :
+	  if ( ( line == pline ) || ( *(line-1) != '\\') ) {
+	        if ( state == ACV_WORD ) {
+		    *line = '\0';
+		    state = ACV_WHITE;
+	        }
+	        break;
+	    }
 	default :
 	    if ( state == ACV_WHITE ) {
 		acav->acv_argv[ ac++ ] = line;

code.c

@@ -34,7 +34,7 @@ encode( char *line )
 	case ' ' :
 	    *temp = '\\';
 	    temp++;
-	    *temp = 'b';
+	    *temp = ' ';
 	    break;
 	case '\t' :
 	    *temp = '\\';
@@ -96,6 +96,7 @@ decode( char *line )
 		*temp = '\t';
 		break;
 	    case 'b':
+	    case ' ':
 		*temp = ' ';
 		break;
 	    case 'r':

retr.c

@@ -210,7 +210,6 @@ retr( SNET *sn, char *pathdesc, char *path, char *temppath, mode_t tempmode,
     if ( cksum ) {
 	EVP_DigestFinal( mdctx, md_value, &md_len );
 	base64_e( md_value, md_len, cksum_b64 );
-	EVP_MD_CTX_free(mdctx);
 	if ( strcmp( trancksum, cksum_b64 ) != 0 ) {
 	    fprintf( stderr, "line %d: checksum in transcript does not match "
 		"checksum from server\n", linenum );
@@ -554,12 +553,11 @@ retr_applefile( SNET *sn, char *pathdesc, char *path, char *temppath,
 
     if ( cksum ) {
 	EVP_DigestFinal( mdctx, md_value, &md_len );
-	base64_e(( char*)&md_value, md_len, cksum_b64 );
-        EVP_MD_CTX_free(mdctx);
+	base64_e( ( unsigned char * ) md_value, md_len, cksum_b64 );
         if ( strcmp( trancksum, cksum_b64 ) != 0 ) {
 	    fprintf( stderr, "line %d: checksum in transcript does not match "
 		"checksum from server\n", linenum );
-	fprintf( stderr, "%s\n", pathdesc );
+	    fprintf( stderr, "%s\n", pathdesc );
             returnval = 1;
 	    goto error1;
         }
@@ -574,6 +572,7 @@ retr_applefile( SNET *sn, char *pathdesc, char *path, char *temppath,
     close( dfd );
 error1:
     unlink( temppath );
+    EVP_MD_CTX_free(mdctx);
     return( returnval );
 }
 

stor.c

@@ -239,7 +239,7 @@ stor_file( SNET *sn, char *pathdesc, char *path, off_t transize,
     /* cksum data sent */
     if ( cksum ) {
 	EVP_DigestFinal( mdctx, md_value, &md_len );
-	base64_e( md_value, md_len, cksum_b64 );
+	base64_e( ( unsigned char * )  md_value, md_len, cksum_b64 );
 	EVP_MD_CTX_free(mdctx);
         if ( strcmp( trancksum, cksum_b64 ) != 0 ) {
 	    fprintf( stderr,
@@ -337,7 +337,6 @@ stor_applefile( SNET *sn, char *pathdesc, char *path, off_t transize,
 		AS_HEADERLEN  ) {
 	fprintf( stderr, "stor_applefile %s failed: %s\n", pathdesc,
 	    strerror( errno ));
-        EVP_MD_CTX_free( mdctx );
 	return( -1 );
     }
     size -= AS_HEADERLEN;
@@ -356,7 +355,6 @@ stor_applefile( SNET *sn, char *pathdesc, char *path, off_t transize,
 		!= ( 3 * sizeof( struct as_entry ))) {
 	fprintf( stderr, "stor_applefile %s failed: %s\n", pathdesc,
 	    strerror( errno ));
-        EVP_MD_CTX_free( mdctx );
 	return( -1 );
     }
     size -= ( 3 * sizeof( struct as_entry ));
@@ -375,7 +373,6 @@ stor_applefile( SNET *sn, char *pathdesc, char *path, off_t transize,
 	    &tv ) != FINFOLEN ) {
 	fprintf( stderr, "stor_applefile %s failed: %s\n", pathdesc,
 	    strerror( errno ));
-        EVP_MD_CTX_free( mdctx );
 	return( -1 );
     }
     size -= FINFOLEN;
@@ -394,7 +391,6 @@ stor_applefile( SNET *sn, char *pathdesc, char *path, off_t transize,
 	    if ( snet_write( sn, buf, rc, &tv ) != rc ) {
 		fprintf( stderr, "stor_applefile %s failed: %s\n", pathdesc,
 		    strerror( errno ));
-                EVP_MD_CTX_free( mdctx );
 		return( -1 );
 	    }
 	    size -= rc;
@@ -448,7 +444,6 @@ stor_applefile( SNET *sn, char *pathdesc, char *path, off_t transize,
     if ( snet_writef( sn, ".\r\n" ) < 0 ) {
 	fprintf( stderr, "stor_applefile %s failed: %s\n", pathdesc,
 	    strerror( errno ));
-        EVP_MD_CTX_free( mdctx );
 	return( -1 );
     }
     if ( verbose ) fputs( "\n>>> .\n", stdout );
@@ -471,18 +466,15 @@ stor_applefile( SNET *sn, char *pathdesc, char *path, off_t transize,
     /* cksum data sent */
     if ( cksum ) {
         EVP_DigestFinal( mdctx, md_value, &md_len );
-        base64_e( ( char*)&md_value, md_len, cksum_b64 );
+        base64_e( ( unsigned char * ) md_value, md_len, cksum_b64 );
+	EVP_MD_CTX_free(mdctx);
         if ( strcmp( trancksum, cksum_b64 ) != 0 ) {
 	    fprintf( stderr,
 		"line %d: checksum listed in transcript wrong\n", linenum );
-	    if ( ! force ) {
-		EVP_MD_CTX_free(mdctx);
-		exit( 2 );
-	    }
+	    if ( ! force ) exit( 2 );
         }
     }
 
-    EVP_MD_CTX_free( mdctx );
     if ( !quiet && !showprogress ) printf( "%s: stored\n", path );
     return( 0 );
 }