head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.118 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.116 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.114 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.112 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.110 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.108 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.106 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.104 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.102 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.100 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.98 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.96 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.94 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.92 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.90 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.88 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.86 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.84 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.82 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.80 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.78 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.76 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.74 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.70 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.50 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.72 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.68 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.66 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.64 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.62 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.60 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.58 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.56 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.54 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.52 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.48 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.46 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.44 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.42 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.40 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.38 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.36 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.34 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.32 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.30 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.28 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.26 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.24 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.22 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.20 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.18 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.16 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.14 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.12 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.10 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.8 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.6 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.2 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.3.0.36 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.34 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.32 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.30 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.28 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.26 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.24 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.22 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.20 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.18 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.16 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.14 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.12 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.10 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.8 pkgsrc-2008Q1:1.3.0.6 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.38 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.36 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.34 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.32 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.30 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 comdex-fall-1999:1.1.1.1 netbsd-1-4-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2011.08.01.15.21.16; author joerg; state Exp; branches; next 1.3; 1.3 date 2007.08.01.20.48.15; author joerg; state Exp; branches; next 1.2; 1.2 date 2002.03.11.14.21.25; author yyamano; state Exp; branches; next 1.1; 1.1 date 99.05.23.20.55.29; author tv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.05.23.20.55.29; author tv; state Exp; branches; next ; desc @@ 1.4 log @Avoid gcc-inline vs C99-inline difference by using static inline. @ text @$NetBSD$ --- bunzip021.c.orig 1999-05-22 21:00:00.000000000 +0000 +++ bunzip021.c @@@@ -114,9 +114,9 @@@@ --*/ #if BZ_UNIX_32 + #include #include #include - #include #include #include @@@@ -141,7 +141,7 @@@@ run rather slowly. gcc version 2.x is recommended. --*/ #ifdef __GNUC__ - #define INLINE inline + #define INLINE static inline #define NORETURN __attribute__ ((noreturn)) #else #define INLINE /**/ @@@@ -400,7 +400,8 @@@@ Int32 bytesIn, bytesOut; Bool verbose, veryVerbose; -Bool compressing, keepInputFiles; +#define compressing False +Bool keepInputFiles; UInt32 globalCrc; #define OM_FILES_TO_FILES 1 @@@@ -2376,17 +2377,13 @@@@ void usage ( Char *fullProgName ) "\nusage: %s [flags and input files in any order]\n" "\n" " Flags: -d force decompression\n" - " -f force compression\n" " -c output to standard out\n" " -v, -V be verbose, or very verbose\n" " -k keep (don't delete) input files\n" " -L display software license\n" " -1 .. -9 set block size of 100k .. 900k\n" "\n" - " If invoked as `bzip', the default action is to compress.\n" - " as `bunzip', the default action is to decompress.\n" - "\n" - " If no file names are given, bzip compresses or decompresses\n" + " If no file names are given, bunzip decompresses\n" " from standard input to standard output. You can combine\n" " flags, so `-v -e -4' means the same as -ve4 or -4ev, &c.\n" "\n" @@@@ -2542,7 +2539,6 @@@@ IntNative main ( IntNative argc, Char *a } keepInputFiles = False; - compressing = True; verbose = False; veryVerbose = False; @@@@ -2550,12 +2546,6 @@@@ IntNative main ( IntNative argc, Char *a opMode = OM_STDIN_TO_STDOUT; else opMode = OM_FILES_TO_FILES; - if ( (strcmp ( "bunzip", progName ) == 0) || - (strcmp ( "BUNZIP", progName ) == 0) || - (strcmp ( "bunzip.exe", progName ) == 0) || - (strcmp ( "BUNZIP.EXE", progName ) == 0) ) - compressing = False; - if (compressing) blockSize100k = 9; for (aa = argList; aa != NULL; aa = aa->link) @@@@ -2564,8 +2554,7 @@@@ IntNative main ( IntNative argc, Char *a switch (aa->name[j]) { case 'Q': break; case 'c': opMode = OM_FILE_TO_STDOUT; break; - case 'd': compressing = False; break; - case 'f': compressing = True; break; + case 'd': break; case 'v': verbose = True; break; case 'k': keepInputFiles = True; break; case '1': blockSize100k = 1; break; @@@@ -2593,7 +2582,6 @@@@ IntNative main ( IntNative argc, Char *a exit ( 1 ); } - compressing = False; if ( !compressing ) blockSize100k = 0; { @ 1.3 log @Don't use malloc.h. @ text @d3 1 a3 1 --- bunzip021.c.orig 2007-08-01 20:31:16.000000000 +0000 d16 9 @ 1.2 log @Don't include malloc.h on Darwin to make it build. @ text @d3 1 a3 1 --- bunzip021.c.orig Thu Feb 28 06:11:49 2002 d5 3 a7 1 @@@@ -116,7 +116,9 @@@@ d9 1 d12 1 a12 3 +#ifndef __APPLE__ #include +#endif d16 1 a16 1 @@@@ -400,7 +402,8 @@@@ d26 1 a26 1 @@@@ -2376,17 +2379,13 @@@@ d45 1 a45 1 @@@@ -2542,7 +2541,6 @@@@ d53 1 a53 1 @@@@ -2550,12 +2548,6 @@@@ d66 1 a66 1 @@@@ -2564,8 +2556,7 @@@@ d76 1 a76 1 @@@@ -2593,7 +2584,6 @@@@ @ 1.1 log @Initial revision @ text @d3 13 a15 3 --- bunzip021.c.orig Sun May 23 16:48:42 1999 +++ bunzip021.c Sun May 23 16:52:27 1999 @@@@ -400,7 +400,8 @@@@ d25 1 a25 1 @@@@ -2376,17 +2377,13 @@@@ d44 1 a44 1 @@@@ -2542,7 +2539,6 @@@@ d52 1 a52 1 @@@@ -2550,12 +2546,6 @@@@ d65 1 a65 1 @@@@ -2564,8 +2554,7 @@@@ d75 1 a75 1 @@@@ -2593,7 +2582,6 @@@@ @ 1.1.1.1 log @Decompressor for old bzip (.bz) compressed files. Does not include the patented compression code. @ text @@