From 8715622ee3a0c0daa74934e5a349bd47c7fd23bd Mon Sep 17 00:00:00 2001 From: Andreas Fankhauser (@tux-six) Date: Thu, 7 Jul 2022 02:40:50 +0200 Subject: Cleanup, setup 'configure', add contrib Dockerfile for simpler build --- src/main/c/commonbase.h | 31 +++++++++++++++++++++++++++++++ src/main/c/deflate.c | 33 ++++++++++++++------------------- src/main/c/inflate.c | 44 +++++++++++++++++--------------------------- 3 files changed, 62 insertions(+), 46 deletions(-) create mode 100644 src/main/c/commonbase.h (limited to 'src') diff --git a/src/main/c/commonbase.h b/src/main/c/commonbase.h new file mode 100644 index 0000000..581bf54 --- /dev/null +++ b/src/main/c/commonbase.h @@ -0,0 +1,31 @@ + +/* common config. Stuff like feature-test-macros for example */ + +#define _POSIX_C_SOURCE 200809L + +#define STR_QUOT_IAHGEWIH(s) #s +#define STR_QUOT(s) STR_QUOT_IAHGEWIH(s) + +#define STR_CAT(a, b) a ## b + +#ifndef likely +# define likely(a) (a) +#endif +#ifndef unlikely +# define unlikely(a) (a) +#endif + +#ifdef _WIN32 +# define WINDOOF 1 +#endif + + +#if WINDOOF +static inline void fixBrokenStdio( void ){ + _setmode(_fileno(stdin), O_BINARY); + _setmode(_fileno(stdout), O_BINARY); +} +#else +# define fixBrokenStdio() +#endif + diff --git a/src/main/c/deflate.c b/src/main/c/deflate.c index 9043c10..f1e761b 100644 --- a/src/main/c/deflate.c +++ b/src/main/c/deflate.c @@ -1,6 +1,8 @@ /* - See "./inflate.c" for bash helpers. + QuickNDirty bash equivalent: + + bash-deflate(){ gzip -c | tail -c +10; } */ @@ -10,16 +12,14 @@ #include #include #include +#include #include /* libs */ -#include "zlib.h" - -/* project */ -#include "string-util.h" -#include "log.h" +#include +typedef unsigned char uchar; /* TODO rm */ typedef struct Deflate Deflate; @@ -48,7 +48,7 @@ static void printHelp( void ){ static int parseArgs( int argc, char**argv, Deflate*deflateCls ){ deflateCls->level = Z_DEFAULT_COMPRESSION; deflateCls->useZlibHdr = 0; - for( uint i=1 ; ilevel); if( err != Z_OK ){ - LOG_ERROR("deflateInit(): (ret=%d): %s", err, strerror(errno)); + fprintf(stderr, "Error: deflateInit(): (ret=%d): %s", err, strerror(errno)); return -1; } @@ -103,9 +102,7 @@ static int doDeflate( Deflate*deflateCls ){ /* input */ { int space = innBuf_cap - innBuf_len; /* look if we can shift */ - //LOG_DEBUG("space=%d\n", space); if( space <= 0 && innBuf_off > 0 ){ - //LOG_DEBUG("do shifting\n"); int wr = 0, rd = innBuf_off; for(;;){ err = rd - wr; /* chunk length to copy */ @@ -118,7 +115,6 @@ static int doDeflate( Deflate*deflateCls ){ innBuf_len -= innBuf_off; innBuf_off = 0; space = innBuf_cap - innBuf_len; - //LOG_DEBUG("space=%d (after shift)\n", space); } if( space > 0 && !inputIsEOF ){ err = fread(innBuf + innBuf_len, 1, space, stdin); @@ -126,7 +122,7 @@ static int doDeflate( Deflate*deflateCls ){ if( feof(stdin) ){ inputIsEOF = !0; }else{ - LOG_ERROR("fread(): %s", strerror(errno)); + fprintf(stderr, "Error: fread(): %s", strerror(errno)); return -1; } } @@ -142,14 +138,13 @@ static int doDeflate( Deflate*deflateCls ){ strm.next_out = outBuf; strm.avail_out = outBuf_cap; assert(strm.avail_out > 0); - //LOG_DEBUG("avail_in=%d, inputIsEOF=%d\n", strm.avail_in, inputIsEOF); assert(strm.avail_in > 0 || inputIsEOF); err = deflate(&strm, inputIsEOF ? Z_FINISH : Z_NO_FLUSH); if(unlikely( err != Z_OK )){ if( err == Z_STREAM_END ){ outputIsEOF = !0; }else{ - LOG_ERROR("deflate(): %s\n", strm.msg); + fprintf(stderr, "Error: deflate(): %s\n", strm.msg); return -1; } } @@ -168,7 +163,7 @@ static int doDeflate( Deflate*deflateCls ){ } err = fwrite(outBuf + outBuf_off, 1, outBuf_len - outBuf_off, stdout); if(unlikely( err != outBuf_len - outBuf_off )){ - LOG_ERROR("fwrite(): %s\n", strerror(errno)); + fprintf(stderr, "Error: fwrite(): %s\n", strerror(errno)); return -1; } outBuf_len = 0; @@ -177,7 +172,8 @@ static int doDeflate( Deflate*deflateCls ){ err = deflateEnd(&strm); if( err != Z_OK ){ - LOG_WARN("deflateEnd() ret=%d: %s\n", err, strm.msg); + fprintf(stderr, "Warn: deflateEnd() ret=%d: %s\n", err, strm.msg); + return -2; } return 0; @@ -192,8 +188,7 @@ int deflate_main( int argc, char**argv ){ err = parseArgs(argc, argv, deflateCls); if( err < 0 ){ return err; } - stdinModeBinary(); - stdoutModeBinary(); + fixBrokenStdio(); err = doDeflate(deflateCls); if( err < 0 ){ return err; } diff --git a/src/main/c/inflate.c b/src/main/c/inflate.c index 67ddb71..437cfd4 100644 --- a/src/main/c/inflate.c +++ b/src/main/c/inflate.c @@ -1,6 +1,5 @@ /* - bash-deflate(){ gzip -c | tail -c +10; } bash-inflate(){ (printf "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00"&&cat -)|gzip -dc; } */ @@ -16,11 +15,8 @@ /* libs */ #include "zlib.h" -/* project */ -#include "log.h" -#include "string-util.h" - +typedef unsigned char uchar; /* TODO cleanup */ typedef struct MyInflate MyInflate; @@ -47,7 +43,7 @@ static void printHelp( void ){ static int parseArgs( int argc, char**argv, MyInflate*myInflate ){ myInflate->tryParseHeaders = !0; /* enabled by default */ - for( uint i=1 ; i 0 ){ - //LOG_DEBUG("try-shift space=%d, innBuf_off=%d\n", space, innBuf_off); int wr = 0, rd = innBuf_off; for(;;){ err = rd - wr; /* chunk length to copy */ @@ -111,17 +106,14 @@ static int doInflate( MyInflate*myInflate ){ innBuf_len -= innBuf_off; innBuf_off = 0; space = innBuf_cap - innBuf_len; - //LOG_DEBUG("after shift space=%d, innBuf_off=%d, innBuf_len=%d\n", space, innBuf_off, innBuf_len); } if( space > 0 && !inputIsEOF ){ - //LOG_TRACE("go read space=%d, inputIsEOF=%d\n", space, inputIsEOF); err = fread(innBuf + innBuf_len, 1, space, stdin); - //LOG_TRACE("fread() -> %d\n", err); if(unlikely( err <= 0 )){ if( feof(stdin) ){ inputIsEOF = !0; }else{ - LOG_ERROR("fread(): %s", strerror(errno)); + fprintf(stderr, "Error: fread(): %s", strerror(errno)); return -1; } } @@ -133,13 +125,16 @@ static int doInflate( MyInflate*myInflate ){ if(unlikely( !headerIsPassed )){ #define avail (innBuf_len - innBuf_off) /* Ensure we have at least two bytes for zlib header detection */ - if( avail < 2 && !inputIsEOF ){ LOG_DEBUG("Not enough data for header detection. have" - " %d\n", avail); continue; } + if( avail < 2 && !inputIsEOF ){ + #ifndef NDEBUG + fprintf(stderr, "[DEBUG] Not enough data for header detection. have %d\n", avail); + #endif + continue; + } headerIsPassed = !0; if( myInflate->tryParseHeaders ){ int b0 = innBuf[0], b1 = innBuf[1]; if( b0 == 0x78 && (b1 == 0x01 || b1 == 0x5E || b1 == 0x9C || b1 == 0xDA) ){ - //LOG_DEBUG("looks like a zlib header. Skip it\n"); innBuf_off += 2; } } @@ -154,27 +149,25 @@ static int doInflate( MyInflate*myInflate ){ // TODO remove assert(strm.avail_in >= 0 || inputIsEOF); assert(strm.avail_out > 0); int flush = inputIsEOF ? Z_FINISH : Z_NO_FLUSH; - //LOG_DEBUG("inflate(in=0x%p, inLen=%d, %s)\n", strm.next_in, strm.avail_in, - // (flush==Z_FINISH) ? "Z_FINISH" : (flush==Z_FULL_FLUSH) ? "Z_FULL_FLUSH" : "Z_NO_FLUSH"); errno = 0; err = inflate(&strm, flush); if(unlikely( err != Z_OK )){ if( err == Z_STREAM_END ){ - //LOG_DEBUG("inflate() -> Z_STREAM_END\n"); outputIsEOF = !0; }else if( err == Z_BUF_ERROR ){ /* Could not make any progress. Have to call again with updated buffers */ noProgressSince += 1; if( noProgressSince > 42 ){ - LOG_WARN("inflate() -> Z_BUF_ERROR: %s (maybe EOF came too early?)\n", + fprintf(stderr, "Warn: inflate() -> Z_BUF_ERROR: %s (maybe EOF came too early?)\n", (strm.msg == NULL) ? "Could not make any progress" : strm.msg); return -1; } }else if( strm.msg != NULL || errno ){ - LOG_ERROR("inflate(): %s\n", (strm.msg != NULL) ? strm.msg : strerror(errno)); + fprintf(stderr, "Error: inflate(): %s\n", (strm.msg != NULL) ? strm.msg : + strerror(errno)); return -1; }else{ - LOG_ERROR("inflate(): -> %d\n", err); + fprintf(stderr, "Error: inflate(): -> %d\n", err); return -1; } }else{ @@ -183,14 +176,12 @@ static int doInflate( MyInflate*myInflate ){ innBuf_off += strm.next_in - innBuf; outBuf_len = strm.next_out - outBuf; if( innBuf_off > innBuf_len ){ innBuf_off = innBuf_len; } - //LOG_DEBUG("strm.remain=%d, outputIsEOF=%d\n", innBuf_len - innBuf_off, outputIsEOF); } /* output */ { err = fwrite(outBuf, 1, outBuf_len, stdout); - //LOG_DEBUG("fwrite(0x%p, 1, %d, stdout) -> %d\n", outBuf, outBuf_len, err); if(unlikely( err != outBuf_len )){ - LOG_ERROR("fwrite(): %s\n", strerror(errno)); + fprintf(stderr, "Errro: fwrite(): %s\n", strerror(errno)); return -1; } outBuf_len = 0; @@ -199,7 +190,7 @@ static int doInflate( MyInflate*myInflate ){ err = inflateEnd(&strm); if( err != Z_OK ){ - LOG_WARN("inflateEnd() ret=%d: %s\n", err, strm.msg); + fprintf(stderr, "Warn: inflateEnd() ret=%d: %s\n", err, strm.msg); } return 0; @@ -215,8 +206,7 @@ int inflate_main( int argc, char**argv ){ err = parseArgs(argc, argv, myInflate); if( err < 0 ){ return err; } - stdinModeBinary(); - stdoutModeBinary(); + fixBrokenStdio(); err = doInflate(myInflate); if( err < 0 ){ return err; } -- cgit v1.1