Fix previous.

Last commit added the option, but did not set the right compression mode.

Author: jodavies

sources/compcomm.c

@@ -505,44 +505,52 @@ int CoCompress(UBYTE *s)
 	if ( StrICmp(s,(UBYTE *)"on") == 0 ) {
 		AC.NoCompress = 0;
 		AR.gzipCompress = 0;
+		return(0);
 	}
 	else if ( StrICmp(s,(UBYTE *)"off") == 0 ) {
 		AC.NoCompress = 1;
 		AR.gzipCompress = 0;
+		return(0);
 	}
 	else {
 		t = s; while ( FG.cTable[*t] <= 1 ) t++;
 		c = *t; *t = 0;
 		if ( StrICmp(s,(UBYTE *)"zstd") == 0 ) {
-#ifndef WITHZSTD
-			Warning("zstd compression not supported on this platform");
+#ifdef WITHZSTD
+			ZWRAP_useZSTDcompression(1);
+#else
+			Warning("zstd compression not supported on this platform.");
 #endif
 		}
-		if ( ( StrICmp(s,(UBYTE *)"gzip") == 0 ) || ( StrICmp(s,(UBYTE *)"zstd") == 0 ) ) {
+		else if ( StrICmp(s,(UBYTE *)"gzip") == 0 ) {
+#ifdef WITHZSTD
+			ZWRAP_useZSTDcompression(0);
+#endif
 #ifndef WITHZLIB
-			Warning("gzip/zstd compression not supported on this platform");
+			Warning("gzip compression not supported on this platform.");
 #endif
-			s = t; *s = c;
-			if ( *s == 0 ) {
-				AR.gzipCompress = GZIPDEFAULT;  /* Normally should be 6 */
-				return(0);
-			}
-			while ( *s == ' ' || *s == ',' || *s == '\t' ) s++;
-			t = s;
-			if ( FG.cTable[*s] == 1 ) {
-				AR.gzipCompress = *s - '0';
-				s++;
-				while ( *s == ' ' || *s == ',' || *s == '\t' ) s++;
-				if ( *s == 0 ) return(0);
-			}
-			MesPrint("&Unknown gzip/zstd option: %s. A digit was expected",t);
-			return(1);
-
 		}
 		else {
-			MesPrint("&Unknown option: %s. On, off, gzip or zstd expected",s);
+			MesPrint("&Unknown Compress option: %s. On, off, gzip or zstd expected.",s);
 			return(1);
 		}
+
+		/* Whether we are using zlib or zstd, accept and use a compression level. */
+		s = t; *s = c;
+		if ( *s == 0 ) {
+			AR.gzipCompress = GZIPDEFAULT;  /* Normally should be 6 */
+			return(0);
+		}
+		while ( *s == ' ' || *s == ',' || *s == '\t' ) s++;
+		t = s;
+		if ( FG.cTable[*s] == 1 ) {
+			AR.gzipCompress = *s - '0';
+			s++;
+			while ( *s == ' ' || *s == ',' || *s == '\t' ) s++;
+			if ( *s == 0 ) return(0);
+		}
+		MesPrint("&Unknown Compress gzip/zstd option: %s. A digit was expected.",t);
+		return(1);
 	}
 	return(0);
 }
@@ -676,7 +684,7 @@ int CoOn(UBYTE *s)
 				c = *s; *s = 0;
 				if ( StrICmp(t,(UBYTE *)"gzip") == 0 ) {
 #ifndef WITHZLIB
-					Warning("gzip compression not supported on this platform");
+					Warning("gzip compression not supported on this platform.");
 #endif
 #ifdef WITHZSTD
 					/* If gzip is specified, turn off zstd compression. zlib still goes via the wrapper. */
@@ -687,7 +695,7 @@ int CoOn(UBYTE *s)
 #ifdef WITHZSTD
 					ZWRAP_useZSTDcompression(1);
 #else
-					Warning("zstd compression not supported on this platform");
+					Warning("zstd compression not supported on this platform.");
 #endif
 				}
 				else {
@@ -709,7 +717,7 @@ int CoOn(UBYTE *s)
 					AR.gzipCompress = GZIPDEFAULT;
 				}
 				else {
-					MesPrint("&Unrecognized option in ON compress gzip/zstd statement: %s, single digit expected",t);
+					MesPrint("&Unrecognized option in ON compress gzip/zstd statement: %s, single digit expected.",t);
 					return(-1);
 				}
 			}