i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated bzip2 to 1.0.5

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24942 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2008-04-12 09:30:47 +00:00
parent 97cdbb548e
commit 316b5f9214
13 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/bzip2/LICENSE
+3 -4
View File
@@ -2,7 +2,7 @@
-------------------------------------------------------------------------- --------------------------------------------------------------------------
This program, "bzip2", the associated library "libbzip2", and all This program, "bzip2", the associated library "libbzip2", and all
documentation, are copyright (C) 1996-2006 Julian R Seward. All documentation, are copyright (C) 1996-2007 Julian R Seward. All
rights reserved. rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Julian Seward, Cambridge, UK. Julian Seward, [email protected]
[email protected] bzip2/libbzip2 version 1.0.5 of 10 December 2007
bzip2/libbzip2 version 1.0.4 of 20 December 2006
-------------------------------------------------------------------------- --------------------------------------------------------------------------
src/bin/bzip2/blocksort.c
+2 -2
View File
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <[email protected]> Copyright (C) 1996-2007 Julian Seward <[email protected]>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
src/bin/bzip2/bzip2.c
+4 -4
View File
@@ -7,8 +7,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <[email protected]> Copyright (C) 1996-2007 Julian Seward <[email protected]>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
@@ -1605,11 +1605,11 @@ void license ( void )
"bzip2, a block-sorting file compressor. " "bzip2, a block-sorting file compressor. "
"Version %s.\n" "Version %s.\n"
" \n" " \n"
" Copyright (C) 1996-2006 by Julian Seward.\n" " Copyright (C) 1996-2007 by Julian Seward.\n"
" \n" " \n"
" This program is free software; you can redistribute it and/or modify\n" " This program is free software; you can redistribute it and/or modify\n"
" it under the terms set out in the LICENSE file, which is included\n" " it under the terms set out in the LICENSE file, which is included\n"
" in the bzip2-1.0.4 source distribution.\n" " in the bzip2-1.0.5 source distribution.\n"
" \n" " \n"
" This program is distributed in the hope that it will be useful,\n" " This program is distributed in the hope that it will be useful,\n"
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
src/bin/bzip2/bzip2.rdef
+3 -3
View File
@@ -2,10 +2,10 @@ resource app_version
{ {
major = 1, major = 1,
middle = 0, middle = 0,
minor = 3, minor = 5,
variety = 5, variety = 5,
internal = 0, internal = 0,
short_info = "1.03", short_info = "1.0.5",
long_info = "1.03 ©2005 Julian R Seward" long_info = "1.0.5 ©2007 Julian R Seward"
}; };
src/bin/bzip2/bzip2recover.c
+3 -3
View File
@@ -7,8 +7,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
@@ -313,7 +313,7 @@ Int32 main ( Int32 argc, Char** argv )
inFileName[0] = outFileName[0] = 0; inFileName[0] = outFileName[0] = 0;
fprintf ( stderr, fprintf ( stderr,
"bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" ); "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" );
if (argc != 2) { if (argc != 2) {
fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",
src/bin/bzip2/bzlib.c
+4 -3
View File
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
@@ -48,7 +48,7 @@ void BZ2_bz__AssertH__fail ( int errcode )
"component, you should also report this bug to the author(s)\n" "component, you should also report this bug to the author(s)\n"
"of that program. Please make an effort to report this bug;\n" "of that program. Please make an effort to report this bug;\n"
"timely and accurate bug reports eventually lead to higher\n" "timely and accurate bug reports eventually lead to higher\n"
"quality software. Thanks. Julian Seward, 15 February 2005.\n\n", "quality software. Thanks. Julian Seward, 10 December 2007.\n\n",
errcode, errcode,
BZ2_bzlibVersion() BZ2_bzlibVersion()
); );
@@ -598,6 +598,7 @@ Bool unRLE_obuf_to_output_FAST ( DState* s )
UInt32 c_tPos = s->tPos; UInt32 c_tPos = s->tPos;
char* cs_next_out = s->strm->next_out; char* cs_next_out = s->strm->next_out;
unsigned int cs_avail_out = s->strm->avail_out; unsigned int cs_avail_out = s->strm->avail_out;
Int32 ro_blockSize100k = s->blockSize100k;
/* end restore */ /* end restore */
UInt32 avail_out_INIT = cs_avail_out; UInt32 avail_out_INIT = cs_avail_out;
src/bin/bzip2/bzlib.h
+2 -2
View File
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
src/bin/bzip2/bzlib_private.h
+11 -5
View File
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
@@ -36,7 +36,7 @@
/*-- General stuff. --*/ /*-- General stuff. --*/
#define BZ_VERSION "1.0.4, 20-Dec-2006" #define BZ_VERSION "1.0.5, 10-Dec-2007"
typedef char Char; typedef char Char;
typedef unsigned char Bool; typedef unsigned char Bool;
@@ -442,11 +442,15 @@ typedef
/*-- Macros for decompression. --*/ /*-- Macros for decompression. --*/
#define BZ_GET_FAST(cccc) \ #define BZ_GET_FAST(cccc) \
/* c_tPos is unsigned, hence test < 0 is pointless. */ \
if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
s->tPos = s->tt[s->tPos]; \ s->tPos = s->tt[s->tPos]; \
cccc = (UChar)(s->tPos & 0xff); \ cccc = (UChar)(s->tPos & 0xff); \
s->tPos >>= 8; s->tPos >>= 8;
#define BZ_GET_FAST_C(cccc) \ #define BZ_GET_FAST_C(cccc) \
/* c_tPos is unsigned, hence test < 0 is pointless. */ \
if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
c_tPos = c_tt[c_tPos]; \ c_tPos = c_tt[c_tPos]; \
cccc = (UChar)(c_tPos & 0xff); \ cccc = (UChar)(c_tPos & 0xff); \
c_tPos >>= 8; c_tPos >>= 8;
@@ -469,8 +473,10 @@ typedef
(((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
#define BZ_GET_SMALL(cccc) \ #define BZ_GET_SMALL(cccc) \
cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ /* c_tPos is unsigned, hence test < 0 is pointless. */ \
s->tPos = GET_LL(s->tPos); if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \
s->tPos = GET_LL(s->tPos);
/*-- externs for decompression. --*/ /*-- externs for decompression. --*/
src/bin/bzip2/compress.c
+2 -2
View File
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
src/bin/bzip2/crctable.c
+2 -2
View File
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
src/bin/bzip2/decompress.c
+2 -2
View File
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
src/bin/bzip2/huffman.c
+2 -2
View File
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.
src/bin/bzip2/randtable.c
+2 -2
View File
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression. lossless, block-sorting data compression.
bzip2/libbzip2 version 1.0.4 of 20 December 2006 bzip2/libbzip2 version 1.0.5 of 10 December 2007
Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file. README file.