From 9bd051176f362715487050a5fca636890835f1e2 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Fri, 31 May 2013 02:35:08 +0300 Subject: [PATCH] [3party] Updated bzip2 to 1.0.6 --- 3party/bzip2/CHANGES | 12 +- 3party/bzip2/LICENSE | 4 +- 3party/bzip2/Makefile-libbz2_so | 14 +- 3party/bzip2/README | 9 +- 3party/bzip2/README.COMPILATION.PROBLEMS | 6 +- 3party/bzip2/README.XML.STUFF | 4 +- 3party/bzip2/blocksort.c | 4 +- 3party/bzip2/blocksort.o | Bin 22928 -> 0 bytes 3party/bzip2/bzip2.1 | 6 +- 3party/bzip2/bzip2.1.preformatted | 6 +- 3party/bzip2/bzip2.c | 8 +- 3party/bzip2/bzip2.txt | 6 +- 3party/bzip2/bzip2recover.c | 6 +- 3party/bzip2/bzlib.c | 12 +- 3party/bzip2/bzlib.h | 6 +- 3party/bzip2/bzlib.o | Bin 41732 -> 0 bytes 3party/bzip2/bzlib_private.h | 6 +- 3party/bzip2/compress.c | 4 +- 3party/bzip2/compress.o | Bin 29968 -> 0 bytes 3party/bzip2/crctable.c | 4 +- 3party/bzip2/crctable.o | Bin 4156 -> 0 bytes 3party/bzip2/decompress.c | 24 +- 3party/bzip2/decompress.o | Bin 29720 -> 0 bytes 3party/bzip2/entities.xml | 6 +- 3party/bzip2/format.pl | 4 +- 3party/bzip2/huffman.c | 4 +- 3party/bzip2/huffman.o | Bin 6492 -> 0 bytes 3party/bzip2/impure.c | 18 - 3party/bzip2/manual.html | 344 +- 3party/bzip2/manual.pdf | Bin 288137 -> 256905 bytes 3party/bzip2/manual.ps | 55503 +++++++++------------ 3party/bzip2/manual.xml | 40 +- 3party/bzip2/mk251.c | 4 +- 3party/bzip2/randtable.c | 4 +- 3party/bzip2/randtable.o | Bin 5172 -> 0 bytes 3party/bzip2/spewG.c | 4 +- 3party/bzip2/unzcrash.c | 4 +- 3party/bzip2/xmlproc.sh | 4 +- 38 files changed, 23017 insertions(+), 33063 deletions(-) delete mode 100644 3party/bzip2/blocksort.o delete mode 100644 3party/bzip2/bzlib.o delete mode 100644 3party/bzip2/compress.o delete mode 100644 3party/bzip2/crctable.o delete mode 100644 3party/bzip2/decompress.o mode change 100644 => 100755 3party/bzip2/format.pl delete mode 100644 3party/bzip2/huffman.o delete mode 100644 3party/bzip2/impure.c delete mode 100644 3party/bzip2/randtable.o mode change 100644 => 100755 3party/bzip2/xmlproc.sh diff --git a/3party/bzip2/CHANGES b/3party/bzip2/CHANGES index 6e4f65e2e0..81e97ca6fa 100644 --- a/3party/bzip2/CHANGES +++ b/3party/bzip2/CHANGES @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -317,3 +317,11 @@ Fixes some minor bugs since the last version, 1.0.3. ~~~~~~~~~~~~~~~~~ Security fix only. Fixes CERT-FI 20469 as it applies to bzip2. + +1.0.6 (6 Sept 10) +~~~~~~~~~~~~~~~~~ + +* Security fix for CVE-2010-0405. This was reported by Mikolaj + Izdebski. + +* Make the documentation build on Ubuntu 10.04 diff --git a/3party/bzip2/LICENSE b/3party/bzip2/LICENSE index f420cffb67..cc614178cf 100644 --- a/3party/bzip2/LICENSE +++ b/3party/bzip2/LICENSE @@ -2,7 +2,7 @@ -------------------------------------------------------------------------- This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2007 Julian R Seward. All +documentation, are copyright (C) 1996-2010 Julian R Seward. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -37,6 +37,6 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Julian Seward, jseward@bzip.org -bzip2/libbzip2 version 1.0.5 of 10 December 2007 +bzip2/libbzip2 version 1.0.6 of 6 September 2010 -------------------------------------------------------------------------- diff --git a/3party/bzip2/Makefile-libbz2_so b/3party/bzip2/Makefile-libbz2_so index 9a13c77e48..e58791b3b3 100644 --- a/3party/bzip2/Makefile-libbz2_so +++ b/3party/bzip2/Makefile-libbz2_so @@ -1,6 +1,6 @@ # This Makefile builds a shared version of the library, -# libbz2.so.1.0.4, with soname libbz2.so.1.0, +# libbz2.so.1.0.6, with soname libbz2.so.1.0, # at least on x86-Linux (RedHat 7.2), # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). # Please see the README file for some important info @@ -10,8 +10,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.5 of 10 December 2007 -# Copyright (C) 1996-2007 Julian Seward +# bzip2/libbzip2 version 1.0.6 of 6 September 2010 +# Copyright (C) 1996-2010 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -35,13 +35,13 @@ OBJS= blocksort.o \ bzlib.o all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.4 libbz2.so.1.0 + ln -s libbz2.so.1.0.6 libbz2.so.1.0 clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared blocksort.o: blocksort.c $(CC) $(CFLAGS) -c blocksort.c diff --git a/3party/bzip2/README b/3party/bzip2/README index e17a84e049..9fb0f63601 100644 --- a/3party/bzip2/README +++ b/3party/bzip2/README @@ -6,8 +6,8 @@ This version is fully compatible with the previous public releases. This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.5 of 10 December 2007 -Copyright (C) 1996-2007 Julian Seward +bzip2/libbzip2 version 1.0.6 of 6 September 2010 +Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in this file. @@ -181,6 +181,10 @@ WHAT'S NEW IN 1.0.5 ? See the CHANGES file. +WHAT'S NEW IN 1.0.6 ? + + See the CHANGES file. + I hope you find bzip2 useful. Feel free to contact me at jseward@bzip.org @@ -208,3 +212,4 @@ Cambridge, UK. 15 February 2005 (bzip2, version 1.0.3) 20 December 2006 (bzip2, version 1.0.4) 10 December 2007 (bzip2, version 1.0.5) + 6 Sept 2010 (bzip2, version 1.0.6) diff --git a/3party/bzip2/README.COMPILATION.PROBLEMS b/3party/bzip2/README.COMPILATION.PROBLEMS index 22b95c6cb6..667d0d6dfe 100644 --- a/3party/bzip2/README.COMPILATION.PROBLEMS +++ b/3party/bzip2/README.COMPILATION.PROBLEMS @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. -bzip2/libbzip2 version 1.0.5 of 10 December 2007 -Copyright (C) 1996-2007 Julian Seward +bzip2/libbzip2 version 1.0.6 of 6 September 2010 +Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -12,7 +12,7 @@ This program is released under the terms of the license contained in the file LICENSE. ------------------------------------------------------------------ -bzip2-1.0.5 should compile without problems on the vast majority of +bzip2-1.0.6 should compile without problems on the vast majority of platforms. Using the supplied Makefile, I've built and tested it myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ 6.0 and nmake, you can build a native Win32 version too. Large file diff --git a/3party/bzip2/README.XML.STUFF b/3party/bzip2/README.XML.STUFF index 1a5b4c55a5..3a57f3fa89 100644 --- a/3party/bzip2/README.XML.STUFF +++ b/3party/bzip2/README.XML.STUFF @@ -2,8 +2,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/3party/bzip2/blocksort.c b/3party/bzip2/blocksort.c index 8773377bbc..28be313fc4 100644 --- a/3party/bzip2/blocksort.c +++ b/3party/bzip2/blocksort.c @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/3party/bzip2/blocksort.o b/3party/bzip2/blocksort.o deleted file mode 100644 index 22b3a7bb282d708c99a6aed71a5c75bc7fca1797..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22928 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 + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -1605,11 +1605,11 @@ void license ( void ) "bzip2, a block-sorting file compressor. " "Version %s.\n" " \n" - " Copyright (C) 1996-2007 by Julian Seward.\n" + " Copyright (C) 1996-2010 by Julian Seward.\n" " \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" - " in the bzip2-1.0.5 source distribution.\n" + " in the bzip2-1.0.6 source distribution.\n" " \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" diff --git a/3party/bzip2/bzip2.txt b/3party/bzip2/bzip2.txt index 4fb9c7435e..d2deb39491 100644 --- a/3party/bzip2/bzip2.txt +++ b/3party/bzip2/bzip2.txt @@ -1,6 +1,6 @@ NAME - bzip2, bunzip2 - a block-sorting file compressor, v1.0.4 + bzip2, bunzip2 - a block-sorting file compressor, v1.0.6 bzcat - decompresses files to stdout bzip2recover - recovers data from damaged bzip2 files @@ -345,11 +345,11 @@ CAVEATS but the details of what the problem is sometimes seem rather misleading. - This manual page pertains to version 1.0.4 of bzip2. Com- + This manual page pertains to version 1.0.6 of bzip2. Com- pressed data created by this version is entirely forwards and backwards compatible with the previous public releases, versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, - 1.0.2 and 1.0.3, but with the following exception: 0.9.0 + 1.0.2 and above, but with the following exception: 0.9.0 and above can correctly decompress multiple concatenated compressed files. 0.1pl2 cannot do this; it will stop after decompressing just the first file in the stream. diff --git a/3party/bzip2/bzip2recover.c b/3party/bzip2/bzip2recover.c index 5f6d621809..f9de0496ab 100644 --- a/3party/bzip2/bzip2recover.c +++ b/3party/bzip2/bzip2recover.c @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -313,7 +313,7 @@ Int32 main ( Int32 argc, Char** argv ) inFileName[0] = outFileName[0] = 0; fprintf ( stderr, - "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); + "bzip2recover 1.0.6: extracts blocks from damaged .bz2 files.\n" ); if (argc != 2) { fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", diff --git a/3party/bzip2/bzlib.c b/3party/bzip2/bzlib.c index a91c9d47f8..5e0289b56e 100644 --- a/3party/bzip2/bzlib.c +++ b/3party/bzip2/bzlib.c @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -30,10 +30,6 @@ #include "bzlib_private.h" -#ifdef __GNUC__ -#pragma GCC diagnostic ignored "-Wunused-parameter" -#endif - /*---------------------------------------------------*/ /*--- Compression stuff ---*/ @@ -429,7 +425,7 @@ int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action ) return progress ? BZ_RUN_OK : BZ_PARAM_ERROR; } else - if (action == BZ_FLUSH) { + if (action == BZ_FLUSH) { s->avail_in_expect = strm->avail_in; s->mode = BZ_M_FLUSHING; goto preswitch; @@ -1376,7 +1372,7 @@ const char * BZ_API(BZ2_bzlibVersion)(void) #ifndef BZ_NO_STDIO /*---------------------------------------------------*/ -#if (defined(_WIN32) || defined(OS2) || defined(MSDOS)) && !defined(OMIM_OS_BADA) +#if defined(_WIN32) || defined(OS2) || defined(MSDOS) # include # include # define SET_BINARY_MODE(file) setmode(fileno(file),O_BINARY) diff --git a/3party/bzip2/bzlib.h b/3party/bzip2/bzlib.h index 8a9dac2d88..8277123da8 100644 --- a/3party/bzip2/bzlib.h +++ b/3party/bzip2/bzlib.h @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -75,7 +75,7 @@ typedef #include #endif -#if defined(_WIN32) && !defined(OMIM_OS_BADA) +#ifdef _WIN32 # include # ifdef small /* windows.h define small to char */ diff --git a/3party/bzip2/bzlib.o b/3party/bzip2/bzlib.o deleted file mode 100644 index 1b676d999f25e116975bc2a7dd17b55f6d2d1a0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41732 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 bdu|8S^&uzv)jd7}nOF}7#^z!iaq52o+U)u! diff --git a/3party/bzip2/bzlib_private.h b/3party/bzip2/bzlib_private.h index 23427879b1..5d0217f463 100644 --- a/3party/bzip2/bzlib_private.h +++ b/3party/bzip2/bzlib_private.h @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -36,7 +36,7 @@ /*-- General stuff. --*/ -#define BZ_VERSION "1.0.5, 10-Dec-2007" +#define BZ_VERSION "1.0.6, 6-Sept-2010" typedef char Char; typedef unsigned char Bool; diff --git a/3party/bzip2/compress.c b/3party/bzip2/compress.c index 8c80a07970..caf7696011 100644 --- a/3party/bzip2/compress.c +++ b/3party/bzip2/compress.c @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/3party/bzip2/compress.o b/3party/bzip2/compress.o deleted file mode 100644 index 6d377d87ff536a7a4030dbdca064eb3cafc1d3dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29968 zcmc(I3w%`7wf8<}W-^B%IDtfn2s%ozAV|Wa76mjw4uTS!@{ottVUkRek&wiB@G5y| z63yHplqf2-RPi>q*ZWmk+ET>^HBf56^0jDDXiNKHFSPK1{ixC_x3$gvul>lJOfqWt z{pR-_m|1(Twf29nz4qhmv(A~5U;OQZe>xdsHheTma~w!`M1G$g>3)u2Ib-?IBTD7z zGgRt%y^k#B#Pu|YygS$-&tKvh{aF}&X180q&g78u6Z!Xlx60T|;% zvJZx@xH#xv+ZQA9RmPry9X~D>1ufrwF@nCTa(}3=9bWEkwy;!`o){9oN3IXX8ea)- zPGVao0)vi9i6L_QyAMWXpo(1D#}2|+h=HImroj#x7dZN2RF`l;q8;mt8QTnh?8Uf9 zIQn4JM2f4>yP-r3JK8W4g$n`+2>sXrjPQn?HPwMCSc36KM-spF`SJ?E^CC!vv%Oyf?aVI-Q96#8(sN)fOnafP$@fqYs|b9TWYvpF34Ek)EUl+6<#6(^Or=) zf|hOCa?C`*QGLFo+r0Eh?Ir55y8RsakqbRqo~U`2tLH?`3p_C{YFZ=h?ysB<^}i57#&B!bidrBQ#)GB zkKHdf6Y%Zk#}T93Jb8|m=f>KTtZrj>;mMeJvhkD#XMG`Np3*vP=EbruY)HDzQ-s{G z35}4h+Dhs3V=ZdbHlapsRce$5yjBNSoNWBRdi3c2v)5}!-@Y6*PoCc@+YX!Fg-tEZ zZ{S-R*uq(@+}QkRb0?Q9{kY|+E~L)qbW08|5^ELWK`pI>5POQUExP+0S1mS8>`oJ3(5|K!RCasJVVnm$?TSc79P$iCN3Q-~u|u zp1&6PR=sjG23)W@nF9)I8W_wt&yheG86`Ej@?{ z@we+guI-GPhhk<6rt;=4^9U)N&+Ilg$M7HB)buC~KFvH5Gmp$L57lC#x6hwpZm!3S z-8{o=sVj(?oiofm;hBxKom%+T*iuxvC%S+9+tIgB!R70t`}d!_zSZu+>>hup@v;`l z?1enuJkni=$}q=OKd=4BeY1JwBlpTft&Nx9vk%=F_^g1DP$J(!-U)GMnS0#ZAG#kr z3VNXTF!<0tv>*p(!6R6@vrr!hR<{~+MjcLcQrk>>IYOC*3XQ9zk0?griXjW`LQ$=TN*nj zV}e;ko9l=43d6Zzx}@X=rU8V_LK3j9{Po+5mE zit*D@jE}QiO8w(XF+LW{l-hq)it%a9Pv!U=mSTLIx>9QY@D$_Y44hK?N2VBmREqJh zOEJDD#rQX-7(XY)_&22(e_V?3Z%#4(#1!LCN-=(3it(qU7=K!d@e!v=>H0i9#rU_U z7=LDp@$X16etwGa=cE`Pv4xb5&v_}vpPyp z)fyXAs3c5|njlrEWa}n{YK;ggR1zjfO^_;7vb8~>TH}BUm4wMr6Ql~2Y;97g*65!? zC1G;Z1gSzLTU!*WHRh*KNthfpL8?&6*3Aml8tGH0ButK)AXTVj>sEzojqfQ`5++AY zkSbKNb(=!9M)edb36rBHNEIsCx?Q1KV|fadgvn78qzaX6-Jwve5j=%T!sMt4QiV#k z?o_DOxSc{JVRF<2sX`@N+ZC!cTBlG+m>e}hs!+++7Zs|9fButK)AXTVj>q`pN z8ktk5ButK)AXTVj>u!Z=jmIfe5++AYkSbKNb&o=|M&T4H36rBHNEIsCx>uoEV{ZzT zgvn78qzaX6-KS8k5jTZO!sMt4QiV#kb}CeBoK2yUFga?1RH2fs2NkL{x~5P`m>e}h zs!+++LkiUzQ&XrUOpcl$Rj6d^5rt}vq$yMqCPz(>Dpa!ds6w^I&lD;NlcOd`6)M?! zOrct%W(t*r$x#!e3YBaFga?1RH2fs=?c{vsZyvUOpcl$Rj6cZhC;Q*rxYp)lcOd`6)M@9rBJO= zDTPYHrBF$j95q3zP{~%0Lbb-76eg-XKYs0mVqO16$usH^%}UrCr8H9@LS$<~Pq)f!n+wvsS8YJyav zo-cuU6a-pK0g&cA!jDIT6f&`sBPU2Da!+8V?%(9Id*^JwA@ul@jP5Nj@+j2S)*@$f zr+fZ^{g-Wc(k-%MUhk(B@z82I9$LjSiP?DE5l<)b2Ub76wbvtmUlL)T*k=C7UmpMz zo^2`o6BJGi54|o6vDOCus4VKiqp2>Kc=p-eb(O>ljYszLs0|M;wPyVcS`5!~o^s-8 zuU5MjeUq!u1AM}+)~sIQ1Ng~7`cU5bc6!_r&Et)_wI92l=r(sW*6y&mw~Rba4>Ip@ z*3mPwKcQ!4KmH0Y-t0YUcVQ;sd{J6 zrn5?6Eu`ojdLW%5U@hjmT_*p@Nz7~llNW0-kDtG(oAT!I7W2K{lGsw>zt_@qHPwLR zySJOiBX4uvW@5z(Q9+Xmv%RyB!ffCm`nPk_qw!eZxs@83{h|kEcbPAd_0q<3|Bkfm zXJGaB^sx*(&M;r98~3?1qvlJWOK*nxV(sTed{MQl-MzUG4R5S{X(;cNebg&+r_qD= zFEak*^J~PJ49=&I7crdjzM-1m&xkvKCyz0d(9bV{ASCsobzuE!YM%k`-uw)94yyaH zV{3S`$#DnFg}Zsj(~k%m@E9aLci+T^MuASh*BBgE)i4+uYn$A4@1n_#wGHmNy)?t~ z7e>v!3K@Hr1{y#Fjnbnr^bPbdqhH++MFIMq#`z=o^}w|x1TRte3kX#WyA^P#H?U8c zjgxtQW+$sS_-Pd{jm2*p56IQ6(U z{}D5BK<=)xxch@#tGi8d4yJHF&ssNMMT(#OtaWVZZWyD^1boo!*+l1@*J-tCM0Mik zNYfCG*Zby3H8JV@$WMNWND1db`V|jU`NGy$wa;1AJk57g>WOXh_wHBB-}4_^osO~S z0m|9TQ~bwOozW#YtzvA*ak2RjJe+uIr7SuShy@A)n3ns_1A$0W5Z0R}1GD0%U9ut8 zJ0t^xXiyN=+aUvkn57`B_dW&&@wYc+L##JC1_tqpg1}kt3VS51Ags4A24=-%1!28k zF))Zf|4jPAdUIl65Z_f0);kdcgQ!pt*4qvPgBYtItoIlO2Jwf3(ihen3Il_9UO{-S zcw9W7Aa1;3h-(x?&J{zv_fzQ$>rH@x`Qk|hVU73?45COuSi}1RgBYS9tg-xoLA-T9 z`obEx9~i{r3L@`{d!#@?SVQsyvqDo4*7*CtAYR`uePIo@4-DdK3c?y$9~i`R1z`=N z4-De3ow6a;nEAjUeyAX<0rG)CR4a)5D;^gU6$CD%uJBZJ?hWaSf-8pjj)JfTwFl;l z5(Qz6U=Iw!qadu|>VZN0?se%4YixR85YH+IYan`H5X%%q(G~YdmV&T`m@Vtij`fLENJttdZh@K^O|c8WtWH#LxCgUsz+n1A}-}L0AL61B19zL9Dvs zaq&rqY)J7HL%a%zbN|XOeJO@}E=I|OtEi)hh4g+rEqc^)<&8(v=-MmVHNbN6xBlvy z9d8q`Tx#6_yHo@W&-De6lOf=4bN9KxUnsj9LBB9vQocc#lzBJMh2#KYDh-y)-#>d0 z13gG@N4Wn%uXO>tJMWG#-fHuf!84i>kL_bcj=)eaWT z?Juaf0U|1rKZ^WIw$U4rWVr`~kSzbYfTm;(CVoThY36P^3RNmHB3|UQ^enyUN}{|i zS!SH|x@1j{v%V`?MRC@4$=VucHG@UwHt;bTZ{he?BwxHBLaV!lv|323&!EC6+Ubdp zq95TkMbgs9%ZO7SoXMvU>de3g^R`=K+9o62Zg0W#8U>y@ZbX7dZ?7_%bvvqJLmWy@ zvZ_y!Q=6jw$aBD>;~Lb}0h)+!rx$xXX6v!z81%;Xqo?fn2jn!Q6LFNB-XwAXpG5gM zl%ZoTqK~<=`^xQuAZ&CzW`EqK-iOD6xbZRYUH>rkJ~6v?*S$+Ub3M~0 zO_?;=Gj4WGO{L$npsHk&r#KR*EcJZx)@iqn_lzs84tpk#XIe@1nwp?L6q;1Ra+iki z-mlyZk>G|k{>rLANriuPZh=3vI$T|o8wy8C1J${q%IXbOfz`QFYka}*2CvE%Zw%BR z{EUNME=Y&2rG*0Jc(t3Sq{0_O)`(Q~V(5-gMRhRj!P~}|t~*7hM~8Fm4k9+MHv&3! ziWiEvd_dTCXD>x)K;hPDq%i3!^o(veDyyr?J^YJ98O}JPS6SUIR7uNjcfxFLFCa^O z!F7QuZz!*HKwgE~D2v#reTV6~|b;2^bE0+I*1L@Nt^-Wl^jy zD?@Qx)jv?&u#=jttfo2yo_!e=807VaiX&x^6_3E^a(Rn=AwRR1P(~kvJXy=^rBuB> z#tyxmNKvVI3l^GexxHyM29nEL!|csHWrEE9m@MG(u4DGcMaFP>%PM{4A!cvEGvt6v z2P1%2%h{tMe-)}PWA=af6AaVGWVpPQ#bu)Ym_W#Oc}uFRR|imJ%XhibC~zvP$>gtp z4Tk7rJT7n0?<-~Yt>5JN95li2U(M`o9Xvk{76tKUJZ695kDM{l<&6|G`%|LQJeL=* zyA1l6{ppXncsj&r&ojb+nWPMN*`NIfm*%^?RXqRAA(-#_n7L##vp*-m3ecX))uIJ2 z2!MqyFS;b;hyVZe*SrNqY_LW$GC!Rf1s{`71(zDZx#_=xD4i4`e}v1aJT*$lDW~Kw z^pyW?kDRAu`S-ycLW9Au??>_~*`3RoX4o%)k+u`nP>c9@(nWr>%3}=i&bNPiG)9R# z!||0cL@uv)O`wW77HtDAA3EMOzV*zpSmf;__th}R5|PJX@bZ^EGRIOXj?n;Xev5i- z-bEPQW>q-2fjRCQ51HF=ET?yuqDYl|ucBjx@F(#UYbEK3LAntsfwPES)5#q7Zzh~9 z$5*>04!w!g@gU`tt)bP-;Uxnw^cbH}Zmg-?14AU(T+GI~mA+7jIaVD*(ToSu9mO%M zn!Iu4ffD8@+11m0e^p6!DZRzfQA#@c7;1B<+#jad%N%7LoQVPH4b?;>v;2>oi9v}K zXsxd@Q0f)h6~b*8pPWIiV~&R|aP4Ve!nc*x>-<6HSp5l@wlRCCHgF>~HN>ryT+FH- z02=Dd5judDKp&H<2SrH2Lb6XvIFgV=gybMe*7|}0{)R}$IvT#VF-NRiZ>1lDVm{3DY_y-xn&6?C&SUI5k0ykV!2AjZ?e>JlH8 zEJyuVu-tiRlRen2xvJnvbQnvULZ~#Nd~1DyO3s?f&oE=`u5fkOM=Wn;_0%aWZJOX4 zaehUB_+J$KbOBl&3A3~>3DgXU%6Zd;T9zyhp2WRP2(m2#0erg zaTRa$RaW91uxWSPj>hO?a=ft%n)s@V7^G>MPmd>S9yK@51ETB^~b57&~ zWU0*Y)3uFqlW%3t+}BYmWB0F}Ka1hY4DAZ8Va_f}Qx~kMF7-3#&mTdxSQTWeokv98 z=;+$Y#09@IF-LJSMW)uIgZ*ya+Fh zb-pWrN4aV!cS6YFTzGahbN>1nj+WzE6E0iJoWJ=N&yI6#EDnT2%=ud(p6FUv9b7%n zR}!uU#_t7Uo-mz8PDurGzAwz27U$9wbN)dnPj?0HT~d8lHFN%_V9ay{mlRc_3YpJ$ zRY{ZnC=?1Lqj2_e=KPc3&39Er)~saCvm(1t)cGv;Rx5PupE<{lVhuP$0a4IsaRfKP$`M3rGA-ur5f} zV(e%p=i%MC&c6%6MZ2r2aLGL8{HMrYvQsC`3zEs*KjkK0whs&WD=|u_TbOo?GaH8V zFbl(IjK=x)G4Fgs8^*iDrk#PJeN6jz^kFy^pmlcb6VBQFLw#5fQw%jYB%-huD53Ve}E)v`q*vRCD)Ib>=k?Fu!GrI7-e z#2H_iCm3WAFX8CXqk>d_0-FrD8EmP?r8bsjF6Qfr)200{C~&J5sKRcRMqn#c-hmbn z<7&-=sjJ;YD+9ZczHl@{Yj}uhV=1AxQEREX5qXelxf-d_<=8}gc1zVsN_E5%Qd**s z0$r0W2Yp{EEtX2dBTQRNjnLcdY{V)maJNRv$M9)F_PQa$fCZ{R71I`wxhODvEz+W} z!A9Icg}oXTq${`G$bMNCeoz%IVcLV_alNgQji9R-ZM85jQ1o>yZDzIS#(>C%+)pn$oihoTMUzq(+Pr4|3W0AkA6qm+A zwj_I9kZH9dvpn1U@*JksiQEI(v~+1t^QEh8Rkm0sv}gF*)K;3!mo9BPU%J{VuK5V2 zt;OCUyAo$LrnQT+j&L@Od+jKBpc(=KY{47z}w28TR1R5;}SDTkns{z7fBwOy>s4)N(M`k{$%fW3?Sk>CL*Jt}GYbt!S1obd?)MsPkybx=+QriiRZ@rb%UZ0KiXD;=QgnAJb z+!d^j)Byb>(d3uFnzJE{U6tbOt{+)a9fHkFBUjnlPS=er^I@6QG>xXHt?fwNNYSe{ zjk?v=wx|BuXR#CV!ij|$jE$@+!gV>rED?3=tsfcmubCHT?5iIc=1Zki(cAJz`g$`8 z*tJjL$&<5i{{@>dgek&u-XxU>x4Y{YSP8#dEO3zr@&l(kO`p(Meglm{CRS zn*V~tZ$d(Trg<_^r)KDF_l*qE<`|c!mGt4Ady6jS+H%O~jL}P&tJ5;7w>^MGmLRA} zVucn9`RnogD6N!c%l*1WQ-wk(t1w-|`8l&RT_!GozJDY$S2Ct;>zC=R|_ z`$D=Xn(jbRT3}hS%YABT@%wZDKu^^K$Gr0{|oU)|J;Nv_u zNxL)Mb`=%=LOQiCKaI)`cl6k!qwI)DT3?;)X}xr=84OPiLobe$eBe{rYXzTBNA*2T4y_v(zL%{ zHH20a*oKt`XX;2Om>Z}nsf?8Ra|2VS-^zM%LK{N87>rp$hJX-Zfk_pF)su!Pp)lfw zV54HXB&I81kt^O<87M{)2Tyuyf`PTT!VxTt7TylqSgri<;c4Z$#;!9)xiRk-w(BO9 z>o;bK|HkvShbKk!@=QH1(SMDa5j`jC zHRG`HWJh!P9nXJcRD5JCEH`e*-FW!$;pg+pBWG&QA2#l>E!A^1+hoJjOJ|*aOIC+% z&?H-?;d$b?K6`jaM~6OkX!kjzQT^Lk-Vs@GJQB&Bb0{i+h*=R^NtrF@xqbSiEK%GT`TQAuekT9#Hog*xtT%3GGuly^@tf`XZ)}$wj88F7t4*jb`ZI9F&!)(pkA%Gq=K58>EBgb=RMUKDo^z*ie;jv}BbS4t% z&=+Oui!#nq#kO^NiDt_%?rz)FW^`|Px~)yWYv_}0XWH~H58d+gaXoic9N-k1YTV z%{F@ZF1eVqGJjy)bHZ4G(bQqAJ+3bs{(a;Ar46Dt@^l1Cp*Sc%1|QNTI##3& zqFZ@7u1ongA-5BKQlt%{wC&YdT$l1AIWKG{I!dGsqO{Ak>Qeq)A-5AfF46{3+TdDs zDgRF)w-bdB|8aH&rM<0Hm-5Sn+)i|*NE<|H+h^6Kd;#Z$?L_B^v_X{4c~)J@<8%aG z*iJMe(gsml)2zC5rwi5LpuZ;M#o9P$3`wQ9}b=T0gymA6xs zrJ$1KP6I{Ypj)BK;XvZW1IJEZ> z@fzCT$1%m32j&tBK1hf?_#1nYzYT^m7a3ijYDgq=YF6}nuO$6CweM;Ap+&)#*Lje zX>!@vvEy;t7G-M?1%>!_58Wj21SmZbKsAIP^7w*&4?|(8TugiW+dYWs)*!0PRpBWS zl@KLyCN1@Qu&FE$S6DcdM3o$dw-fo>Jte^s&n!>g`muS_*H1(%MP$W;(29l4?V4pN zUlyoBTl>{^p-t4E@>r37=~EA(_8*vk7_g4#K(Uv1Jh6bad&;@&g$B&e2IS=*LgM)n zseg~8(FS9+AcN$OoPg&hw_ zdX1#-6$t*5k`_riMAEnB3i;!b7D%c|`uZFp|C*%JCH?Dc!T+J8)sjw>^jyA>e@D_1 zNj;MO?oJ_pR?=mXW=Z-sA}ku(zeUn}BsC=c*(@P{RMI;o{bZ)#zbffkNvBGBafXoZ zlJp@-zaZ)9+lBlENgtH-T1ijbCge{^x=2#Dq(^W9A-kiJ{tB0W)Q_c-F8>m1KVa$4 zdB|J)(*`{%-+_xtq7O@Yx1@i?r6}Q@`yy-qkp<^C@>ZN((4+DjBwZ-!6iMBngkwXw zZ&+~tGOagG=QM%yZAtHv^kzw0rV5;~l4eR;J6Z6(lIBYKW}e`GFRyn!&q#g@{HHAT zY)H^sDfR9JztW;NJwfkHr>N&APS&1h(fb$Vt$y+%Pk##y#|t!{CZvgS|A935=UWce zPJeGr$s3WkmVZM|DL3KB+V0YJ8ksv-+o%~?FS`omvob)4@ipP z%k@V|dIY-=Dt}1QLP-}$nk(r9Nry-}NYYL;j>_+o^xKj?FX9-Jz zr1Ia8bfcteCB0M98IpcM(lL^5M(~r$w@7-wq{}3|S<;&%{Q!Fg(myBZK1ugV`i!Jc zN?Ivtg``pGw`NJvERMHJQgnO!dtPKP4(M+u4nhK^GCFS}u)xr41}Fw|@HaCcgE2RP zJ}c8(LH}K*X)pbfOw(R@uT0ZknEIK@(q8wtOw(Q#Eas*!9N2jBH0@g_AdMgiu^E=+ zp7csfI&4Xg?LYzs8bg-oz~xXY}6CdU*&(XwnXMF`lhq-ZETUSK(%d;BWML zXX7?*Fg)MuEyMjz!LBF<6OZc5#byM5AhQfNw@Z|y5L-0jBe+R>6o#F(bu))7?dHV3 c4Vh)6(6hh8?dhHkp11F=5y3L+wvn;_0j==3)c^nh diff --git a/3party/bzip2/crctable.c b/3party/bzip2/crctable.c index 215687b2c0..1fea7e946c 100644 --- a/3party/bzip2/crctable.c +++ b/3party/bzip2/crctable.c @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/3party/bzip2/crctable.o b/3party/bzip2/crctable.o deleted file mode 100644 index b1382143e34b17124148c456a73d930d21648fe9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4156 zcmbVP4Omm<7r%G+GNv0aL{KAgHU$k~h_nn6K@=iX5Me3^m$4048+UUbC>n`hq>@IF zTA~T5lphos87h>PADN<5WE5IvMWtbsrWG0gbMD>b%jfx5@AKUI-uHLT`Mu}7?|IL= zo&B@pZ&!jKD0oOmKaYkF89(ks!ChLhm>_JRhdtWk|Q1v$om@jv9S z6`BWf90HC#z!Cfp{Lr(wBH975Xfdgwwf+MRtIfjc_K)S?a5&QAzxtuJsW}&%enh84 z_l%1%7C3J=AQnj3yEfdQ;qcrG`%XeX7W$#kWB5t%^lm7}=fAXQaDYz+nv9#3DvObY z1&0Ptkd2Ktn~geIJgW(oW!v>et?WT%m~xzKtkz_cO&CXz8jHrJ&Nk|THH0G7s;7x4zri&&7pn#7LY=# zJ{M9zrpZ%V2mvXwvwZ-8i#5+=vB~tTjSvW2`N16>4y9eNqZq~x{lriP6oWco76I+r zS5f3*G_kod?!{S(Tzi1Nsx+^PS~TqnUUKfi99p$yk)CC&`XxG?C`|=h0TXdNeJFZ# z7ojaG=d^%VJ-EfravTN&aJbOIhoIXBk82pd2oa5dh^~kCAp9IGrDls@_rwg7uV)D= zc_n}XIX6}>Ca5|5m`1tUOi(HOSOjD4pb}InnhWF-U~S`ENd_0Dvo=d1L8%&X3K2Cg ziJyXXoC#_^dd*Mcgwjw)Ag6)H9lj_Ad6Kcj5>&bjkikQ#jB*DL-Xc^cj-0+)4Pb%} z2;@?N3wsAhxvEvOAe1bSP}w8l6mh}j>NNzV*?K2@9jh^E^=vLd zX;DWY$C$0TIvXxALFFWJ;8+CBb_bZdgagL|sAmh*M!lBdwe$F83jqNFxO4>dcrm9P z1|Y1h(X>csAt*x`fRwxrX9Lu3HX~|upweCh4BpC=RRxiN{_tKbyu`*!8XOXiiI>=U z$uX1^s4aRtgaox{3&c*z&-6waqYjc{F_&ZVW|Xj)cp6+qxcaCfUebb+K7uDJxiDIX z^LwFy5w{m32{#hgA|3$u{qW&F1z$LXjYmL4qp}-`%=mM_9o5}2hj~@*CxVDZKt!j4 zf)IBd*N2;+n-HP_PVX3tXv_pYpJtdeYK(Q+L4;D{@oW<`cd~^z;m2U+K}Z=UCN{>z zT5W39HpgaxEa37cS(l@;KwjvGlb}bEq$e{?m!q~DZJ4W0?p4*CPO$<%p)|(tT41}Z$#np1slN=-R5>p~yktaEXl)`-{7)^-9kpO|GJ_IES7e|QW zy`b##I2>;eP=NSJGTw^>f$JzD-b(?92nDD*$R7|mIbNh#jOM5%hU4JingqX4Bp`Ef z%G|uk00~d#?!uXRjDl5>hJi`E*Az*Z#Wwuv;w(J*zR=wK|1<;v^-}8zG2Zw*px3RVFwOO`RtPMzDL?ON{z##%$3S zsBJocxaI-^Xe5bl^WXTB4!5D-@}pXHA0H{)B|lK$SN%_@7TD)|HDh{u-&wzAc36&g=zTJF#&zrr0E7mAiF-EMBm z$+TTMAb(-*-pgAztgm|Z;j*laj~odoExp+OOmf$*72maMOXj5qzVmbJl|#y`-ES{1 z%6oHFkfLT{$hF;9d}?-Ph>ewH`JpWV=IhOWt7t!ug~G8kzQBVkvnfDxD+*uL?1StlDO{O zytwv&>Ir?B_rfpNx7gb*mK%&ml1*>5du9u|nseTb-JU5*&rJKM$Zu{=)`dBmkcyct zL22=B;t|sh`LsrDKCx?`tWEpsAGZT`&AQZHl~7yt?q4-ohsTu44?MT&@_t2N&AJzq z#tqR@#mbv**PgnbvHQhoQF+_8Ju=L9F-}}{FN+RsvuJu>`7#VS^Bf?O7{po^* zw^EZr|GYf&`rk}v!-*d{ir$-WI`Uk}`R>yzOX@!jt0?@aqcQwKT4h)3wM!EH{M$|W z#cdn19y*bz4c#PKvbyxtlM8CrS+CY6EK<4AiC;^PCrnb7#6A-kH+9`oV!`B`qw~Iv zT9G;@BWCtX5q@LF`Ck~-No*e<=a)Hl>dXCLNIr=DCN*?6j~`=IndL)|NT zi)vr)3V+SJy=%{zBlWK=y;!*8M3%B*VbQJaucp^MH!{|~=^mfZH8tYvPuqfOm%ksf zaP^C2>oS7ZC(OUKSCkTU;8fD|_6@Us?Mi$s@S-Gc>yf6IQAI13Zpw;TmKaM|eosGI za9doG_n1$du{?xUj}AJn`!S)yGgFo3{gipc@R0o0dmo& + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -381,6 +381,13 @@ Int32 BZ2_decompress ( DState* s ) es = -1; N = 1; do { + /* Check that N doesn't get too big, so that es doesn't + go negative. The maximum value that can be + RUNA/RUNB encoded is equal to the block size (post + the initial RLE), viz, 900k, so bounding N at 2 + million should guard against overflow without + rejecting any legitimate inputs. */ + if (N >= 2*1024*1024) RETURN(BZ_DATA_ERROR); if (nextSym == BZ_RUNA) es = es + (0+1) * N; else if (nextSym == BZ_RUNB) es = es + (1+1) * N; N = N * 2; @@ -485,15 +492,28 @@ Int32 BZ2_decompress ( DState* s ) RETURN(BZ_DATA_ERROR); /*-- Set up cftab to facilitate generation of T^(-1) --*/ + /* Check: unzftab entries in range. */ + for (i = 0; i <= 255; i++) { + if (s->unzftab[i] < 0 || s->unzftab[i] > nblock) + RETURN(BZ_DATA_ERROR); + } + /* Actually generate cftab. */ s->cftab[0] = 0; for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1]; for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1]; + /* Check: cftab entries in range. */ for (i = 0; i <= 256; i++) { if (s->cftab[i] < 0 || s->cftab[i] > nblock) { /* s->cftab[i] can legitimately be == nblock */ RETURN(BZ_DATA_ERROR); } } + /* Check: cftab entries non-descending. */ + for (i = 1; i <= 256; i++) { + if (s->cftab[i-1] > s->cftab[i]) { + RETURN(BZ_DATA_ERROR); + } + } s->state_out_len = 0; s->state_out_ch = 0; diff --git a/3party/bzip2/decompress.o b/3party/bzip2/decompress.o deleted file mode 100644 index 49ea251b1f915f45597d322a4b41ae79261e2bf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29720 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≤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 - + - - + + diff --git a/3party/bzip2/format.pl b/3party/bzip2/format.pl old mode 100644 new mode 100755 index 1928d15739..f169fd9de2 --- a/3party/bzip2/format.pl +++ b/3party/bzip2/format.pl @@ -4,8 +4,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.5 of 10 December 2007 -# Copyright (C) 1996-2007 Julian Seward +# bzip2/libbzip2 version 1.0.6 of 6 September 2010 +# Copyright (C) 1996-2010 Julian Seward # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. diff --git a/3party/bzip2/huffman.c b/3party/bzip2/huffman.c index 87e79e38af..2283fdbc5a 100644 --- a/3party/bzip2/huffman.c +++ b/3party/bzip2/huffman.c @@ -8,8 +8,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward + bzip2/libbzip2 version 1.0.6 of 6 September 2010 + Copyright (C) 1996-2010 Julian Seward Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. diff --git a/3party/bzip2/huffman.o b/3party/bzip2/huffman.o deleted file mode 100644 index 655ef10f662edc8a9839a560b0ed6a576ce44983..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6492 zcma)A3vg7`89w)so_hjDNwnsl0$%#^9E>Gz*=?(Qa= zI^Nm6=lqZJo$vhTKabtt|NC#B7cs^(d=**l)KT#Wd6EosJWse8OTdpxYER!1>F4t$ ztbK`WBcE@(xpR9~rdn5_Xis&$f-#j>*g-1j@%aK)L$cY|6!W)PT;BM=hHZCp8@&#q zeJ{$X`J!z(FeFtDMLsr0Fx(Uo@=OdJq#rUE+gD6h#+C!aDXMuG{)UE_wU;nwV)#lK zTY|uSfH=&0@-brmaI+Q9!{|n*9yI=Exj=XgJZLWPyDI$Tqc&w3g`ubJ5!{GJ2vBVQGZkRn5!q^7Om%)(fk;fw~ zc}#yHk3Gq@s4wAf2+6svtH1Z2ZJAX^7zN-l8^h4~GU7HG6sDY=#f!E8b~R(WQPA?Z zm*kv>)*5|fp5|Dx)%UV_oK>RcO?|xM(8Mdq_7U?GS;p^6o2P10ebMphY1B?%R5jC) zW__m;6**#R==4WM>Zt^r#^;apQAypWxhBmUr@q(s#O3MfY4a4?tu>vUKTMm>lsPbB z4pKiOeJ_57M!ZITqIM8KpQ91T&}hcH&~~J^kJS7z2h-j`=u*8;QS-Dpm@?0%@#*Do zDf8U;)oCwjMz7d9;X2v{?YXodm1~C^^}lAQ^9*l!PGV<>mp;~xz7KT`YM@m5SSzMx zL|;0J4Qs3pnf=KwDAIkefKJLh0Y-MeTs2)kIAWfsv82uOw#B>%K{=H&FQm;2Yt6v} zZKCYD5oL|^%22&vD{P`&+BCJi`2RgR7pJ}Ffn|4SN9#h$JU`yUZ5QnjO6Di$WPV97 zzhncM6KV4jF&|5tW0E9(15S*K=wgmEq;4~5IGHvlZPw-#r6FnZ(-7LJ%=oi*Nlc_6`AF=Zu0f^r@#p_b891OJ z)w&(XzCTd*y^HhijQKvTT)tTD9x;bO9mB)~y*=(sn{NY^A^~yQ9L~ypr#e1LdyTu{ zsSKsf;lqf<@LIFHTL+$!$^7nP2fN;9i8{N3mGGB5PhT-oK=cl$&Ym7yqF}kzaQPH~ zPG2-Ye#YYO{_Q89V}TqRrk&=IcYcFyr)Q#K#GDj-u`f)FuNyI^NF2W&qsOLG`X(!V z6FbL5(hUVRqSTP)H4xL3I&Dr)BZ}tKTC<{abku@`#GIfJyv4zH^h}hGm}3IHg3#B> z&Io-{Gs|b7k4bcdjH8dC160?Vp3YGldU5x!M$8FL(1pIl#yCPUgG*1>#G>vo+hIxC z>*yKM;g;zM{s^^NL*xZlPv@WE&u6Y$0H)4pNk;}dZ4k<*go4ILbT!S6=t`>4?(JQ> zw+tO4j}8xL+T;X_gvYb~^R8LO~^+4E5Belsaln*^C!=W35$Sq9?{z zOTW`vy#tvvlV;74awK6E`%lZxq$X3yD>3lJ-9tUY<;Vhrj;>0yvnx#LG#t8q81Yz2 zF_lj{4nLh@RATh0I-QCO3h1uLzN@jtIX(}gKHJa6IR}g%17o&bhn{dAz`c`@$>XlA zUQexORn>~BTRb;xh(<$}r!L%BSFc*V%yUB^lJMNJj43V2rlvN3xT=v= zd*fCtUfq$5b+lQbaImq(YOUUA#ak1RXmvc133-UC!_+t=_WO#-`Er_>7VhK+$oM5V2B!r9)*XjjSXg*&O<;oR4 zIDUhYSJjJVIvNF`NVwU3R`Za(d_^;E%Nj!@hWMzeOGG@*>#i zh~vzF$ojTZTXJst0Iah5STf8pTK52>KrdX4;#GW$R?>?ZIw=hO7kJO3>U^hmUlAs+ z*yn2thMBhQJ5Z{XT=wr{+WkV-$?lIbZM%>S$o#I#G%qz*D;+@n3#YOT6wGiU*1@zL zC#efV+j)=ZA}p_k+JnSebYrV_k&jxb17`thnvZa{(XR}qJ+uUx`Q_TfPf8s6A*DS+ zlFc>ViY7!rt#mRz?3ZEX!(Jf4Y7w&9kUt)0+M~@dI(9p>hHH?-d~nUdMy54Bml?hl zZj1zi;bx`<$VaWDF~^&&1cjJsOpiM@jqzy@}GY7y&KTNf_7bAgxMGlIvB!uOp zv~VP0Neas_S@!y4L4MKJ+MmJLwaWK$wZ4#rq}a!Etnw^b!jyQ86h-{{)4GJ^99d=< zx{vZ`hEC246he-Z7rB>E4hvV(!HE=x zz8yj#%{s-0cQDNgsR4B_WkaV-5c#wv(&)#J3hlrNQr!`WgqVKgQMA{*lpRdJi3@eK z=9#{nI2igcunc_^?^5M9Xp~xXz!+_<^t_C1$4PNg*8deMwVyegV%E2rQgexmI(|l? z(FOug`;D?nlI{?a!xi2d2_TZnCQ@kqKRVzFZ?dq`Y{hF(+>((7Ag#zqg9lu}jBw(B zYfnZvdBD{w1+~A%m54;PV3%S_-3d{chV>5Br`k!uhwOhgFmIPC_{ETZ3H@mRQ zTG*+SdZD?p!~JUz{|biggo|tcex~@uAU3%YZ6GYAEzI2rCj|k%({{9kJn`qG@oTL;&ijbbhv5>Yw z{0`xY;fzAX%-%@T@_mJ7l@7e+5bwi5>BKHzG39A7mwcj|6D>@6M$EPD#J0JGCjVK{ zx18VSgyax&|Gbc#F8IA5>H*hYt1%f8zpMc1-AcQrHy8OU|s*P%f~-AZvWH7BoPoDvf2Rz%+cTY+s` zuu!?)A;3xsc+=7D8CG{OM(0wfUAd?t zcAP8z+*ouiB6$@xsB^D(ta9Au!2cQ9_UpNV-{7!f@E~0Bv2Q^nUcpyoSOAFSXC({p zMob~#Q=N>*s)OOiP%>au2Up&@n&oO3%ihhTdEj zwruWCHX9#*`13){-PC{i^52g?sLgvKnC$6SmzEt{b6hK~Y8S$*1IA_b=5lpixp8@K zk9wWkaIZPuudXaRrWR7};Gvg_|8}Xw9zk`3N?PP9OCp8DL-IbZOXyVY7j=V5T7$X1 zB>z#^bt*p;b%RQZeXj3AfEV*a|IL01k2`j)@U=A5`&+GA>?_zfut4LCb|PWf5T~0e z+2VZr5!%|Ah45~)XfN7Mr*)k3J~0EHj=`M!DxIsduadiE@p33v|hPNu3$Q6`0+Z7ia1+oD-j1Pk@tt9E&ls)IEEmeMOqLT^v*b4>%YR|8Bwv>0VcBo5Ea`U}**jzjm{-IG%wD4Zt|?3Lmm`h> zk*zn$I%OYJT#tg8_+p!+Dkfm=z({p&YDv``LFbl+{XQSutyp4{&)4J+hS>iA_QeP- diff --git a/3party/bzip2/impure.c b/3party/bzip2/impure.c deleted file mode 100644 index a51529f308..0000000000 --- a/3party/bzip2/impure.c +++ /dev/null @@ -1,18 +0,0 @@ -#ifdef OMIM_OS_BADA - -#include - -/* Note that there is a copy of this in sys/reent.h. */ -#ifndef __ATTRIBUTE_IMPURE_PTR__ -#define __ATTRIBUTE_IMPURE_PTR__ -#endif - -#ifndef __ATTRIBUTE_IMPURE_DATA__ -#define __ATTRIBUTE_IMPURE_DATA__ -#endif - -struct _reent __ATTRIBUTE_IMPURE_DATA__ _impure_data = _REENT_INIT(_impure_data); -struct _reent *__ATTRIBUTE_IMPURE_PTR__ _impure_ptr = &_impure_data; -struct _reent *_CONST __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &_impure_data; - -#endif \ No newline at end of file diff --git a/3party/bzip2/manual.html b/3party/bzip2/manual.html index bd9eac8591..b8d73fccc5 100644 --- a/3party/bzip2/manual.html +++ b/3party/bzip2/manual.html @@ -1,8 +1,8 @@ -bzip2 and libbzip2, version 1.0.5 - +bzip2 and libbzip2, version 1.0.6 + -
+

-bzip2 and libbzip2, version 1.0.5

+bzip2 and libbzip2, version 1.0.6

A program and library for data compression

@@ -91,29 +91,29 @@ div.literallayout, pre.programlisting, pre.screen {

http://www.bzip.org
-

Version 1.0.5 of 10 December 2007

-

Copyright 1996-2007 Julian Seward

-
-

This program, bzip2, the +

Version 1.0.6 of 6 September 2010

+

Copyright 1996-2010 Julian Seward

+
+

This program, bzip2, the associated library libbzip2, and - all documentation, are copyright 1996-2007 Julian Seward. + all documentation, are copyright 1996-2010 Julian Seward. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

-
-
+

1.Introduction

bzip2 compresses files @@ -228,19 +228,19 @@ describes both how to use the program and how to work with the library interface. Most of the manual is devoted to this library, not the program, which is good news if your interest is only in the program.

-
-
+

2.How to use bzip2

@@ -260,34 +260,34 @@ only in the program.

This chapter contains a copy of the bzip2 man page, and nothing else.

-
+

2.1.NAME

-
    -

  • bzip2, +

      +

    • bzip2, bunzip2 - a block-sorting file - compressor, v1.0.4

      • -

    • bzcat - + compressor, v1.0.6

      • +

    • bzcat - decompresses files to stdout

      • -

    • bzip2recover - +

    • bzip2recover - recovers data from damaged bzip2 files

-
+

2.2.SYNOPSIS

-
    -

  • bzip2 [ +

      +

    • bzip2 [ -cdfkqstvzVL123456789 ] [ filenames ... ]

      • -

    • bunzip2 [ +

    • bunzip2 [ -fkvsVL ] [ filenames ... ]

      • -

    • bzcat [ -s ] [ +

    • bzcat [ -s ] [ filenames ... ]

      • -

    • bzip2recover +

    • bzip2recover filename

-
+

2.3.DESCRIPTION

bzip2 compresses files @@ -329,20 +329,20 @@ ignored, and a warning issued. bzip2 attempts to guess the filename for the decompressed file from that of the compressed file as follows:

-
    -

  • filename.bz2 +

      +

    • filename.bz2 becomes filename

      • -

    • filename.bz +

    • filename.bz becomes filename

      • -

    • filename.tbz2 +

    • filename.tbz2 becomes filename.tar

      • -

    • filename.tbz +

    • filename.tbz becomes filename.tar

      • -

    • anyothername +

    • anyothername becomes anyothername.out

    @@ -407,7 +407,7 @@ to indicate a corrupt compressed file, 3 for an internal consistency error (eg, bug) which caused bzip2 to panic.

-
+

2.4.OPTIONS

@@ -458,7 +458,7 @@ consistency error (eg, bug) which caused the same figure, at the expense of your compression ratio. In short, if your machine is low on memory (8 megabytes or less), use -s for everything. See - MEMORY MANAGEMENT below.

+ MEMORY MANAGEMENT below.

-q --quiet

Suppress non-essential warning messages. @@ -478,7 +478,7 @@ consistency error (eg, bug) which caused -9 (or -best)

Set the block size to 100 k, 200 k ... 900 k - when compressing. Has no effect when decompressing. See MEMORY MANAGEMENT below. The + when compressing. Has no effect when decompressing. See MEMORY MANAGEMENT below. The --fast and --best aliases are primarily for GNU gzip compatibility. @@ -502,7 +502,7 @@ consistency error (eg, bug) which caused renders these flags irrelevant.

-
+

2.5.MEMORY MANAGEMENT

bzip2 compresses large @@ -574,7 +574,7 @@ Flag usage usage -s usage Size -8 6800k 3300k 2100k 828642 -9 7600k 3700k 2350k 828642

-
+

2.6.RECOVERING DATA FROM DAMAGED FILES

bzip2 compresses files in @@ -612,7 +612,7 @@ cannot be recovered. If you wish to minimise any potential data loss through media or transmission errors, you might consider compressing with a smaller block size.

-
+

2.7.PERFORMANCE NOTES

The sorting phase of compression gathers together similar @@ -638,14 +638,14 @@ performance improvements. I imagine bzip2 will perform best on machines with very large caches.

-
+

2.8.CAVEATS

I/O error messages are not as helpful as they could be. bzip2 tries hard to detect I/O errors and exit cleanly, but the details of what the problem is sometimes seem rather misleading.

-

This manual page pertains to version 1.0.5 of +

This manual page pertains to version 1.0.6 of bzip2. Compressed data created by this version is entirely forwards and backwards compatible with the previous public releases, versions 0.1pl2, 0.9.0 and 0.9.5, 1.0.0, @@ -665,7 +665,7 @@ build yourself an unlimited version if you can recompile it with MaybeUInt64 set to be an unsigned 64-bit integer.

-
+

2.9.AUTHOR

Julian Seward, @@ -690,7 +690,7 @@ patches, helped with portability problems, lent machines, gave advice and were generally helpful.

-
+

3. Programming with libbzip2 @@ -707,34 +707,34 @@ Programming with libbzip2
3.2. Error handling
3.3. Low-level interface
-
3.3.1. BZ2_bzCompressInit
-
3.3.2. BZ2_bzCompress
-
3.3.3. BZ2_bzCompressEnd
-
3.3.4. BZ2_bzDecompressInit
-
3.3.5. BZ2_bzDecompress
-
3.3.6. BZ2_bzDecompressEnd
+
3.3.1. BZ2_bzCompressInit
+
3.3.2. BZ2_bzCompress
+
3.3.3. BZ2_bzCompressEnd
+
3.3.4. BZ2_bzDecompressInit
+
3.3.5. BZ2_bzDecompress
+
3.3.6. BZ2_bzDecompressEnd
3.4. High-level interface
-
3.4.1. BZ2_bzReadOpen
-
3.4.2. BZ2_bzRead
-
3.4.3. BZ2_bzReadGetUnused
-
3.4.4. BZ2_bzReadClose
-
3.4.5. BZ2_bzWriteOpen
-
3.4.6. BZ2_bzWrite
-
3.4.7. BZ2_bzWriteClose
+
3.4.1. BZ2_bzReadOpen
+
3.4.2. BZ2_bzRead
+
3.4.3. BZ2_bzReadGetUnused
+
3.4.4. BZ2_bzReadClose
+
3.4.5. BZ2_bzWriteOpen
+
3.4.6. BZ2_bzWrite
+
3.4.7. BZ2_bzWriteClose
3.4.8. Handling embedded compressed data streams
3.4.9. Standard file-reading/writing code
3.5. Utility functions
-
3.5.1. BZ2_bzBuffToBuffCompress
-
3.5.2. BZ2_bzBuffToBuffDecompress
+
3.5.1. BZ2_bzBuffToBuffCompress
+
3.5.2. BZ2_bzBuffToBuffDecompress
-
3.6. zlib compatibility functions
-
3.7. Using the library in a stdio-free environment
+
3.6. zlib compatibility functions
+
3.7. Using the library in a stdio-free environment
-
3.7.1. Getting rid of stdio
+
3.7.1. Getting rid of stdio
3.7.2. Critical error handling
3.8. Making a Windows DLL
@@ -744,8 +744,8 @@ Programming with libbzip2 libbzip2.

For general background information, particularly about memory use and performance aspects, you'd be well advised to read -How to use bzip2 as well.

-
+How to use bzip2 as well.

+

3.1.Top-level structure

libbzip2 is a flexible @@ -765,7 +765,7 @@ library clients.

To use any part of the library, you need to #include <bzlib.h> into your sources.

-
+

3.1.1.Low-level summary

This interface provides services for compressing and @@ -800,7 +800,7 @@ to these functions. This is a flexible mechanism allowing a consumer-pull style of activity, or producer-push, or a mixture of both.

-
+

3.1.2.High-level summary

This interface provides some handy wrappers around the @@ -839,7 +839,7 @@ respectively. That avoids portability problems associated with file operations and file attributes, whilst not being much of an imposition on the programmer.

-
+

3.1.3.Utility functions summary

For very simple needs, @@ -871,7 +871,7 @@ I hope to document them properly when time permits.

library to be built as a Windows DLL.

-
+

3.2.Error handling

The library is designed to recover cleanly in all @@ -1008,12 +1008,12 @@ kind.

buffer provided.

-
+

3.3.Low-level interface

-
+

-3.3.1.BZ2_bzCompressInit

+3.3.1.BZ2_bzCompressInit

typedef struct {
   char *next_in;
   unsigned int avail_in;
@@ -1137,9 +1137,9 @@ BZ_OK
   if BZ_OK is returned
   no specific action needed in case of error
-
+

-3.3.2.BZ2_bzCompress

+3.3.2.BZ2_bzCompress
int BZ2_bzCompress ( bz_stream *strm, int action );

Provides more input and/or output buffer space for the library. The caller maintains input and output buffers, and @@ -1296,20 +1296,20 @@ FINISHING/other Return value = BZ_SEQUENCE_ERROR

That still looks complicated? Well, fair enough. The usual sequence of calls for compressing a load of data is:

-
    -

  1. Get started with +

      +

    1. Get started with BZ2_bzCompressInit.

      2. -

    2. Shovel data in and shlurp out its compressed form +

    3. Shovel data in and shlurp out its compressed form using zero or more calls of BZ2_bzCompress with action = BZ_RUN.

      4. -

    4. Finish up. Repeatedly call +

    5. Finish up. Repeatedly call BZ2_bzCompress with action = BZ_FINISH, copying out the compressed output, until BZ_STREAM_END is returned.

      6. -

    6. Close up and go home. Call +

    7. Close up and go home. Call BZ2_bzCompressEnd.

    If the data you want to compress fits into your input @@ -1329,9 +1329,9 @@ a bug in your programming.

    BZ_PARAM_ERROR
   if strm is NULL, or strm->s is NULL
-
+

-3.3.3.BZ2_bzCompressEnd

+3.3.3.BZ2_bzCompressEnd
int BZ2_bzCompressEnd ( bz_stream *strm );

Releases all memory associated with a compression stream.

@@ -1339,9 +1339,9 @@ stream.

BZ_PARAM_ERROR  if strm is NULL or strm->s is NULL
 BZ_OK           otherwise
-
+

-3.3.4.BZ2_bzDecompressInit

+3.3.4.BZ2_bzDecompressInit
int BZ2_bzDecompressInit ( bz_stream *strm, int verbosity, int small );

Prepares for decompression. As with BZ2_bzCompressInit, a @@ -1364,7 +1364,7 @@ internal state will have been initialised, and library will use an alternative decompression algorithm which uses less memory but at the cost of decompressing more slowly (roughly speaking, half the speed, but the maximum memory -requirement drops to around 2300k). See How to use bzip2 +requirement drops to around 2300k). See How to use bzip2 for more information on memory management.

Note that the amount of memory needed to decompress a stream cannot be determined until the stream's header has been @@ -1386,9 +1386,9 @@ BZ_MEM_ERROR if BZ_OK was returned no specific action required in case of error

-
+

-3.3.5.BZ2_bzDecompress

+3.3.5.BZ2_bzDecompress
int BZ2_bzDecompress ( bz_stream *strm );

Provides more input and/out output buffer space for the library. The caller maintains input and output buffers, and uses @@ -1461,9 +1461,9 @@ BZ_OK BZ2_bzDecompressEnd otherwise

-
+

-3.3.6.BZ2_bzDecompressEnd

+3.3.6.BZ2_bzDecompressEnd
int BZ2_bzDecompressEnd ( bz_stream *strm );

Releases all memory associated with a decompression stream.

@@ -1476,14 +1476,14 @@ BZ_OK 
  None.
-
+

3.4.High-level interface

This interface provides functions for reading and writing bzip2 format files. First, some general points.

-
    -

  • All of the functions take an +

      +

    • All of the functions take an int* first argument, bzerror. After each call, bzerror should be consulted @@ -1500,7 +1500,7 @@ general points.

      of the difficulty. bzerror may also be set to various other values; precise details are given on a per-function basis below.

      • -

    • If bzerror indicates +

    • If bzerror indicates an error (ie, anything except BZ_OK and BZ_STREAM_END), you should @@ -1519,22 +1519,22 @@ general points.

      BZ2_bzReadClose (BZ2_bzWriteClose) should then be called to clean up.

      • -

    • The FILE* arguments +

    • The FILE* arguments passed to BZ2_bzReadOpen / BZ2_bzWriteOpen should be set to binary mode. Most Unix systems will do this by default, but other platforms, including Windows and Mac, will not. If you omit this, you may encounter problems when moving code to new platforms.

      • -

    • Memory allocation requests are handled by +

    • Memory allocation requests are handled by malloc / free. At present there is no facility for user-defined memory allocators in the file I/O functions (could easily be added, though).

    -
    +

    -3.4.1.BZ2_bzReadOpen

    +3.4.1.BZ2_bzReadOpen
typedef void BZFILE;
 
 BZFILE *BZ2_bzReadOpen( int *bzerror, FILE *f, 
@@ -1594,9 +1594,9 @@ NULL
 BZ2_bzClose
   otherwise
-
+

-3.4.2.BZ2_bzRead

+3.4.2.BZ2_bzRead
int BZ2_bzRead ( int *bzerror, BZFILE *b, void *buf, int len );

Reads up to len (uncompressed) bytes from the compressed file @@ -1668,9 +1668,9 @@ collect data from buf, then BZ2_bzReadClose or BZ2_bzReadGetUnused BZ2_bzReadClose otherwise

-
+

-3.4.3.BZ2_bzReadGetUnused

+3.4.3.BZ2_bzReadGetUnused
void BZ2_bzReadGetUnused( int* bzerror, BZFILE *b, 
                           void** unused, int* nUnused );

Returns data which was read from the compressed file but @@ -1697,9 +1697,9 @@ BZ_OK

Allowable next actions:

BZ2_bzReadClose
-
+

-3.4.4.BZ2_bzReadClose

+3.4.4.BZ2_bzReadClose
void BZ2_bzReadClose ( int *bzerror, BZFILE *b );

Releases all memory pertaining to the compressed file b. @@ -1717,9 +1717,9 @@ BZ_OK

Allowable next actions:

none
-
+

-3.4.5.BZ2_bzWriteOpen

+3.4.5.BZ2_bzWriteOpen
BZFILE *BZ2_bzWriteOpen( int *bzerror, FILE *f, 
                          int blockSize100k, int verbosity,
                          int workFactor );
@@ -1763,9 +1763,9 @@ NULL BZ2_bzWriteClose otherwise
-
+

-3.4.6.BZ2_bzWrite

+3.4.6.BZ2_bzWrite
void BZ2_bzWrite ( int *bzerror, BZFILE *b, void *buf, int len );

Absorbs len bytes from the buffer buf, eventually to be @@ -1781,9 +1781,9 @@ BZ_IO_ERROR BZ_OK otherwise

-
+

-3.4.7.BZ2_bzWriteClose

+3.4.7.BZ2_bzWriteClose
void BZ2_bzWriteClose( int *bzerror, BZFILE* f,
                        int abandon,
                        unsigned int* nbytes_in,
@@ -1833,20 +1833,20 @@ BZ_IO_ERROR
 BZ_OK
   otherwise
-
+

3.4.8.Handling embedded compressed data streams

The high-level library facilitates use of bzip2 data streams which form some part of a surrounding, larger data stream.

-
    -

  • For writing, the library takes an open file handle, +

      +

    • For writing, the library takes an open file handle, writes compressed data to it, fflushes it but does not fclose it. The calling application can write its own data before and after the compressed data stream, using that same file handle.

      • -

    • Reading is more complex, and the facilities are not as +

    • Reading is more complex, and the facilities are not as general as they could be since generality is hard to reconcile with efficiency. BZ2_bzRead reads from the compressed file in blocks of size @@ -1882,7 +1882,7 @@ can be used. If you require extra flexibility, you'll have to bite the bullet and get to grips with the low-level interface.

    -
    +

    3.4.9.Standard file-reading/writing code

    Here's how you'd write data to a compressed file:

    @@ -1949,12 +1949,12 @@ if ( bzerror != BZ_STREAM_END ) { }
    -
    +

    3.5.Utility functions

    -
    +

    -3.5.1.BZ2_bzBuffToBuffCompress

    +3.5.1.BZ2_bzBuffToBuffCompress
    int BZ2_bzBuffToBuffCompress( char*         dest,
                               unsigned int* destLen,
                               char*         source,
@@ -2005,9 +2005,9 @@ BZ_OUTBUFF_FULL
 BZ_OK
   otherwise
    -
    +

    -3.5.2.BZ2_bzBuffToBuffDecompress

    +3.5.2.BZ2_bzBuffToBuffDecompress
int BZ2_bzBuffToBuffDecompress( char*         dest,
                                 unsigned int* destLen,
                                 char*         source,
@@ -2065,9 +2065,9 @@ BZ_OK
   otherwise
-
+

-3.6.zlib compatibility functions

+3.6.zlib compatibility functions

Yoshioka Tsuneo has contributed some functions to give better zlib compatibility. These functions are BZ2_bzopen, @@ -2108,12 +2108,12 @@ and fclose.

*errnum to its numerical value.

-
+

-3.7.Using the library in a stdio-free environment

-
+3.7.Using the library in a stdio-free environment
+

-3.7.1.Getting rid of stdio

+3.7.1.Getting rid of stdio

In a deeply embedded application, you might want to use just the memory-to-memory functions. You can do this conveniently by compiling the library with preprocessor symbol @@ -2131,7 +2131,7 @@ functions:

When compiled like this, all functions will ignore verbosity settings.

-
+

3.7.2.Critical error handling

libbzip2 contains a number @@ -2143,13 +2143,13 @@ behaviour depends on whether or not the library was compiled with message:

bzip2/libbzip2: internal error number N.

-

This is a bug in bzip2/libbzip2, 1.0.5 of 10 December 2007. +

This is a bug in bzip2/libbzip2, 1.0.6 of 6 September 2010. Please report it to me at: jseward@bzip.org. If this happened when you were using some program which uses libbzip2 as a component, you should also report this bug to the author(s) of that program. Please make an effort to report this bug; timely and accurate bug reports eventually lead to higher -quality software. Thanks. Julian Seward, 10 December 2007. +quality software. Thanks. Julian Seward, 6 September 2010.

where N is some error code @@ -2176,7 +2176,7 @@ are indicated via error return codes from functions, and can be recovered from.

-
+

3.8.Making a Windows DLL

Everything related to Windows has been contributed by @@ -2218,7 +2218,7 @@ Otherwise the resulting binary won't work correctly.

plausible.

-
+

4.Miscellanea

@@ -2233,7 +2233,7 @@ plausible.

These are just some random thoughts of mine. Your mileage may vary.

-
+

4.1.Limitations of the compressed file format

bzip2-1.0.X, @@ -2250,15 +2250,15 @@ work since the release of shown complexities in the file format which slow down decompression and, in retrospect, are unnecessary. These are:

-