From 423790ecba0d2940f663a0ff22975e3b0c7b0d6f Mon Sep 17 00:00:00 2001 From: Luiz Rafael Culik Date: Sat, 3 Apr 2004 04:21:31 +0000 Subject: [PATCH] Added linux makefiles --- harbour/contrib/hbzlib/License.txt | 73 + harbour/contrib/hbzlib/Linux/Makefile | 91 + harbour/contrib/hbzlib/Linux/ZipFileMapping.h | 70 + .../contrib/hbzlib/Linux/ZipPathComponent.cpp | 194 ++ harbour/contrib/hbzlib/Linux/ZipPlatform.cpp | 546 +++++ harbour/contrib/hbzlib/Makefile | 33 - harbour/contrib/hbzlib/adler32.c | 49 - harbour/contrib/hbzlib/compress.c | 68 - harbour/contrib/hbzlib/crc32.c | 162 -- harbour/contrib/hbzlib/deflate.c | 1350 ----------- harbour/contrib/hbzlib/deflate.h | 318 --- harbour/contrib/hbzlib/gvmat32c.c | 209 -- harbour/contrib/hbzlib/gzio.c | 875 ------- harbour/contrib/hbzlib/include/ZipExport.h | 18 + harbour/contrib/hbzlib/include/hbz.h | 84 + .../hbzlib/{strcomp.c => include/hbzip.h} | 75 +- harbour/contrib/hbzlib/include/hbzip2.h | 128 + harbour/contrib/hbzlib/include/resource.h | 15 + harbour/contrib/hbzlib/{ => include}/stdafx.h | 49 +- harbour/contrib/hbzlib/{ => include}/unzip.h | 31 +- harbour/contrib/hbzlib/{ => include}/zconf.h | 27 +- harbour/contrib/hbzlib/{ => include}/zip.h | 17 +- .../contrib/hbzlib/include/zipabstractfile.h | 54 + harbour/contrib/hbzlib/include/ziparchive.h | 2052 +++++++++++++++++ .../hbzlib/{ => include}/zipautobuffer.h | 36 +- .../zipbaseexception.h} | 35 +- .../hbzlib/{ => include}/zipcentraldir.h | 406 +++- .../contrib/hbzlib/include/zipcollections.h | 180 ++ .../hbzlib/{ => include}/zipcompatibility.h | 28 +- .../hbzlib/{ => include}/zipexception.h | 152 +- .../contrib/hbzlib/{ => include}/zipfile.h | 47 +- .../hbzlib/{ => include}/zipfileheader.h | 123 +- .../hbzlib/{ => include}/zipfilemapping.h | 26 +- .../hbzlib/{ => include}/zipinternalinfo.h | 12 +- .../contrib/hbzlib/{ => include}/zipmemfile.h | 47 +- .../hbzlib/{ => include}/zippathcomponent.h | 112 +- .../hbzlib/{ => include}/zipplatform.h | 99 +- harbour/contrib/hbzlib/include/zipstorage.h | 588 +++++ .../contrib/hbzlib/{ => include}/zipstring.h | 155 +- harbour/contrib/hbzlib/{ => include}/zutil.h | 12 +- harbour/contrib/hbzlib/infblock.c | 398 ---- harbour/contrib/hbzlib/infblock.h | 39 - harbour/contrib/hbzlib/infcodes.c | 257 --- harbour/contrib/hbzlib/infcodes.h | 27 - harbour/contrib/hbzlib/inffast.c | 170 -- harbour/contrib/hbzlib/inffast.h | 17 - harbour/contrib/hbzlib/inffixed.h | 151 -- harbour/contrib/hbzlib/inflate.c | 366 --- harbour/contrib/hbzlib/inftrees.c | 455 ---- harbour/contrib/hbzlib/inftrees.h | 58 - harbour/contrib/hbzlib/infutil.c | 87 - harbour/contrib/hbzlib/infutil.h | 98 - harbour/contrib/hbzlib/lincompile.sh | 3 + harbour/contrib/hbzlib/make_b32.bat | 29 + harbour/contrib/hbzlib/make_vc.bat | 21 + harbour/contrib/hbzlib/makefile.bc | 182 -- harbour/contrib/hbzlib/makefile2.bc | 126 - harbour/contrib/hbzlib/maketree.c | 85 - harbour/contrib/hbzlib/stdafx.cpp | 17 - harbour/contrib/hbzlib/trees.c | 1214 ---------- harbour/contrib/hbzlib/trees.h | 128 - harbour/contrib/hbzlib/tzipfile.ch | 9 - harbour/contrib/hbzlib/uncompr.c | 58 - harbour/contrib/hbzlib/zipabstractfile.h | 47 - harbour/contrib/hbzlib/ziparchive.cpp | 1440 ------------ harbour/contrib/hbzlib/ziparchive.h | 1063 --------- harbour/contrib/hbzlib/ziparchive2.mak | 278 --- harbour/contrib/hbzlib/ziparchivemt.mak | 271 --- harbour/contrib/hbzlib/zipautobuffer.cpp | 104 - harbour/contrib/hbzlib/zipbaseexception.h | 6 - harbour/contrib/hbzlib/zipcentraldir.cpp | 676 ------ harbour/contrib/hbzlib/zipcollections.cpp | 26 - harbour/contrib/hbzlib/zipcollections.h | 107 - harbour/contrib/hbzlib/zipcompatibility.cpp | 207 -- harbour/contrib/hbzlib/zipexception.cpp | 73 - harbour/contrib/hbzlib/zipfile.c | 164 -- harbour/contrib/hbzlib/zipfile.cpp | 101 - harbour/contrib/hbzlib/zipfile2.c | 631 ----- harbour/contrib/hbzlib/zipfileheader.cpp | 330 --- harbour/contrib/hbzlib/zipmemfile.cpp | 99 - harbour/contrib/hbzlib/zippathcomponent.cpp | 73 - harbour/contrib/hbzlib/zipplatform.cpp | 270 --- harbour/contrib/hbzlib/zipplatformcomm.cpp | 44 - harbour/contrib/hbzlib/zipstorage.cpp | 421 ---- harbour/contrib/hbzlib/zipstorage.h | 375 --- harbour/contrib/hbzlib/zlib.h | 893 ------- harbour/contrib/hbzlib/zlibapi1.c | 397 ---- harbour/contrib/hbzlib/zutil.c | 225 -- 88 files changed, 5170 insertions(+), 15792 deletions(-) create mode 100644 harbour/contrib/hbzlib/License.txt create mode 100644 harbour/contrib/hbzlib/Linux/Makefile create mode 100644 harbour/contrib/hbzlib/Linux/ZipFileMapping.h create mode 100644 harbour/contrib/hbzlib/Linux/ZipPathComponent.cpp create mode 100644 harbour/contrib/hbzlib/Linux/ZipPlatform.cpp delete mode 100644 harbour/contrib/hbzlib/Makefile delete mode 100644 harbour/contrib/hbzlib/adler32.c delete mode 100644 harbour/contrib/hbzlib/compress.c delete mode 100644 harbour/contrib/hbzlib/crc32.c delete mode 100644 harbour/contrib/hbzlib/deflate.c delete mode 100644 harbour/contrib/hbzlib/deflate.h delete mode 100644 harbour/contrib/hbzlib/gvmat32c.c delete mode 100644 harbour/contrib/hbzlib/gzio.c create mode 100644 harbour/contrib/hbzlib/include/ZipExport.h create mode 100644 harbour/contrib/hbzlib/include/hbz.h rename harbour/contrib/hbzlib/{strcomp.c => include/hbzip.h} (61%) create mode 100644 harbour/contrib/hbzlib/include/hbzip2.h create mode 100644 harbour/contrib/hbzlib/include/resource.h rename harbour/contrib/hbzlib/{ => include}/stdafx.h (69%) rename harbour/contrib/hbzlib/{ => include}/unzip.h (95%) rename harbour/contrib/hbzlib/{ => include}/zconf.h (94%) rename harbour/contrib/hbzlib/{ => include}/zip.h (95%) create mode 100644 harbour/contrib/hbzlib/include/zipabstractfile.h create mode 100644 harbour/contrib/hbzlib/include/ziparchive.h rename harbour/contrib/hbzlib/{ => include}/zipautobuffer.h (71%) rename harbour/contrib/hbzlib/{zipinternalinfo.cpp => include/zipbaseexception.h} (54%) rename harbour/contrib/hbzlib/{ => include}/zipcentraldir.h (50%) create mode 100644 harbour/contrib/hbzlib/include/zipcollections.h rename harbour/contrib/hbzlib/{ => include}/zipcompatibility.h (84%) rename harbour/contrib/hbzlib/{ => include}/zipexception.h (50%) rename harbour/contrib/hbzlib/{ => include}/zipfile.h (65%) rename harbour/contrib/hbzlib/{ => include}/zipfileheader.h (71%) rename harbour/contrib/hbzlib/{ => include}/zipfilemapping.h (69%) rename harbour/contrib/hbzlib/{ => include}/zipinternalinfo.h (93%) rename harbour/contrib/hbzlib/{ => include}/zipmemfile.h (66%) rename harbour/contrib/hbzlib/{ => include}/zippathcomponent.h (58%) rename harbour/contrib/hbzlib/{ => include}/zipplatform.h (54%) create mode 100644 harbour/contrib/hbzlib/include/zipstorage.h rename harbour/contrib/hbzlib/{ => include}/zipstring.h (56%) rename harbour/contrib/hbzlib/{ => include}/zutil.h (95%) delete mode 100644 harbour/contrib/hbzlib/infblock.c delete mode 100644 harbour/contrib/hbzlib/infblock.h delete mode 100644 harbour/contrib/hbzlib/infcodes.c delete mode 100644 harbour/contrib/hbzlib/infcodes.h delete mode 100644 harbour/contrib/hbzlib/inffast.c delete mode 100644 harbour/contrib/hbzlib/inffast.h delete mode 100644 harbour/contrib/hbzlib/inffixed.h delete mode 100644 harbour/contrib/hbzlib/inflate.c delete mode 100644 harbour/contrib/hbzlib/inftrees.c delete mode 100644 harbour/contrib/hbzlib/inftrees.h delete mode 100644 harbour/contrib/hbzlib/infutil.c delete mode 100644 harbour/contrib/hbzlib/infutil.h create mode 100644 harbour/contrib/hbzlib/lincompile.sh create mode 100644 harbour/contrib/hbzlib/make_b32.bat create mode 100644 harbour/contrib/hbzlib/make_vc.bat delete mode 100644 harbour/contrib/hbzlib/makefile.bc delete mode 100644 harbour/contrib/hbzlib/makefile2.bc delete mode 100644 harbour/contrib/hbzlib/maketree.c delete mode 100644 harbour/contrib/hbzlib/stdafx.cpp delete mode 100644 harbour/contrib/hbzlib/trees.c delete mode 100644 harbour/contrib/hbzlib/trees.h delete mode 100644 harbour/contrib/hbzlib/tzipfile.ch delete mode 100644 harbour/contrib/hbzlib/uncompr.c delete mode 100644 harbour/contrib/hbzlib/zipabstractfile.h delete mode 100644 harbour/contrib/hbzlib/ziparchive.cpp delete mode 100644 harbour/contrib/hbzlib/ziparchive.h delete mode 100644 harbour/contrib/hbzlib/ziparchive2.mak delete mode 100644 harbour/contrib/hbzlib/ziparchivemt.mak delete mode 100644 harbour/contrib/hbzlib/zipautobuffer.cpp delete mode 100644 harbour/contrib/hbzlib/zipbaseexception.h delete mode 100644 harbour/contrib/hbzlib/zipcentraldir.cpp delete mode 100644 harbour/contrib/hbzlib/zipcollections.cpp delete mode 100644 harbour/contrib/hbzlib/zipcollections.h delete mode 100644 harbour/contrib/hbzlib/zipcompatibility.cpp delete mode 100644 harbour/contrib/hbzlib/zipexception.cpp delete mode 100644 harbour/contrib/hbzlib/zipfile.c delete mode 100644 harbour/contrib/hbzlib/zipfile.cpp delete mode 100644 harbour/contrib/hbzlib/zipfile2.c delete mode 100644 harbour/contrib/hbzlib/zipfileheader.cpp delete mode 100644 harbour/contrib/hbzlib/zipmemfile.cpp delete mode 100644 harbour/contrib/hbzlib/zippathcomponent.cpp delete mode 100644 harbour/contrib/hbzlib/zipplatform.cpp delete mode 100644 harbour/contrib/hbzlib/zipplatformcomm.cpp delete mode 100644 harbour/contrib/hbzlib/zipstorage.cpp delete mode 100644 harbour/contrib/hbzlib/zipstorage.h delete mode 100644 harbour/contrib/hbzlib/zlib.h delete mode 100644 harbour/contrib/hbzlib/zlibapi1.c delete mode 100644 harbour/contrib/hbzlib/zutil.c diff --git a/harbour/contrib/hbzlib/License.txt b/harbour/contrib/hbzlib/License.txt new file mode 100644 index 0000000000..0fd5e9833c --- /dev/null +++ b/harbour/contrib/hbzlib/License.txt @@ -0,0 +1,73 @@ +/** \page pageLic Licensing information + +ZipArchive library - creation, modification and decompression of "zip" format archives
+Copyright © 2000 - 2002 Tadeusz Dracz.
+E-Mail: \htmlonly tdracz@artpol-software.com
+Web: http://www.artpol-software.com \endhtmlonly + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +
+************************************************************************* +An English version of the \ref pageGPL "GNU GPL" is in the gpl.txt file distributed with +this project. Translations to other languages are available at: +\htmlonly +http://www.gnu.org/copyleft/gpl.html +\endhtmlonly + + +Distributing ZipArchive under GNU GPL implies ZipArchive can only be used +with software that is licensed under conditions compliant with the GPL. +Embedding in proprietary software requires an alternative license. + + +\subsection s1 Alternative license for use with proprietary software + + +If you want to distribute software in a commercial context that incorporates +ZipArchive and you do not want to meet the conditions of GNU GPL +(e.g. an obligation to provide a customer with the source code of your +software that uses the ZipArchive library), you need to have a commercial license. +- The commercial license provides you with the same rights as the GNU GPL, but in +addition allows you to embed ZipArchive library in proprietary software without +affecting the copyright of this software (it removes the GNU GPL obligation +to publish the source code) +- The license gives you royalty free distribution rights +- The license does not allow you to transfer these rights +- The license is granted per developer +- You won't need to purchase an additional license for the future versions of the library + + +The commercial license is available free of charge for using ZipArchive library in: +- freeware software (freeware is software that is available free of charge, but which is copyrighted by the developer, who retains the right to control its redistribution and to sell it in the future) + - excluded is software which is associated with an equipment that the same company manufactures and which has no practical usage value without it (e.g. software used for maintenace of machines) - unless the equipment is free as well (?) + - if you decide to sell the software in the future - you will need to purchase the commercial license for using the ZipArchive library, unless it is distributed in the shareware way - see below +- software distributed in the Shareware way (Shareware distribution gives users a chance to try software before buying it. If you try a Shareware program and continue using it, you are expected to register. Individual programs differ on details -- some request registration while others require it, some specify a maximum trial period. +Copyright laws apply to both Shareware and commercial software and the copyright holder retains all rights, with the exception that copying and distributing the program for evaluation purposes is encouraged, subject to certain conditions. For example, some authors require written permission before a commercial disk vendor may copy their Shareware. ) + - excluded is software which price for a single copy is higher than the price of the ZipArchive library for a single developer + +Extended Licence for HBZLIB (library for zip compression in \htmlonly Harbour\endhtmlonly)
+You can create proprietary software using hbzlib respecting the follow: +- ZipArchive library must be linked together with hbzlib +- you cannot use ZipArchive as a dynamic library (DLL), it must be linked staticaly with the software +- the commercial license for ZipArchive is free of charge, but these grants are valid only if the whole application is written with Harbour + +There is a fee for the commercial license for using the library in the software not falling into the mentioned categories. +
+It is recommended that you should print two copies of the commercial license +document after you receive it, sign them and send by post. One copy, signed by the author will be sent back to you. +Please \htmlonly contact the author or visit the Artpol Software web site\endhtmlonly to find out more. + +*/ diff --git a/harbour/contrib/hbzlib/Linux/Makefile b/harbour/contrib/hbzlib/Linux/Makefile new file mode 100644 index 0000000000..af73e9f967 --- /dev/null +++ b/harbour/contrib/hbzlib/Linux/Makefile @@ -0,0 +1,91 @@ +# Makefile for ZipArchive library +# Copyright (C) 2000-2002 Tadeusz Dracz +# For conditions of distribution and use, see copyright notice in License.txt +# To install to /usr/lib and /usr/include, type: +# make install +# to install to a different directory change prefix + + + +CC=g++ +CCC=cc + +#FLAGSD = -g +FLAGSD = + +ZIPARCHLIB = libziparch.a + +ZIPPIELOCATION = stl/zippie/ + +prefix = /usr +libdir = ${prefix}/lib +includedir = ${prefix}/include +zipardir = $(includedir)/ziparchive + +AR=ar rc +RANLIB=ranlib + +.SUFFIXES: .c .cpp +.c.o: + $(CCC) -c -I. -I$(HB_INC_INSTALL) -o $*.o $< +.cpp.o: + $(CC) $(FLAGSD) -I$(HB_INC_INSTALL) -c -I. $< + +OBJS = ZipArchive.o ZipAutoBuffer.o ZipCentralDir.o \ +ZipCompatibility.o ZipException.o ZipFile.o ZipFileHeader.o \ +ZipMemFile.o ZipPathComponent.o ZipPlatform.o ZipPlatformComm.o \ +ZipStorage.o ZipString.o zipnew.o zipcomp.o zip.o + +#OBJSZLIB = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/uncompr.o zlib/deflate.o zlib/trees.o \ +zlib/zutil.o zlib/inflate.o zlib/infblock.o zlib/inftrees.o zlib/infcodes.o zlib/infutil.o zlib/inffast.o + +OBJSZLIB = + +$(ZIPARCHLIB): $(OBJS) $(OBJSZLIB) + $(AR) $@ $(OBJS) $(OBJSZLIB) + -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 + +ZipArchive.o: ZipArchive.h +ZipAutoBuffer.o: ZipAutoBuffer.h +ZipCentralDir.o: ZipCentralDir.h +ZipCompatibility.o: ZipCompatibility.h +ZipException.o: ZipException.h +ZipFile.o: ZipFile.h +ZipFileHeader.o: ZipFileHeader.h +ZipMemFile.o: ZipMemFile.h +ZipPathComponent.o: ZipPathComponent.h +ZipPlatform.o: ZipPlatform.h +ZipStorage.o: ZipStorage.h +ZipString.o: ZipString.h +zipnew.o: hbzip2.h +zipcomp.o: hbzip2.h +zip.o: hbzip2.h + +clean: + -rm -f *.o *~ $(ZIPARCHLIB) + +zippie: + + $(CC) -I$(zipardir) -I$(HB_INC_INSTALL) $(FLAGSD) -o zippie $(ZIPPIELOCATION)zippie.cpp $(ZIPPIELOCATION)CmdLine.cpp -lz -lstdc++ -lziparch +# $(CC) -I$(zipardir) $(FLAGSD) -o zippie ZIPPIELOCATION)zippie.cpp $(ZIPPIELOCATION)CmdLine.cpp -lstdc++ -lziparch +cleanzippie: + -rm -f zippie + +install: + -@if [ ! -d $(includedir) ]; then mkdir $(includedir); fi + -@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi + -@if [ ! -d $(zipardir) ]; then mkdir $(zipardir); fi + cp libziparch.a $(libdir) + cp libziparch.a /usr/lib/xharbour + chmod 755 $(libdir)/$(ZIPARCHLIB) + chmod 755 /usr/lib/xharbour/libziparch.a + cp *.h $(zipardir) + chmod 644 $(zipardir)/*h + +uninstall: + rm -f $(zipardir)/*h + rm -f $(libdir)/$(ZIPARCHLIB) + rmdir $(zipardir) + + + diff --git a/harbour/contrib/hbzlib/Linux/ZipFileMapping.h b/harbour/contrib/hbzlib/Linux/ZipFileMapping.h new file mode 100644 index 0000000000..a38e6e9d11 --- /dev/null +++ b/harbour/contrib/hbzlib/Linux/ZipFileMapping.h @@ -0,0 +1,70 @@ +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipFileMapping.h $ +// $Archive: /ZipArchive_Linux/ZipFileMapping.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2002 by Tadeusz Dracz (http://www.artpol-software.com/) +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// For the licensing details see the file License.txt +//////////////////////////////////////////////////////////////////////////////// + + +#if !defined(AFX_AUTOHANDLE_H__D68326EA_D7FA_4792_AB1F_68D09533E399__INCLUDED_) +#define AFX_AUTOHANDLE_H__D68326EA_D7FA_4792_AB1F_68D09533E399__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#include + +namespace ziparchv +{ + + + struct CZipFileMapping + { + CZipFileMapping() + { + m_iSize = 0; + m_pFileMap = NULL; + } + bool CreateMapping(CZipFile* pFile) + { + if (!pFile) + return false; + m_iSize = pFile->GetLength(); + m_pFileMap = mmap(0, m_iSize, PROT_READ|PROT_WRITE, MAP_SHARED, pFile->m_hFile, 0); + return (m_pFileMap != NULL); + } + void RemoveMapping() + { + + if (m_pFileMap) + { + munmap(m_pFileMap, m_iSize); + m_pFileMap = NULL; + } + } + ~CZipFileMapping() + { + RemoveMapping(); + } + char* GetMappedMemory() + { + return reinterpret_cast (m_pFileMap); + } + protected: + void* m_pFileMap; + size_t m_iSize; + + }; +} + +#endif // !defined(AFX_AUTOHANDLE_H__D68326EA_D7FA_4792_AB1F_68D09533E399__INCLUDED_) diff --git a/harbour/contrib/hbzlib/Linux/ZipPathComponent.cpp b/harbour/contrib/hbzlib/Linux/ZipPathComponent.cpp new file mode 100644 index 0000000000..69431d104b --- /dev/null +++ b/harbour/contrib/hbzlib/Linux/ZipPathComponent.cpp @@ -0,0 +1,194 @@ +//////////////////////////////////////////////////////////////////////////////// + +// $Workfile: ZipPathComponent.cpp $ + +// $Archive: /ZipArchive_Linux/ZipPathComponent.cpp $ + +// $Date$ $Author$ + +//////////////////////////////////////////////////////////////////////////////// + +// This source file is part of the ZipArchive library source distribution and + +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) + +// + +// This program is free software; you can redistribute it and/or + +// modify it under the terms of the GNU General Public License + +// as published by the Free Software Foundation; either version 2 + +// of the License, or (at your option) any later version. + +// + +// For the licensing details see the file License.txt + +//////////////////////////////////////////////////////////////////////////////// + + + +#include "stdafx.h" + +#include "zippathcomponent.h" + + + +////////////////////////////////////////////////////////////////////// + +// Construction/Destruction + +////////////////////////////////////////////////////////////////////// + + + + + +CZipPathComponent::~CZipPathComponent() + +{ + + + +} + + + +void CZipPathComponent::SetFullPath(LPCTSTR lpszFullPath) + +{ + + + + CZipString szTempPath(lpszFullPath); + + const CZipString szPrefix = _T("\\\\?\\unc\\"); + + int i = -1, iLen = szPrefix.GetLength(); + + if (iLen > szTempPath.GetLength()) + + iLen = szTempPath.GetLength(); + + CZipString szPossiblePrefix = szTempPath.Left(iLen); + + szPossiblePrefix.MakeLower(); // must perform case insensitive comparison + + while (++i < iLen && szPossiblePrefix[i] == szPrefix[i]); + + if (i == 2 || i == 4 || i == 8) // unc path, unicode path or unc path meeting windows file name conventions + + { + + m_szPrefix = szTempPath.Left(i); + + szTempPath = szTempPath.Mid(i); + + } + + else + + m_szPrefix.Empty(); + + + + + + m_szDrive.Empty(); + + m_szFileTitle.Empty(); + + m_szDirectory.Empty(); + + m_szFileExt.Empty(); + + int p; + + for (p = szTempPath.GetLength() - 1; p >= 0; p--) + + if (szTempPath[p] == m_cSeparator) + + break; + + + + if (p != -1) + + { + + m_szDirectory = szTempPath.Left(p); + + if (p == szTempPath.GetLength() - 1 ) + + return; // no filename present + + else + + p++; + + } + + else + + p = 0; + + + + // p points at the beginning of the filename + + m_szFileTitle = szTempPath.Mid(p); + + for (p = m_szFileTitle.GetLength() - 1; p >= 0; p--) + + if (m_szFileTitle[p] == _T('.')) + + break; + + + + if (p != -1) + + { + + m_szFileExt = m_szFileTitle.Mid(p+1); + + m_szFileTitle = m_szFileTitle.Left(p); + + } + + + + + + + +} + + + + + +CZipString CZipPathComponent::GetNoDrive() const + +{ + + CZipString szPath = m_szDirectory; + + CZipString szFileName = GetFileName(); + + if (!szFileName.IsEmpty() && !szPath.IsEmpty()) + + szPath += m_cSeparator; + + + + szPath += szFileName; + + return szPath; + +} + + + diff --git a/harbour/contrib/hbzlib/Linux/ZipPlatform.cpp b/harbour/contrib/hbzlib/Linux/ZipPlatform.cpp new file mode 100644 index 0000000000..ebc14abab6 --- /dev/null +++ b/harbour/contrib/hbzlib/Linux/ZipPlatform.cpp @@ -0,0 +1,546 @@ +//////////////////////////////////////////////////////////////////////////////// + +// $Workfile: ZipPlatform.cpp $ + +// $Archive: /ZipArchive_Linux/ZipPlatform.cpp $ + +// $Date$ $Author$ + +//////////////////////////////////////////////////////////////////////////////// + +// This source file is part of the ZipArchive library source distribution and + +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) + +// + +// This program is free software; you can redistribute it and/or + +// modify it under the terms of the GNU General Public License + +// as published by the Free Software Foundation; either version 2 + +// of the License, or (at your option) any later version. + +// + +// For the licensing details see the file License.txt + +//////////////////////////////////////////////////////////////////////////////// + + + + + +#include "stdafx.h" + +#include "zipplatform.h" + +#include "zipfileheader.h" + +#include "zipexception.h" + +#include "zipautobuffer.h" + + + + + +#include + + + + + + + +#include "zippathcomponent.h" + + + + + +#include "zipcompatibility.h" + +#include + +#include + +#include + +#include + +#include + +#include + + + +const TCHAR CZipPathComponent::m_cSeparator = _T('/'); + + + +#ifndef _UTIMBUF_DEFINED + +#define _utimbuf utimbuf + +#endif + + + +////////////////////////////////////////////////////////////////////// + +// Construction/Destruction + +////////////////////////////////////////////////////////////////////// + +DWORD ZipPlatform::GetDeviceFreeSpace(LPCTSTR lpszPath) + +{ + + struct statfs sStats; + + if (statfs(lpszPath, &sStats) == -1) + + return 0; + + + + return sStats.f_bsize * sStats.f_bavail; + +} + + + +bool ZipPlatform::GetFileSize(LPCTSTR lpszFileName, DWORD& dSize) + +{ + + int f = open(lpszFileName, O_RDONLY); + + if (f == -1) + + return false; + + int iSize = lseek(f, 0, SEEK_END); + + close(f); + + if (iSize == -1) + + return false; + + dSize = (DWORD)iSize; + + return true; + +} + + + +CZipString ZipPlatform::GetTmpFileName(LPCTSTR lpszPath, DWORD iSizeNeeded) + +{ + + TCHAR empty[] = _T(""), prefix [] = _T("zar"); + + TCHAR* buf = NULL; + + CZipString tempPath; + + if (lpszPath) + + { + + // first try the user provided directory + + tempPath = lpszPath; + + if (ZipPlatform::GetDeviceFreeSpace(tempPath) < iSizeNeeded) + + tempPath.Empty(); + + else + + { + + CZipPathComponent::AppendSeparator(tempPath); + + tempPath += prefix; + + tempPath += _T("XXXXXX"); + + TCHAR* c = mktemp(tempPath.GetBuffer(tempPath.GetLength())); + + tempPath.ReleaseBuffer(); + + if (c) + + return tempPath; + + else + + tempPath.Empty(); + + } + + } + + + + + + TCHAR* v = tempnam(tempPath, prefix); + + tempPath = v; + + free(v); + + + + if (!tempPath.IsEmpty()) + + { + + CZipPathComponent zpc(tempPath); + + if (ZipPlatform::GetDeviceFreeSpace(zpc.GetFilePath()) < iSizeNeeded) + + return empty; + + return tempPath; + + } + + else + + return empty; + +} + + + +bool ZipPlatform::GetCurrentDirectory(CZipString& sz) + +{ + + char* pBuf = getcwd(NULL, 0); + + if (!pBuf) + + return false; + + sz = pBuf; + + free(pBuf); + + return true; + +} + + + +bool ZipPlatform::SetFileAttr(LPCTSTR lpFileName, DWORD uAttr) + +{ + + return chmod(lpFileName, uAttr >> 16) == 0; + + + +} + + + +bool ZipPlatform::GetFileAttr(LPCTSTR lpFileName, DWORD& uAttr) + +{ + + struct stat sStats; + + if (stat(lpFileName, &sStats) == -1) + + return false; + + uAttr = (sStats.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO | S_IFMT)) << 16; + + return true; + + + + + +} + + + +bool ZipPlatform::GetFileModTime(LPCTSTR lpFileName, time_t & ttime) + +{ + + + + struct stat st; + + if (stat(lpFileName, &st) != 0) + + return false; + + + + ttime = st.st_mtime; + + return ttime != -1; + +} + + + +bool ZipPlatform::SetFileModTime(LPCTSTR lpFileName, time_t ttime) + +{ + + struct utimbuf ub; + + ub.actime = time(NULL); + + ub.modtime = ttime == -1 ? time(NULL) : ttime; // if wrong file time, set it to the current + + return utime(lpFileName, &ub) == 0; + +} + + + + + +bool ZipPlatform::ChangeDirectory(LPCTSTR lpDirectory) + +{ + + return chdir(lpDirectory) == 0; + +} + +int ZipPlatform::FileExists(LPCTSTR lpszName) + +{ + + struct stat st; + + if (stat(lpszName, &st) != 0) + + return 0; + + else + + { + + if (S_ISDIR(st.st_mode)) + + return -1; + + else + + return 1; + + } + + + + + + + +} + + + +ZIPINLINE bool ZipPlatform::IsDriveRemovable(LPCTSTR lpszFilePath) + +{ + + // not implemmented + + return true; + +} + + + +ZIPINLINE bool ZipPlatform::SetVolLabel(LPCTSTR lpszPath, LPCTSTR lpszLabel) + +{ + + // not implemmented + + return true; + +} + + + +ZIPINLINE void ZipPlatform::AnsiOem(CZipAutoBuffer& buffer, bool bAnsiToOem) + +{ + + // not implemmented + +} + + + +ZIPINLINE bool ZipPlatform::RemoveFile(LPCTSTR lpszFileName, bool bThrow) + +{ + + if (unlink(lpszFileName) != 0) + + if (bThrow) + + CZipException::Throw(CZipException::notRemoved, lpszFileName); + + else + + return false; + + return true; + + + + + +} + +ZIPINLINE bool ZipPlatform::RenameFile( LPCTSTR lpszOldName, LPCTSTR lpszNewName , bool bThrow) + +{ + + + + if (rename(lpszOldName, lpszNewName) != 0) + + if (bThrow) + + CZipException::Throw(CZipException::notRenamed, lpszOldName); + + else + + return false; + + return true; + + + +} + +ZIPINLINE bool ZipPlatform::IsDirectory(DWORD uAttr) + +{ + + return S_ISDIR(uAttr >> 16) != 0; + +} + +ZIPINLINE bool ZipPlatform::CreateDirectory(LPCTSTR lpDirectory) + +{ + + return mkdir(lpDirectory, S_IRUSR | S_IWUSR | S_IRGRP |S_IROTH) == 0; + + + +} + + + +ZIPINLINE DWORD ZipPlatform::GetDefaultAttributes() + +{ + + return 0x81a40000; + +} + + + +ZIPINLINE DWORD ZipPlatform::GetDefaultDirAttributes() + +{ + + return 0x41ff0010; + +} + + + + + +ZIPINLINE int ZipPlatform::GetSystemID() + +{ + + return ZipCompatibility::zcUnix; + +} + + + +ZIPINLINE bool ZipPlatform::GetSystemCaseSensitivity() + +{ + + return true; + +} + + + + + +bool ZipPlatform::TruncateFile(int iDes, DWORD iSize) + +{ + + return ftruncate(iDes, iSize) == 0; + + + +} + + + +int ZipPlatform::OpenFile(LPCTSTR lpszFileName, UINT iMode, int iShareMode) + +{ + + return open(lpszFileName, iMode, S_IRUSR | S_IWUSR | S_IRGRP |S_IROTH ); + +} + + + +bool ZipPlatform::FlushFile(int iDes) + +{ + + return fsync(iDes) == 0; + +} + + + +int ZipPlatform::GetFileSystemHandle(int iDes) + +{ + + return iDes; + +} + + + + + + + diff --git a/harbour/contrib/hbzlib/Makefile b/harbour/contrib/hbzlib/Makefile deleted file mode 100644 index a00f02b6d1..0000000000 --- a/harbour/contrib/hbzlib/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# -# $Id$ -# - - -ROOT = ../../ - -C_SOURCES = \ - zipfile.c \ - zipfile2.c \ - zlibapi1.c \ - tzipfile.c \ - strcomp.c \ - adler32.c \ - compress.c \ - crc32.c \ - deflate.c \ - gzio.c \ - infblock.c \ - infcodes.c \ - inffast.c \ - inflate.c \ - inftrees.c \ - infutil.c \ - trees.c \ - uncompr.c \ - zutil.c \ - - -LIBNAME=zlib - -include $(TOP)$(ROOT)config/lib.cf - diff --git a/harbour/contrib/hbzlib/adler32.c b/harbour/contrib/hbzlib/adler32.c deleted file mode 100644 index 39de6af360..0000000000 --- a/harbour/contrib/hbzlib/adler32.c +++ /dev/null @@ -1,49 +0,0 @@ -/* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zlib.h" - -#define BASE 65521L /* largest prime smaller than 65536 */ -#define NMAX 5552 -/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ - -#define DO1(buf,i) {s1 += buf[i]; s2 += s1;} -#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); -#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); -#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); -#define DO16(buf) DO8(buf,0); DO8(buf,8); - -/* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) - uLong adler; - const Bytef *buf; - uInt len; -{ - unsigned long s1 = adler & 0xffff; - unsigned long s2 = (adler >> 16) & 0xffff; - int k; - - if (buf == Z_NULL) return 1L; - - while (len > 0) { - k = len < NMAX ? len : NMAX; - len -= k; - while (k >= 16) { - DO16(buf); - buf += 16; - k -= 16; - } - if (k != 0) do { - s1 += *buf++; - s2 += s1; - } while (--k); - s1 %= BASE; - s2 %= BASE; - } - return (s2 << 16) | s1; -} - diff --git a/harbour/contrib/hbzlib/compress.c b/harbour/contrib/hbzlib/compress.c deleted file mode 100644 index 1cee470913..0000000000 --- a/harbour/contrib/hbzlib/compress.c +++ /dev/null @@ -1,68 +0,0 @@ -/* compress.c -- compress a memory buffer - * Copyright (C) 1995-1998 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zlib.h" - -/* =========================================================================== - Compresses the source buffer into the destination buffer. The level - parameter has the same meaning as in deflateInit. sourceLen is the byte - length of the source buffer. Upon entry, destLen is the total size of the - destination buffer, which must be at least 0.1% larger than sourceLen plus - 12 bytes. Upon exit, destLen is the actual size of the compressed buffer. - - compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_BUF_ERROR if there was not enough room in the output buffer, - Z_STREAM_ERROR if the level parameter is invalid. -*/ -int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; - int level; -{ - z_stream stream; - int err; - - stream.next_in = (Bytef*)source; - stream.avail_in = (uInt)sourceLen; -#ifdef MAXSEG_64K - /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; -#endif - stream.next_out = dest; - stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; - - stream.zalloc = (alloc_func)0; - stream.zfree = (free_func)0; - stream.opaque = (voidpf)0; - - err = deflateInit(&stream, level); - if (err != Z_OK) return err; - - err = deflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - deflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; - } - *destLen = stream.total_out; - - err = deflateEnd(&stream); - return err; -} - -/* =========================================================================== - */ -int ZEXPORT compress (dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; -{ - return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); -} diff --git a/harbour/contrib/hbzlib/crc32.c b/harbour/contrib/hbzlib/crc32.c deleted file mode 100644 index a91101a81c..0000000000 --- a/harbour/contrib/hbzlib/crc32.c +++ /dev/null @@ -1,162 +0,0 @@ -/* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zlib.h" - -#define local static - -#ifdef DYNAMIC_CRC_TABLE - -local int crc_table_empty = 1; -local uLongf crc_table[256]; -local void make_crc_table OF((void)); - -/* - Generate a table for a byte-wise 32-bit CRC calculation on the polynomial: - x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. - - Polynomials over GF(2) are represented in binary, one bit per coefficient, - with the lowest powers in the most significant bit. Then adding polynomials - is just exclusive-or, and multiplying a polynomial by x is a right shift by - one. If we call the above polynomial p, and represent a byte as the - polynomial q, also with the lowest power in the most significant bit (so the - byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p, - where a mod b means the remainder after dividing a by b. - - This calculation is done using the shift-register method of multiplying and - taking the remainder. The register is initialized to zero, and for each - incoming bit, x^32 is added mod p to the register if the bit is a one (where - x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by - x (which is shifting right by one and adding x^32 mod p if the bit shifted - out is a one). We start with the highest power (least significant bit) of - q and repeat for all eight bits of q. - - The table is simply the CRC of all possible eight bit values. This is all - the information needed to generate CRC's on data a byte at a time for all - combinations of CRC register values and incoming bytes. -*/ -local void make_crc_table() -{ - uLong c; - int n, k; - uLong poly; /* polynomial exclusive-or pattern */ - /* terms of polynomial defining this crc (except x^32): */ - static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; - - /* make exclusive-or pattern from polynomial (0xedb88320L) */ - poly = 0L; - for (n = 0; n < sizeof(p)/sizeof(Byte); n++) - poly |= 1L << (31 - p[n]); - - for (n = 0; n < 256; n++) - { - c = (uLong)n; - for (k = 0; k < 8; k++) - c = c & 1 ? poly ^ (c >> 1) : c >> 1; - crc_table[n] = c; - } - crc_table_empty = 0; -} -#else -/* ======================================================================== - * Table of CRC-32's of all single-byte values (made by make_crc_table) - */ -local const uLongf crc_table[256] = { - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, - 0x2d02ef8dL -}; -#endif - -/* ========================================================================= - * This function can be used by asm versions of crc32() - */ -const uLongf * ZEXPORT get_crc_table() -{ -#ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) make_crc_table(); -#endif - return (const uLongf *)crc_table; -} - -/* ========================================================================= */ -#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8); -#define DO2(buf) DO1(buf); DO1(buf); -#define DO4(buf) DO2(buf); DO2(buf); -#define DO8(buf) DO4(buf); DO4(buf); - -/* ========================================================================= */ -uLong ZEXPORT crc32(crc, buf, len) - uLong crc; - const Bytef *buf; - uInt len; -{ - if (buf == Z_NULL) return 0L; -#ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) - make_crc_table(); -#endif - crc = crc ^ 0xffffffffL; - while (len >= 8) - { - DO8(buf); - len -= 8; - } - if (len) do { - DO1(buf); - } while (--len); - return crc ^ 0xffffffffL; -} diff --git a/harbour/contrib/hbzlib/deflate.c b/harbour/contrib/hbzlib/deflate.c deleted file mode 100644 index 25d5818e2e..0000000000 --- a/harbour/contrib/hbzlib/deflate.c +++ /dev/null @@ -1,1350 +0,0 @@ -/* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-1998 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - * ALGORITHM - * - * The "deflation" process depends on being able to identify portions - * of the input text which are identical to earlier input (within a - * sliding window trailing behind the input currently being processed). - * - * The most straightforward technique turns out to be the fastest for - * most input files: try all possible matches and select the longest. - * The key feature of this algorithm is that insertions into the string - * dictionary are very simple and thus fast, and deletions are avoided - * completely. Insertions are performed at each input character, whereas - * string matches are performed only when the previous match ends. So it - * is preferable to spend more time in matches to allow very fast string - * insertions and avoid deletions. The matching algorithm for small - * strings is inspired from that of Rabin & Karp. A brute force approach - * is used to find longer strings when a small match has been found. - * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze - * (by Leonid Broukhis). - * A previous version of this file used a more sophisticated algorithm - * (by Fiala and Greene) which is guaranteed to run in linear amortized - * time, but has a larger average cost, uses more memory and is patented. - * However the F&G algorithm may be faster for some highly redundant - * files if the parameter max_chain_length (described below) is too large. - * - * ACKNOWLEDGEMENTS - * - * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and - * I found it in 'freeze' written by Leonid Broukhis. - * Thanks to many people for bug reports and testing. - * - * REFERENCES - * - * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". - * Available in ftp://ds.internic.net/rfc/rfc1951.txt - * - * A description of the Rabin and Karp algorithm is given in the book - * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. - * - * Fiala,E.R., and Greene,D.H. - * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 - * - */ - -/* @(#) $Id$ */ - -#include "deflate.h" - -const char deflate_copyright[] = - " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly "; -/* - If you use the zlib library in a product, an acknowledgment is welcome - in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this - copyright string in the executable of your product. - */ - -/* =========================================================================== - * Function prototypes. - */ -typedef enum { - need_more, /* block not completed, need more input or more output */ - block_done, /* block flush performed */ - finish_started, /* finish started, need only more output at next deflate */ - finish_done /* finish done, accept no more input or output */ -} block_state; - -typedef block_state (*compress_func) OF((deflate_state *s, int flush)); -/* Compression function. Returns the block state after the call. */ - -local void fill_window OF((deflate_state *s)); -local block_state deflate_stored OF((deflate_state *s, int flush)); -local block_state deflate_fast OF((deflate_state *s, int flush)); -local block_state deflate_slow OF((deflate_state *s, int flush)); -local void lm_init OF((deflate_state *s)); -local void putShortMSB OF((deflate_state *s, uInt b)); -local void flush_pending OF((z_streamp strm)); -local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); -#ifdef ASMV - void match_init OF((void)); /* asm code initialization */ - uInt longest_match OF((deflate_state *s, IPos cur_match)); -#else -local uInt longest_match OF((deflate_state *s, IPos cur_match)); -#endif - -#ifdef DEBUG -local void check_match OF((deflate_state *s, IPos start, IPos match, - int length)); -#endif - -/* =========================================================================== - * Local data - */ - -#define NIL 0 -/* Tail of hash chains */ - -#ifndef TOO_FAR -# define TOO_FAR 4096 -#endif -/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ - -#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) -/* Minimum amount of lookahead, except at the end of the input file. - * See deflate.c for comments about the MIN_MATCH+1. - */ - -/* Values for max_lazy_match, good_match and max_chain_length, depending on - * the desired pack level (0..9). The values given below have been tuned to - * exclude worst case performance for pathological files. Better values may be - * found for specific files. - */ -typedef struct config_s { - ush good_length; /* reduce lazy search above this match length */ - ush max_lazy; /* do not perform lazy search above this match length */ - ush nice_length; /* quit search above this match length */ - ush max_chain; - compress_func func; -} config; - -local const config configuration_table[10] = { -/* good lazy nice chain */ -/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ -/* 1 */ {4, 4, 8, 4, deflate_fast}, /* maximum speed, no lazy matches */ -/* 2 */ {4, 5, 16, 8, deflate_fast}, -/* 3 */ {4, 6, 32, 32, deflate_fast}, - -/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ -/* 5 */ {8, 16, 32, 32, deflate_slow}, -/* 6 */ {8, 16, 128, 128, deflate_slow}, -/* 7 */ {8, 32, 128, 256, deflate_slow}, -/* 8 */ {32, 128, 258, 1024, deflate_slow}, -/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* maximum compression */ - -/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 - * For deflate_fast() (levels <= 3) good is ignored and lazy has a different - * meaning. - */ - -#define EQUAL 0 -/* result of memcmp for equal strings */ - -struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ - -/* =========================================================================== - * Update a hash value with the given input byte - * IN assertion: all calls to to UPDATE_HASH are made with consecutive - * input characters, so that a running hash key can be computed from the - * previous key instead of complete recalculation each time. - */ -#define UPDATE_HASH(s,h,c) (h = (((h)<hash_shift) ^ (c)) & s->hash_mask) - - -/* =========================================================================== - * Insert string str in the dictionary and set match_head to the previous head - * of the hash chain (the most recent string with same hash key). Return - * the previous length of the hash chain. - * If this file is compiled with -DFASTEST, the compression level is forced - * to 1, and no hash chains are maintained. - * IN assertion: all calls to to INSERT_STRING are made with consecutive - * input characters and the first MIN_MATCH bytes of str are valid - * (except for the last MIN_MATCH-1 bytes of the input file). - */ -#ifdef FASTEST -#define INSERT_STRING(s, str, match_head) \ - (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ - match_head = s->head[s->ins_h], \ - s->head[s->ins_h] = (Pos)(str)) -#else -#define INSERT_STRING(s, str, match_head) \ - (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ - s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \ - s->head[s->ins_h] = (Pos)(str)) -#endif - -/* =========================================================================== - * Initialize the hash table (avoiding 64K overflow for 16 bit systems). - * prev[] will be initialized on the fly. - */ -#define CLEAR_HASH(s) \ - s->head[s->hash_size-1] = NIL; \ - zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); - -/* ========================================================================= */ -int ZEXPORT deflateInit_(strm, level, version, stream_size) - z_streamp strm; - int level; - const char *version; - int stream_size; -{ - return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, - Z_DEFAULT_STRATEGY, version, stream_size); - /* To do: ignore strm->next_in if we use it as window */ -} - -/* ========================================================================= */ -int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - version, stream_size) - z_streamp strm; - int level; - int method; - int windowBits; - int memLevel; - int strategy; - const char *version; - int stream_size; -{ - deflate_state *s; - int noheader = 0; - static const char* my_version = ZLIB_VERSION; - - ushf *overlay; - /* We overlay pending_buf and d_buf+l_buf. This works since the average - * output size for (length,distance) codes is <= 24 bits. - */ - - if (version == Z_NULL || version[0] != my_version[0] || - stream_size != sizeof(z_stream)) { - return Z_VERSION_ERROR; - } - if (strm == Z_NULL) return Z_STREAM_ERROR; - - strm->msg = Z_NULL; - if (strm->zalloc == Z_NULL) { - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; - } - if (strm->zfree == Z_NULL) strm->zfree = zcfree; - - if (level == Z_DEFAULT_COMPRESSION) level = 6; -#ifdef FASTEST - level = 1; -#endif - - if (windowBits < 0) { /* undocumented feature: suppress zlib header */ - noheader = 1; - windowBits = -windowBits; - } - if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || - windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || - strategy < 0 || strategy > Z_HUFFMAN_ONLY) { - return Z_STREAM_ERROR; - } - s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); - if (s == Z_NULL) return Z_MEM_ERROR; - strm->state = (struct internal_state FAR *)s; - s->strm = strm; - - s->noheader = noheader; - s->w_bits = windowBits; - s->w_size = 1 << s->w_bits; - s->w_mask = s->w_size - 1; - - s->hash_bits = memLevel + 7; - s->hash_size = 1 << s->hash_bits; - s->hash_mask = s->hash_size - 1; - s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); - - s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); - s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); - s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); - - s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ - - overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); - s->pending_buf = (uchf *) overlay; - s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); - - if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || - s->pending_buf == Z_NULL) { - strm->msg = (char*)ERR_MSG(Z_MEM_ERROR); - deflateEnd (strm); - return Z_MEM_ERROR; - } - s->d_buf = overlay + s->lit_bufsize/sizeof(ush); - s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; - - s->level = level; - s->strategy = strategy; - s->method = (Byte)method; - - return deflateReset(strm); -} - -/* ========================================================================= */ -int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; -{ - deflate_state *s; - uInt length = dictLength; - uInt n; - IPos hash_head = 0; - - if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL || - strm->state->status != INIT_STATE) return Z_STREAM_ERROR; - - s = strm->state; - strm->adler = adler32(strm->adler, dictionary, dictLength); - - if (length < MIN_MATCH) return Z_OK; - if (length > MAX_DIST(s)) { - length = MAX_DIST(s); -#ifndef USE_DICT_HEAD - dictionary += dictLength - length; /* use the tail of the dictionary */ -#endif - } - zmemcpy(s->window, dictionary, length); - s->strstart = length; - s->block_start = (long)length; - - /* Insert all strings in the hash table (except for the last two bytes). - * s->lookahead stays null, so s->ins_h will be recomputed at the next - * call of fill_window. - */ - s->ins_h = s->window[0]; - UPDATE_HASH(s, s->ins_h, s->window[1]); - for (n = 0; n <= length - MIN_MATCH; n++) { - INSERT_STRING(s, n, hash_head); - } - if (hash_head) hash_head = 0; /* to make compiler happy */ - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflateReset (strm) - z_streamp strm; -{ - deflate_state *s; - - if (strm == Z_NULL || strm->state == Z_NULL || - strm->zalloc == Z_NULL || strm->zfree == Z_NULL) return Z_STREAM_ERROR; - - strm->total_in = strm->total_out = 0; - strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ - strm->data_type = Z_UNKNOWN; - - s = (deflate_state *)strm->state; - s->pending = 0; - s->pending_out = s->pending_buf; - - if (s->noheader < 0) { - s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */ - } - s->status = s->noheader ? BUSY_STATE : INIT_STATE; - strm->adler = 1; - s->last_flush = Z_NO_FLUSH; - - _tr_init(s); - lm_init(s); - - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflateParams(strm, level, strategy) - z_streamp strm; - int level; - int strategy; -{ - deflate_state *s; - compress_func func; - int err = Z_OK; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - s = strm->state; - - if (level == Z_DEFAULT_COMPRESSION) { - level = 6; - } - if (level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) { - return Z_STREAM_ERROR; - } - func = configuration_table[s->level].func; - - if (func != configuration_table[level].func && strm->total_in != 0) { - /* Flush the last buffer: */ - err = deflate(strm, Z_PARTIAL_FLUSH); - } - if (s->level != level) { - s->level = level; - s->max_lazy_match = configuration_table[level].max_lazy; - s->good_match = configuration_table[level].good_length; - s->nice_match = configuration_table[level].nice_length; - s->max_chain_length = configuration_table[level].max_chain; - } - s->strategy = strategy; - return err; -} - -/* ========================================================================= - * Put a short in the pending buffer. The 16-bit value is put in MSB order. - * IN assertion: the stream state is correct and there is enough room in - * pending_buf. - */ -local void putShortMSB (s, b) - deflate_state *s; - uInt b; -{ - put_byte(s, (Byte)(b >> 8)); - put_byte(s, (Byte)(b & 0xff)); -} - -/* ========================================================================= - * Flush as much pending output as possible. All deflate() output goes - * through this function so some applications may wish to modify it - * to avoid allocating a large strm->next_out buffer and copying into it. - * (See also read_buf()). - */ -local void flush_pending(strm) - z_streamp strm; -{ - unsigned len = strm->state->pending; - - if (len > strm->avail_out) len = strm->avail_out; - if (len == 0) return; - - zmemcpy(strm->next_out, strm->state->pending_out, len); - strm->next_out += len; - strm->state->pending_out += len; - strm->total_out += len; - strm->avail_out -= len; - strm->state->pending -= len; - if (strm->state->pending == 0) { - strm->state->pending_out = strm->state->pending_buf; - } -} - -/* ========================================================================= */ -int ZEXPORT deflate (strm, flush) - z_streamp strm; - int flush; -{ - int old_flush; /* value of flush param for previous deflate call */ - deflate_state *s; - - if (strm == Z_NULL || strm->state == Z_NULL || - flush > Z_FINISH || flush < 0) { - return Z_STREAM_ERROR; - } - s = strm->state; - - if (strm->next_out == Z_NULL || - (strm->next_in == Z_NULL && strm->avail_in != 0) || - (s->status == FINISH_STATE && flush != Z_FINISH)) { - ERR_RETURN(strm, Z_STREAM_ERROR); - } - if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); - - s->strm = strm; /* just in case */ - old_flush = s->last_flush; - s->last_flush = flush; - - /* Write the zlib header */ - if (s->status == INIT_STATE) { - - uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; - uInt level_flags = (s->level-1) >> 1; - - if (level_flags > 3) level_flags = 3; - header |= (level_flags << 6); - if (s->strstart != 0) header |= PRESET_DICT; - header += 31 - (header % 31); - - s->status = BUSY_STATE; - putShortMSB(s, header); - - /* Save the adler32 of the preset dictionary: */ - if (s->strstart != 0) { - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); - } - strm->adler = 1L; - } - - /* Flush as much pending output as possible */ - if (s->pending != 0) { - flush_pending(strm); - if (strm->avail_out == 0) { - /* Since avail_out is 0, deflate will be called again with - * more output space, but possibly with both pending and - * avail_in equal to zero. There won't be anything to do, - * but this is not an error situation so make sure we - * return OK instead of BUF_ERROR at next call of deflate: - */ - s->last_flush = -1; - return Z_OK; - } - - /* Make sure there is something to do and avoid duplicate consecutive - * flushes. For repeated and useless calls with Z_FINISH, we keep - * returning Z_STREAM_END instead of Z_BUFF_ERROR. - */ - } else if (strm->avail_in == 0 && flush <= old_flush && - flush != Z_FINISH) { - ERR_RETURN(strm, Z_BUF_ERROR); - } - - /* User must not provide more input after the first FINISH: */ - if (s->status == FINISH_STATE && strm->avail_in != 0) { - ERR_RETURN(strm, Z_BUF_ERROR); - } - - /* Start a new block or continue the current one. - */ - if (strm->avail_in != 0 || s->lookahead != 0 || - (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { - block_state bstate; - - bstate = (*(configuration_table[s->level].func))(s, flush); - - if (bstate == finish_started || bstate == finish_done) { - s->status = FINISH_STATE; - } - if (bstate == need_more || bstate == finish_started) { - if (strm->avail_out == 0) { - s->last_flush = -1; /* avoid BUF_ERROR next call, see above */ - } - return Z_OK; - /* If flush != Z_NO_FLUSH && avail_out == 0, the next call - * of deflate should use the same flush parameter to make sure - * that the flush is complete. So we don't have to output an - * empty block here, this will be done at next call. This also - * ensures that for a very small output buffer, we emit at most - * one empty block. - */ - } - if (bstate == block_done) { - if (flush == Z_PARTIAL_FLUSH) { - _tr_align(s); - } else { /* FULL_FLUSH or SYNC_FLUSH */ - _tr_stored_block(s, (char*)0, 0L, 0); - /* For a full flush, this empty block will be recognized - * as a special marker by inflate_sync(). - */ - if (flush == Z_FULL_FLUSH) { - CLEAR_HASH(s); /* forget history */ - } - } - flush_pending(strm); - if (strm->avail_out == 0) { - s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */ - return Z_OK; - } - } - } - Assert(strm->avail_out > 0, "bug2"); - - if (flush != Z_FINISH) return Z_OK; - if (s->noheader) return Z_STREAM_END; - - /* Write the zlib trailer (adler32) */ - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); - flush_pending(strm); - /* If avail_out is zero, the application will call deflate again - * to flush the rest. - */ - s->noheader = -1; /* write the trailer only once! */ - return s->pending != 0 ? Z_OK : Z_STREAM_END; -} - -/* ========================================================================= */ -int ZEXPORT deflateEnd (strm) - z_streamp strm; -{ - int status; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - - status = strm->state->status; - if (status != INIT_STATE && status != BUSY_STATE && - status != FINISH_STATE) { - return Z_STREAM_ERROR; - } - - /* Deallocate in reverse order of allocations: */ - TRY_FREE(strm, strm->state->pending_buf); - TRY_FREE(strm, strm->state->head); - TRY_FREE(strm, strm->state->prev); - TRY_FREE(strm, strm->state->window); - - ZFREE(strm, strm->state); - strm->state = Z_NULL; - - return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK; -} - -/* ========================================================================= - * Copy the source state to the destination state. - * To simplify the source, this is not supported for 16-bit MSDOS (which - * doesn't have enough memory anyway to duplicate compression states). - */ -int ZEXPORT deflateCopy (dest, source) - z_streamp dest; - z_streamp source; -{ -#ifdef MAXSEG_64K - return Z_STREAM_ERROR; -#else - deflate_state *ds; - deflate_state *ss; - ushf *overlay; - - - if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { - return Z_STREAM_ERROR; - } - - ss = source->state; - - *dest = *source; - - ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); - if (ds == Z_NULL) return Z_MEM_ERROR; - dest->state = (struct internal_state FAR *) ds; - *ds = *ss; - ds->strm = dest; - - ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); - ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); - ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); - overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); - ds->pending_buf = (uchf *) overlay; - - if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || - ds->pending_buf == Z_NULL) { - deflateEnd (dest); - return Z_MEM_ERROR; - } - /* following zmemcpy do not work for 16-bit MSDOS */ - zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte)); - zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos)); - zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos)); - zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); - - ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); - ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); - ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; - - ds->l_desc.dyn_tree = ds->dyn_ltree; - ds->d_desc.dyn_tree = ds->dyn_dtree; - ds->bl_desc.dyn_tree = ds->bl_tree; - - return Z_OK; -#endif -} - -/* =========================================================================== - * Read a new buffer from the current input stream, update the adler32 - * and total number of bytes read. All deflate() input goes through - * this function so some applications may wish to modify it to avoid - * allocating a large strm->next_in buffer and copying from it. - * (See also flush_pending()). - */ -local int read_buf(strm, buf, size) - z_streamp strm; - Bytef *buf; - unsigned size; -{ - unsigned len = strm->avail_in; - - if (len > size) len = size; - if (len == 0) return 0; - - strm->avail_in -= len; - - if (!strm->state->noheader) { - strm->adler = adler32(strm->adler, strm->next_in, len); - } - zmemcpy(buf, strm->next_in, len); - strm->next_in += len; - strm->total_in += len; - - return (int)len; -} - -/* =========================================================================== - * Initialize the "longest match" routines for a new zlib stream - */ -local void lm_init (s) - deflate_state *s; -{ - s->window_size = (ulg)2L*s->w_size; - - CLEAR_HASH(s); - - /* Set the default configuration parameters: - */ - s->max_lazy_match = configuration_table[s->level].max_lazy; - s->good_match = configuration_table[s->level].good_length; - s->nice_match = configuration_table[s->level].nice_length; - s->max_chain_length = configuration_table[s->level].max_chain; - - s->strstart = 0; - s->block_start = 0L; - s->lookahead = 0; - s->match_length = s->prev_length = MIN_MATCH-1; - s->match_available = 0; - s->ins_h = 0; -#ifdef ASMV - match_init(); /* initialize the asm code */ -#endif -} - -/* =========================================================================== - * Set match_start to the longest match starting at the given string and - * return its length. Matches shorter or equal to prev_length are discarded, - * in which case the result is equal to prev_length and match_start is - * garbage. - * IN assertions: cur_match is the head of the hash chain for the current - * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 - * OUT assertion: the match length is not greater than s->lookahead. - */ -#ifndef ASMV -/* For 80x86 and 680x0, an optimized version will be provided in match.asm or - * match.S. The code will be functionally equivalent. - */ -#ifndef FASTEST -local uInt longest_match(s, cur_match) - deflate_state *s; - IPos cur_match; /* current match */ -{ - unsigned chain_length = s->max_chain_length;/* max hash chain length */ - register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ - register int len; /* length of current match */ - int best_len = s->prev_length; /* best match length so far */ - int nice_match = s->nice_match; /* stop if match long enough */ - IPos limit = s->strstart > (IPos)MAX_DIST(s) ? - s->strstart - (IPos)MAX_DIST(s) : NIL; - /* Stop when cur_match becomes <= limit. To simplify the code, - * we prevent matches with the string of window index 0. - */ - Posf *prev = s->prev; - uInt wmask = s->w_mask; - -#ifdef UNALIGNED_OK - /* Compare two bytes at a time. Note: this is not always beneficial. - * Try with and without -DUNALIGNED_OK to check. - */ - register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1; - register ush scan_start = *(ushf*)scan; - register ush scan_end = *(ushf*)(scan+best_len-1); -#else - register Bytef *strend = s->window + s->strstart + MAX_MATCH; - register Byte scan_end1 = scan[best_len-1]; - register Byte scan_end = scan[best_len]; -#endif - - /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. - * It is easy to get rid of this optimization if necessary. - */ - Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); - - /* Do not waste too much time if we already have a good match: */ - if (s->prev_length >= s->good_match) { - chain_length >>= 2; - } - /* Do not look for matches beyond the end of the input. This is necessary - * to make deflate deterministic. - */ - if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; - - Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); - - do { - Assert(cur_match < s->strstart, "no future"); - match = s->window + cur_match; - - /* Skip to next match if the match length cannot increase - * or if the match length is less than 2: - */ -#if (defined(UNALIGNED_OK) && MAX_MATCH == 258) - /* This code assumes sizeof(unsigned short) == 2. Do not use - * UNALIGNED_OK if your compiler uses a different size. - */ - if (*(ushf*)(match+best_len-1) != scan_end || - *(ushf*)match != scan_start) continue; - - /* It is not necessary to compare scan[2] and match[2] since they are - * always equal when the other bytes match, given that the hash keys - * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at - * strstart+3, +5, ... up to strstart+257. We check for insufficient - * lookahead only every 4th comparison; the 128th check will be made - * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is - * necessary to put more guard bytes at the end of the window, or - * to check more often for insufficient lookahead. - */ - Assert(scan[2] == match[2], "scan[2]?"); - scan++, match++; - do { - } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - scan < strend); - /* The funny "do {}" generates better code on most compilers */ - - /* Here, scan <= window+strstart+257 */ - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - if (*scan == *match) scan++; - - len = (MAX_MATCH - 1) - (int)(strend-scan); - scan = strend - (MAX_MATCH-1); - -#else /* UNALIGNED_OK */ - - if (match[best_len] != scan_end || - match[best_len-1] != scan_end1 || - *match != *scan || - *++match != scan[1]) continue; - - /* The check at best_len-1 can be removed because it will be made - * again later. (This heuristic is not always a win.) - * It is not necessary to compare scan[2] and match[2] since they - * are always equal when the other bytes match, given that - * the hash keys are equal and that HASH_BITS >= 8. - */ - scan += 2, match++; - Assert(*scan == *match, "match[2]?"); - - /* We check for insufficient lookahead only every 8th comparison; - * the 256th check will be made at strstart+258. - */ - do { - } while (*++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); - - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - - len = MAX_MATCH - (int)(strend - scan); - scan = strend - MAX_MATCH; - -#endif /* UNALIGNED_OK */ - - if (len > best_len) { - s->match_start = cur_match; - best_len = len; - if (len >= nice_match) break; -#ifdef UNALIGNED_OK - scan_end = *(ushf*)(scan+best_len-1); -#else - scan_end1 = scan[best_len-1]; - scan_end = scan[best_len]; -#endif - } - } while ((cur_match = prev[cur_match & wmask]) > limit - && --chain_length != 0); - - if ((uInt)best_len <= s->lookahead) return (uInt)best_len; - return s->lookahead; -} - -#else /* FASTEST */ -/* --------------------------------------------------------------------------- - * Optimized version for level == 1 only - */ -local uInt longest_match(s, cur_match) - deflate_state *s; - IPos cur_match; /* current match */ -{ - register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ - register int len; /* length of current match */ - register Bytef *strend = s->window + s->strstart + MAX_MATCH; - - /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. - * It is easy to get rid of this optimization if necessary. - */ - Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); - - Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); - - Assert(cur_match < s->strstart, "no future"); - - match = s->window + cur_match; - - /* Return failure if the match length is less than 2: - */ - if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1; - - /* The check at best_len-1 can be removed because it will be made - * again later. (This heuristic is not always a win.) - * It is not necessary to compare scan[2] and match[2] since they - * are always equal when the other bytes match, given that - * the hash keys are equal and that HASH_BITS >= 8. - */ - scan += 2, match += 2; - Assert(*scan == *match, "match[2]?"); - - /* We check for insufficient lookahead only every 8th comparison; - * the 256th check will be made at strstart+258. - */ - do { - } while (*++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); - - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - - len = MAX_MATCH - (int)(strend - scan); - - if (len < MIN_MATCH) return MIN_MATCH - 1; - - s->match_start = cur_match; - return len <= s->lookahead ? len : s->lookahead; -} -#endif /* FASTEST */ -#endif /* ASMV */ - -#ifdef DEBUG -/* =========================================================================== - * Check that the match at match_start is indeed a match. - */ -local void check_match(s, start, match, length) - deflate_state *s; - IPos start, match; - int length; -{ - /* check that the match is indeed a match */ - if (zmemcmp(s->window + match, - s->window + start, length) != EQUAL) { - fprintf(stderr, " start %u, match %u, length %d\n", - start, match, length); - do { - fprintf(stderr, "%c%c", s->window[match++], s->window[start++]); - } while (--length != 0); - z_error("invalid match"); - } - if (z_verbose > 1) { - fprintf(stderr,"\\[%d,%d]", start-match, length); - do { putc(s->window[start++], stderr); } while (--length != 0); - } -} -#else -# define check_match(s, start, match, length) -#endif - -/* =========================================================================== - * Fill the window when the lookahead becomes insufficient. - * Updates strstart and lookahead. - * - * IN assertion: lookahead < MIN_LOOKAHEAD - * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD - * At least one byte has been read, or avail_in == 0; reads are - * performed for at least two bytes (required for the zip translate_eol - * option -- not supported here). - */ -local void fill_window(s) - deflate_state *s; -{ - register unsigned n, m; - register Posf *p; - unsigned more; /* Amount of free space at the end of the window. */ - uInt wsize = s->w_size; - - do { - more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); - - /* Deal with !@#$% 64K limit: */ - if (more == 0 && s->strstart == 0 && s->lookahead == 0) { - more = wsize; - - } else if (more == (unsigned)(-1)) { - /* Very unlikely, but possible on 16 bit machine if strstart == 0 - * and lookahead == 1 (input done one byte at time) - */ - more--; - - /* If the window is almost full and there is insufficient lookahead, - * move the upper half to the lower one to make room in the upper half. - */ - } else if (s->strstart >= wsize+MAX_DIST(s)) { - - zmemcpy(s->window, s->window+wsize, (unsigned)wsize); - s->match_start -= wsize; - s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ - s->block_start -= (long) wsize; - - /* Slide the hash table (could be avoided with 32 bit values - at the expense of memory usage). We slide even when level == 0 - to keep the hash table consistent if we switch back to level > 0 - later. (Using level 0 permanently is not an optimal usage of - zlib, so we don't care about this pathological case.) - */ - n = s->hash_size; - p = &s->head[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - } while (--n); - - n = wsize; -#ifndef FASTEST - p = &s->prev[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - /* If n is not on any hash chain, prev[n] is garbage but - * its value will never be used. - */ - } while (--n); -#endif - more += wsize; - } - if (s->strm->avail_in == 0) return; - - /* If there was no sliding: - * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && - * more == window_size - lookahead - strstart - * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) - * => more >= window_size - 2*WSIZE + 2 - * In the BIG_MEM or MMAP case (not yet supported), - * window_size == input_size + MIN_LOOKAHEAD && - * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. - * Otherwise, window_size == 2*WSIZE so more >= 2. - * If there was sliding, more >= WSIZE. So in all cases, more >= 2. - */ - Assert(more >= 2, "more < 2"); - - n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); - s->lookahead += n; - - /* Initialize the hash value now that we have some input: */ - if (s->lookahead >= MIN_MATCH) { - s->ins_h = s->window[s->strstart]; - UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); -#if MIN_MATCH != 3 - Call UPDATE_HASH() MIN_MATCH-3 more times -#endif - } - /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, - * but this is not important since only literal bytes will be emitted. - */ - - } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); -} - -/* =========================================================================== - * Flush the current block, with given end-of-file flag. - * IN assertion: strstart is set to the end of the current match. - */ -#define FLUSH_BLOCK_ONLY(s, eof) { \ - _tr_flush_block(s, (s->block_start >= 0L ? \ - (charf *)&s->window[(unsigned)s->block_start] : \ - (charf *)Z_NULL), \ - (ulg)((long)s->strstart - s->block_start), \ - (eof)); \ - s->block_start = s->strstart; \ - flush_pending(s->strm); \ - Tracev((stderr,"[FLUSH]")); \ -} - -/* Same but force premature exit if necessary. */ -#define FLUSH_BLOCK(s, eof) { \ - FLUSH_BLOCK_ONLY(s, eof); \ - if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \ -} - -/* =========================================================================== - * Copy without compression as much as possible from the input stream, return - * the current block state. - * This function does not insert new strings in the dictionary since - * uncompressible data is probably not useful. This function is used - * only for the level=0 compression option. - * NOTE: this function should be optimized to avoid extra copying from - * window to pending_buf. - */ -local block_state deflate_stored(s, flush) - deflate_state *s; - int flush; -{ - /* Stored blocks are limited to 0xffff bytes, pending_buf is limited - * to pending_buf_size, and each stored block has a 5 byte header: - */ - ulg max_block_size = 0xffff; - ulg max_start; - - if (max_block_size > s->pending_buf_size - 5) { - max_block_size = s->pending_buf_size - 5; - } - - /* Copy as much as possible from input to output: */ - for (;;) { - /* Fill the window as much as possible: */ - if (s->lookahead <= 1) { - - Assert(s->strstart < s->w_size+MAX_DIST(s) || - s->block_start >= (long)s->w_size, "slide too late"); - - fill_window(s); - if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; - - if (s->lookahead == 0) break; /* flush the current block */ - } - Assert(s->block_start >= 0L, "block gone"); - - s->strstart += s->lookahead; - s->lookahead = 0; - - /* Emit a stored block if pending_buf will be full: */ - max_start = s->block_start + max_block_size; - if (s->strstart == 0 || (ulg)s->strstart >= max_start) { - /* strstart == 0 is possible when wraparound on 16-bit machine */ - s->lookahead = (uInt)(s->strstart - max_start); - s->strstart = (uInt)max_start; - FLUSH_BLOCK(s, 0); - } - /* Flush if we may have to slide, otherwise block_start may become - * negative and the data will be gone: - */ - if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { - FLUSH_BLOCK(s, 0); - } - } - FLUSH_BLOCK(s, flush == Z_FINISH); - return flush == Z_FINISH ? finish_done : block_done; -} - -/* =========================================================================== - * Compress as much as possible from the input stream, return the current - * block state. - * This function does not perform lazy evaluation of matches and inserts - * new strings in the dictionary only for unmatched strings or for short - * matches. It is used only for the fast compression options. - */ -local block_state deflate_fast(s, flush) - deflate_state *s; - int flush; -{ - IPos hash_head = NIL; /* head of the hash chain */ - int bflush; /* set if current block must be flushed */ - - for (;;) { - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the next match, plus MIN_MATCH bytes to insert the - * string following the next match. - */ - if (s->lookahead < MIN_LOOKAHEAD) { - fill_window(s); - if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { - return need_more; - } - if (s->lookahead == 0) break; /* flush the current block */ - } - - /* Insert the string window[strstart .. strstart+2] in the - * dictionary, and set hash_head to the head of the hash chain: - */ - if (s->lookahead >= MIN_MATCH) { - INSERT_STRING(s, s->strstart, hash_head); - } - - /* Find the longest match, discarding those <= prev_length. - * At this point we have always match_length < MIN_MATCH - */ - if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) { - /* To simplify the code, we prevent matches with the string - * of window index 0 (in particular we have to avoid a match - * of the string with itself at the start of the input file). - */ - if (s->strategy != Z_HUFFMAN_ONLY) { - s->match_length = longest_match (s, hash_head); - } - /* longest_match() sets match_start */ - } - if (s->match_length >= MIN_MATCH) { - check_match(s, s->strstart, s->match_start, s->match_length); - - _tr_tally_dist(s, s->strstart - s->match_start, - s->match_length - MIN_MATCH, bflush); - - s->lookahead -= s->match_length; - - /* Insert new strings in the hash table only if the match length - * is not too large. This saves time but degrades compression. - */ -#ifndef FASTEST - if (s->match_length <= s->max_insert_length && - s->lookahead >= MIN_MATCH) { - s->match_length--; /* string at strstart already in hash table */ - do { - s->strstart++; - INSERT_STRING(s, s->strstart, hash_head); - /* strstart never exceeds WSIZE-MAX_MATCH, so there are - * always MIN_MATCH bytes ahead. - */ - } while (--s->match_length != 0); - s->strstart++; - } else -#endif - { - s->strstart += s->match_length; - s->match_length = 0; - s->ins_h = s->window[s->strstart]; - UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); -#if MIN_MATCH != 3 - Call UPDATE_HASH() MIN_MATCH-3 more times -#endif - /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not - * matter since it will be recomputed at next deflate call. - */ - } - } else { - /* No match, output a literal byte */ - Tracevv((stderr,"%c", s->window[s->strstart])); - _tr_tally_lit (s, s->window[s->strstart], bflush); - s->lookahead--; - s->strstart++; - } - if (bflush) FLUSH_BLOCK(s, 0); - } - FLUSH_BLOCK(s, flush == Z_FINISH); - return flush == Z_FINISH ? finish_done : block_done; -} - -/* =========================================================================== - * Same as above, but achieves better compression. We use a lazy - * evaluation for matches: a match is finally adopted only if there is - * no better match at the next window position. - */ -local block_state deflate_slow(s, flush) - deflate_state *s; - int flush; -{ - IPos hash_head = NIL; /* head of hash chain */ - int bflush; /* set if current block must be flushed */ - - /* Process the input block. */ - for (;;) { - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the next match, plus MIN_MATCH bytes to insert the - * string following the next match. - */ - if (s->lookahead < MIN_LOOKAHEAD) { - fill_window(s); - if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { - return need_more; - } - if (s->lookahead == 0) break; /* flush the current block */ - } - - /* Insert the string window[strstart .. strstart+2] in the - * dictionary, and set hash_head to the head of the hash chain: - */ - if (s->lookahead >= MIN_MATCH) { - INSERT_STRING(s, s->strstart, hash_head); - } - - /* Find the longest match, discarding those <= prev_length. - */ - s->prev_length = s->match_length, s->prev_match = s->match_start; - s->match_length = MIN_MATCH-1; - - if (hash_head != NIL && s->prev_length < s->max_lazy_match && - s->strstart - hash_head <= MAX_DIST(s)) { - /* To simplify the code, we prevent matches with the string - * of window index 0 (in particular we have to avoid a match - * of the string with itself at the start of the input file). - */ - if (s->strategy != Z_HUFFMAN_ONLY) { - s->match_length = longest_match (s, hash_head); - } - /* longest_match() sets match_start */ - - if (s->match_length <= 5 && (s->strategy == Z_FILTERED || - (s->match_length == MIN_MATCH && - s->strstart - s->match_start > TOO_FAR))) { - - /* If prev_match is also MIN_MATCH, match_start is garbage - * but we will ignore the current match anyway. - */ - s->match_length = MIN_MATCH-1; - } - } - /* If there was a match at the previous step and the current - * match is not better, output the previous match: - */ - if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) { - uInt max_insert = s->strstart + s->lookahead - MIN_MATCH; - /* Do not insert strings in hash table beyond this. */ - - check_match(s, s->strstart-1, s->prev_match, s->prev_length); - - _tr_tally_dist(s, s->strstart -1 - s->prev_match, - s->prev_length - MIN_MATCH, bflush); - - /* Insert in hash table all strings up to the end of the match. - * strstart-1 and strstart are already inserted. If there is not - * enough lookahead, the last two strings are not inserted in - * the hash table. - */ - s->lookahead -= s->prev_length-1; - s->prev_length -= 2; - do { - if (++s->strstart <= max_insert) { - INSERT_STRING(s, s->strstart, hash_head); - } - } while (--s->prev_length != 0); - s->match_available = 0; - s->match_length = MIN_MATCH-1; - s->strstart++; - - if (bflush) FLUSH_BLOCK(s, 0); - - } else if (s->match_available) { - /* If there was no match at the previous position, output a - * single literal. If there was a match but the current match - * is longer, truncate the previous match to a single literal. - */ - Tracevv((stderr,"%c", s->window[s->strstart-1])); - _tr_tally_lit(s, s->window[s->strstart-1], bflush); - if (bflush) { - FLUSH_BLOCK_ONLY(s, 0); - } - s->strstart++; - s->lookahead--; - if (s->strm->avail_out == 0) return need_more; - } else { - /* There is no previous match to compare with, wait for - * the next step to decide. - */ - s->match_available = 1; - s->strstart++; - s->lookahead--; - } - } - Assert (flush != Z_NO_FLUSH, "no flush?"); - if (s->match_available) { - Tracevv((stderr,"%c", s->window[s->strstart-1])); - _tr_tally_lit(s, s->window[s->strstart-1], bflush); - s->match_available = 0; - } - FLUSH_BLOCK(s, flush == Z_FINISH); - return flush == Z_FINISH ? finish_done : block_done; -} diff --git a/harbour/contrib/hbzlib/deflate.h b/harbour/contrib/hbzlib/deflate.h deleted file mode 100644 index 962676da86..0000000000 --- a/harbour/contrib/hbzlib/deflate.h +++ /dev/null @@ -1,318 +0,0 @@ -/* deflate.h -- internal compression state - * Copyright (C) 1995-1998 Jean-loup Gailly - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* @(#) $Id$ */ - -#ifndef _DEFLATE_H -#define _DEFLATE_H - -#include "zutil.h" - -/* =========================================================================== - * Internal compression state. - */ - -#define LENGTH_CODES 29 -/* number of length codes, not counting the special END_BLOCK code */ - -#define LITERALS 256 -/* number of literal bytes 0..255 */ - -#define L_CODES (LITERALS+1+LENGTH_CODES) -/* number of Literal or Length codes, including the END_BLOCK code */ - -#define D_CODES 30 -/* number of distance codes */ - -#define BL_CODES 19 -/* number of codes used to transfer the bit lengths */ - -#define HEAP_SIZE (2*L_CODES+1) -/* maximum heap size */ - -#define MAX_BITS 15 -/* All codes must not exceed MAX_BITS bits */ - -#define INIT_STATE 42 -#define BUSY_STATE 113 -#define FINISH_STATE 666 -/* Stream status */ - - -/* Data structure describing a single value and its code string. */ -typedef struct ct_data_s { - union { - ush freq; /* frequency count */ - ush code; /* bit string */ - } fc; - union { - ush dad; /* father node in Huffman tree */ - ush len; /* length of bit string */ - } dl; -} FAR ct_data; - -#define Freq fc.freq -#define Code fc.code -#define Dad dl.dad -#define Len dl.len - -typedef struct static_tree_desc_s static_tree_desc; - -typedef struct tree_desc_s { - ct_data *dyn_tree; /* the dynamic tree */ - int max_code; /* largest code with non zero frequency */ - static_tree_desc *stat_desc; /* the corresponding static tree */ -} FAR tree_desc; - -typedef ush Pos; -typedef Pos FAR Posf; -typedef unsigned IPos; - -/* A Pos is an index in the character window. We use short instead of int to - * save space in the various tables. IPos is used only for parameter passing. - */ - -typedef struct internal_state { - z_streamp strm; /* pointer back to this zlib stream */ - int status; /* as the name implies */ - Bytef *pending_buf; /* output still pending */ - ulg pending_buf_size; /* size of pending_buf */ - Bytef *pending_out; /* next pending byte to output to the stream */ - int pending; /* nb of bytes in the pending buffer */ - int noheader; /* suppress zlib header and adler32 */ - Byte data_type; /* UNKNOWN, BINARY or ASCII */ - Byte method; /* STORED (for zip only) or DEFLATED */ - int last_flush; /* value of flush param for previous deflate call */ - - /* used by deflate.c: */ - - uInt w_size; /* LZ77 window size (32K by default) */ - uInt w_bits; /* log2(w_size) (8..16) */ - uInt w_mask; /* w_size - 1 */ - - Bytef *window; - /* Sliding window. Input bytes are read into the second half of the window, - * and move to the first half later to keep a dictionary of at least wSize - * bytes. With this organization, matches are limited to a distance of - * wSize-MAX_MATCH bytes, but this ensures that IO is always - * performed with a length multiple of the block size. Also, it limits - * the window size to 64K, which is quite useful on MSDOS. - * To do: use the user input buffer as sliding window. - */ - - ulg window_size; - /* Actual size of window: 2*wSize, except when the user input buffer - * is directly used as sliding window. - */ - - Posf *prev; - /* Link to older string with same hash index. To limit the size of this - * array to 64K, this link is maintained only for the last 32K strings. - * An index in this array is thus a window index modulo 32K. - */ - - Posf *head; /* Heads of the hash chains or NIL. */ - - uInt ins_h; /* hash index of string to be inserted */ - uInt hash_size; /* number of elements in hash table */ - uInt hash_bits; /* log2(hash_size) */ - uInt hash_mask; /* hash_size-1 */ - - uInt hash_shift; - /* Number of bits by which ins_h must be shifted at each input - * step. It must be such that after MIN_MATCH steps, the oldest - * byte no longer takes part in the hash key, that is: - * hash_shift * MIN_MATCH >= hash_bits - */ - - long block_start; - /* Window position at the beginning of the current output block. Gets - * negative when the window is moved backwards. - */ - - uInt match_length; /* length of best match */ - IPos prev_match; /* previous match */ - int match_available; /* set if previous match exists */ - uInt strstart; /* start of string to insert */ - uInt match_start; /* start of matching string */ - uInt lookahead; /* number of valid bytes ahead in window */ - - uInt prev_length; - /* Length of the best match at previous step. Matches not greater than this - * are discarded. This is used in the lazy match evaluation. - */ - - uInt max_chain_length; - /* To speed up deflation, hash chains are never searched beyond this - * length. A higher limit improves compression ratio but degrades the - * speed. - */ - - uInt max_lazy_match; - /* Attempt to find a better match only when the current match is strictly - * smaller than this value. This mechanism is used only for compression - * levels >= 4. - */ -# define max_insert_length max_lazy_match - /* Insert new strings in the hash table only if the match length is not - * greater than this length. This saves time but degrades compression. - * max_insert_length is used only for compression levels <= 3. - */ - - int level; /* compression level (1..9) */ - int strategy; /* favor or force Huffman coding*/ - - uInt good_match; - /* Use a faster search when the previous match is longer than this */ - - int nice_match; /* Stop searching when current match exceeds this */ - - /* used by trees.c: */ - /* Didn't use ct_data typedef below to supress compiler warning */ - struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ - struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ - struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ - - struct tree_desc_s l_desc; /* desc. for literal tree */ - struct tree_desc_s d_desc; /* desc. for distance tree */ - struct tree_desc_s bl_desc; /* desc. for bit length tree */ - - ush bl_count[MAX_BITS+1]; - /* number of codes at each bit length for an optimal tree */ - - int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ - int heap_len; /* number of elements in the heap */ - int heap_max; /* element of largest frequency */ - /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. - * The same heap array is used to build all trees. - */ - - uch depth[2*L_CODES+1]; - /* Depth of each subtree used as tie breaker for trees of equal frequency - */ - - uchf *l_buf; /* buffer for literals or lengths */ - - uInt lit_bufsize; - /* Size of match buffer for literals/lengths. There are 4 reasons for - * limiting lit_bufsize to 64K: - * - frequencies can be kept in 16 bit counters - * - if compression is not successful for the first block, all input - * data is still in the window so we can still emit a stored block even - * when input comes from standard input. (This can also be done for - * all blocks if lit_bufsize is not greater than 32K.) - * - if compression is not successful for a file smaller than 64K, we can - * even emit a stored file instead of a stored block (saving 5 bytes). - * This is applicable only for zip (not gzip or zlib). - * - creating new Huffman trees less frequently may not provide fast - * adaptation to changes in the input data statistics. (Take for - * example a binary file with poorly compressible code followed by - * a highly compressible string table.) Smaller buffer sizes give - * fast adaptation but have of course the overhead of transmitting - * trees more frequently. - * - I can't count above 4 - */ - - uInt last_lit; /* running index in l_buf */ - - ushf *d_buf; - /* Buffer for distances. To simplify the code, d_buf and l_buf have - * the same number of elements. To use different lengths, an extra flag - * array would be necessary. - */ - - ulg opt_len; /* bit length of current block with optimal trees */ - ulg static_len; /* bit length of current block with static trees */ - uInt matches; /* number of string matches in current block */ - int last_eob_len; /* bit length of EOB code for last block */ - -#ifdef DEBUG - ulg compressed_len; /* total bit length of compressed file mod 2^32 */ - ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ -#endif - - ush bi_buf; - /* Output buffer. bits are inserted starting at the bottom (least - * significant bits). - */ - int bi_valid; - /* Number of valid bits in bi_buf. All bits above the last valid bit - * are always zero. - */ - -} FAR deflate_state; - -/* Output a byte on the stream. - * IN assertion: there is enough room in pending_buf. - */ -#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} - - -#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) -/* Minimum amount of lookahead, except at the end of the input file. - * See deflate.c for comments about the MIN_MATCH+1. - */ - -#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD) -/* In order to simplify the code, particularly on 16 bit machines, match - * distances are limited to MAX_DIST instead of WSIZE. - */ - - /* in trees.c */ -void _tr_init OF((deflate_state *s)); -int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); -void _tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, - int eof)); -void _tr_align OF((deflate_state *s)); -void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, - int eof)); - -#define d_code(dist) \ - ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) -/* Mapping from a distance to a distance code. dist is the distance - 1 and - * must not have side effects. _dist_code[256] and _dist_code[257] are never - * used. - */ - -#ifndef DEBUG -/* Inline versions of _tr_tally for speed: */ - -#if defined(GEN_TREES_H) || !defined(STDC) - extern uch _length_code[]; - extern uch _dist_code[]; -#else - extern const uch _length_code[]; - extern const uch _dist_code[]; -#endif - -# define _tr_tally_lit(s, c, flush) \ - { uch cc = (c); \ - s->d_buf[s->last_lit] = 0; \ - s->l_buf[s->last_lit++] = cc; \ - s->dyn_ltree[cc].Freq++; \ - flush = (s->last_lit == s->lit_bufsize-1); \ - } -# define _tr_tally_dist(s, distance, length, flush) \ - { uch len = (length); \ - ush dist = (distance); \ - s->d_buf[s->last_lit] = dist; \ - s->l_buf[s->last_lit++] = len; \ - dist--; \ - s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ - s->dyn_dtree[d_code(dist)].Freq++; \ - flush = (s->last_lit == s->lit_bufsize-1); \ - } -#else -# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) -# define _tr_tally_dist(s, distance, length, flush) \ - flush = _tr_tally(s, distance, length) -#endif - -#endif diff --git a/harbour/contrib/hbzlib/gvmat32c.c b/harbour/contrib/hbzlib/gvmat32c.c deleted file mode 100644 index 06d107b70c..0000000000 --- a/harbour/contrib/hbzlib/gvmat32c.c +++ /dev/null @@ -1,209 +0,0 @@ -/* gvmat32.c -- C portion of the optimized longest_match for 32 bits x86 - * Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant. - * File written by Gilles Vollant, by modifiying the longest_match - * from Jean-loup Gailly in deflate.c - * it prepare all parameters and call the assembly longest_match_gvasm - * longest_match execute standard C code is wmask != 0x7fff - * (assembly code is faster with a fixed wmask) - * - */ - -#include "deflate.h" - -#undef FAR -//#include - -#ifdef ASMV -#define NIL 0 - -#define UNALIGNED_OK - - -/* if your C compiler don't add underline before function name, - define ADD_UNDERLINE_ASMFUNC */ -#ifdef ADD_UNDERLINE_ASMFUNC -#define longest_match_7fff _longest_match_7fff -#define longest_match_686 _longest_match_686 -#define cpudetect32 _cpudetect32 -#endif - - - -void match_init() -{ -} - -unsigned long cpudetect32(); - -uInt longest_match_c( - deflate_state *s, - IPos cur_match); /* current match */ - - -uInt longest_match_7fff( - deflate_state *s, - IPos cur_match); /* current match */ - -uInt longest_match_686( - deflate_state *s, - IPos cur_match); /* current match */ - -uInt longest_match( - deflate_state *s, - IPos cur_match) /* current match */ -{ - static uInt iIsPPro=2; - - if ((s->w_mask == 0x7fff) && (iIsPPro==0)) - return longest_match_7fff(s,cur_match); - - if (iIsPPro==1) - return longest_match_686(s,cur_match); - - if (iIsPPro==2) - iIsPPro = (((cpudetect32()/0x100)&0xf)>=6) ? 1 : 0; - - return longest_match_c(s,cur_match); -} - - - -uInt longest_match_c(s, cur_match) - deflate_state *s; - IPos cur_match; /* current match */ -{ - unsigned chain_length = s->max_chain_length;/* max hash chain length */ - register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ - register int len; /* length of current match */ - int best_len = s->prev_length; /* best match length so far */ - int nice_match = s->nice_match; /* stop if match long enough */ - IPos limit = s->strstart > (IPos)MAX_DIST(s) ? - s->strstart - (IPos)MAX_DIST(s) : NIL; - /* Stop when cur_match becomes <= limit. To simplify the code, - * we prevent matches with the string of window index 0. - */ - Posf *prev = s->prev; - uInt wmask = s->w_mask; - -#ifdef UNALIGNED_OK - /* Compare two bytes at a time. Note: this is not always beneficial. - * Try with and without -DUNALIGNED_OK to check. - */ - register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1; - register ush scan_start = *(ushf*)scan; - register ush scan_end = *(ushf*)(scan+best_len-1); -#else - register Bytef *strend = s->window + s->strstart + MAX_MATCH; - register Byte scan_end1 = scan[best_len-1]; - register Byte scan_end = scan[best_len]; -#endif - - /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. - * It is easy to get rid of this optimization if necessary. - */ - Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); - - /* Do not waste too much time if we already have a good match: */ - if (s->prev_length >= s->good_match) { - chain_length >>= 2; - } - /* Do not look for matches beyond the end of the input. This is necessary - * to make deflate deterministic. - */ - if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; - - Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); - - do { - Assert(cur_match < s->strstart, "no future"); - match = s->window + cur_match; - - /* Skip to next match if the match length cannot increase - * or if the match length is less than 2: - */ -#if (defined(UNALIGNED_OK) && MAX_MATCH == 258) - /* This code assumes sizeof(unsigned short) == 2. Do not use - * UNALIGNED_OK if your compiler uses a different size. - */ - if (*(ushf*)(match+best_len-1) != scan_end || - *(ushf*)match != scan_start) continue; - - /* It is not necessary to compare scan[2] and match[2] since they are - * always equal when the other bytes match, given that the hash keys - * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at - * strstart+3, +5, ... up to strstart+257. We check for insufficient - * lookahead only every 4th comparison; the 128th check will be made - * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is - * necessary to put more guard bytes at the end of the window, or - * to check more often for insufficient lookahead. - */ - Assert(scan[2] == match[2], "scan[2]?"); - scan++, match++; - do { - } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - scan < strend); - /* The funny "do {}" generates better code on most compilers */ - - /* Here, scan <= window+strstart+257 */ - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - if (*scan == *match) scan++; - - len = (MAX_MATCH - 1) - (int)(strend-scan); - scan = strend - (MAX_MATCH-1); - -#else /* UNALIGNED_OK */ - - if (match[best_len] != scan_end || - match[best_len-1] != scan_end1 || - *match != *scan || - *++match != scan[1]) continue; - - /* The check at best_len-1 can be removed because it will be made - * again later. (This heuristic is not always a win.) - * It is not necessary to compare scan[2] and match[2] since they - * are always equal when the other bytes match, given that - * the hash keys are equal and that HASH_BITS >= 8. - */ - scan += 2, match++; - Assert(*scan == *match, "match[2]?"); - - /* We check for insufficient lookahead only every 8th comparison; - * the 256th check will be made at strstart+258. - */ - do { - } while (*++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); - - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - - len = MAX_MATCH - (int)(strend - scan); - scan = strend - MAX_MATCH; - -#endif /* UNALIGNED_OK */ - - if (len > best_len) { - s->match_start = cur_match; - best_len = len; - if (len >= nice_match) break; -#ifdef UNALIGNED_OK - scan_end = *(ushf*)(scan+best_len-1); -#else - scan_end1 = scan[best_len-1]; - scan_end = scan[best_len]; -#endif - } - } while ((cur_match = prev[cur_match & wmask]) > limit - && --chain_length != 0); - - if ((uInt)best_len <= s->lookahead) return (uInt)best_len; - return s->lookahead; -} - -#endif /* ASMV */ diff --git a/harbour/contrib/hbzlib/gzio.c b/harbour/contrib/hbzlib/gzio.c deleted file mode 100644 index f7c336a55a..0000000000 --- a/harbour/contrib/hbzlib/gzio.c +++ /dev/null @@ -1,875 +0,0 @@ -/* gzio.c -- IO on .gz files - * Copyright (C) 1995-1998 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - * - * Compile this file with -DNO_DEFLATE to avoid the compression code. - */ - -/* @(#) $Id$ */ - -#include - -#include "zutil.h" - -struct internal_state {int dummy;}; /* for buggy compilers */ - -#ifndef Z_BUFSIZE -# ifdef MAXSEG_64K -# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */ -# else -# define Z_BUFSIZE 16384 -# endif -#endif -#ifndef Z_PRINTF_BUFSIZE -# define Z_PRINTF_BUFSIZE 4096 -#endif - -#define ALLOC(size) malloc(size) -#define TRYFREE(p) {if (p) free(p);} - -static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ - -/* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define RESERVED 0xE0 /* bits 5..7: reserved */ - -typedef struct gz_stream { - z_stream stream; - int z_err; /* error code for last stream operation */ - int z_eof; /* set if end of input file */ - FILE *file; /* .gz file */ - Byte *inbuf; /* input buffer */ - Byte *outbuf; /* output buffer */ - uLong crc; /* crc32 of uncompressed data */ - char *msg; /* error message */ - char *path; /* path name for debugging only */ - int transparent; /* 1 if input file is not a .gz file */ - char mode; /* 'w' or 'r' */ - long startpos; /* start of compressed data in file (header skipped) */ -} gz_stream; - - -local gzFile gz_open OF((const char *path, const char *mode, int fd)); -local int do_flush OF((gzFile file, int flush)); -local int get_byte OF((gz_stream *s)); -local void check_header OF((gz_stream *s)); -local int destroy OF((gz_stream *s)); -local void putLong OF((FILE *file, uLong x)); -local uLong getLong OF((gz_stream *s)); - -/* =========================================================================== - Opens a gzip (.gz) file for reading or writing. The mode parameter - is as in fopen ("rb" or "wb"). The file is given either by file descriptor - or path name (if fd == -1). - gz_open return NULL if the file could not be opened or if there was - insufficient memory to allocate the (de)compression state; errno - can be checked to distinguish the two cases (if errno is zero, the - zlib error is Z_MEM_ERROR). -*/ -local gzFile gz_open (path, mode, fd) - const char *path; - const char *mode; - int fd; -{ - int err; - int level = Z_DEFAULT_COMPRESSION; /* compression level */ - int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ - char *p = (char*)mode; - gz_stream *s; - char fmode[80]; /* copy of mode, without the compression level */ - char *m = fmode; - - if (!path || !mode) return Z_NULL; - - s = (gz_stream *)ALLOC(sizeof(gz_stream)); - if (!s) return Z_NULL; - - s->stream.zalloc = (alloc_func)0; - s->stream.zfree = (free_func)0; - s->stream.opaque = (voidpf)0; - s->stream.next_in = s->inbuf = Z_NULL; - s->stream.next_out = s->outbuf = Z_NULL; - s->stream.avail_in = s->stream.avail_out = 0; - s->file = NULL; - s->z_err = Z_OK; - s->z_eof = 0; - s->crc = crc32(0L, Z_NULL, 0); - s->msg = NULL; - s->transparent = 0; - - s->path = (char*)ALLOC(strlen(path)+1); - if (s->path == NULL) { - return destroy(s), (gzFile)Z_NULL; - } - strcpy(s->path, path); /* do this early for debugging */ - - s->mode = '\0'; - do { - if (*p == 'r') s->mode = 'r'; - if (*p == 'w' || *p == 'a') s->mode = 'w'; - if (*p >= '0' && *p <= '9') { - level = *p - '0'; - } else if (*p == 'f') { - strategy = Z_FILTERED; - } else if (*p == 'h') { - strategy = Z_HUFFMAN_ONLY; - } else { - *m++ = *p; /* copy the mode */ - } - } while (*p++ && m != fmode + sizeof(fmode)); - if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL; - - if (s->mode == 'w') { -#ifdef NO_DEFLATE - err = Z_STREAM_ERROR; -#else - err = deflateInit2(&(s->stream), level, - Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); - /* windowBits is passed < 0 to suppress zlib header */ - - s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); -#endif - if (err != Z_OK || s->outbuf == Z_NULL) { - return destroy(s), (gzFile)Z_NULL; - } - } else { - s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); - - err = inflateInit2(&(s->stream), -MAX_WBITS); - /* windowBits is passed < 0 to tell that there is no zlib header. - * Note that in this case inflate *requires* an extra "dummy" byte - * after the compressed stream in order to complete decompression and - * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are - * present after the compressed stream. - */ - if (err != Z_OK || s->inbuf == Z_NULL) { - return destroy(s), (gzFile)Z_NULL; - } - } - s->stream.avail_out = Z_BUFSIZE; - - errno = 0; - s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode); - - if (s->file == NULL) { - return destroy(s), (gzFile)Z_NULL; - } - if (s->mode == 'w') { - /* Write a very simple .gz header: - */ - fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], - Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE); - s->startpos = 10L; - /* We use 10L instead of ftell(s->file) to because ftell causes an - * fflush on some systems. This version of the library doesn't use - * startpos anyway in write mode, so this initialization is not - * necessary. - */ - } else { - check_header(s); /* skip the .gz header */ - s->startpos = (ftell(s->file) - s->stream.avail_in); - } - - return (gzFile)s; -} - -/* =========================================================================== - Opens a gzip (.gz) file for reading or writing. -*/ -gzFile ZEXPORT gzopen (path, mode) - const char *path; - const char *mode; -{ - return gz_open (path, mode, -1); -} - -/* =========================================================================== - Associate a gzFile with the file descriptor fd. fd is not dup'ed here - to mimic the behavio(u)r of fdopen. -*/ -gzFile ZEXPORT gzdopen (fd, mode) - int fd; - const char *mode; -{ - char name[20]; - - if (fd < 0) return (gzFile)Z_NULL; - sprintf(name, "", fd); /* for debugging */ - - return gz_open (name, mode, fd); -} - -/* =========================================================================== - * Update the compression level and strategy - */ -int ZEXPORT gzsetparams (file, level, strategy) - gzFile file; - int level; - int strategy; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - /* Make room to allow flushing */ - if (s->stream.avail_out == 0) { - - s->stream.next_out = s->outbuf; - if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { - s->z_err = Z_ERRNO; - } - s->stream.avail_out = Z_BUFSIZE; - } - - return deflateParams (&(s->stream), level, strategy); -} - -/* =========================================================================== - Read a byte from a gz_stream; update next_in and avail_in. Return EOF - for end of file. - IN assertion: the stream s has been sucessfully opened for reading. -*/ -local int get_byte(s) - gz_stream *s; -{ - if (s->z_eof) return EOF; - if (s->stream.avail_in == 0) { - errno = 0; - s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file); - if (s->stream.avail_in == 0) { - s->z_eof = 1; - if (ferror(s->file)) s->z_err = Z_ERRNO; - return EOF; - } - s->stream.next_in = s->inbuf; - } - s->stream.avail_in--; - return *(s->stream.next_in)++; -} - -/* =========================================================================== - Check the gzip header of a gz_stream opened for reading. Set the stream - mode to transparent if the gzip magic header is not present; set s->err - to Z_DATA_ERROR if the magic header is present but the rest of the header - is incorrect. - IN assertion: the stream s has already been created sucessfully; - s->stream.avail_in is zero for the first time, but may be non-zero - for concatenated .gz files. -*/ -local void check_header(s) - gz_stream *s; -{ - int method; /* method byte */ - int flags; /* flags byte */ - uInt len; - int c; - - /* Check the gzip magic header */ - for (len = 0; len < 2; len++) { - c = get_byte(s); - if (c != gz_magic[len]) { - if (len != 0) s->stream.avail_in++, s->stream.next_in--; - if (c != EOF) { - s->stream.avail_in++, s->stream.next_in--; - s->transparent = 1; - } - s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END; - return; - } - } - method = get_byte(s); - flags = get_byte(s); - if (method != Z_DEFLATED || (flags & RESERVED) != 0) { - s->z_err = Z_DATA_ERROR; - return; - } - - /* Discard time, xflags and OS code: */ - for (len = 0; len < 6; len++) (void)get_byte(s); - - if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */ - len = (uInt)get_byte(s); - len += ((uInt)get_byte(s))<<8; - /* len is garbage if EOF but the loop below will quit anyway */ - while (len-- != 0 && get_byte(s) != EOF) ; - } - if ((flags & ORIG_NAME) != 0) { /* skip the original file name */ - while ((c = get_byte(s)) != 0 && c != EOF) ; - } - if ((flags & COMMENT) != 0) { /* skip the .gz file comment */ - while ((c = get_byte(s)) != 0 && c != EOF) ; - } - if ((flags & HEAD_CRC) != 0) { /* skip the header crc */ - for (len = 0; len < 2; len++) (void)get_byte(s); - } - s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK; -} - - /* =========================================================================== - * Cleanup then free the given gz_stream. Return a zlib error code. - Try freeing in the reverse order of allocations. - */ -local int destroy (s) - gz_stream *s; -{ - int err = Z_OK; - - if (!s) return Z_STREAM_ERROR; - - TRYFREE(s->msg); - - if (s->stream.state != NULL) { - if (s->mode == 'w') { -#ifdef NO_DEFLATE - err = Z_STREAM_ERROR; -#else - err = deflateEnd(&(s->stream)); -#endif - } else if (s->mode == 'r') { - err = inflateEnd(&(s->stream)); - } - } - if (s->file != NULL && fclose(s->file)) { -#ifdef ESPIPE - if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */ -#endif - err = Z_ERRNO; - } - if (s->z_err < 0) err = s->z_err; - - TRYFREE(s->inbuf); - TRYFREE(s->outbuf); - TRYFREE(s->path); - TRYFREE(s); - return err; -} - -/* =========================================================================== - Reads the given number of uncompressed bytes from the compressed file. - gzread returns the number of bytes actually read (0 for end of file). -*/ -int ZEXPORT gzread (file, buf, len) - gzFile file; - voidp buf; - unsigned len; -{ - gz_stream *s = (gz_stream*)file; - Bytef *start = (Bytef*)buf; /* starting point for crc computation */ - Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */ - - if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR; - - if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1; - if (s->z_err == Z_STREAM_END) return 0; /* EOF */ - - next_out = (Byte*)buf; - s->stream.next_out = (Bytef*)buf; - s->stream.avail_out = len; - - while (s->stream.avail_out != 0) { - - if (s->transparent) { - /* Copy first the lookahead bytes: */ - uInt n = s->stream.avail_in; - if (n > s->stream.avail_out) n = s->stream.avail_out; - if (n > 0) { - zmemcpy(s->stream.next_out, s->stream.next_in, n); - next_out += n; - s->stream.next_out = next_out; - s->stream.next_in += n; - s->stream.avail_out -= n; - s->stream.avail_in -= n; - } - if (s->stream.avail_out > 0) { - s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out, - s->file); - } - len -= s->stream.avail_out; - s->stream.total_in += (uLong)len; - s->stream.total_out += (uLong)len; - if (len == 0) s->z_eof = 1; - return (int)len; - } - if (s->stream.avail_in == 0 && !s->z_eof) { - - errno = 0; - s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file); - if (s->stream.avail_in == 0) { - s->z_eof = 1; - if (ferror(s->file)) { - s->z_err = Z_ERRNO; - break; - } - } - s->stream.next_in = s->inbuf; - } - s->z_err = inflate(&(s->stream), Z_NO_FLUSH); - - if (s->z_err == Z_STREAM_END) { - /* Check CRC and original size */ - s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); - start = s->stream.next_out; - - if (getLong(s) != s->crc) { - s->z_err = Z_DATA_ERROR; - } else { - (void)getLong(s); - /* The uncompressed length returned by above getlong() may - * be different from s->stream.total_out) in case of - * concatenated .gz files. Check for such files: - */ - check_header(s); - if (s->z_err == Z_OK) { - uLong total_in = s->stream.total_in; - uLong total_out = s->stream.total_out; - - inflateReset(&(s->stream)); - s->stream.total_in = total_in; - s->stream.total_out = total_out; - s->crc = crc32(0L, Z_NULL, 0); - } - } - } - if (s->z_err != Z_OK || s->z_eof) break; - } - s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); - - return (int)(len - s->stream.avail_out); -} - - -/* =========================================================================== - Reads one byte from the compressed file. gzgetc returns this byte - or -1 in case of end of file or error. -*/ -int ZEXPORT gzgetc(file) - gzFile file; -{ - unsigned char c; - - return gzread(file, &c, 1) == 1 ? c : -1; -} - - -/* =========================================================================== - Reads bytes from the compressed file until len-1 characters are - read, or a newline character is read and transferred to buf, or an - end-of-file condition is encountered. The string is then terminated - with a null character. - gzgets returns buf, or Z_NULL in case of error. - - The current implementation is not optimized at all. -*/ -char * ZEXPORT gzgets(file, buf, len) - gzFile file; - char *buf; - int len; -{ - char *b = buf; - if (buf == Z_NULL || len <= 0) return Z_NULL; - - while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ; - *buf = '\0'; - return b == buf && len > 0 ? Z_NULL : b; -} - - -#ifndef NO_DEFLATE -/* =========================================================================== - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of bytes actually written (0 in case of error). -*/ -int ZEXPORT gzwrite (file, buf, len) - gzFile file; - const voidp buf; - unsigned len; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - s->stream.next_in = (Bytef*)buf; - s->stream.avail_in = len; - - while (s->stream.avail_in != 0) { - - if (s->stream.avail_out == 0) { - - s->stream.next_out = s->outbuf; - if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { - s->z_err = Z_ERRNO; - break; - } - s->stream.avail_out = Z_BUFSIZE; - } - s->z_err = deflate(&(s->stream), Z_NO_FLUSH); - if (s->z_err != Z_OK) break; - } - s->crc = crc32(s->crc, (const Bytef *)buf, len); - - return (int)(len - s->stream.avail_in); -} - -/* =========================================================================== - Converts, formats, and writes the args to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written (0 in case of error). -*/ -#ifdef STDC -#include - -int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) -{ - char buf[Z_PRINTF_BUFSIZE]; - va_list va; - int len; - - va_start(va, format); -#ifdef HAS_vsnprintf - (void)vsnprintf(buf, sizeof(buf), format, va); -#else - (void)vsprintf(buf, format, va); -#endif - va_end(va); - len = strlen(buf); /* some *sprintf don't return the nb of bytes written */ - if (len <= 0) return 0; - - return gzwrite(file, buf, (unsigned)len); -} -#else /* not ANSI C */ - -int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) - gzFile file; - const char *format; - int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; -{ - char buf[Z_PRINTF_BUFSIZE]; - int len; - -#ifdef HAS_snprintf - snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -#else - sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -#endif - len = strlen(buf); /* old sprintf doesn't return the nb of bytes written */ - if (len <= 0) return 0; - - return gzwrite(file, buf, len); -} -#endif - -/* =========================================================================== - Writes c, converted to an unsigned char, into the compressed file. - gzputc returns the value that was written, or -1 in case of error. -*/ -int ZEXPORT gzputc(file, c) - gzFile file; - int c; -{ - unsigned char cc = (unsigned char) c; /* required for big endian systems */ - - return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; -} - - -/* =========================================================================== - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. -*/ -int ZEXPORT gzputs(file, s) - gzFile file; - const char *s; -{ - return gzwrite(file, (char*)s, (unsigned)strlen(s)); -} - - -/* =========================================================================== - Flushes all pending output into the compressed file. The parameter - flush is as in the deflate() function. -*/ -local int do_flush (file, flush) - gzFile file; - int flush; -{ - uInt len; - int done = 0; - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - s->stream.avail_in = 0; /* should be zero already anyway */ - - for (;;) { - len = Z_BUFSIZE - s->stream.avail_out; - - if (len != 0) { - if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) { - s->z_err = Z_ERRNO; - return Z_ERRNO; - } - s->stream.next_out = s->outbuf; - s->stream.avail_out = Z_BUFSIZE; - } - if (done) break; - s->z_err = deflate(&(s->stream), flush); - - /* Ignore the second of two consecutive flushes: */ - if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK; - - /* deflate has finished flushing only when it hasn't used up - * all the available space in the output buffer: - */ - done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END); - - if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break; - } - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; -} - -int ZEXPORT gzflush (file, flush) - gzFile file; - int flush; -{ - gz_stream *s = (gz_stream*)file; - int err = do_flush (file, flush); - - if (err) return err; - fflush(s->file); - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; -} -#endif /* NO_DEFLATE */ - -/* =========================================================================== - Sets the starting position for the next gzread or gzwrite on the given - compressed file. The offset represents a number of bytes in the - gzseek returns the resulting offset location as measured in bytes from - the beginning of the uncompressed stream, or -1 in case of error. - SEEK_END is not implemented, returns error. - In this version of the library, gzseek can be extremely slow. -*/ -z_off_t ZEXPORT gzseek (file, offset, whence) - gzFile file; - z_off_t offset; - int whence; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || whence == SEEK_END || - s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) { - return -1L; - } - - if (s->mode == 'w') { -#ifdef NO_DEFLATE - return -1L; -#else - if (whence == SEEK_SET) { - offset -= s->stream.total_in; - } - if (offset < 0) return -1L; - - /* At this point, offset is the number of zero bytes to write. */ - if (s->inbuf == Z_NULL) { - s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */ - zmemzero(s->inbuf, Z_BUFSIZE); - } - while (offset > 0) { - uInt size = Z_BUFSIZE; - if (offset < Z_BUFSIZE) size = (uInt)offset; - - size = gzwrite(file, s->inbuf, size); - if (size == 0) return -1L; - - offset -= size; - } - return (z_off_t)s->stream.total_in; -#endif - } - /* Rest of function is for reading only */ - - /* compute absolute position */ - if (whence == SEEK_CUR) { - offset += s->stream.total_out; - } - if (offset < 0) return -1L; - - if (s->transparent) { - /* map to fseek */ - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - if (fseek(s->file, offset, SEEK_SET) < 0) return -1L; - - s->stream.total_in = s->stream.total_out = (uLong)offset; - return offset; - } - - /* For a negative seek, rewind and use positive seek */ - if ((uLong)offset >= s->stream.total_out) { - offset -= s->stream.total_out; - } else if (gzrewind(file) < 0) { - return -1L; - } - /* offset is now the number of bytes to skip. */ - - if (offset != 0 && s->outbuf == Z_NULL) { - s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); - } - while (offset > 0) { - int size = Z_BUFSIZE; - if (offset < Z_BUFSIZE) size = (int)offset; - - size = gzread(file, s->outbuf, (uInt)size); - if (size <= 0) return -1L; - offset -= size; - } - return (z_off_t)s->stream.total_out; -} - -/* =========================================================================== - Rewinds input file. -*/ -int ZEXPORT gzrewind (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'r') return -1; - - s->z_err = Z_OK; - s->z_eof = 0; - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - s->crc = crc32(0L, Z_NULL, 0); - - if (s->startpos == 0) { /* not a compressed file */ - rewind(s->file); - return 0; - } - - (void) inflateReset(&s->stream); - return fseek(s->file, s->startpos, SEEK_SET); -} - -/* =========================================================================== - Returns the starting position for the next gzread or gzwrite on the - given compressed file. This position represents a number of bytes in the - uncompressed data stream. -*/ -z_off_t ZEXPORT gztell (file) - gzFile file; -{ - return gzseek(file, 0L, SEEK_CUR); -} - -/* =========================================================================== - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. -*/ -int ZEXPORT gzeof (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - return (s == NULL || s->mode != 'r') ? 0 : s->z_eof; -} - -/* =========================================================================== - Outputs a long in LSB order to the given file -*/ -local void putLong (file, x) - FILE *file; - uLong x; -{ - int n; - for (n = 0; n < 4; n++) { - fputc((int)(x & 0xff), file); - x >>= 8; - } -} - -/* =========================================================================== - Reads a long in LSB order from the given gz_stream. Sets z_err in case - of error. -*/ -local uLong getLong (s) - gz_stream *s; -{ - uLong x = (uLong)get_byte(s); - int c; - - x += ((uLong)get_byte(s))<<8; - x += ((uLong)get_byte(s))<<16; - c = get_byte(s); - if (c == EOF) s->z_err = Z_DATA_ERROR; - x += ((uLong)c)<<24; - return x; -} - -/* =========================================================================== - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. -*/ -int ZEXPORT gzclose (file) - gzFile file; -{ - int err; - gz_stream *s = (gz_stream*)file; - - if (s == NULL) return Z_STREAM_ERROR; - - if (s->mode == 'w') { -#ifdef NO_DEFLATE - return Z_STREAM_ERROR; -#else - err = do_flush (file, Z_FINISH); - if (err != Z_OK) return destroy((gz_stream*)file); - - putLong (s->file, s->crc); - putLong (s->file, s->stream.total_in); -#endif - } - return destroy((gz_stream*)file); -} - -/* =========================================================================== - Returns the error message for the last error which occured on the - given compressed file. errnum is set to zlib error number. If an - error occured in the file system and not in the compression library, - errnum is set to Z_ERRNO and the application may consult errno - to get the exact error code. -*/ -const char* ZEXPORT gzerror (file, errnum) - gzFile file; - int *errnum; -{ - char *m; - gz_stream *s = (gz_stream*)file; - - if (s == NULL) { - *errnum = Z_STREAM_ERROR; - return (const char*)ERR_MSG(Z_STREAM_ERROR); - } - *errnum = s->z_err; - if (*errnum == Z_OK) return (const char*)""; - - m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg); - - if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err); - - TRYFREE(s->msg); - s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3); - strcpy(s->msg, s->path); - strcat(s->msg, ": "); - strcat(s->msg, m); - return (const char*)s->msg; -} diff --git a/harbour/contrib/hbzlib/include/ZipExport.h b/harbour/contrib/hbzlib/include/ZipExport.h new file mode 100644 index 0000000000..08c7ef4f69 --- /dev/null +++ b/harbour/contrib/hbzlib/include/ZipExport.h @@ -0,0 +1,18 @@ +#if !defined (ZIP_EXPORT_H) +#define ZIP_EXPORT_H + +#if defined (ZIP_HAS_DLL) +# if (ZIP_HAS_DLL == 1) +# if defined (ZIP_BUILD_DLL) +# define ZIP_API __declspec (dllexport) +# else +# define ZIP_API __declspec (dllimport) +# endif /* ZIP_BUILD_DLL */ +# else +# define ZIP_API +# endif /* ! ZIP_HAS_DLL == 1 */ +#else +# define ZIP_API +#endif /* ZIP_HAS_DLL */ + +#endif /* ZIP_EXPORT_H */ diff --git a/harbour/contrib/hbzlib/include/hbz.h b/harbour/contrib/hbzlib/include/hbz.h new file mode 100644 index 0000000000..34ef23c61f --- /dev/null +++ b/harbour/contrib/hbzlib/include/hbz.h @@ -0,0 +1,84 @@ +#ifndef HB_APIZLIB_H_ +#define HB_APIZLIB_H_ +#define HB_OS_WIN_32_USED +#include +#include +#include +#include +#include +#include + +#include + +#ifdef __cplusplus +#include +extern "C" { +#endif + + +#define filePos 1 +#define Lenght 2 +#define Method 3 +#define Size 4 +#define Ratio 5 +#define Date 6 +#define Time 7 +#define Crc32 8 +#define Attr 9 +#define WRITEBUFFERSIZE (16384) +#define MAXFILENAME (256) +typedef struct _HB_ZIP_INTERNAL{ +int iWrite; +int iExtract; +int iRead; +char * szComment; +PHB_ITEM pItem; +} HB_ZIP_INTERNAL,* PHB_ZIP_INTERNAL,* HB_ZIP_INTERNAL_PTR; +#ifndef LPCTSTR +typedef const char *LPCSTR; +typedef LPCSTR LPCTSTR; +#endif +class SpanCallback : public CZipSpanCallback +{ + bool Callback(int iProgress) + { + PHB_ITEM pDisk=hb_itemPutNL(NULL,m_uDiskNeeded); + bool iReturn=true; + hb_vmEvalBlockV( pChangeDiskBlock, 1,pDisk ); + hb_itemRelease(pDisk); + return iReturn; + } +}; + +class SpanActionCallback : public CZipActionCallback +{ + bool Callback(int iProgress) + { + int iReturn=1; + PHB_ITEM pDisk; + PHB_ITEM pTotal =hb_itemPutNL(NULL,m_uTotalToDo); + pDisk= hb_itemPutNL(NULL,m_uTotalSoFar); + hb_vmEvalBlockV( pProgressInfo, 2,pDisk,pTotal); + hb_itemRelease(pDisk); + hb_itemRelease(pTotal); + return iReturn; + } +}; + + +class hbZip { +public: +BOOL bAdded; +hbZip(){ + bAdded=false +}; +virtual ~hbZip(); +CZipArchive szZip; +SpanCallback span; +SpanActionCallback spanac; +}; + +#ifdef __cplusplus +} +#endif +#endif diff --git a/harbour/contrib/hbzlib/strcomp.c b/harbour/contrib/hbzlib/include/hbzip.h similarity index 61% rename from harbour/contrib/hbzlib/strcomp.c rename to harbour/contrib/hbzlib/include/hbzip.h index f453494fe5..0da70cc170 100644 --- a/harbour/contrib/hbzlib/strcomp.c +++ b/harbour/contrib/hbzlib/include/hbzip.h @@ -4,9 +4,9 @@ /* * Harbour Project source code: - * CompressStrin() and UnCompressString() functions + * Header file for the Zlib API, * - * Copyright 2000-2001 Luiz Rafael Culik + * Copyright 2000 Luiz Rafael Culik * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -51,42 +51,41 @@ */ -#include "zlib.h" -#include "hbzip2.h" - -#define pMaxBuffer 500000 - -HB_FUNC(COMPRESSSTRING) -{ - const char *szString = (const char*)hb_parc(1); - ULONG ulLen = strlen(szString)+1; - ULONG ulBuffLen; - char *szBuff; - szBuff = ( char * )hb_xalloc(ulLen+1); - ulBuffLen = ulLen+1+pMaxBuffer; - - compress(szBuff, &ulBuffLen, szString, ulLen); - - hb_storclen(szBuff,ulBuffLen,1); - hb_stornl(ulBuffLen,2); - hb_xfree(szBuff); +#ifndef HB_APIZLIB_H_ +#define HB_APIZLIB_H_ +#include +#include +#include +#include +#include +#include +#include +#include "zip.h" +#include "unzip.h" +#if defined(HB_EXTERN_C) +extern "C" { +#endif +#define filePos 1 +#define Lenght 2 +#define Method 3 +#define Size 4 +#define Ratio 5 +#define Date 6 +#define Time 7 +#define Crc32 8 +extern uLong hb___filetime(char *f, tm_zip *tmzip, uLong *dt); +extern char *hb___CheckFile( char * szFile); +extern int hb___CompressOneFile(char *szFile,char *szFiletoCompress,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite); +extern int hb___CompressMultipleFile(char *szFile,PHB_ITEM pArray,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite); +extern BOOL hb___unZipFiles(char *szFile,PHB_ITEM pBlock,BOOL bExtractPath); +extern int hb___ExtractCurrentFile(unzFile uf,BOOL popt_extract_without_path,BOOL popt_overwrite,PHB_ITEM pBlock); +extern void hb____ChangeFileDate(char *filename,uLong dosdate,tm_unz tmu_date); +extern int hb___MakeDir(char *szNewDirectory); +extern int hb___GetNumbersofFilestoUnzip(char *szFile); +extern PHB_ITEM hb___GetFilesNamesFromZip(char *szFile,BOOL iMode); +#if defined(HB_EXTERN_C) } +#endif -HB_FUNC(UNCOMPRESSSTRING) -{ - - char *szString = hb_parc(1); - ULONG ulLen = hb_parnl(2); - ULONG ulBuffLen; - char *szBuff; - szBuff = ( char * )hb_xalloc(pMaxBuffer+ulLen+sizeof(ULONG)); - strcpy((char*)szBuff, "garbage"); - ulBuffLen = pMaxBuffer+ulLen; - - uncompress(szBuff, &ulBuffLen, szString, ulLen); - - hb_retclen_buffer(szBuff,ulBuffLen); -/* hb_xfree(szBuff); */ - -} +#endif /* HB_APIEXT_H_ */ diff --git a/harbour/contrib/hbzlib/include/hbzip2.h b/harbour/contrib/hbzlib/include/hbzip2.h new file mode 100644 index 0000000000..4821e125d9 --- /dev/null +++ b/harbour/contrib/hbzlib/include/hbzip2.h @@ -0,0 +1,128 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Header file for the Zlib API, + * + * Copyright 2000-2001 Luiz Rafael Culik + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + + +#ifndef HB_APIZLIB_H_ +#define HB_APIZLIB_H_ +#define HB_OS_WIN_32_USED +#include +#include +#include +#include +#include +#include +#include + +#include + +#ifdef __cplusplus +#include +extern "C" { +#endif + + +#define filePos 1 +#define Lenght 2 +#define Method 3 +#define Size 4 +#define Ratio 5 +#define Date 6 +#define Time 7 +#define Crc32 8 +#define Attr 9 +#define WRITEBUFFERSIZE (16384) +#define MAXFILENAME (256) +typedef struct _HB_ZIP_INTERNAL{ +int iWrite; +int iExtract; +int iRead; +char * szComment; +PHB_ITEM pItem; +} HB_ZIP_INTERNAL,* PHB_ZIP_INTERNAL,* HB_ZIP_INTERNAL_PTR; +#ifndef LPCTSTR +typedef const char *LPCSTR; +typedef LPCSTR LPCTSTR; +#endif +extern char *hb___CheckFile( char * szFile); +extern PHB_ITEM hb___GetFilesNamesFromZip(char *szFile,BOOL iMode); +extern void hb_____GetTime(struct tm *tz); +extern int hb_CmpPkSpan(char *szFile,PHB_ITEM pArray,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite,char *szPassWord,BOOL bPath,BOOL bDrive,PHB_ITEM pProgress); +extern int hb_CmpPkSpanStd(char *szFile,char *szFiletoCompress,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite,char *szPassWord,BOOL bPath,BOOL bDrive,PHB_ITEM pProgress); +extern char *hb_getPassWord(char *szName); +extern int hb___GetNumbersofFilestoUnzip(char *szFile); +extern int hb___SetCallbackFunc(PHB_ITEM pFunc); +extern int hb_CmpTdSpan(char *szFile,PHB_ITEM pArray,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite,char *szPassWord,PHB_ITEM pDiskBlock,int iSpanSize ,BOOL bPath ,BOOL bDrive,PHB_ITEM pProgress); + +extern int hb_CompressFile(char *szFile,PHB_ITEM pArray,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite,char *szPassWord,BOOL bPath,BOOL bDrive,PHB_ITEM pProgress); +extern int hb_CompressFileStd(char *szFile,char *szFiletoCompress,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite,char *szPassWord,BOOL bPath,BOOL bDrive,PHB_ITEM pProgress); +extern int hb_CmpTdSpanStd(char *szFile,char * szFiletoCompress,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite,char *szPassWord,PHB_ITEM pDiskBlock,int iSpanSize,BOOL bPath,BOOL bDrive,PHB_ITEM pProgress); +extern int hb_UnzipAll(char *szFile,PHB_ITEM pBlock,BOOL bWithPath,char *szPassWord,char *szPath,PHB_ITEM pDiskBlock,PHB_ITEM pProgress); +extern int hb_UnzipOne(char *szFile,PHB_ITEM pBlock,BOOL bWithPath,char *szPassWord,char *szPath,char *szFiletoExtract,PHB_ITEM pProgress); +extern int hb_UnzipSel(char *szFile,PHB_ITEM pBlock,BOOL bWithPath,char *szPassWord,char *szPath,PHB_ITEM pArray,PHB_ITEM pProgress); +extern int hb_UnzipOneIndex(char *szFile,PHB_ITEM pBlock,BOOL bWithPath,char *szPassWord,char *szPath,int uiCount,PHB_ITEM pProgress); +extern int hb_UnzipSelIndex(char *szFile,PHB_ITEM pBlock,BOOL bWithPath,char *szPassWord,char *szPath,PHB_ITEM pSelArray,PHB_ITEM pProgress); +extern int hb_DeleteOne(char *szFile,char *szFiletoDelete); +extern int hb_DeleteSel(char *szFile,PHB_ITEM pArray,BOOL bCase); +extern int hb_DeleteOneIndex(char *szFile,int uiCount); +extern int hb_TestForPKS(char *szFile); +extern void hb_SetZipBuff(int a,int b,int c); +extern void hb_SetZipComment(char *szComment); +extern const char *hb_GetZipComment(char *szFile); +extern BOOL hb_IsPassWord(char *szName); +extern unsigned long GetCurrentFileSize( LPCTSTR szFile); +extern BOOL hb_SaveZipFileFromMemory(char *szFile); +extern BOOL hb_CreateZipInMemory(char *szFileToCompress,char *szFile); + +#ifdef __cplusplus +} +#endif +#endif /* HB_APIEXT_H_ */ diff --git a/harbour/contrib/hbzlib/include/resource.h b/harbour/contrib/hbzlib/include/resource.h new file mode 100644 index 0000000000..6cf0c78db2 --- /dev/null +++ b/harbour/contrib/hbzlib/include/resource.h @@ -0,0 +1,15 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by version.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/harbour/contrib/hbzlib/stdafx.h b/harbour/contrib/hbzlib/include/stdafx.h similarity index 69% rename from harbour/contrib/hbzlib/stdafx.h rename to harbour/contrib/hbzlib/include/stdafx.h index fb9046fcbc..bd28a8dae6 100644 --- a/harbour/contrib/hbzlib/stdafx.h +++ b/harbour/contrib/hbzlib/include/stdafx.h @@ -1,9 +1,11 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: stdafx.h $ +// $Archive: /ZipArchive_STL/stdafx.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -15,12 +17,13 @@ #if !defined(AFX_STDAFX_H__926F70F4_1B34_49AA_9532_498E8D2F3495__INCLUDED_) #define AFX_STDAFX_H__926F70F4_1B34_49AA_9532_498E8D2F3495__INCLUDED_ -#ifdef __BORLANDC__ -#define ZIPINLINE +#if (_MSC_VER < 1300) && !defined (__BORLANDC__) && !defined (__GNUC__) + #define ZIPINLINE inline #else -#define ZIPINLINE inline + #define ZIPINLINE #endif + #define ZIP_ARCHIVE_STL #if _MSC_VER > 1000 @@ -28,6 +31,7 @@ //because of STL #pragma warning (disable : 4710) // 'function' : function not inlined #pragma warning (disable : 4514) // unreferenced inline/local function has been removed + #pragma warning (disable:4786) // 'identifier' : identifier was truncated to 'number' characters in the debug information #endif // _MSC_VER > 1000 @@ -49,11 +53,21 @@ typedef int HFILE; typedef void* HANDLE; typedef unsigned long DWORD; + typedef long LONG; typedef int BOOL; typedef unsigned char BYTE; typedef unsigned short WORD; typedef unsigned int UINT; + #ifndef FALSE + #define FALSE (int)0 + #endif + + #ifndef TRUE + #define TRUE (int)1 + #endif + + typedef unsigned short WCHAR; // wc, 16-bit UNICODE character typedef const WCHAR *LPCWSTR; typedef const char *LPCSTR; @@ -74,16 +88,11 @@ #else - #include - #include + #include + #include #ifndef STRICT #define STRICT #endif - #include - # define ZEXPORT __declspec(dllexport) WINAPI - # define ZEXPORTRVA __declspec(dllexport) WINAPIV - - #endif // #ifndef _WIN32 #ifndef ASSERT @@ -103,6 +112,14 @@ #define TRACE #endif +#if _MSC_VER >= 1300 + #define ZIP_ULONGLONG ULONGLONG + #define ZIP_LONGLONG LONGLONG +#else + #define ZIP_ULONGLONG DWORD + #define ZIP_LONGLONG LONG +#endif + //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. diff --git a/harbour/contrib/hbzlib/unzip.h b/harbour/contrib/hbzlib/include/unzip.h similarity index 95% rename from harbour/contrib/hbzlib/unzip.h rename to harbour/contrib/hbzlib/include/unzip.h index de7a92c6ce..89fef3fd7a 100644 --- a/harbour/contrib/hbzlib/unzip.h +++ b/harbour/contrib/hbzlib/include/unzip.h @@ -1,4 +1,4 @@ -/* unzip.h -- IO for uncompress .zip files using zlib +/* unzip.h -- IO for uncompress .zip files using zlib Version 0.15 beta, Mar 19th, 1998, Copyright (C) 1998 Gilles Vollant @@ -33,7 +33,7 @@ */ -/* for more info about .ZIP format, see +/* for more info about .ZIP format, see ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip PkWare has also a specification at : ftp://ftp.pkware.com/probdesc.zip */ @@ -41,18 +41,19 @@ #ifndef _unz_H #define _unz_H -#ifdef __cplusplus -extern "C" { +#ifndef _HBCOMPRESS_H +#include "hbcomprs.h" #endif -#ifndef _ZLIB_H -#include "zlib.h" + +#ifdef __cplusplus +extern "C" { #endif #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) /* like the STRICT of WIN32, we define a pointer that cannot be converted from (void*) without cast */ -typedef struct TagunzFile__ { int unused; } unzFile__; +typedef struct TagunzFile__ { int unused; } unzFile__; typedef unzFile__ *unzFile; #else typedef voidp unzFile; @@ -69,7 +70,7 @@ typedef voidp unzFile; #define UNZ_CRCERROR (-105) /* tm_unz contain date/time info */ -typedef struct tm_unz_s +typedef struct tm_unz_s { uInt tm_sec; /* seconds after the minute - [0,59] */ uInt tm_min; /* minutes after the hour - [0,59] */ @@ -98,8 +99,8 @@ typedef struct unz_file_info_s uLong compression_method; /* compression method 2 bytes */ uLong dosDate; /* last mod file date in Dos fmt 4 bytes */ uLong crc; /* crc-32 4 bytes */ - uLong compressed_size; /* compressed size 4 bytes */ - uLong uncompressed_size; /* uncompressed size 4 bytes */ + uLong compressed_size; /* compressed size 4 bytes */ + uLong uncompressed_size; /* uncompressed size 4 bytes */ uLong size_filename; /* filename length 2 bytes */ uLong size_file_extra; /* extra field length 2 bytes */ uLong size_file_comment; /* file comment length 2 bytes */ @@ -175,7 +176,7 @@ extern int ZEXPORT unzGoToNextFile OF((unzFile file)); return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. */ -extern int ZEXPORT unzLocateFile OF((unzFile file, +extern int ZEXPORT unzLocateFile OF((unzFile file, const char *szFileName, int iCaseSensitivity)); /* @@ -226,8 +227,8 @@ extern int ZEXPORT unzCloseCurrentFile OF((unzFile file)); Return UNZ_CRCERROR if all the file was read but the CRC is not good */ - -extern int ZEXPORT unzReadCurrentFile OF((unzFile file, + +extern int ZEXPORT unzReadCurrentFile OF((unzFile file, voidp buf, unsigned len)); /* @@ -248,7 +249,7 @@ extern z_off_t ZEXPORT unztell OF((unzFile file)); extern int ZEXPORT unzeof OF((unzFile file)); /* - return 1 if the end of file was reached, 0 elsewhere + return 1 if the end of file was reached, 0 elsewhere */ extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, @@ -263,7 +264,7 @@ extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, if buf!=NULL, len is the size of the buffer, the extra header is copied in buf. - the return value is the number of bytes copied in buf, or (if <0) + the return value is the number of bytes copied in buf, or (if <0) the error code */ #ifdef __cplusplus diff --git a/harbour/contrib/hbzlib/zconf.h b/harbour/contrib/hbzlib/include/zconf.h similarity index 94% rename from harbour/contrib/hbzlib/zconf.h rename to harbour/contrib/hbzlib/include/zconf.h index 6d450fc793..9fcacbe06f 100644 --- a/harbour/contrib/hbzlib/zconf.h +++ b/harbour/contrib/hbzlib/include/zconf.h @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-1998 Jean-loup Gailly. + * Copyright (C) 1995-2002 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -8,6 +8,19 @@ #ifndef _ZCONF_H #define _ZCONF_H +/* +#if _MSC_VER > 1000 + #pragma warning (disable : 4131) + #pragma warning (disable : 4115) + #pragma warning (disable : 4127) + #pragma warning (disable : 4100) + #pragma warning (disable : 4244) + #pragma warning (disable : 4702) + #pragma warning (disable : 4206) +#endif // _MSC_VER > 1000 +*/ + + /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. @@ -130,13 +143,23 @@ /* Type declarations */ -#ifndef OF /* function prototypes */ +/* function prototypes */ + +#ifdef OF +#undef OF +#endif + +/* +#ifndef OF # ifdef STDC + */ # define OF(args) args +/* # else # define OF(args) () # endif #endif + */ /* The following definitions for FAR are needed only for MSDOS mixed * model programming (small or medium model with some far allocations). diff --git a/harbour/contrib/hbzlib/zip.h b/harbour/contrib/hbzlib/include/zip.h similarity index 95% rename from harbour/contrib/hbzlib/zip.h rename to harbour/contrib/hbzlib/include/zip.h index 8426eecc3c..9310860a79 100644 --- a/harbour/contrib/hbzlib/zip.h +++ b/harbour/contrib/hbzlib/include/zip.h @@ -1,4 +1,4 @@ -/* zip.h -- IO for compress .zip files using zlib +/* zip.h -- IO for compress .zip files using zlib Version 0.15 alpha, Mar 19th, 1998, Copyright (C) 1998 Gilles Vollant @@ -36,7 +36,7 @@ */ -/* for more info about .ZIP format, see +/* for more info about .ZIP format, see ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip PkWare has also a specification at : ftp://ftp.pkware.com/probdesc.zip @@ -44,18 +44,21 @@ #ifndef _zip_H #define _zip_H + + +#ifndef _HBCOMPRESS_H +#include "hbcomprs.h" +#endif + #ifdef __cplusplus extern "C" { #endif -#ifndef _ZLIB_H -#include "zlib.h" -#endif #if defined(STRICTZIP) || defined(STRICTZIPUNZIP) /* like the STRICT of WIN32, we define a pointer that cannot be converted from (void*) without cast */ -typedef struct TagzipFile__ { int unused; } zipFile__; +typedef struct TagzipFile__ { int unused; } zipFile__; typedef zipFile__ *zipFile; #else typedef voidp zipFile; @@ -67,7 +70,7 @@ typedef voidp zipFile; #define ZIP_INTERNALERROR (-104) /* tm_zip contain date/time info */ -typedef struct tm_zip_s +typedef struct tm_zip_s { uInt tm_sec; /* seconds after the minute - [0,59] */ uInt tm_min; /* minutes after the hour - [0,59] */ diff --git a/harbour/contrib/hbzlib/include/zipabstractfile.h b/harbour/contrib/hbzlib/include/zipabstractfile.h new file mode 100644 index 0000000000..8c9097b262 --- /dev/null +++ b/harbour/contrib/hbzlib/include/zipabstractfile.h @@ -0,0 +1,54 @@ +/////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipAbstractFile.h $ +// $Archive: /ZipArchive/ZipAbstractFile.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// For the licensing details see the file License.txt +//////////////////////////////////////////////////////////////////////////////// + +#if !defined(AFX_ZIPABSTRACTFILE_H__46F247DE_21A6_4D12_AF64_B5A6B3CF4D57__INCLUDED_) +#define AFX_ZIPABSTRACTFILE_H__46F247DE_21A6_4D12_AF64_B5A6B3CF4D57__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 +#include "ZipExport.h" +#include "zipstring.h" + +class ZIP_API CZipAbstractFile +{ +public: + + enum { begin = SEEK_SET, // 0 + current = SEEK_CUR, // 1 + end = SEEK_END // 2 + }; + CZipAbstractFile(){} + virtual bool Open(LPCTSTR , UINT , bool ){return true;} + virtual void Close() = 0; + virtual void Flush() = 0; + virtual ZIP_ULONGLONG GetPosition() const = 0; + virtual ZIP_ULONGLONG Seek(ZIP_LONGLONG lOff, int nFrom) = 0; + virtual ZIP_ULONGLONG GetLength() const = 0; + virtual void SetLength(ZIP_ULONGLONG nNewLen) = 0; + virtual ZIP_ULONGLONG SeekToBegin(){return Seek(0, begin);} + virtual ZIP_ULONGLONG SeekToEnd(){return Seek(0, end);} + virtual CZipString GetFilePath() const = 0; + virtual UINT Read(void *lpBuf, UINT nCount) = 0; + virtual void Write(const void* lpBuf, UINT nCount) = 0; + virtual bool IsClosed() const = 0; + virtual ~CZipAbstractFile(){}; + +}; + + + +#endif // !defined(AFX_ZIPABSTRACTFILE_H__46F247DE_21A6_4D12_AF64_B5A6B3CF4D57__INCLUDED_) diff --git a/harbour/contrib/hbzlib/include/ziparchive.h b/harbour/contrib/hbzlib/include/ziparchive.h new file mode 100644 index 0000000000..23402203e0 --- /dev/null +++ b/harbour/contrib/hbzlib/include/ziparchive.h @@ -0,0 +1,2052 @@ +/////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipArchive.h $ +// $Archive: /ZipArchive/ZipArchive.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// For the licensing details see the file License.txt +// +// Check the site http://www.artpol-software.com for the updated version of the library. +//////////////////////////////////////////////////////////////////////////////// +// +// The following information files are distributed along with this library: +// License.txt - licensing information +// gpl.txt - General Public License text +// Readme.txt - general information +// ChangeLog.txt - revision history +// faq.txt - frequently asked questions +// Appnote.txt - details on the zip format +// ( also available at ftp://ftp.pkware.com/appnote.zip) +// +// + + + +/** +* \file ZipArchive.h +* Interface for the CZipArchive class. +* +*/ + +#if !defined(AFX_ZIPARCHIVE_H__A7F528A6_1872_4071_BE66_D56CC2DDE0E6__INCLUDED_) +#define AFX_ZIPARCHIVE_H__A7F528A6_1872_4071_BE66_D56CC2DDE0E6__INCLUDED_ + +/** + \namespace ziparchv + A helper namespace. + \par Members + - CZipFileMapping + +*/ + + + + +/** + \struct CZipFileMapping ZipFileMapping.h + + Maps a file to the memory. A system-specific implementation. + Stored in ziparchv namespace. + + \c #include "ZipFileMapping.h" +*/ + + +// to ensure that the correct files are copied +// (see "Compatibility" chapter in the documentation). +// Rebuild the project after copying the files. +#ifdef ZIP_ARCHIVE_MFC_PROJ + #ifndef ZIP_ARCHIVE_MFC + #error You need to copy files from the MFC subdirectory\ + to the ZipArchive root directory and rebuild the project + #endif +#elif defined ZIP_ARCHIVE_STL_PROJ + #ifndef ZIP_ARCHIVE_STL + #error You need to copy files from the STL subdirectory\ + to the ZipArchive root directory and rebuild the project + #endif +#endif // + +#if (_MSC_VER > 1000) && (defined ZIP_HAS_DLL) + #pragma warning( disable : 4251 ) // needs to have dll-interface to be used by clients of class + #pragma warning( disable : 4275 ) // non dll-interface class used as base for dll-interface +#endif + + +//#ifdef __cplusplus +//extern "C" { +//#endif +#ifndef _HBCOMPRESS_H +#include "hbcomprs.h" +#endif +//#ifdef __cplusplus +//} +//#endif + + +#include "zipexception.h" +#include "zipautobuffer.h" +#include "zipcentraldir.h" +#include "zipstorage.h" +#include "zippathcomponent.h" +#include "zipstring.h" +#include "ZipExport.h" + + +/** + Structure used as a parameter in CZipArchive::AddNewFile(CZipAddNewFileInfo& ); + Use one of constructors provided and then adjust the member variables that are + set to default values by #Defaults method. +*/ +struct ZIP_API CZipAddNewFileInfo +{ + CZipAddNewFileInfo(LPCTSTR lpszFilePath, bool bFullPath = true) + : m_szFilePath(lpszFilePath),m_bFullPath(bFullPath) + { + m_pFile = NULL; + Defaults(); + } + CZipAddNewFileInfo(LPCTSTR lpszFilePath, LPCTSTR lpszFileNameInZip) + : m_szFilePath(lpszFilePath), m_szFileNameInZip(lpszFileNameInZip) + { + m_pFile = NULL; + Defaults(); + } + CZipAddNewFileInfo(CZipAbstractFile* pFile, LPCTSTR lpszFileNameInZip) + : m_pFile(pFile), m_szFileNameInZip(lpszFileNameInZip) + { + Defaults(); + } + /** + the full path to the file to be added; if it is empty you need to set #m_pFile + */ + CZipString m_szFilePath; + + /** + the file name that will be stored in the archive (if the file is a directory, + there is a path separator automatically added at the end); #SetRootPath + function has no effect on this parameter + */ + CZipString m_szFileNameInZip; + + /** + It has only the meaning when #m_szFileNameInZip is not specified and #m_szFilePath is not empty. + + - if \c true, include full path of the file inside the archive (even if #m_szRootPath is set)
+ + - if \c false only the filename without a path is stored in the archive
+ + in this case if #m_szRootPath is set previously with #SetRootPath + and if the beginning of #m_szFilePath equals #m_szRootPath + then the filename is set to the remaining part of m_szFilePath + (you can say to m_lpszFilePath minus #m_szRootPath) + */ + bool m_bFullPath; + + /** + the compression level, see #OpenNewFile + */ + int m_iComprLevel; + + /** + the smartness level of of the library; can be one or more #Smartness + values (you can OR them);
+ if zipsmCheckForEff is specified and due to it the file needs to be + reinserted into the archive without a compression and the callback + functor is specified, the callback functor's method Callback is called with the first argument set to + DWORD (-1) (you need to remember the last argument if you need the size of the file) + */ + int m_iSmartLevel; + + /** + the index of the existing file in the archive to be replaced by the file being added (the new file + goes into the same physical place as the old file - the archive may of course grow or shrink as a result) + +- >= 0 the index of the file to be replaced +- -1 do not replace any file and add the new file at the end of the archive (default) +- -2 if the new file has the same name as a file already in the archive then replace it or add at the end of the archive if it's filename is unique; it uses CZipArchive::FindFile with + the arguments \e iCaseSensitive and \e bFileNameOnly set to default values + + \note + - you replace files in disk-spanning archives (i.e. use a value different from -1) + - if the space size taken by the old file is different from the space size needed by the new file, the callback is called while moving data (see CZipArchive::cbReplace) + - this replaces the file physically, so no information from the file being replaced is retained (such as attributes, modification time, etc.) + - if you use an invalid index, the function will fail; if you specify the last file in the archive to be replaced, it'll be removed and the usual action taken + - the new file encryption does not depend on the old file encryption but only on the current password settings (see CZipArchive::SetPassword) + - if #m_iComprLevel is not 0 then a temporary archive is created in the temporary directory + (see CZipArchive::SetTempPath) or in the memory (if you use CZipArchive::zipsmMemoryFlag in #m_iSmartLevel) + - the most complicated scenario is when you try to replace the file and use CZipArchive::zipsmCheckForEff flag in #m_iSmartLevel and the file compression proves to be + inefficient (you can use the sample application \e ZipArc to observe the following process): + - first you get CZipArchive::cbAdd callback - the file is being compressed to a temporary archive, + - then the file compression proves to be inefficient and the file needs to be stored instead of compressed, + but first the space inside archive must be adjusted to fit the file being added in the place of file being replaced - you get CZipArchive::cbReplace, + - then, at the end, the file is being stored - you get CZipArchive::cbAddStore callback + + \see SetAdvanced + \see CZipArchive::WillBeDuplicated + */ + int m_iReplaceIndex; + + /** + the size of the buffer used while file operations + */ + unsigned long m_nBufSize; + + /** + instead of from a physical file, the data for compression is taken from the CZipAbstractFile object (e.g. from CZipMemFile) + + \note + - you have to leave #m_szFilePath empty if you set #m_pFile to not NULL + - the time of the file in zip is set to the current time, and the attributes to the default + file attributes (depending on the system) + - you cannot add directories this way + */ + CZipAbstractFile* m_pFile; + + /** + Set default values for #m_iSmartLevel, #m_iReplaceIndex, #m_nBufSize and #m_iComprLevel + */ + void Defaults(); +}; + + +/** + The representation of the zip archive file. + This class provides all the operations on the zip archive. + +*/ +class ZIP_API CZipArchive +{ + +public: + /** + The purpose of this structure is to hold the data that allow communication + with the zlib library + */ + struct ZIP_API CZipInternalInfo + { + + CZipInternalInfo() + { + m_iBufferSize = 65536; + } + virtual ~CZipInternalInfo(){} + + /** + Allocate internal buffer of m_iBufferSize size + */ + void Init() + { + m_pBuffer.Allocate(m_iBufferSize); + } + void ReleaseBuf() + { + m_pBuffer.Release(); + } + z_stream m_stream; ///< zlib library data stream + DWORD m_uUncomprLeft; ///< bytes left to uncompress + DWORD m_uComprLeft; ///< bytes left to decompress + DWORD m_uCrc32; ///< crc32 file control value + + /** + The size of the buffer used in decompressing data. + Set before opening the archive. + It is usually set with CZipArchive::SetAdvanced + (specify this value as the second argument). + \see CZipArchive::SetAdvanced + */ + DWORD m_iBufferSize; + + /** + This buffer caches data during compression and decompression. + */ + CZipAutoBuffer m_pBuffer; + }; + + CZipArchive(); + virtual ~CZipArchive(); + +/** + In non-UNICODE version just copy \e szSingle to \e szWide. + In UNICODE version works the same way as ZipPlatform::SingleToWide + \param szSingle + \param szWide + + \return (in non-UNICODE version the number of characters copied) + \see ZipPlatform::SingleToWide +*/ + static int SingleToWide(const CZipAutoBuffer &szSingle, CZipString& szWide); + +/** + In non-UNICODE version just copy \e lpWide to \e szSingle. + In UNICODE version works the same way as ZipPlatform::WideToSingle + \param lpWide + \param szSingle + \return (in non-UNICODE version the number of characters copied) + \see ZipPlatform::WideToSingle + +*/ + static int WideToSingle(LPCTSTR lpWide, CZipAutoBuffer &szSingle); + + +/** + Set the password for the file to be opened or created. + Use this method BEFORE opening or adding a file, but AFTER opening an archive + \param lpszPassword + set it to NULL to clear password + \return \c false if the password contains ASCII characters + with values 128 or higher or the file inside archive is opened + +*/ + bool SetPassword(LPCTSTR lpszPassword = NULL); + +/** + \return the current archive password or an empty string if there is no password +*/ + CZipString GetPassword()const ; + +/** + Set the buffer sizes. No buffer can be set smaller than 1024. + Use this method before opening the archive. The optimal size for + the write buffer in the disk spanning archive is the size of the volume. + + \param iWriteBuffer + the write cache size used + \see CZipStorage::m_iWriteBufferSize + \param iGeneralBuffer + buffer used in extracting, compressing, deleting, getting (#GetFromArchive) files, renaming and replacing + \see CZipInternalInfo::m_iBufferSize + \param iSearchBuffer + the buffer used in searching for the central dir + \see CZipCentralDir::m_iBufferSize + \see GetAdvanced +*/ + void SetAdvanced(int iWriteBuffer = 65536, int iGeneralBuffer = 65536, int iSearchBuffer = 32768); + + /** + retreive buffer size as set by #SetAdvanced + */ + void GetAdvanced(int* piWriteBuffer = NULL, int* piGeneralBuffer = NULL, int* piSearchBuffer= NULL) + { + if (piWriteBuffer) + *piWriteBuffer = m_storage.m_iWriteBufferSize; + if (piGeneralBuffer) + *piGeneralBuffer = m_info.m_iBufferSize; + if (piSearchBuffer) + *piSearchBuffer = m_centralDir.m_iBufferSize; + } + + /** + Enum values used as \e iWhich parameter in #SetCallback function. + You can assign several values to the same functor (OR them) + \see CZipActionCallback + */ + enum CallbackType + { + cbNothing = 0x0000, ///< you can use it for your own purposes + cbAdd = 0x0001, ///< called when adding a file with one of #AddNewFile functions + cbAddTmp = 0x0002, ///< called while adding a file (only on a disk-spanning archive) when the smartness level contains CZipArchive::zipsmCheckForEff or CZipArchive::zipsmCheckForEffInMem + ///< and if just compressed file is being moved from a temporary place (file or memory) to the archive + cbAddStore = 0x0004, ///< called while adding a file and if it's compressing has proven to be inefficient and it is now being stored (instead of compressed) in the archive; + ///< smartness level must contain CZipArchive::zipsmCheckForEff or CZipArchive::zipsmCheckForEffInMem; the archive can be disk-spanning or not + + cbExtract = 0x0008, ///< called when extracting a file with one of #ExtractFile functions + + cbDeleteCnt = 0x0010, ///< called before the actual deletion takes place and the map of holes and continuous areas is being created (it safe to break it by returning \c false from the callback method) + cbDelete = 0x0020, ///< called when moving data while deleting file(s) with function #DeleteFile or one of #DeleteFiles functions + + cbTest = 0x0040, ///< called when testing a file with #TestFile function + cbSave = 0x0080, ///< called when saving the central directory with CZipCentralDir::Write (usually on close or flush); it is safe to break on non-disk spanning archive - the saved part of + ///< the central directory will be removed from disk + cbGetFromArchive + = 0x0100, ///< called when using one of #GetFromArchive methods + cbRename = 0x0200, ///< called when during the renaming a file there is a need to make less or more space for the new filename + cbReplace = 0x0400, ///< called when moving data while replacing files to make less or more space for the new file + cbNextValue = 0x0800, ///< for CZipActionCallback overrides and user defined callbacks + + + cbSubActions= cbAddTmp | cbAddStore | cbDeleteCnt | cbReplace, ///< sub actions - they are part of bigger actions (#cbAddTmp | #cbAddStore | #cbDeleteCnt | #cbReplace) + cbActions = cbAdd | cbExtract | cbDelete | cbTest | cbSave | cbGetFromArchive | cbRename, ///< main actions (#cbAdd | #cbExtract | #cbDelete | #cbTest | #cbSave | #cbGetFromArchive | #cbRename) + cbAll = cbActions | cbSubActions ///< assign all callbacks to the same functor + }; + + + /** + + Set callback functors for the following operations on the zip archive: adding, extracting, testing or deleting files. + See \ref sectCallb information on how to use functors. + \param pCallback + the address of the functional object which class is derived from CZipActionCallback + (you need to override member function CZipCallback::Callback in the derived class) + Set it to \c NULL to clear callback for the selected actions. + \param iWhich + can be one or more (use logical OR) #CallbackType values. + + \see CZipActionCallback + \see GetCallback + + */ + void SetCallback(CZipActionCallback* pCallback = NULL, int iWhich = cbAll); + + /** + \return the callback \e iWhich set with #SetCallback + */ + CZipActionCallback* GetCallback(CallbackType iWhich) + { + return m_callbacks.Get(iWhich); + } + + /** + Set the callback functor used during operations on a + PKZIP compatible disk spanning archive to change disks. + Set it before opening the archive. If you open the archive + in the \ref PKSpan "PKZIP compatible mode" and don't set the callback functor, + the exception CZipException::noCallback will be thrown. + + Callback functor's method CZipSpanCallback::Callback is called when there is a need for a disk change. + Calling CZipArchive methods from inside this method may result in an unexpected behavior. + \param pCallback + the address of the functional object which class is derived from CZipSpanCallback + (you need to override member function CZipCallback::Callback in the derived class) + Set it to \c NULL to clear the callback. + + \see CZipSpanCallback + */ + void SetSpanCallback(CZipSpanCallback* pCallback = NULL){m_storage.m_pChangeDiskFunc = pCallback;} + + + + /** + Archive open modes used in #Open(LPCTSTR , int , int ) + and #Open(CZipMemFile, int ) + */ + enum OpenMode + { + zipOpen, ///< open an existing archive + /** + Open an existing archive as a read only file. + This mode is intended to use in a self extract code or opening + archive on storage without write access (e.g. CD-ROMS), + If you try to modify the archive in this mode, + an exception will be thrown. + */ + zipOpenReadOnly, + zipCreate, ///< create a new archive + zipCreateSpan ///< create a disk spanning archive + }; + + + +/** + Open or create a zip archive. + + The archive creation mode depends on \e iMode and \e iVolumesSize values: + - if \e iMode == #zipCreateSpan and \e iVolumeSize <= 0 then create disk spanning + archive in \ref PKSpan "PKZIP compatible mode" (pkzipSpan) + - if \e iMode == #zipCreateSpan and \e iVolumeSize > 0 then create disk spanning + archive in \ref TDSpan "TD compatible mode" (tdSpan) + - if \e iMode == #zipOpen and the existing archive is a spanned archive + then pkzipSpan mode is assumed if the archive is on a removable device + or tdSpan otherwise;
+ if you want to open tdSpan archive on a removable device, set \e iVolumeSize + to a value different from 0 + - if \e iMode == #zipCreate then \e iVolumeSize doesn't matter + + \param szPathName + the path to the archive + \param iMode + one of the #OpenMode values + \param iVolumeSize + the volume size in the disk spanning archive; + the size of the volume may be from 1 to INT_MAX , + and the bigger - the faster is creation and extraction (no file changes between volumes) - but the size of the whole archive is the same. + If you're creating disk-spanning archive in \ref TDSpan "TD span compatible mode" + and plan later to convert it to \ref PKSpan "PKZIP compatible mode" (see \ref sectSpan), it is good to set this this value to + about the size of the diskette (a little less just in case). + + \note Throws exceptions. + \see Open(CZipMemFile&, int); + \see GetSpanMode +*/ + void Open(LPCTSTR szPathName, int iMode = zipOpen, int iVolumeSize = 0); + + +/** + Open or create the archive in memory. The CZipMemFile object is not closed + after closing the archive, so that is it possible to work with it afterwards. + \param mf + CZipMemFile structure to create archive in or extract from + \note This is important: you shouldn't destroy CZipMemFile object before + closing the archive, because you'll get an error; + \param iMode + Open mode. + The following modes are valid: #zipOpen, #zipOpenReadOnly, #zipCreate + \note Throws exceptions. + \see Open(LPCTSTR, int, int); +*/ + void Open(CZipMemFile& mf, int iMode = zipOpen); + +/** + Set #m_szRootPath to a specified value. Use it if you don't want to set + \e bFullPath argument in #AddNewFile or #ExtractFile to true and you + don't want to strip the whole path neither, but only a specific beginning. + Use it AFTER opening the archive and before using #AddNewFile or #ExtractFile. + See \ref q9 "the FAQ" for the example of use. + \param szPath + Set it to the string that you want to be omitted from the beginning of the path of the file + in the archive
+ if \c NULL - clears the #m_szRootPath and no path beginning will be matched against it + + \note Set the case-sensitivity with #SetCaseSensitivity + + \see AddNewFile + \see ExtractFile + \see GetRootPath + +*/ + void SetRootPath(LPCTSTR szPath = NULL); + + + /** + Return the current value of #m_szRootPath + \return CZipString + */ + CZipString GetRootPath()const + { + return m_szRootPath; + } + + /** + The levels of smartness of the adding files action (see #AddNewFile) + \note If you wish to use \e zipsmCheckForEff, you should use + \e zipsmNotCompSmall as well, because it will save you the time + ( the small file will be surely larger after compression, so that + we can add it not compressed straight away);the compression level + is always ignored for a directory and set to 0 + */ + + enum Smartness + { + zipsmLazy = 0x0000, ///< do not bother (you know what you're doing after all) + zipsmCPassDir = 0x0001, ///< clear password for directories + zipsmCPFile0 = 0x0002, ///< clear password for files of 0 size + zipsmNotCompSmall = 0x0004, ///< do not compress files smaller than 5 bytes (they are always stored larger than uncompressed) + zipsmCheckForEff = 0x0008, ///< check whether the compressed file is larger than uncompressed and if so, remove it and store without the compression; + ///< in the disk spanning mode, the temporary file is used for that: if the file compression is efficient, the data is not compressed + ///< again, but moved from the temporary file to the archive; you can use #SetTempPath() to set the path where the + ///< file will be created or you can let the library figure it out (the library tries first the system default temporary directory, + ///< if it is not present or there is not enough space there, it tries the current directory, if it fails, no temporary file is created + ///< and the compression goes the usual way + + zipsmMemoryFlag = 0x0010, ///< combine it with zipsmCheckForEff or use zipsmCheckForEffInMem, you can also use this when replacing files see note at CZipAddNewFileInfo::m_iReplaceIndex + + zipsmCheckForEffInMem = zipsmMemoryFlag | zipsmCheckForEff, ///< the same as #zipsmCheckForEff, but the temporary file is created created in memory instead (the temporary directory set with #SetTempPath() is ignored); has the meaning only with a disk-spanning archive, + ///< non-disk spanning archives don't need a temporary file + zipsmSmartPass = zipsmCPassDir | zipsmCPFile0, ///< smart password policy (a combination of \e zipsmCPassDir and \e zipsmCPFile0) + zipsmSmartAdd = zipsmNotCompSmall | zipsmCheckForEff, ///< smart adding (a combination of \e zipsmNotCompSmall and \e zipsmCheckForEff) + zipsmSafeSmart = zipsmSmartPass | zipsmNotCompSmall, ///< safe smart (smartest without checking for efficiency) + zipsmSmartest = zipsmSmartPass | zipsmSmartAdd, ///< smart at its best + + + zipsmInternal01 = 0xf000 ///< for internal use only + + }; + + + /** + Add a new file to the archive. You can set the callback functor with #SetCallback. + \param info see CZipAddNewFileInfo + \return \c if it returns false then the file was not added, but the internal + state allows you to add other files (which is not possible after throwing + an exception) + + \note + - If you abort while adding a file in a non-disk-spanning archive, the added data will be removed from the archive + - Throws exceptions. + + \see SetCallback + \see AddNewFile(LPCTSTR, LPCTSTR, int, int, unsigned long) + \see AddNewFile(LPCTSTR, int, bool, int, unsigned long) + \see AddNewFile(CZipMemFile&, LPCTSTR, int, int, unsigned long) + */ + bool AddNewFile(CZipAddNewFileInfo& info); + bool AddNewFileDrv(CZipAddNewFileInfo& info); + + + /** + \see AddNewFile(CZipAddNewFileInfo& ); the parameters are equivalent to CZipAddNewFileInfo member variables + + */ + bool AddNewFile(LPCTSTR lpszFilePath, int iComprLevel = -1, bool bFullPath = true, + int iSmartLevel = zipsmSafeSmart, unsigned long nBufSize = 65536); + + bool AddNewFileDrv(LPCTSTR lpszFilePath, int iComprLevel = -1, bool bFullPath = true, + int iSmartLevel = zipsmSafeSmart, unsigned long nBufSize = 65536); + /** + \see AddNewFile(CZipAddNewFileInfo& ); the parameters are equivalent to CZipAddNewFileInfo member variables + */ + bool AddNewFile(LPCTSTR lpszFilePath, + LPCTSTR lpszFileNameInZip, + int iComprLevel = -1, + int iSmartLevel = zipsmSafeSmart, + unsigned long nBufSize = 65536); + + /** + \see AddNewFile(CZipAddNewFileInfo& ); the parameters are equivalent to CZipAddNewFileInfo member variables + */ + bool AddNewFile(CZipMemFile& mf, + LPCTSTR lpszFileNameInZip, + int iComprLevel = -1, + int iSmartLevel = zipsmSafeSmart, + unsigned long nBufSize = 65536); + + + +/** + Add a new file to the opened zip archive. The zip archive cannot be + an existing disk spanning archive (existing at the moment of opening archive), + because modifying such an archive is not possible (at least not with this + version ). + + \param header + The structure that provides additional information about the added file. + The following fields are valid: + - \e m_uMethod - file compression method; can be 0 (storing) or Z_DEFLATE (deflating) + otherwise Z_DEFLATE is assumed + - \e m_uModDate, \e m_uModTime - Use CZipFileHeader::SetTime to set them. + If \e lpszFilePath is not NULL this fields are overwritten and updated automatically. + See CZipFileHeader::SetTime + - \e m_uExternalAttr - Attributes of the file. + If \e lpszFilePath is not NULL this field is overwritten and updated automatically. + Use #SetFileHeaderAttr to set them. See #SetFileHeaderAttr. + - \e m_szFileName - A filename (may be with path) to be stored inside archive + to represent this file. See CZipFileHeader::SetFileName + - \e m_szComment - A file comment. See CZipFileHeader::SetComment + - \e m_pExtraField - LOCAL extra field, use #SetExtraField after opening + a new file, but before closing it to set the not local extra field + in the header in the central directory. See #SetExtraField
+ Other fields are ignored - they are updated automatically. + If the function returns \c true, \link #GetSystemCompatibility + system compatibility \endlink for this object is + set to the correct value (the same as #m_iArchiveSystCompatib), + additionally if \e lpszFilePath was not NULL, the attributes and + the time fields are filled with information retrieved from + the file pointed by \e lpszFilePath. + \param iLevel + The level of compression (-1, 0 - 9). + The are several preset values for the compression level: + - Z_DEFAULT_COMPRESSION : -1 (equals 6) + - Z_NO_COMPRESSION : 0 + - Z_BEST_SPEED : 1 + - Z_BEST_COMPRESSION : 9 + \param lpszFilePath + The path to the file to retrieve date stamp and attributes from. + These values are stored inside the archive. + \param uInternal + for internal use only + + \return \c false in the following cases: + - the \e lpszFilePath is not NULL and the file attributes and data was not correctly retrieved + - a file is already opened for extraction or compression + - archive is an existing disk span archive + - maximum file count inside archive already reached (65536) + \note Throws exceptions. + +*/ + bool OpenNewFile(CZipFileHeader & header, int iLevel = Z_DEFAULT_COMPRESSION, LPCTSTR lpszFilePath = NULL, DWORD uInternal = 0); + +/** + Compress the contents of the buffer and write it to a new file. + \param pBuf + the buffer containing the data to be compressed and written + \param iSize + the number of bytes to be written from the buffer + \return \c false if the new file hasn't been opened yet + \note Throws exceptions. + \see OpenNewFile +*/ + bool WriteNewFile(const void *pBuf, DWORD iSize); + + +/** + Set the extra field in the central directory of the currently opened file. + Must be used after opening a new file in the archive, but before closing it + To set the local extra field, set it in the CZipFileHeader structure passed + as the argument to the #OpenNewFile + \param pBuf + the bufer with the data to be copied + \param iSize + the size of the extra field in the buffer + \see OpenNewFile +*/ + void SetExtraField(const char *pBuf, WORD iSize); + +/** + Close the new file in the archive. + \return \c false if there is no new file opened + \param bAfterException + it will close the new file without writing anything (call it also + with this parameter set to \c true after an exception other than CZipException::abortedSafely was + thrown from one of #AddNewFile functions) + \note Throws exceptions. + \see OpenNewFile +*/ + bool CloseNewFile(bool bAfterException = false); + +/** + Acquire a file with the given index from another archive. + The compressed data of the file from another archive are copied + without decompressing to the current archive. + You can set the callback functor with #SetCallback. + \param zip + an opened archive to get the file from (must not be multi-disk) + \param uIndex + a zero-based index of the file to get from the \e zip archive + \param iReplaceIndex the same as CZipAddNewFileInfo::m_iReplaceIndex + \param bKeepSystComp + if \c false, which is default, then the file from \e zip archive + system compatibility is converted to the current archive system + compatibility (if they differ) + \return \c false if the operation could not be performed (either of archives is closed, + a file inside either of archives is opened, \e zip archive is multi-disk or the current + archive is an existing multi-disk archive) + \note Throws exceptions
+ (when an exception is thrown, you may need to call #CloseNewFile with \e bAfterException set to \c true, to make the archive reusable). + \note it is safe to abort the action (by returning false from the callback call) in non-disk spanning archive and when no replacing is taking place + (the file not entirely added is removed from the archive) + \see SetCallback + \see GetFromArchive(CZipArchive& , CZipWordArray &, bool) + \see GetFromArchive(CZipArchive& , CZipStringArray &, bool) + \see FindMatches + \see SetAdvanced +*/ + bool GetFromArchive(CZipArchive& zip, WORD uIndex, int iReplaceIndex = -1, bool bKeepSystComp = false) + { + + m_info.Init(); + bool bRet; + try + { + bRet = GetFromArchive(zip, uIndex, iReplaceIndex, bKeepSystComp, GetCallback(cbGetFromArchive)); + } + catch(...) + { + m_info.ReleaseBuf(); + throw; + } + m_info.ReleaseBuf(); + if (bRet && m_bAutoFlush) + Flush(); + + return bRet; + } + + /** + Acquire files with the given indexes from another archive. + + \param aIndexes + an array of zero-based indexes of the files inside the \e zip archive + + \see GetFromArchive(CZipArchive& , WORD, int, bool) + + \note + - To get files which filenames match a specified pattern, use #FindMatches function + */ + bool GetFromArchive(CZipArchive& zip, CZipWordArray &aIndexes, bool bKeepSystComp = false); + + /** + Acquire files with the given indexes from another archive. + \param aNames + an array of filenames inside the \e zip archive; + + \see GetFromArchive(CZipArchive& , WORD, int, bool) + \see EnableFindFast + + \note + - Set the case-sensitivity with #SetCaseSensitivity + - Enables FindFast if not enabled + + */ + + bool GetFromArchive(CZipArchive& zip, CZipStringArray &aNames, bool bKeepSystComp = false) + { + CZipWordArray indexes; + zip.GetIndexes(aNames, indexes); + return GetFromArchive(zip, indexes, bKeepSystComp); + + } + + /** + Get indexes of the files stored int \e aNames array and put them into \e aIndexes + \param aNames + an array of filenames inside the archive; + \param aIndexes + an array of indexes to be build + \note + - Set the case-sensitivity with #SetCaseSensitivity + - Enables FindFast if not enabled + + */ + void GetIndexes(const CZipStringArray &aNames, CZipWordArray& aIndexes); + +/** + Extract the file from the archive. You can set the callback functor with #SetCallback. + The argument \e lpszNewName may point to the full path and is influenced by \e bFullPath + argument (if \e lpszNewName contains drive specification then it is removed) + \param uIndex + the index of the file to extract + \param lpszPath + \verbatim + The PATH only to extract the file to. May not be NULL. If you wish to + use UNC path you need to replace \\\\ at the beginning of UNC path with \\\\?\UNC\ . + \endverbatim + \param bFullPath
+ - if \c true, then extract with the full path - in this case the resulting + file path is \e lpszPath plus the path stored in the archive or plus \e lpszNewName + if \e lpszNewName is not NULL.
+ - if \c false, the destination file path is \e lpszPath + \e the filename only + extracted from the path stored in the archive or from \e lpszNewName if + \e lpszNewName is specified;
+ if #m_szRootPath is set previously with #SetRootPath then to \e lpszPath + is added the path stored in the archive (or \e lpszNewName if + \e lpszNewName is specified) that has removed the beginning that equals + #m_szRootPath (if there is no common beginning then is behaves like + #m_szRootPath was empty) + \param lpszNewName + The new name of the file after extraction. + If NULL the original filename stored in the archive is used. + May point to the full path but, if \e bFullPath is \c false, only the filename is extracted from this argument, + \param nBufSize + the size of the buffer used while file operations + \return \c true if successful + \note + - To extract files which filenames match a specified pattern, use #FindMatches function + - Throws exceptions. + \see SetCallback + \see ExtractFile(WORD, CZipMemFile&, DWORD) + \see FindMatches +*/ + bool ExtractFile(WORD uIndex, LPCTSTR lpszPath, bool bFullPath = true, + LPCTSTR lpszNewName = NULL, DWORD nBufSize = 65536); + + + /** + The same as #ExtractFile(WORD , LPCTSTR , bool , LPCTSTR , DWORD ) + but instead to a physical file, this function decompress the data into CZipMemFile object + \note + - if you pass CZipMemFile object already with data, its contents are NOT overwirtten, but the decompressed data is appended at the end + - if you try to extract a directory, the function will return \c false + */ + bool ExtractFile(WORD uIndex, CZipMemFile& mf, DWORD nBufSize = 65536); + +/** + Open the file with the given index in the archive for extracting. + Not successful opening the file doesn't lock the whole archive, so + you can try to open another one (after catching an exception if it was + thrown). Throw exception CZipException::badPassword if the password + was not set for the encrypted file. + \param uIndex + the index of the file + \return \c true if successful + \note Throws exceptions. +*/ + bool OpenFile(WORD uIndex); + +/** + Decompress currently opened file to the buffer. + \param pBuf + buffer to receive data + \param iSize + the size of the buffer + \return the number of bytes read + \see OpenFile + \note Throws exceptions. +*/ + DWORD ReadFile(void *pBuf, DWORD iSize); + + +/** + Test the file with the given index for the integrity. You can set the callback functor with #SetCallback. + The method throws exceptions but performs all the necessary cleanup + before, so that the next file can be tested after catching the exception. + \param uIndex + index of the file to test + \param uBufSize + the size of the buffer used during extraction + \return \c false if the incorrect action has been taken by + the user or the programmer (it is when #OpenFile or #GetFileInfo returned \c false or \e uBufSize is 0). + If the file didn't passed the test or there was a disk I/O error or the password supplied was incorrect, an exception is thrown. + \note Throws exceptions. + \see SetCallback + +*/ + bool TestFile(WORD uIndex, DWORD uBufSize = 65536); + +/** + Perform the necessary cleanup after an exception was thrown + while testing the archive so that next files in the archive can be tested. + Called by #TestFile. Does not remove the file headers + information from the central directory. + \see TestFile + \see CZipCentralDir::Clear +*/ + void CloseFileAfterTestFailed(); + +/** + Get the local extra filed of the currently opened + for extraction file in the archive. + \param pBuf + the buffer to receive the data + \param iSize + the size of the buffer + \return If \e pBuf is NULL or iSize is 0, returns the size of the local extra field. + Returns -1 if there is no file opened for the extraction. +*/ + int GetLocalExtraField(char* pBuf, int iSize)const ; + +/** + The same as CZipArchive::CloseFile(LPCTSTR), but additionally + closes \e file. + \param file + OPENED CZipFile structure of the extracted file + \return + \note Throws exceptions. + \see CZipArchive::CloseFile(LPCTSTR) +*/ + int CloseFile(CZipFile &file); + + +/** + Close the file opened for extraction in the archive and copy its date and + attributes to the file pointed by \e lpszFilePath + \param lpszFilePath + Points to the path of the file to have the date and attributes information updated. + \param bAfterException + Set to \c true to close the file inside archive after an exception has been + thrown, to allow futher operations on the archive. + \warning Close the file pointed by \e lpszFilePath before using this method, + because the system may not be able to retrieve information from it. + \return
+ - "1" = ok + - "-1" = some bytes left to uncompress - probably due to a bad password or corrupted archive + - "-2" = setting extracted file date and attributes was not successful + \note Throws exceptions. +*/ + int CloseFile(LPCTSTR lpszFilePath = NULL, bool bAfterException = false); + +/** + Delete the file from the archive with the given index. + You can set the callback functor with #SetCallback. + If you plan to delete more than one file, use one of DeleteFiles functions rather than calling DeleteFile + successively, because these functions are optimized for deleting multiple files + \param uIndex + a zero-based index + \note Throws exceptions. + \see SetCallback + \see DeleteFiles(CZipWordArray&) + \see DeleteFiles(const CZipStringArray&) + \see FindMatches +*/ + void DeleteFile(WORD uIndex); + +/** + Delete files from the archive. + You can set the callback functor with #SetCallback. + Sorts \e aIndexes array in an ascending order. + \param aIndexes + an array of zero-based indexes of the files inside the archive + \note + - To remove files which filenames match a specified pattern, use #FindMatches function + - Throws exceptions. + \see SetCallback + \see DeleteFile + \see DeleteFiles(const CZipStringArray& ) + \see FindMatches +*/ + void DeleteFiles(CZipWordArray &aIndexes); + + +/** + Delete files from the archive. + You can set the callback functor with #SetCallback. + \param aNames + an array of filenames inside the archive; + \note + - Set the case-sensitivity with #SetCaseSensitivity + - Enables FindFast if not enabled + - Throws exceptions. + \see SetCallback + \see DeleteFile + \see DeleteFiles(CZipWordArray&) + \see EnableFindFast +*/ + void DeleteFiles(const CZipStringArray &aNames); + + +/** + Set the global comment in the archive. + \param lpszComment + the file comment + \return \c false if the archive is closed or if it is an existing disk spanning archive + \note Throws exceptions. +*/ + bool SetGlobalComment(LPCTSTR lpszComment); + + +/** + \return the global comment or an empty string if the archive is closed +*/ + CZipString GetGlobalComment()const ; + + +/** + Set the comment of the file with the given index inside the archive. + \param uIndex + zero-based index of the file in the archive + \param lpszComment + a comment to add + \return \c false if the comment change is impossible + \note Throws exceptions. +*/ + bool SetFileComment(WORD uIndex, LPCTSTR lpszComment); + +/** + \return the path of the currently opened archive volume +*/ + CZipString GetArchivePath()const; + +/** + \return
+ - a one-based number of the current disk + - 0 if there is no current disk (the archive is closed) + \note Useful mostly while working with the disk-spanning archive in creation to find out + how many disks were already created. To find out how many disks are in an existing disk-spanning archive, + use the function #GetCentralDirInfo +*/ + int GetCurrentDisk()const ; + +/** + Return the disk spanning mode of the current archive. + + \return
+ - -2 - existing TD mode compatible disk spanning archive + - -1 - existing PKZIP compatible + - 0 - no disk spanning + - 1 - PKZIP compatible in creation + - 2 - TD compatible in creation + + \see \ref PKSpan, \ref TDSpan + +*/ + int GetSpanMode()const + { + return m_storage.m_iSpanMode * m_storage.IsSpanMode(); + } + + /** + case-sensitivity values used as argument \e iCaseSensitive in #FindFile + */ + enum FFCaseSens + { + ffDefault, ///< use the default case-sensitivity as set with #SetCaseSensitivity function; + ///< if CZipCentralDir::m_findarray was build before with a different case-sensitivity, + ///< it is rebuild again, if it hasn't been build so far, it is build now with the + ///< default case-sensitivity + ffCaseSens, ///< perform a case-sensitive search (if the \c CZipArchive is non-case-sensitive, + ///< a less effective search is perfomed); does not rebuild CZipCentralDir::m_findarray, + ///< but if the array hasn't been built yet, it is build now as \b non-case-sensitive + ///< (you can use \c SetCaseSensitivity(true) and then #ffDefault to build it as case-sensitive) + ffNoCaseSens ///< perform a non-case-sensitive search (if the \c CZipArchive is case-sensitive, + ///< a less effective search is performed); does not rebuild CZipCentralDir::m_findarray, + ///< but if the array hasn't been built yet, it is build now as \b case-sensitive + ///< (you can use \c SetCaseSensitivity(false) and then #ffDefault to build it as non-case-sensitive) + + }; + +/** + Find the file in the archive. + If the archive wasn't opened with CZipCentralDir::m_bConvertAfterOpen set to \c true, + this function automatically convert all the filenames with the function + CZipCentralDir::ConvertAll and set CZipCentralDir::m_bConvertAfterOpen to \c true. + This function requires \link CZipCentralDir::m_bFindFastEnabled FindFast \endlink + feature enabled. + \param lpszFileName + the name of the file to be found in the archive; must be with path unless + you set \e bFileNameOnly to \c true. Use path separators the same as they are for your system + (\e "\" for Windows and \e "/" for Unix/Linux) + \param iCaseSensitive can be one of #FFCaseSens values + \param bFileNameOnly + if \c true, the function tries to find a filename without a path (a less effective search is performed); if you wish to find + a directory name, do not end it with the path separator, which is required if you set \e bFileName to \c false + \return
+ - the index of the file found + - -1 if there is no such a file in the archive + \see CZipCentralDir::FindFileNameIndex + \see EnableFindFast + \see CZipCentralDir::ConvertAll + \see SetConvertAfterOpen +*/ + int FindFile(LPCTSTR lpszFileName, int iCaseSensitive = ffDefault, bool bFileNameOnly = false); + +/** + Get the info of the file with the given index. + \param fhInfo + the structure to receive info + \param uIndex + a zero-based index of the file inside the archive + \return \c true if successful +*/ + bool GetFileInfo(CZipFileHeader & fhInfo, WORD uIndex) const; + + +/** + \param bOnlyFiles + if \c true, the directories are not inluded in a total count; + default is \c false + \return the number of files in the archive +*/ + int GetCount(bool bOnlyFiles = false)const + { + int iTotalCount = m_centralDir.m_headers.GetSize(); + if (bOnlyFiles) + { + int iCount = 0; + for (int i = 0; i < iTotalCount; i++) + if (!m_centralDir.m_headers[i]->IsDirectory()) + iCount++; + return iCount; + } + else + return iTotalCount; + } + + /** + values used in #Close function as parameter \e iAfterException + */ + enum CloseAfterException + { + afNoException, ///< normal close, no exception was thrown before by CZipArchive object + afAfterException, ///< an exception has been thrown, don't write any data but perform necessary cleaning to reuse CZipArchive object for another archive + afWriteDir ///< the same as above, but write the central directory end structure to the archive, so that we can save at least the files that have + ///< been added properly and maybe try to repair the archive later + }; + +/** + Close the archive. + \param iAfterException + one of #CloseAfterException enum values + \param bUpdateTimeStamp + if \c true, set the modification date of the zip file to the date of the newest file in the archive; + in disk-spanning mode only the last archive file will have the time stamp updated; + you can use this option even without performing any additional processing on the archive, just open and close it + \note Throws exceptions if \e iAfterException is different from \c afAfterException +*/ + void Close(int iAfterException = afNoException, bool bUpdateTimeStamp = false); + + +/** + Test if the archive is closed (a whole or the current volume only) + \param bArchive
+ - \c true: test for the whole archive + - \c false: test for the volume file only + + \return \c true if closed +*/ + bool IsClosed(bool bArchive = true)const ; + + /** + Write the central directory to the archive and flushes the internal buffers to the disk, + so that the archive is finalized on the disk, but you can still modify it. Use it after + opening (or creating) and modifying the archive if you want to prevent the loss + of the data you've compressed so far in case of the program crash.
+ If you use it on a disk spanning archive in creation it will not be closed, but its state + will be changed from "archive in creation" to "an existing span archive". Use it when you finish adding files to the disk-spanning archive and want to + begin extracting or testing it. It follows that you can call it only once in this case. However, if + after finalizing the disk spanning archive it turns out that it is one disk only, it is converted to + a normal archive and you can use it as such. If you want to know what is the state of the archive after using + this function call #GetSpanMode. + \note + - Cannot be used on existing disk spanning archives (they are not modifable anyway) + - If you have an archive with a huge central directory, it'll influence the perfomance calling this function without a reason. + - Throws exceptions. + \see GetSpanMode + \see SetAutoFlush + \see GetAutoFlush + + */ + void Flush(); + + + /** + Set the CZipArchive object to call #Flush after each operation that modifies the archive + (adding a new file, deleting file(s), modifying the global or a file comment). + It is useful when we want to prevent the loss of data in case of the program crash - the zip file will be then finalized on the disk. + Use it after opening the archive. + \note + - You can set AutoFlush only for non-disk spanning archives, however you can call #Flush once for a disk-spanning archive in creation. + - If you have an archive with a huge central directory, setting Auto-Flush will influence the performance. + \see Flush + \see GetAutoFlush + */ + void SetAutoFlush(bool bAutoFlush = true); + + + /** + return the current #m_bAutoFlush value + \see Flush + \see SetAutoFlush + */ + bool GetAutoFlush()const {return m_bAutoFlush;} + +/** + Return the system compatibility of the current archive. + System compatibility value for the single file in the archive + (represented by CZipFileHeader) influences file attributes conversion + (the file attributes are defined differently across the platforms). + When opening an existing archive CZipArchive assumes the system compatibility + of the whole archive to be the same as of the first file in the archive + (if present). In other cases the current system value is assumed which is + taken from ZipPlatform::GetSystemID during creating or opening an archive + \remark + If the existing archive during opening is empty, ZipPlatform::GetSystemID + is assumed to be the default system for the files that will be added to the archive. + + \return + one of the enum values defined in \link ZipCompatibility::ZipPlatforms + ZipCompatibility.h \endlink + \see ZipCompatibility::ZipPlatforms + \see ZipPlatform::GetSystemID + \see CZipFileHeader::GetSystemCompatibility +*/ + int GetSystemCompatibility() const {return m_iArchiveSystCompatib;} + +/** + Set the system compatibility of the archive. By default it is set to the + current system value (the one returned by ZipPlatform::GetSystemID() function). + Use it after opening the archive, but before adding a new file or using + SetFileHeaderAttr() function + \param iSystemComp + can be one of ZipCompatibility::ZipPlatforms values + \return + return \c false if the value \e iSystemComp is not supported + (ZipCompatibility::IsPlatformSupported returns \c false for the value) + or it is not possible to set it right now +*/ + bool SetSystemCompatibility(int iSystemComp); + +/** + Set the attributes for CZipFileHeader structure to be used + in #OpenNewFile method as an argument. + This special procedure is taken, because the system compatibility must + be set for CZipFileHeader prior to the value, which must be identical to + the return value of #GetSystemCompatibility method. + \param header + the structure to have attributes set + \param uAttr + attributes to set + \note Throws exceptions if the archive system or the current system + is not supported by the ZipArchive library. + \see GetSystemCompatibility +*/ + void SetFileHeaderAttr(CZipFileHeader& header, DWORD uAttr); + + +/** + A helper for a various purposes (needed e.g. by the program that + cracks the zip archives password) + \return the pointer to the static CRC table in the zlib library + +*/ + static const DWORD* GetCRCTable() + { + return get_crc_table(); + } + +/** + Return the underlying archive storage medium. + \warning A method for a very advanced use - you normally never need it. + \return the pointer to #m_storage + \see CZipStorage +*/ + CZipStorage* GetStorage(){return &m_storage;} + + +/** + Set #m_bDetectZlibMemoryLeaks value. + \param bDetect + \note Use before opening a file in the archive. + \see m_bDetectZlibMemoryLeaks + +*/ +/* + void SetDetectZlibMemoryLeaks(bool bDetect) + { + if (m_iFileOpened != nothing) + { + TRACE(_T("CZipArchive::SetDetectZlibMemoryLeaks: Set it before opening a file in the archive")); + return; + } + m_bDetectZlibMemoryLeaks = bDetect; + + } +*/ +/** + Set CZipCentralDir::m_bConvertAfterOpen value. + The default value is \c true. + Setting this value to \c false is generally not effective and is intended + only for quick and short operations on archives with lots of files inside + (e.g. open archive, make an operation on a file which index you already know + and close the archive - using #FindFile function already makes setting this + value to \c false inefficient) + + \param bConvertAfterOpen + \note Use before opening the archive. + \see CZipCentralDir::m_bConvertAfterOpen +*/ + void SetConvertAfterOpen (bool bConvertAfterOpen) + { + if (!IsClosed()) + { + TRACE(_T("CZipArchive::SetConvertAfterOpen: Set it before opening the archive")); + return; + } + m_centralDir.m_bConvertAfterOpen = bConvertAfterOpen; + + } + +/** + Enable fast finding by the file name of the files inside the archive. + Set CZipCentralDir::m_bFindFastEnabled to \c true, which is required by #FindFile. + #FindFileIt is called by #FindFileif necessary. It builds CZipCentralDir::m_findarray + with the default case-sensitivity (set with #SetCaseSensitivity) + \note Call it only after opening the archive. + \param bEnable + \see CZipCentralDir::m_bFindFastEnabled + \see FindFile +*/ + void EnableFindFast(bool bEnable = true); + + + /** + After you enable FindFast feature with #EnableFindFast, you can retrieve + how the files are sorted in CZipCentralDir::m_findarray (you can use it + in your own program if you need to display the sorted list and do not want + to duplicate data) + + \param iFindFastIndex + index in CZipCentralDir::m_findarray (not necessary the same as the one you'd + pass to #GetFileInfo); the number of items in this array is the same + as the number of files in the archive (you can retrieve it with + #GetCount) + + \return + index of the file in central directory (now you can call #GetFileInfo to get + the information); if the value is \c -1 then you have not called + #EnableFindFast before or the archive is closed or the \e iFindFastIndex + is out of range) + */ + int GetFindFastIndex(int iFindFastIndex) const + { + if (IsClosed()) + { + TRACE(_T("CZipArchive::GetFindFastIndex: ZipArchive not yet opened.\n")); + return -1; + } + + return m_centralDir.GetFindFastIndex(iFindFastIndex); + } + + + /** + Set a temporary path used when compressing files and #zipsmCheckForEff + is specified as an argument in #AddNewFile and the disk spanning archive + is in creation. + \param lpszPath set it to NULL to clear the temporary path and let the + library figure it out (it uses the system temporary directory if possible) + \param bForce if \e lpszPath is not \c NULL and this parameter set to \c true + the directory is created if it doesn't exists (if the given directory + does not exists , the temporary file will not be created) + \see AddNewFile + \see Smartness + \see GetTempPath + */ + void SetTempPath(LPCTSTR lpszPath = NULL, bool bForce = true); + + + + /** + enum values used in #PredictFileNameInZip + */ + enum Predict + { + + prDir, ///< if an argument is a directory, add a separator at the end + prFile, ///< treat the argument as a common file + prAuto ///< treat the argument as a directory only if it has a path separator at the end + + }; + + /** + Given the file path in the form it would be passed to #AddNewFile + as \e lpszFilePath argument, the function returns the file name + as it would be stored in the archive.
+ The function takes into account the root path set with #SetRootPath. You can use this function + to eliminate duplicates before adding a list of files.
+ + \param lpszFilePath + the file path as it would be passed to #AddNewFile function + \param bFullPath + the same as \e bFullPath in #AddNewFile + \param iWhat + one of #Predict values to treat \e lpszFilePath correctly + \param bExactly + if \c true, return the filename exactly as it would look inside the archive i.e. convert slash to backslash, and perform ANSI->OEM conversion; + otherwise return the filename with the path separators that are used by default in the system + + \return a modified file path + */ + CZipString PredictFileNameInZip(LPCTSTR lpszFilePath, bool bFullPath, int iWhat = prAuto, bool bExactly = false)const ; + + /** + Check if the filename will be duplicted in the archive, if added to the archive in the given form + \param bFileNameOnly + if \c true, assume that the filename is duplicated if only the filename (no path) is the same (\e bFullPath is ignored), otherwise the whole filename with path is taken into account. + + \b Default: \c false + + The rest of the parameters have the same meaning as in #PredictFileNameInZip. + + \return the zero-based index of the file in the archive that the filename would be duplicated, or -1, if the filename is unique + */ + int WillBeDuplicated(LPCTSTR lpszFilePath, bool bFullPath, bool bFileNameOnly = false, int iWhat = prAuto); + + + /** + Predict the full filename with path after extraction. The parameters (except for the first) are in the form you'd pass + to the #ExtractFile(WORD , LPCTSTR , bool , LPCTSTR , DWORD ) function. The function takes into account the root path set with #SetRootPath. + \param lpszFileNameInZip + the filename of the file inside the archive (may be \c NULL if lpszNewName is not \c NULL) + \param lpszPath + \param bFullPath + \param lpszNewName + \return a predicted file path + */ + CZipString PredictExtractedFileName(LPCTSTR lpszFileNameInZip, LPCTSTR lpszPath, bool bFullPath, LPCTSTR lpszNewName = NULL)const ; + + /** + + Return the current value of #m_szTempPath + + \return CZipString + */ + CZipString GetTempPath()const + { + return m_szTempPath; + } + +/** + Function used in conjunction with #m_szRootPath to trim paths in #AddNewFile and #ExtractFile + \param zpc + \see SetRootPath + +*/ + CZipString TrimRootPath(CZipPathComponent& zpc)const ; + + /** + Remove \e lpszBeginning from the beginning of the \e szPath. Both argument are + considered to be paths so they matches up to the path separator. + + \param lpszBeginning + \param szPath + \param pCompareFunction (see: #m_pZipCompare) + + + \return \c true if the path beginning was removed + */ + static bool RemovePathBeginning(LPCTSTR lpszBeginning, CZipString& szPath, ZIPSTRINGCOMPARE pCompareFunction); + + /** + Set the default archive case-sensitivity. Affects the following functions: + - #FindFile + - #FindMatches + - #EnableFindFast + - #TrimRootPath + - #DeleteFiles + + + + \param bCaseSensitive + the default CZipArchive case-sensitivity depends on the system and is set + as follows: + - on Windows: \c false
+ - on Linux: \c true + \note Set it before using one of the functions above or leave it as it is by default; + + */ + + void SetCaseSensitivity(bool bCaseSensitive) + { + m_bCaseSensitive = bCaseSensitive; + m_pZipCompare = GetCZipStrCompFunc(bCaseSensitive); + } + + /** + Return the central directory information. + \see GetCentralDirSize + */ + void GetCentralDirInfo(CZipCentralDir::Info& info)const; + + + /** + Get the central directory size. + \see CZipCentralDir::GetSize + \see GetCentralDirInfo + */ + DWORD GetCentralDirSize(bool bWhole = true) const + { + return m_centralDir.GetSize(bWhole); + } + + /** + return \c true if the archive cannot be modified, because it is an existing disk spanning archive + or it was opened with #zipOpenReadOnly + */ + bool IsReadOnly(){return m_storage.IsReadOnly();} + + + /** + + If you set \e bIgnore to \c true, CRC is not checked for the files being tested or extracted. + This method is useful when working with Java TM Archives (jar). + The CRC is checked by default. You can use this function on an opened or closed archive. + + */ + void SetIgnoreCRC(bool bIgnore = true){m_bIgnoreCRC = bIgnore;} + + /** + A class used in wildcard pattern matching. + This class is based on code by J. Kercheval, created 01/05/1991 + and available as a public domain at http://www.snippets.org. + */ + class ZIP_API CWildcard + { + public: + + + enum Match + { + matchNone, ///< for internal use + matchValid, ///< valid match + matchEnd, ///< premature end of pattern string + matchAbort, ///< premature end of text string + matchRange, ///< match failure on [..] construct + matchLiteral, ///< match failure on literal match + matchPattern ///< bad pattern + }; + + enum Pattern + { + patternEmpty = -4, ///< [..] construct is empty + patternClose, ///< no end bracket in [..] construct + patternRange, ///< malformed range in [..] construct + patternEsc, ///< literal escape at end of pattern + patternValid, ///< valid pattern + }; + + + /** + Match the pattern against the string \e lpszText + A match means the entire string \e lpszText is used up in matching. + + \param lpszText + the string to match against + \param iRetCode + if not \c NULL, set to one of #Match values indicating the return code + \return \c true if \e lpszText matches the pattern. + \see SetPattern + */ + bool IsMatch(LPCTSTR lpszText, int* iRetCode = NULL); + + /** + + \param lpszPattern + + \return \c true if \e lpszPattern has any special wildcard characters. + + */ + static bool IsPattern(LPCTSTR lpszPattern); + + /** + Test the pattern for validity. + + \param lpszPattern + the pattern to test + \param iErrorType + if not \c NULL, set to one of #Pattern values indicating the return code + \return \c true if \e lpszPattern is a well formed regular expression according + to the CWildcard class syntax (see #SetPattern) + */ + static bool IsPatternValid(LPCTSTR lpszPattern, int* iErrorType = NULL); + + /** + Match the pattern \e lpszPattern against the string \e lpszText + A match means the entire string \e lpszText is used up in matching. + + + \param lpszPattern + see #SetPattern + \param lpszText + the string to match against + \return + one of #Match values + */ + static int Match(LPCTSTR lpszPattern, LPCTSTR lpszText); + + CWildcard(){} + /** + Initialize the pattern. + \see SetPattern + */ + CWildcard(LPCTSTR lpszPattern, bool bCaseSensitive) + { + SetPattern(lpszPattern, bCaseSensitive); + } + virtual ~CWildcard(){} + + /** + Set the pattern to \e lpszPattern. + \param lpszPattern + + In the pattern string: + - * matches any sequence of characters(zero or more) + - ? matches any character + - [SET] matches any character in the specified set, + - [!SET] or[^SET] matches any character not in the specified set. + + A set is composed of characters or ranges; a range looks like + character hyphen character(as in 0 - 9 or A - Z).[0 - 9a - zA - Z_] is the + minimal set of characters allowed in the[..] pattern construct. + Other characters are allowed(ie. 8 bit characters) if your system + will support them. + + \note To suppress the special syntactic significance of any of []*?!^-\, + and match the character exactly, precede it with a \ + */ + void SetPattern(LPCTSTR lpszPattern, bool bCaseSensitive) + { + m_szPattern = lpszPattern; + m_bCaseSensitive=bCaseSensitive; + if (!bCaseSensitive) + m_szPattern.MakeLower(); + } + operator LPCTSTR() + { + return (LPCTSTR)m_szPattern; + } + protected: + bool m_bCaseSensitive; + static int MatchAfterStar(LPCTSTR p , LPCTSTR t); + CZipString m_szPattern; + }; + + + /** + This function finds the indexes of the files, which filenames match the specified pattern and stores + these indexes in the array. The indexes can be used then e.g. in deleting (CZipArchive::DeleteFiles) or + extracting files (CZipArchive::ExtractFile). + + \param lpszPattern + the pattern to match (see CWildcard::SetPattern on how to build the pattern). The case-sensitivity of the pattern + is set to the global archive case-sensitivity (set with #SetCaseSensitivity) + \param ar + the array which will contain the indexes of the files which filenames match the pattern; the contents of the array are NOT clearead, but the + indexes are appended to it + \param bFullPath
+ - if \c true, match the filename with path (if present) of the file (if the file is a directory, end it with the path separator or use a pattern that will recognize it) + - otherwise match only the name of the file (if the file is a directory, do not end it with the path separator) + + */ + void FindMatches(LPCTSTR lpszPattern, CZipWordArray& ar, bool bFullPath = true)const; + + + /** + Change the name of the file with the given index. + + \param uIndex + zero-based index of the file + \param lpszNewName + new name for the file + \return + + \note Throws exceptions. + \see SetAdvanced + */ + bool RenameFile(WORD uIndex, LPCTSTR lpszNewName); + + /** + + If \c true, the drive letter is removed from the filename stored inside the archive when adding a new file to the archive. It affects + #AddNewFile, #ExtractFile, #PredictFileNameInZip, #PredictExtractedFileName, #WillBeDuplicated methods. + + \b Default: \c true + */ + bool m_bRemoveDriveLetter; + +protected: + + /** + \param iReplaceIndex index of file to be replaced + \param uTotal the size of the new file to replace existing + \param lpszFileName the filename for callback initialization + */ + void MakeSpaceForReplace(int iReplaceIndex, DWORD uTotal, LPCTSTR lpszFileName); + /** + A structure for the internal use only. Clears the password if necessary and + restores it later (also in case of an exception). + */ + struct ZIP_API CZipSmClrPass + { + void ClearPasswordSmartly(CZipArchive* pZip) + { + m_pZip = pZip; + m_szPass = pZip->GetPassword(); + if (!m_szPass.IsEmpty()) + pZip->SetPassword(); + } + ~CZipSmClrPass() + { + if (!m_szPass.IsEmpty()) + m_pZip->SetPassword(m_szPass); + } + CZipString m_szPass; + CZipArchive* m_pZip; + }; + + /** + Holds map of holes and areas to remain when deleting files from the archive. + A structure for the internal use only. + */ + struct ZIP_API CZipDeleteInfo + { + CZipDeleteInfo(){m_pHeader = NULL; m_bDelete = false;} + CZipDeleteInfo(CZipFileHeader* pHeader, bool bDelete) + :m_pHeader(pHeader), m_bDelete (bDelete){} + CZipFileHeader* m_pHeader; + bool m_bDelete; + }; + + + /** + Storage for callback functors. A structure for the internal use only. + \see SetCallback + */ + struct ZIP_API CZipClbckStrg : public CZipMap + { + void Set(CZipActionCallback* pCallback, CallbackType iType) + { + if (pCallback) + { + SetAt(iType, pCallback); + } + else + RemoveKey(iType); + } + CZipActionCallback* Get(CallbackType iType) + { + CZipActionCallback* pCallback = NULL; + if (Lookup(iType, pCallback)) + { + pCallback->m_iType = iType; + return pCallback; + } + else + return NULL; + } + + }; + + + /** + \see CZipClbckStrg + */ + CZipClbckStrg m_callbacks; + + + /** + Write central directory calling a callback functor if available + */ + void WriteCentralDirectory(bool bFlush = true); + + /** + Default archive case-sensitivity + \see SetCaseSensitivity + */ + bool m_bCaseSensitive; + + /** + a pointer to the function in CZipString structure, + used to compare elements; can point to Compare, CompareNoCase, + Collate or CollateNoCase function address in CZipString structure ZIPSTRINGCOMPARE is defined as follows:
+ typedef int (CZipString::*ZIPSTRINGCOMPARE)( LPCTSTR ) const; + */ + ZIPSTRINGCOMPARE m_pZipCompare; + + /** + Internal data. + \see CZipInternalInfo + */ + CZipInternalInfo m_info; + + + /** + Physical layer of the archive. + \see CZipStorage + */ + CZipStorage m_storage; + + /** + A central directory object. + \see CZipCentralDir + */ + CZipCentralDir m_centralDir; + + /** + The open mode of the current file inside archive. + */ + enum OpenFileType + { + extract = -1, ///< current file opened for extraction + nothing, ///< no file inside archive opened + compress ///< a new file opened for compression + }; + + /** + Takes one of the #OpenFileType enum values. + */ + char m_iFileOpened; + + /** + The current AutoFlush value. + \see Flush + \see SetAutoFlush + \see GetAutoFlush + */ + bool m_bAutoFlush; + + /** + The value set with #SetIgnoreCRC + */ + bool m_bIgnoreCRC; + + + +/** + The root path to be omitted in #AddNewFile and #ExtractFile functions + from the beginning of the full file path. Set by #SetRootPath + \see TrimRootPath + \see SetRootPath +*/ + CZipString m_szRootPath; + + /** + A temporary path set with #SetTempPath function + \see SetTempPath + \see AddNewFile + \see Smartness + */ + CZipString m_szTempPath; + +/** + Open the archive in the given mode. + Called by #Open(LPCTSTR, int, int) and #Open(CZipMemFile&, int). + \param iMode + an opening mode + \note Throws exceptions. +*/ + void OpenInternal(int iMode); + + /** + The system code of the current archive. All new files in the archive + will be created regarding this value. Can be one of the enum values + defined in \link ZipCompatibility::ZipPlatforms ZipCompatibility.h + \endlink + + \see GetSystemCompatibility + */ + int m_iArchiveSystCompatib; + +/** + Free the memory allocated by the zlib library that hasn't been freed + due to an error in the zlib library (usually never happens). +*/ + void EmptyPtrList(); + + + +/** + Move the range of data in the archive specified by the \e uStartOffset + and \e uEndOffset by \e uToMove + +*/ + void MovePackedFiles(DWORD uStartOffset, DWORD uEndOffset, DWORD uMoveBy, CZipActionCallback* pCallback, bool bForward = false); + + /** + Remove recently added file (used by AddNewFile) if compressed is larger than uncompressed or if callback method return \c false. + \param bRemoveAnyway if \c true, do not check for the efficiency, but remove the file + + */ + bool RemoveLast(bool bRemoveAnyway = false); + + /** + It is used in GetFromArchive public functions and in AddNewFile and the callback parameter is needed + */ + bool GetFromArchive(CZipArchive& zip, WORD uIndex, int iReplaceIndex, bool bKeepSystComp, CZipActionCallback* pCallback); + + /** + \return whether the code should continue or not + */ + bool UpdateReplaceIndex(int& iReplaceIndex, LPCTSTR lpszNewFileName); + +/** + \return the currently opened for compression or decompression + file inside the archive NULL if there is no file opened +*/ + CZipFileHeader* CurrentFile(); + +/** + If the parameter \e iErr signalizes a zlib library error, throw CZipException + \param iErr + a zlib library error to check + \note Throws exceptions. +*/ + void CheckForError(int iErr); + + +/** + Throw a CZipException error. + \param err + the error code + \see CZipException::ZipErrors + \param bZlib + if \c true, treat \e err as a zlib error code and perform the conversion to the one of CZipException codes. + \see CZipException::Throw +*/ + void ThrowError(int err, bool bZlib = false); + + + typedef CZipPtrList::iterator CZipPtrListIter; + CZipPtrList m_list; ///< a list holding pointers to the memory areas allocated by the zlib library + + + static void* _zliballoc(void* opaque, UINT items, UINT size); ///< memory allocator called by the zlib library + static void _zlibfree(void* opaque, void* address); ///< memory deallocator called by the zlib library + + + /** + Specify whether to control memory allocation and freeing by the zlib library. + + \b Default: \c true + \note Set it before opening a file (new or existing) in the archive. + \see SetDetectZlibMemoryLeaks + + */ +// bool m_bDetectZlibMemoryLeaks; + + + /** + Copyright string. + */ + static const TCHAR m_gszCopyright[]; + +/** + \defgroup Cryptography Cryptography + Methods performing data encryption and decryption + and attributes used by them. +*/ + /*@{*/ + +/** + Decode \e uCount bytes from the internal buffer. + \see m_info + \see CZipInternalInfo::m_pBuffer + +*/ + void CryptDecodeBuffer(DWORD uCount); +/** + Encode the internal buffer. + \see m_info + \see CZipInternalInfo::m_pBuffer +*/ + void CryptEncodeBuffer(); + +/** + Encode the character \e c and update \link #m_keys encryption keys \endlink. + +*/ + void CryptEncode(char &c); +/** + Create an encryption header for the new file in the archive. + \param iCrc + A control value. Use the two lower bytes of CZipFileHeader::m_uModTime. + This entails the need for a data description presence at the end of + the compressed data. We cannot use the real CRC now, because we don't know + it yet. + \param buf + a buffer to receive the header + \see CryptCheck +*/ + void CryptCryptHeader(long iCrc, CZipAutoBuffer& buf); +/** + \internal + \return +*/ + DWORD CryptCRC32(DWORD l, char c); +/** + Decode the character \e c and update \link #m_keys encryption keys \endlink. +*/ + void CryptDecode(char &c); + /** + \internal + */ + char CryptDecryptByte(); + +/** + Decrypt the encryption header and check its control value. + The control value depends on the presence of the data descriptor. + \return \c true if the control value is correct + \see CryptCryptHeader +*/ + bool CryptCheck(); +/** + Update \link #m_keys encryption keys \endlink with the given value. +*/ + void CryptUpdateKeys(char c); +/** + Initialize \link #m_keys encryption keys \endlink. +*/ + void CryptInitKeys(); + /** + The archive password. If empty, the new file will not be encrypted. + */ + CZipAutoBuffer m_pszPassword; + + /** + Encryption keys. + The key values are initialized using a supplied encryption password. + \see CryptInitKeys + */ + DWORD m_keys[3]; + + /*@}*/ +}; + + + +#endif // !defined(AFX_ZIPARCHIVE_H__A7F528A6_1872_4071_BE66_D56CC2DDE0E6__INCLUDED_) diff --git a/harbour/contrib/hbzlib/zipautobuffer.h b/harbour/contrib/hbzlib/include/zipautobuffer.h similarity index 71% rename from harbour/contrib/hbzlib/zipautobuffer.h rename to harbour/contrib/hbzlib/include/zipautobuffer.h index 0dbd4093e6..533f7c1328 100644 --- a/harbour/contrib/hbzlib/zipautobuffer.h +++ b/harbour/contrib/hbzlib/include/zipautobuffer.h @@ -1,12 +1,11 @@ -/** -* \file ZipAutoBuffer.h -* Interface for the CZipAutoBuffer class. -* -* \author Tadeusz Dracz -*/ -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +/////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipAutoBuffer.h $ +// $Archive: /ZipArchive/ZipAutoBuffer.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -15,6 +14,11 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// +/** +* \file ZipAutoBuffer.h +* Interface for the CZipAutoBuffer class. +* +*/ #if !defined(AFX_ZIPAUTOBUFFER_H__DEC28C20_83FE_11D3_B7C3_EDEC47A8A86C__INCLUDED_) #define AFX_ZIPAUTOBUFFER_H__DEC28C20_83FE_11D3_B7C3_EDEC47A8A86C__INCLUDED_ @@ -23,16 +27,27 @@ #pragma once #endif // _MSC_VER > 1000 +#include "ZipExport.h" /** A smart buffer freeing its contents on destruction. */ -ZEXPORT class CZipAutoBuffer +class ZIP_API CZipAutoBuffer { public: operator char*() { return m_pBuffer; } +#ifndef __BORLANDC__ + operator const char*() const // Borland seems to have problems with this + { + return m_pBuffer; + } +#endif + + + + // may produce ambiguity on some compilers // operator const char*() const @@ -61,3 +76,4 @@ protected: }; #endif // !defined(AFX_ZIPAUTOBUFFER_H__DEC28C20_83FE_11D3_B7C3_EDEC47A8A86C__INCLUDED_) + \ No newline at end of file diff --git a/harbour/contrib/hbzlib/zipinternalinfo.cpp b/harbour/contrib/hbzlib/include/zipbaseexception.h similarity index 54% rename from harbour/contrib/hbzlib/zipinternalinfo.cpp rename to harbour/contrib/hbzlib/include/zipbaseexception.h index a4ded567cc..6eb4b00719 100644 --- a/harbour/contrib/hbzlib/zipinternalinfo.cpp +++ b/harbour/contrib/hbzlib/include/zipbaseexception.h @@ -1,7 +1,11 @@ -// ZipInternalInfo.cpp: implementation of the CZipInternalInfo class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipBaseException.h $ +// $Archive: /ZipArchive_STL/ZipBaseException.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -10,24 +14,9 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "zipinternalinfo.h" +#ifndef __ZIPBASEEXCEPTION_H__ +#define __ZIPBASEEXCEPTION_H__ -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// +typedef std::exception CZipBaseException; -CZipInternalInfo::CZipInternalInfo() -{ - m_iBufferSize = 16384; -} - -CZipInternalInfo::~CZipInternalInfo() -{ - -} - -void CZipInternalInfo::Init() -{ - m_pBuffer.Allocate(m_iBufferSize); -} +#endif //__ZIPBASEEXCEPTION_H__ diff --git a/harbour/contrib/hbzlib/zipcentraldir.h b/harbour/contrib/hbzlib/include/zipcentraldir.h similarity index 50% rename from harbour/contrib/hbzlib/zipcentraldir.h rename to harbour/contrib/hbzlib/include/zipcentraldir.h index 0337dc6acc..c7c6132ec2 100644 --- a/harbour/contrib/hbzlib/zipcentraldir.h +++ b/harbour/contrib/hbzlib/include/zipcentraldir.h @@ -1,12 +1,11 @@ -/** -* \file ZipCentralDir.h -* Interface for the CZipCentralDir class. -* -* \author Tadeusz Dracz -*/ -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipCentralDir.h $ +// $Archive: /ZipArchive/ZipCentralDir.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -15,48 +14,112 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// +/** +* \file ZipCentralDir.h +* Interface for the CZipCentralDir class. +* +*/ + #if !defined(AFX_CENTRALDIR_H__859029E8_8927_4717_9D4B_E26E5DA12BAE__INCLUDED_) #define AFX_CENTRALDIR_H__859029E8_8927_4717_9D4B_E26E5DA12BAE__INCLUDED_ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 + +#if (_MSC_VER > 1000) && (defined ZIP_HAS_DLL) + #pragma warning( disable : 4251 ) // needs to have dll-interface to be used by clients of class +#endif + #include "zipexception.h" #include "zipfileheader.h" #include "zipautobuffer.h" #include "zipcollections.h" #include "zipcompatibility.h" -/** - Used in fast finding files by the filename. - \see CZipCentralDir::m_findarray - \see CZipArchive::FindFile -*/ -ZEXPORT struct CZipFindFast -{ - CZipFindFast() - { - m_uIndex = 0; - m_pHeader= NULL; - } - CZipFindFast(CZipFileHeader* pHeader, WORD uIndex):m_pHeader(pHeader), m_uIndex(uIndex){} - /** - We extract a name from it. - */ - CZipFileHeader* m_pHeader; - - /** - The index in the central directory of the \e m_pHeader. - */ - WORD m_uIndex; -}; +#include "ZipExport.h" +#define ZIPARCHIVE_DATADESCRIPTOR_LEN 12 /** A class representing the central directory record in the archive. */ -ZEXPORT class CZipCentralDir +class ZIP_API CZipCentralDir { - public: + /** + Used in fast finding files by the filename. + A structure for the internal use only. + \see CZipCentralDir::m_findarray + \see CZipArchive::GetFindFastElement + \see CZipArchive::FindFile + \see CZipArchive::EnableFindFast + */ + struct ZIP_API CZipFindFast + { + CZipFindFast() + { + m_uIndex = 0; + m_pHeader= NULL; + } + CZipFindFast(CZipFileHeader* pHeader, WORD uIndex):m_pHeader(pHeader), m_uIndex(uIndex){} + /** + A pointer to the structure in CZipCentralDir. We extract a name from it. + */ + CZipFileHeader* m_pHeader; + + /** + The index in the central directory of the \e m_pHeader. + */ + WORD m_uIndex; + }; + + + /** + Stores general information about the central directory record. + */ + struct ZIP_API Info + { + DWORD m_uCentrDirPos; ///< the position of the beginning of the central directory (as located by #Locate) + DWORD m_uBytesBeforeZip;///< The number of bytes before the actual zip archive in a file. It is non-zero for self-extracting archives. + WORD m_uThisDisk; ///< number of the disk with the central directory end record (the number of disks in the disk-spanning archive) + WORD m_uDiskWithCD; ///< number of the disk with the start of the central directory + WORD m_uDiskEntriesNo; ///< total number of entries in the central dir on this disk + WORD m_uEntriesNumber; ///< total number of entries in the central dir + DWORD m_uSize; ///< size of the central directory (valid only if #m_bOnDisk is \c true; use #GetSize instead) + DWORD m_uOffset; ///< offset of start of central directory with respect to the starting disk number + ///< (as written in the central directory record); + ///< valid only if #m_bOnDisk is \c true + bool m_bOnDisk; ///< \c true if the central directory is physically present in the archive +#if !defined(__GNUC__) + protected: + friend CZipCentralDir; +#endif + + bool CheckIfOK_1() + { + return ((DWORD)m_uCentrDirPos >= m_uOffset + m_uSize); + } + void SetBytesBeforeZip(bool bIsSpan) + { + m_uBytesBeforeZip = bIsSpan ? 0 : m_uCentrDirPos - m_uSize - m_uOffset; + } + bool CheckIfOK_2() + { + return (m_uSize || !m_uEntriesNumber) && (m_uEntriesNumber || !m_uSize); + } + void DiskChange(int iCurrentDisk) + { + m_uThisDisk = (WORD)iCurrentDisk; + if (m_uEntriesNumber) + { + m_uDiskEntriesNo = 0; + } + else + { + m_uDiskWithCD = m_uThisDisk; + m_uOffset = 0; + } + } + }; CZipCentralDir(); virtual ~CZipCentralDir(); @@ -64,12 +127,6 @@ public: static char m_gszSignature[]; ///< central dir signature char m_szSignature[4]; ///< end of central dir signature (must be 0x06054b50) - WORD m_uThisDisk; ///< number of this disk - WORD m_uDiskWithCD; ///< number of the disk with the start of the central directory - WORD m_uDiskEntriesNo; ///< total number of entries in the central dir on this disk - WORD m_uEntriesNumber; ///< total number of entries in the central dir - DWORD m_uSize; ///< size of the central directory - DWORD m_uOffset; ///< offset of start of central directory with respect to the starting disk number CZipAutoBuffer m_pszComment; ///< the archive comment CZipAutoBuffer m_pLocalExtraField; ///< a local extra field @@ -100,16 +157,48 @@ public: a zero-based index \return \c true if the file with the given index exists inside the archive; otherwise \c false; */ - bool IsValidIndex(int uIndex); + bool IsValidIndex(int uIndex)const; /** Remove the file header from the central directory. - \param uIndex - a zero-based index of the file header to remove + \param pHeader + the header to remove + \param iIndex if index is not known set it to -1 + \param bShift \note Throws exceptions. */ - void RemoveFile(WORD uIndex); + void RemoveFile(CZipFileHeader* pHeader, int iIndex = -1, bool bShift = true); + + /** + Remove last file from the central directory. + + */ + void RemoveLastFile(CZipFileHeader* pHeader = NULL, int iIndex = -1) + { + if (iIndex == -1) + { + iIndex = m_headers.GetSize() - 1; + if (iIndex == -1) + return; + } + if (!pHeader) + pHeader = m_headers[iIndex]; + DWORD uNewSize = pHeader->m_uOffset + GetBytesBefore(); + // then remove + RemoveFile(pHeader, iIndex); + + m_pStorage->Flush(); + m_pStorage->m_pFile->SetLength(uNewSize); + m_info.m_bOnDisk = false; // it is true when AutoFlush is set to true + } + + + /** + Remove all files + \note Throws exceptions. + */ + void RemoveAll(); /** Cleanup the structure. \param bEverything @@ -124,10 +213,27 @@ public: /** Add a new file to the central directory. \param header - copy data from it to the new file header + copy data from it to the new file header + \param iReplaceIndex if different from -1, the index of the file to be replaced + \return the pointer to the new header \note Throws exceptions. */ - void AddNewFile(const CZipFileHeader & header); + CZipFileHeader* AddNewFile(const CZipFileHeader & header, int iReplaceIndex = -1); + + /** + return the header filename, converted if needed + */ + CZipString GetProperHeaderFileName(const CZipFileHeader* pHeader) const + { + if (!m_bConvertAfterOpen) + { + CZipFileHeader fh = *pHeader; + ConvertFileName(true, false, &fh); + return fh.GetFileName(); + } + else + return pHeader->GetFileName(); + } /** Remove physically the central directory from the archive. @@ -141,14 +247,16 @@ public: \param bWhole if \c true, include the size of the file headers \return the size of the central directory + \see CZipArchive::GetCentralDirSize */ - DWORD GetSize(bool bWhole = false); + DWORD GetSize(bool bWhole = false) const; /** Close a file inside archive opened for reading. + \param bAfterException \c true if closing after exception \note Throws exceptions. */ - void CloseFile(); + void CloseFile(bool bAfterException = false); /** Close a file inside archive opened for reading. @@ -160,20 +268,39 @@ public: Write the central directory to the archive. \note Throws exceptions. */ - void Write(); + void Write(CZipActionCallback* pCallback); + /** + \see CZipArchive::EnableFindFast + */ + void EnableFindFast(bool bEnable, bool bCaseSensitive); + + /** + \see CZipArchive::FindFile + \note \e bSporadically set to \c false rebuilds #m_findarray if necessary + */ + int FindFile(LPCTSTR lpszFileName, bool bCaseSensitive, bool bSporadically, bool bFileNameOnly); + + + /** + \see CZipArchive::GetFindFastIndex + */ + int GetFindFastIndex(int iFindFastIndex)const + { + if (!IsValidIndex(iFindFastIndex) || !m_bFindFastEnabled) + { + // ASSERT(FALSE); // + return -1; + } + + return m_findarray[iFindFastIndex].m_uIndex; + } /** Points to CZipArchive::m_storage. */ CZipStorage* m_pStorage; - - DWORD m_uCentrDirPos; ///< the position of the beginning of the central directory - /** - The count of bytes before the actual zip archive in a file. - It is non-zero for self-extracting archives. - */ - DWORD m_uBytesBeforeZip; + /** The size of the buffer used in searching for the central dir. @@ -185,55 +312,24 @@ public: int m_iBufferSize; - /** - Used in fast finding files by the filename. - \see CZipFindFast - \see m_bFindFastEnabled - \see CZipArchive::FindFile - */ - CZipFindFastArray m_findarray; - typedef CZipPtrList::iterator CZipFindFastLstIter; - /** - If \c true, the there is an additional array build, to speed up the - finding process - CZipArchive::FindFile uses this array to perform a - binary search. - \b Default: \c false - \see CZipArchive::EnableFindFast - \see CZipArchive::FindFile - \see CZipCentralDir::m_findarray - */ - bool m_bFindFastEnabled; - -/** - Clear #m_findarray contents and free memory. -*/ -/** - Build #m_findarray. -*/ - void BuildFindFastArray(); /** Holds all the files inside archive info. \see CZipFileHeader */ - CZipPtrList m_headers; - typedef CZipPtrList::iterator CZipFileHdrLstIter; - - - - /** - \name Helpers - Helper methods to operate on the CZipPtrList - - */ - //@{ + CZipArray m_headers; + + CZipFileHeader* operator[](int iIndex) + { + return m_headers[iIndex]; + } + const CZipFileHeader* operator[](int iIndex) const + { + return m_headers[iIndex]; + } + - CZipFileHeader* operator[](int iIndex); - CZipFileHdrLstIter GetIterator(int iIndex); - CZipFileHeader* GetFileHeader(const CZipFileHdrLstIter &iterator); - //@} /** - If \c true, the conversion of the filenames takes place after opening the archive (after reading the central directory @@ -241,16 +337,18 @@ public: the archive. - If \c false, the conversion takes place on each call to CZipArchive::GetFileInfo + Change is value with CZipArchive::SetConvertAfterOpen. + Set it to \c true when you plan to use CZipArchive::FindFile or get the stored files information.
- Set it to \c false when you plan mostly to only modify the archive. + Set it to \c false when you plan mostly to modify the archive. \b Default: \c true \note Set it before opening the archive. + \see CZipArchive::SetConvertAfterOpen \see ConvertFileName */ bool m_bConvertAfterOpen; - - + /** Convert the filename of the CZipFileHeader depending on the current system @@ -266,7 +364,7 @@ public: \see ZipCompatibility::FileNameUpdate \see m_bConvertAfterOpen */ - void ConvertFileName(bool bFromZip, bool bAfterOpen, CZipFileHeader* pHeader = NULL) + void ConvertFileName(bool bFromZip, bool bAfterOpen, CZipFileHeader* pHeader = NULL) const { if (bAfterOpen != m_bConvertAfterOpen) return; @@ -289,16 +387,77 @@ public: \param lpszFileName the name of the file to find, must be exactly the same (apart from case) as it appears in the archive - \param bCaseSensitive - \c true if perform a case sensitive search \return the index in #m_findarray with the appropriate CZipFindFast structure or \c -1 if there is no file with the given name \see CZipArchive::FindFile */ - int FindFileNameIndex(LPCTSTR lpszFileName, bool bCaseSensitive); + int FindFileNameIndex(LPCTSTR lpszFileName) const; - + DWORD GetBytesBefore() const {return m_info.m_uBytesBeforeZip;} + /** + Get the information about the central directory + */ + void GetInfo(Info& info) const {info = m_info;} + /** + \return the value of m_bFindFastEnabled + */ + bool IsFindFastEnabled(){return m_bFindFastEnabled;} + /** + Called by CZipArchive::RenameFile + */ + void RenameFile(WORD uIndex, LPCTSTR lpszNewName); protected: + /** + Sort the files inside the archive headers by the order in the archive. + */ + void SortHeaders(); + static int CompareHeaders(const void *pArg1, const void *pArg2) + { + CZipFileHeader* pw1 = *(CZipFileHeader**)pArg1; + CZipFileHeader* pw2 = *(CZipFileHeader**)pArg2; + if ((pw1->m_uOffset < pw2->m_uOffset && pw1->m_uDiskStart == pw2->m_uDiskStart) + || (pw1->m_uDiskStart < pw2->m_uDiskStart)) + return -1; + else if ((pw1->m_uOffset > pw2->m_uOffset && pw1->m_uDiskStart == pw2->m_uDiskStart) + || (pw1->m_uDiskStart > pw2->m_uDiskStart)) + return 1; + else + { + ASSERT(FALSE); + // two files with the same offsets on the same disk??? + CZipException::Throw(CZipException::badZipFile); + return 0; // just for the compiler comfort + } + } + + +/** + Build #m_findarray. +*/ + void BuildFindFastArray( bool bCaseSensitive ); + + /** + Used in fast finding files by the filename. + \see CZipFindFast + \see m_bFindFastEnabled + \see CZipArchive::FindFile + */ + CZipArray m_findarray; + + /** + If \c true, the there is an additional array build, to speed up the + finding process + CZipArchive::FindFile uses this array to perform a + binary search. + \b Default: \c false + \see CZipArchive::EnableFindFast + \see CZipArchive::FindFile + \see CZipCentralDir::m_findarray + */ + bool m_bFindFastEnabled; + + + /** The \e lpszFileName and \e bCaseSensitive arguments are the same as in the #FindFileNameIndex. The function get CZipFindFast @@ -307,25 +466,40 @@ protected: \param lpszFileName \param uIndex the index from #m_findarray - \param bCaseSensitive \return - 0 if the filenames are the same - < 0 if the filename stored in the array is less than \e lpszFileName - > 0 if the filename stored in the array is greater than \e lpszFileName */ -ZIPINLINE int CompareElement(LPCTSTR lpszFileName, WORD uIndex, bool bCaseSensitive); - + int CompareElement(LPCTSTR lpszFileName, WORD uIndex) const + { + return (m_findarray[uIndex].m_pHeader->GetFileName().*m_pCompare)(lpszFileName); + } /** Insert a new CZipFindFast element to the #m_findarray. Initialize CZipFindFast object with \e pHeader and \e uIndex values. - \param pHeader - \param uIndex */ void InsertFindFastElement(CZipFileHeader* pHeader, WORD uIndex); + + + /** - \c true if the central directory is in physically present in the archive + A compare function (Collate or CollateNoCase) set once so as not + to check every time which one to use
+ ZIPSTRINGCOMPARE is defined in CZipString.h as:
+ typedef int (CZipString::*ZIPSTRINGCOMPARE)( LPCTSTR ) const; */ - bool m_bOnDisk; + ZIPSTRINGCOMPARE m_pCompare; + + /** + The way the m_findarray is sorted + */ + bool m_bCaseSensitive; + + /** + \see Info + */ + Info m_info; /** \return the location of the beginning of the central dir end record in the archive @@ -358,7 +532,7 @@ ZIPINLINE int CompareElement(LPCTSTR lpszFileName, WORD uIndex, bool bCaseSens Write the file headers to the archive. \note Throws exceptions. */ - void WriteHeaders(); + void WriteHeaders(CZipActionCallback* pCallback, bool bOneDisk); /** Write the central directory end record. \return the size of the record @@ -371,7 +545,9 @@ ZIPINLINE int CompareElement(LPCTSTR lpszFileName, WORD uIndex, bool bCaseSens \param err \see CZipException::Throw */ - void ThrowError(int err); + void ThrowError(int err) const; + + }; diff --git a/harbour/contrib/hbzlib/include/zipcollections.h b/harbour/contrib/hbzlib/include/zipcollections.h new file mode 100644 index 0000000000..002d3d9cf4 --- /dev/null +++ b/harbour/contrib/hbzlib/include/zipcollections.h @@ -0,0 +1,180 @@ +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipCollections.h $ +// $Archive: /ZipArchive_STL/ZipCollections.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// For the licensing details see the file License.txt +//////////////////////////////////////////////////////////////////////////////// + +#ifndef ZIPCOLLECTIONS_DOT_H +#define ZIPCOLLECTIONS_DOT_H + +#if _MSC_VER > 1000 + #pragma warning( push, 3 ) // STL "requirements" + #pragma warning (disable : 4284) //return type for 'identifier::operator >' is not a UDT or reference to a UDT. Will produce errors if applied using infix notation + #pragma warning (disable : 4018) //'expression' : signed/unsigned mismatch +#endif + +#include +#include +#include +#include +#include + +#include "zipstring.h" +#include "ZipExport.h" + +template +class CZipArray : private std::vector +{ +public: + #if __GNUC__ >= 3 + typedef typename std::vector::iterator iterator; + typedef typename std::vector inherited; +#else + + typedef std::vector::iterator iterator; + typedef std::vector inherited; +protected: +#endif + iterator GetIterFromIndex(int uIndex) + { + iterator iter = begin(); + iter += uIndex; + // int t = 0; while (t != uIndex) {iter++;t++;} + return iter; + } +public: + void Sort(bool bAscending) + { + if (bAscending) + std::sort (begin (), end (), std::less ()); + else + std::sort (begin (), end (), std::greater ()); + } + int GetSize() const{return (int)size(); } + int GetUpperBound() const {return size() - 1;} + int Add(const TYPE& x) {push_back(x);return GetUpperBound();} + void RemoveAll() {clear();} + void RemoveAt(int uIndex) { erase(GetIterFromIndex(uIndex));} + void InsertAt(int uIndex, const TYPE& x){insert(GetIterFromIndex(uIndex), x);} +#ifndef _MSC_VER + TYPE& operator[](int iIndex) + { + return inherited::operator[](iIndex); + } + TYPE operator[](int iIndex) const + { + return inherited::operator[](iIndex); + } +#else + using inherited::operator[]; +#endif +}; + + +typedef CZipArray CZipStringArray; +typedef CZipArray CZipWordArray; + + +template +class ZIP_API CZipPtrList : private std::list +{ + +public: +#if __GNUC__ >= 3 + typedef typename std::list::iterator iterator; + typedef typename std::list::const_iterator const_iterator; +#else + typedef std::list::iterator iterator; + typedef std::list::const_iterator const_iterator; +#endif + int GetCount() const {return size();} + void AddTail(const TYPE& x){push_back(x);} + void AddHead(const TYPE& x){push_front(x);} + void RemoveHead() {pop_front();} + void RemoveTail() {pop_back();} + void RemoveAll() {clear();} + TYPE& GetHead() {return front();} + TYPE GetHead() const {return front();} + TYPE& GetTail() {return back();} + TYPE GetTail() const {return back();} + iterator GetHeadPosition() { return begin();} + const_iterator GetHeadPosition() const { return begin();} + iterator GetTailPosition() { return back();} + TYPE& GetNext(iterator& pos) { return *pos++;} + const TYPE GetNext(const_iterator& pos) const{ return *pos++;} + TYPE& GetPrev(iterator& pos) { return *pos--;} + TYPE GetPrev(iterator& pos) const{ return *pos--;} + iterator Find(TYPE& x) { return std::find(begin(), end(), x);} + void RemoveAt(iterator& pos) { erase(pos);} + bool IteratorValid(const_iterator &iter) const + { + return iter != end(); + } + bool IteratorValid(iterator &iter) + { + return iter != end(); + } + iterator FindIndex(int iIndex) + { + iterator iter = begin(); + int t = 0; while (t != iIndex) {iter++;t++;} + return iter; + } + const_iterator FindIndex(int iIndex) const + { + const_iterator iter = begin(); + int t = 0; while (t != iIndex) {iter++;t++;} + return iter; + } + TYPE& GetAt(const iterator& pos) { return *pos;} + TYPE GetAt(const_iterator& pos) const{ return *pos;} + +}; + +// simplified and partial only +template +class ZIP_API CZipMap : private std::map +{ +public: + void SetAt( KEY key, VALUE newValue) + { + insert(std::map::value_type(key, newValue)); + } + BOOL RemoveKey( KEY key ) + { + return erase(key) != 0; + } + BOOL Lookup( KEY key, VALUE& rValue ) const + { + #if __GNUC__ >= 3 + typename std::map::const_iterator iter ; + #else + const_iterator iter ; + #endif + iter = find(key) ; + if (iter == end()) + return FALSE; + else + { + rValue = iter->second; + return TRUE; + } + } +}; + +#if defined(_MSC_VER) && (_MSC_VER > 1100) + #pragma warning( pop) +#endif + +#endif /* ZIPCOLLECTIONS_DOT_H */ + diff --git a/harbour/contrib/hbzlib/zipcompatibility.h b/harbour/contrib/hbzlib/include/zipcompatibility.h similarity index 84% rename from harbour/contrib/hbzlib/zipcompatibility.h rename to harbour/contrib/hbzlib/include/zipcompatibility.h index 59dd6a8e72..b453ff5bcc 100644 --- a/harbour/contrib/hbzlib/zipcompatibility.h +++ b/harbour/contrib/hbzlib/include/zipcompatibility.h @@ -1,12 +1,11 @@ -/** -* \file ZipCompatibility.h -* ZipCompatibility namespace declaration. -* -* \author Tadeusz Dracz -*/ -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipCompatibility.h $ +// $Archive: /ZipArchive/ZipCompatibility.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -15,6 +14,13 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// + +/** +* \file ZipCompatibility.h +* ZipCompatibility namespace declaration. +* +*/ + #if !defined(AFX_ZIPCOMPATIBILITY_H__8E8B9904_84C7_4B22_B364_A10ED0E7DAD6__INCLUDED_) #define AFX_ZIPCOMPATIBILITY_H__8E8B9904_84C7_4B22_B364_A10ED0E7DAD6__INCLUDED_ @@ -26,7 +32,7 @@ class CZipAutoBuffer; class CZipFileHeader; /** - Functions that provides the proper conversion of attrubutes + Functions that provides the proper conversion of attributes and filename strings between different system platforms. */ namespace ZipCompatibility @@ -58,7 +64,7 @@ namespace ZipCompatibility \link #ZipPlatforms the system code \endlink \return \c true if supported */ -ZIPINLINE bool IsPlatformSupported(int iCode); + bool IsPlatformSupported(int iCode); /** diff --git a/harbour/contrib/hbzlib/zipexception.h b/harbour/contrib/hbzlib/include/zipexception.h similarity index 50% rename from harbour/contrib/hbzlib/zipexception.h rename to harbour/contrib/hbzlib/include/zipexception.h index 53a506d749..569931c153 100644 --- a/harbour/contrib/hbzlib/zipexception.h +++ b/harbour/contrib/hbzlib/include/zipexception.h @@ -1,13 +1,11 @@ -/** -* \file ZipException.h -* Interface for the CZipException class. -* -* \author Tadeusz Dracz -*/ - -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipException.h $ +// $Archive: /ZipArchive/ZipException.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -16,26 +14,46 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// +/** +* \file ZipException.h +* Interface for the CZipException class. +* +*/ + + #if !defined(AFX_ZIPEXCEPTION_H__E3546921_D728_11D3_B7C7_E77339672847__INCLUDED_) #define AFX_ZIPEXCEPTION_H__E3546921_D728_11D3_B7C7_E77339672847__INCLUDED_ #if _MSC_VER > 1000 #pragma once +#pragma warning( push ) +#pragma warning (disable:4702) // disable "Unreachable code" warning in Throw function in the Release mode #endif // _MSC_VER > 1000 #include "zipstring.h" #include "zipbaseexception.h" +#include "ZipExport.h" + +#define ZIP_ENABLE_ERROR_DESCRIPTION /** A class representing exceptions specific to the ZipArchive library. - Library exception class derived in the MFC version from CException - and in non-MFC version from std::exception. + Library exception class derived in the MFC version from \c CException + and in non-MFC version from \c std::exception. */ -ZEXPORT class CZipException : public CZipBaseException +class ZIP_API CZipException : public CZipBaseException { public: + +/** + \param iCause + error cause (takes one of the #ZipErrors enumeration codes) + \param lpszZipName + the name of the file where the error occurred (if applicable) +*/ CZipException(int iCause = generic, LPCTSTR lpszZipName = NULL); + CZipException::CZipException(CZipException& e) { m_szFileName = e.m_szFileName; @@ -56,7 +74,17 @@ public: \see CZipException() */ - static void Throw(int iZipError = CZipException::generic, LPCTSTR lpszZipName = NULL); + + static void Throw(int iZipError = CZipException::generic, LPCTSTR lpszZipName = NULL) + { + #ifdef _MFC_VER + throw new CZipException(iZipError, lpszZipName); + #else + CZipException e(iZipError, lpszZipName); + throw e; + #endif + } + /** Convert a zlib library error code to a \link #ZipErrors CZipException error code \endlink @@ -64,8 +92,50 @@ public: zlib library error code \return \link #ZipErrors CZipException error code \endlink */ + static int ZlibErrToZip(int iZlibError); + +#ifdef ZIP_ENABLE_ERROR_DESCRIPTION + + /** + Return the error description. + \note You need to have defined ZIP_ENABLE_ERROR_DESCRIPTION + (in file ZipException.h); undefine this value if you don't want to + store the messages in the library. + + + */ + CZipString GetErrorDescription(); + + + /** + Return the description of the error based on system variables + (this function is provided only for compatibility with MFC \c CException::GetErrorMessage) + + \param lpszError + a pointer to a buffer that will receive the error message + if \c NULL + + \param nMaxError + the maximum number of characters the buffer can hold, including the NULL terminator + + + \return + \c TRUE if the error string is not empty + \note + - The function will not copy more than \c nMaxError – 1 characters + to the buffer, and it always adds a trailing null to end the string; + if the buffer is too small, the error message will be truncated. + - You need to have defined ZIP_ENABLE_ERROR_DESCRIPTION + (in file ZipException.h); undefine this value if you don't want to + store the messages in the library. + + */ + BOOL GetErrorMessage(LPTSTR lpszError, UINT nMaxError, UINT* = NULL); + +#endif //ZIP_ENABLE_ERROR_DESCRIPTION + /** The name of the zip file where the error occurred. */ @@ -82,8 +152,10 @@ public: generic = 100, ///< unknown error badZipFile, ///< damaged or not a zip file badCrc, ///< crc mismatched - noCallback, ///< no callback function set - aborted, ///< disk change callback function returned \c false + noCallback, ///< no disk-spanning callback functor set + aborted, ///< callback functor's method Callback returned \c false while disk change in the disk-spanning archive + abortedAction, ///< callback functor's method Callback returned \c false in CZipArchive class members: AddNewFile, ExtractFile, TestFile, DeleteFile or DeleteFiles + abortedSafely, ///< the same as above, you may be sure that the operation was successfully completed before or it didn't cause any damage in the archive (break when counting before deleting files; see CZipArchive::cbDeleteCnt) nonRemovable, ///< the disk selected for pkzipSpan archive is non removable tooManyVolumes, ///< limit of the maximum volumes reached (999) tooLongFileName, ///< the filename of the file added to the archive is too long @@ -92,7 +164,7 @@ public: internal, ///< internal error notRemoved, ///< error while removing a file (under Windows call GetLastError() to find out more) notRenamed, ///< error while renaming a file (under Windows call GetLastError() to find out more) - platfNotSupp, ///< the platform that the zip file was created under is not supported + platfNotSupp, ///< the platform that the zip file is being created for is not supported cdirNotFound, ///< the central directory was not found in the archive (it is thrown also when the last disk of multi-disk archive is not in the drive when opening the archive) streamEnd = 500, ///< zlib library error needDict, ///< zlib library error @@ -103,24 +175,54 @@ public: bufError, ///< zlib library error versionError, ///< zlib library error }; + + + /** A cause of the error - takes one of the #ZipErrors enumeration codes. */ int m_iCause; - -/** - \param iCause - error cause (takes one of the #ZipErrors enumeration codes) - \param lpszZipName - the name of the file where the error occurred (if applicable) -*/ - +#if __GNUC__ >=3 + virtual ~CZipException() throw(); +#else virtual ~CZipException(); +#endif +protected: + +#ifdef ZIP_ENABLE_ERROR_DESCRIPTION + + + /** + Return the error description + + \param iCause : error number + \param bNoLoop: if \c true tells not to search for en error description, + it the error is generic + + \return + */ + CZipString GetInternalErrorDescription(int iCause, bool bNoLoop = false); + + + /** + Return the description of the error based on system variables + + + \return + */ + CZipString GetSystemErrorDescription(); + + +#endif //ZIP_ENABLE_ERROR_DESCRIPTION + #ifdef _MFC_VER DECLARE_DYNAMIC(CZipException) + #pragma warning( pop ) #endif }; #endif // !defined(AFX_ZIPEXCEPTION_H__E3546921_D728_11D3_B7C7_E77339672847__INCLUDED_) + + diff --git a/harbour/contrib/hbzlib/zipfile.h b/harbour/contrib/hbzlib/include/zipfile.h similarity index 65% rename from harbour/contrib/hbzlib/zipfile.h rename to harbour/contrib/hbzlib/include/zipfile.h index 9e2ed0257e..e44c8e9240 100644 --- a/harbour/contrib/hbzlib/zipfile.h +++ b/harbour/contrib/hbzlib/include/zipfile.h @@ -1,7 +1,11 @@ -// ZipFile.h: interface for the ZipFiles class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipFile.h $ +// $Archive: /ZipArchive_STL/ZipFile.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -16,16 +20,24 @@ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 + #include "zipabstractfile.h" #include "zipstring.h" -#include +#include "ZipExport.h" -ZEXPORT class CZipFile :public CZipAbstractFile +#ifndef __GNUC__ + #include +#else + #include + #include +#endif + +class ZIP_API CZipFile :public CZipAbstractFile { - void ThrowError(); + void ThrowError() const; public: int m_hFile; - operator HFILE(); + operator HANDLE(); enum OpenModes { modeRead = 0x0001, @@ -44,14 +56,15 @@ public: Open(lpszFileName, openFlags, true); } void Flush(); - DWORD GetLength(); - CZipString GetFilePath(){return m_szFileName;} - bool IsClosed(){ return m_hFile == -1;} + ZIP_ULONGLONG GetLength() const; + CZipString GetFilePath() const {return m_szFileName;} + bool IsClosed()const { return m_hFile == -1;} bool Open(LPCTSTR lpszFileName, UINT openFlags, bool bThrow); void Close() { if (IsClosed()) return; + if (close(m_hFile) != 0) ThrowError(); else @@ -65,14 +78,18 @@ public: if (write(m_hFile, lpBuf, nCount) != (int) nCount) ThrowError(); } - long GetPosition() + ZIP_ULONGLONG GetPosition() const { +#ifndef __GNUC__ long ret = tell(m_hFile); +#else + long ret = lseek(m_hFile, 0, SEEK_CUR); +#endif if (ret == -1L) ThrowError(); return ret; } - void SetLength(long nNewLen); + void SetLength(ZIP_ULONGLONG nNewLen); UINT Read(void *lpBuf, UINT nCount) { errno = 0; @@ -82,9 +99,9 @@ public: return ret; } - long Seek(long dOff, int nFrom) + ZIP_ULONGLONG Seek(ZIP_LONGLONG dOff, int nFrom) { - long ret = lseek(m_hFile, dOff, nFrom); + long ret = lseek(m_hFile, (long)dOff, nFrom); if (ret == -1) ThrowError(); return ret; diff --git a/harbour/contrib/hbzlib/zipfileheader.h b/harbour/contrib/hbzlib/include/zipfileheader.h similarity index 71% rename from harbour/contrib/hbzlib/zipfileheader.h rename to harbour/contrib/hbzlib/include/zipfileheader.h index 0d669db90a..b1b0eac8ac 100644 --- a/harbour/contrib/hbzlib/zipfileheader.h +++ b/harbour/contrib/hbzlib/include/zipfileheader.h @@ -1,12 +1,11 @@ -/** -* \file ZipFileHeader.h -* Interface for the CZipFileHeader class. -* -* \author Tadeusz Dracz -*/ -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipFileHeader.h $ +// $Archive: /ZipArchive/ZipFileHeader.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -15,6 +14,12 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// +/** +* \file ZipFileHeader.h +* Interface for the CZipFileHeader class. +* +*/ + #if !defined(AFX_FILEHEADER_H__0081FC65_C9C9_4D48_AF72_DBF37DF5E0CF__INCLUDED_) #define AFX_FILEHEADER_H__0081FC65_C9C9_4D48_AF72_DBF37DF5E0CF__INCLUDED_ @@ -22,11 +27,12 @@ #pragma once #endif // _MSC_VER > 1000 +#include "ZipExport.h" #include "zipstorage.h" #include "zipautobuffer.h" -#include "sys\types.h" +#include "sys/types.h" #include "zipcompatibility.h" - +#define ZIPARCHIVE_ENCR_HEADER_LEN 12 /** Representation of a single file stored in the zip archive. @@ -36,7 +42,7 @@ (it would mean updating all the information in the local headers and the offsets would be changed as well when the filename would changed its size) */ -ZEXPORT class CZipFileHeader +class ZIP_API CZipFileHeader { friend class CZipCentralDir; friend class CZipArchive; @@ -46,7 +52,6 @@ public: virtual ~CZipFileHeader(); - // /** Change slash to backslash or vice-versa in #m_pszFileName. @@ -57,22 +62,22 @@ public: /** \return the filename size in characters (without NULL) */ - WORD GetFileNameSize(){return (WORD)m_pszFileName.GetSize();} + WORD GetFileNameSize()const {return (WORD)m_pszFileName.GetSize();} /** \return the comment size in characters (without NULL) */ - WORD GetCommentSize(){return (WORD)m_pszComment.GetSize();} + WORD GetCommentSize() const {return (WORD)m_pszComment.GetSize();} /** \return the extra field size in characters */ - WORD GetExtraFieldSize(){return (WORD)m_pExtraField.GetSize();} + WORD GetExtraFieldSize()const{return (WORD)m_pExtraField.GetSize();} /** \return the filename */ - CZipString GetFileName(); + CZipString GetFileName()const; /** Set the filename @@ -87,7 +92,7 @@ public: /** \return the file comment */ - CZipString GetComment(); + CZipString GetComment() const; /** Set the file comment. @@ -103,13 +108,42 @@ public: /** \return \c true if the data descriptor is present */ - bool IsDataDescr(); + bool IsDataDescr()const { return ((m_uFlag & 8) != 0); } + + + /** + \return + get the effective compressed size: if the file is encrypted, return less by the size of the encryption header + */ + DWORD GetEffComprSize() + { + return m_uComprSize - (IsEncrypted() ? ZIPARCHIVE_ENCR_HEADER_LEN : 0); + } + /** + \return + \c false if the file should be stored instead of being compressed + */ + bool CompressionEfficient() + { + DWORD uBefore = m_uUncomprSize; + // ignore the length of encryption header + DWORD uAfter = GetEffComprSize(); + return uAfter <= uBefore; + } + + /** + \return the compression ratio of the file + */ + float GetCompressionRatio() + { + return m_uUncomprSize ? ((float)m_uComprSize) * 100 / m_uUncomprSize : 0; + } /** \return \c if the file is encrypted ( a password is needed to extract this file) \see CZipArchive::SetPassword */ - bool IsEncrypted(); + bool IsEncrypted()const { return ((m_uFlag & 1) != 0); } char m_szSignature[4]; ///< central file header signature WORD m_uVersionMadeBy; ///< version made by and system compatibility @@ -141,7 +175,7 @@ public: /** Set #m_uModDate, #m_uModTime (file modification time) - \param const time_t& ttime + \param ttime \see GetTime */ void SetTime(const time_t& ttime); @@ -150,12 +184,14 @@ public: \return the modification time \see SetTime */ - time_t GetTime(); + time_t GetTime()const; /** - \return the total size of the structure as stored in the central directory + \param bLocal + if \c true return the local file header size or in the central directory otherwise + \return the total size of the structure depending on the \e bLocal parameter */ - DWORD GetSize(); + DWORD GetSize(bool bLocal = false)const; /** \return the system compatibility of the current file as @@ -168,23 +204,34 @@ public: \see CZipArchive::GetSystemComatibility \see ZipPlatform::GetSystemID */ - int GetSystemCompatibility() + int GetSystemCompatibility()const { return (m_uVersionMadeBy & 0xFF00) >> 8; } /** \return the attributes of the file converted to the current system compatible value - \note Throws exception if the archive system or the current system + \note + - Throws exception if the archive system or the current system is not supported by the ZipArchive library. + - (only Linux version): After obtaining the attributes, you need to shift them right by 16 */ - DWORD GetSystemAttr(); + DWORD GetSystemAttr()const; + + /** + \return + the original attributes as stored in the archive (without performing any conversion) + */ + DWORD GetOriginalAttributes() const {return m_uExternalAttr;} /** \return \c true, if this object represents a directory; otherwise \c false; + If #m_uExternalAttr value is zero, the function check for a presence of a path + separator at the end of the file name. If it is present, it is assumed to be a directory. */ - bool IsDirectory(); + bool IsDirectory()const; + protected: @@ -197,14 +244,14 @@ protected: void SetSystemCompatibility(int iSystemID) { m_uVersionMadeBy &= 0x00FF; - m_uVersionMadeBy |= (iSystemID << 8); + m_uVersionMadeBy |= (WORD)(iSystemID << 8); } /** Set the system attributes if you wish to set the attributes of this structure use CZipArchive::SetFileHeaderAttr() \param uAttr - attibutes to set + attributes to set \note Throws exceptions if the archive system or the current system is not supported by the ZipArchive library. \see CZipArchive::SetFileHeaderAttr @@ -215,14 +262,14 @@ protected: /** Set the version made by number. - \param uVersion + */ void SetVersion(WORD uVersion) { if ((m_uVersionMadeBy & 0x00FF) != (uVersion & 0x00FF)) { m_uVersionMadeBy &= 0xFF00; - m_uVersionMadeBy |= (uVersion & 0x00FF); + m_uVersionMadeBy |= (WORD)(uVersion & 0x00FF); } } @@ -239,10 +286,10 @@ protected: /** Fill the buffer with the current values of crc and compressed and uncompressed sizes of the file. - \param pBuffer + */ - void GetCrcAndSizes(char* pBuffer); + void GetCrcAndSizes(char* pBuffer)const; /** Check whether the actual values of crc and compressed and @@ -252,7 +299,7 @@ protected: buffer with the mentioned data \return \c true if they are the same; otherwise \c false; */ - bool CheckCrcAndSizes(char* pBuf); + bool CheckCrcAndSizes(char* pBuf) const; /** @@ -260,14 +307,14 @@ protected: Called by CZipArchive::OpenNewFile \param iLevel a compression level - \param bExtraHeader - \c true, if the data descriptor will be present + \param bSpan + \c true, if the data descriptor will be present because of spanning archive \param bEncrypted \c true, if the file will be encrypted \return \c true if the sizes of the filename, extra field and comments does not exceed \c unsigned \c short maximum value; otherwise \c false; */ - bool PrepareData(int iLevel, bool bExtraHeader, bool bEncrypted); + bool PrepareData(int iLevel, bool bSpan, bool bEncrypted); /** Write the local file header to the \e storage \param storage diff --git a/harbour/contrib/hbzlib/zipfilemapping.h b/harbour/contrib/hbzlib/include/zipfilemapping.h similarity index 69% rename from harbour/contrib/hbzlib/zipfilemapping.h rename to harbour/contrib/hbzlib/include/zipfilemapping.h index c0557d2ec7..1ab8cd711a 100644 --- a/harbour/contrib/hbzlib/zipfilemapping.h +++ b/harbour/contrib/hbzlib/include/zipfilemapping.h @@ -1,21 +1,22 @@ -/** -* \file ZipFileMapping.h -* Interface for the CZipFileMapping class. -* -* \author Tadeusz Dracz -* -*/ -// Part of the ZipArchive library +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipFileMapping.h $ +// $Archive: /ZipArchive/ZipFileMapping.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) // -// Copyright (C) 2000 - 2001 Tadeusz Dracz. // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. // // For the licensing details see the file License.txt +// +// Check the site http://www.artpol-software.com for the updated version of the library. //////////////////////////////////////////////////////////////////////////////// + #if !defined(AFX_AUTOHANDLE_H__D68326EA_D7FA_4792_AB1F_68D09533E399__INCLUDED_) #define AFX_AUTOHANDLE_H__D68326EA_D7FA_4792_AB1F_68D09533E399__INCLUDED_ @@ -23,6 +24,7 @@ #pragma once #endif // _MSC_VER > 1000 +#include "ZipFile.h" namespace ziparchv { @@ -34,11 +36,11 @@ namespace ziparchv m_hFileMap = NULL; m_pFileMap = NULL; } - bool CreateMapping(HANDLE hFile) + bool CreateMapping(CZipFile* pFile) { - if (!hFile) + if (!pFile) return false; - m_hFileMap = CreateFileMapping(hFile, NULL, PAGE_READWRITE, + m_hFileMap = CreateFileMapping((*pFile), NULL, PAGE_READWRITE, 0, 0, _T("ZipArchive Mapping File")); if (!m_hFileMap) return false; diff --git a/harbour/contrib/hbzlib/zipinternalinfo.h b/harbour/contrib/hbzlib/include/zipinternalinfo.h similarity index 93% rename from harbour/contrib/hbzlib/zipinternalinfo.h rename to harbour/contrib/hbzlib/include/zipinternalinfo.h index 27c7758cd6..73d3c3d536 100644 --- a/harbour/contrib/hbzlib/zipinternalinfo.h +++ b/harbour/contrib/hbzlib/include/zipinternalinfo.h @@ -5,13 +5,13 @@ * \author Tadeusz Dracz */ // Part of the ZipArchive library -// +// // Copyright (C) 2000 - 2001 Tadeusz Dracz. // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. -// +// // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// @@ -22,13 +22,17 @@ #pragma once #endif // _MSC_VER > 1000 #include "zipautobuffer.h" -#include "zlib.h" +#include "zconf.h" + +#ifndef _HBCOMPRESS_H +#include "hbcomprs.h" +#endif /** The purpose of this structure is to hold the data that allow communication with the zlib library */ -ZEXPORT struct CZipInternalInfo +ZEXPORT struct CZipInternalInfo { CZipInternalInfo(); virtual ~CZipInternalInfo(); diff --git a/harbour/contrib/hbzlib/zipmemfile.h b/harbour/contrib/hbzlib/include/zipmemfile.h similarity index 66% rename from harbour/contrib/hbzlib/zipmemfile.h rename to harbour/contrib/hbzlib/include/zipmemfile.h index 4142ce1981..8501224452 100644 --- a/harbour/contrib/hbzlib/zipmemfile.h +++ b/harbour/contrib/hbzlib/include/zipmemfile.h @@ -1,12 +1,11 @@ -/** -* \file ZipMemFile.h -* Interface for the CZipMemFile class. -* -* \author Tadeusz Dracz -*/ -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipMemFile.h $ +// $Archive: /ZipArchive/ZipMemFile.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -15,27 +14,33 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// +/** +* \file ZipMemFile.h +* Interface for the CZipMemFile class. +* +*/ #if !defined(AFX_ZIPMEMFILE_H__EA73AB25_6B51_4C5E_8D78_BAC95812598F__INCLUDED_) #define AFX_ZIPMEMFILE_H__EA73AB25_6B51_4C5E_8D78_BAC95812598F__INCLUDED_ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 +#include "hbapi.h" #include "zipabstractfile.h" #include "zipstring.h" +#include "ZipExport.h" /** A memory buffer which behaves like a physical file. Automatically grows when necessary */ -ZEXPORT class CZipMemFile : public CZipAbstractFile +class ZIP_API CZipMemFile : public CZipAbstractFile { protected: - UINT m_nGrowBy, m_nPos; - UINT m_nBufSize, m_nDataSize; + size_t m_nGrowBy, m_nPos; + size_t m_nBufSize, m_nDataSize; BYTE* m_lpBuf; bool m_bAutoDelete; - void Free() { if (m_lpBuf) @@ -51,18 +56,17 @@ protected: m_lpBuf = NULL; } - void Grow(long nBytes); + void Grow(size_t nBytes); public: - bool IsClosed() { return m_lpBuf == NULL;} + bool IsClosed() const { return m_lpBuf == NULL;} void Flush(){} - long Seek(long lOff, int nFrom); - DWORD GetLength() {return m_nDataSize;} + ZIP_ULONGLONG Seek(ZIP_LONGLONG lOff, int nFrom); + ZIP_ULONGLONG GetLength() const {return m_nDataSize;} void Write(const void* lpBuf, UINT nCount); UINT Read(void* lpBuf, UINT nCount); - void SetLength(long nNewLen); - CZipString GetFilePath() {return _T("");} - bool Open(LPCTSTR lpszFileName, UINT openFlags, bool shareMode); + void SetLength(ZIP_ULONGLONG nNewLen); + CZipString GetFilePath() const {return _T("");} CZipMemFile(long nGrowBy = 1024) { Init(); @@ -72,9 +76,10 @@ public: CZipMemFile(BYTE* lpBuf, UINT nBufSize, long nGrowBy = 0) { + Init(); Attach(lpBuf, nBufSize, nGrowBy); } - long GetPosition(){ return m_nPos;} + ZIP_ULONGLONG GetPosition() const { return m_nPos;} void Attach(BYTE* lpBuf, UINT nBufSize, long nGrowBy = 0) { Close(); diff --git a/harbour/contrib/hbzlib/zippathcomponent.h b/harbour/contrib/hbzlib/include/zippathcomponent.h similarity index 58% rename from harbour/contrib/hbzlib/zippathcomponent.h rename to harbour/contrib/hbzlib/include/zippathcomponent.h index bac2f581e6..efaa9bc505 100644 --- a/harbour/contrib/hbzlib/zippathcomponent.h +++ b/harbour/contrib/hbzlib/include/zippathcomponent.h @@ -1,12 +1,11 @@ -/** -* \file ZipPathComponent.h -* Interface for the CZipPathComponent class. -* -* \author Tadeusz Dracz -*/ -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipPathComponent.h $ +// $Archive: /ZipArchive/ZipPathComponent.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -15,6 +14,11 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// +/** +* \file ZipPathComponent.h +* Interface for the CZipPathComponent class. +* +*/ #if !defined(AFX_ZIPPATHCOMPONENT_H__9B222C08_AD11_4138_96CC_1237511E3E37__INCLUDED_) #define AFX_ZIPPATHCOMPONENT_H__9B222C08_AD11_4138_96CC_1237511E3E37__INCLUDED_ @@ -22,60 +26,102 @@ #pragma once #endif // _MSC_VER > 1000 #include "zipstring.h" +#include "ZipExport.h" /** A class splitting a file path into components. */ -class CZipPathComponent +class ZIP_API CZipPathComponent { public: CZipPathComponent(){} virtual ~CZipPathComponent(); - static TCHAR m_cSeparator; ///< A system - specific default path separator. Defined in ZipPlatform.cpp. + static const TCHAR m_cSeparator; ///< A system - specific default path separator. Defined in ZipPlatform.cpp. /** Append a path separator to \e szPath if it is not already there. - \param szPath */ static void AppendSeparator(CZipString& szPath) { -// szPath.TrimRight(m_cSeparator); - szPath.TrimRight(_T("\\/")); + RemoveSeparators(szPath); szPath += m_cSeparator; } + + /** + Remove separators from the end of \e szPath + */ + static void RemoveSeparators(CZipString& szPath) + { +// szPath.TrimRight(m_cSeparator); + szPath.TrimRight(_T("\\/")); + } + + /** + Remove separators from the beginning of \e szPath + + */ + + static void RemoveSeparatorsLeft(CZipString& szPath) + { + szPath.TrimLeft(_T("\\/")); + } + + + /** + \return \c true if \e c is a slash or a backslash + + + */ + static bool IsSeparator(TCHAR c) + { + return c == _T('\\') || c == _T('/'); + } + + /** + \return \c true if the path has a path separator at the and + */ + static bool HasEndingSeparator(const CZipString& szPath) + { + int iLen = szPath.GetLength(); + if (iLen) + return IsSeparator(szPath[iLen - 1]); + else + return false; + } + /** Construct the object and set a path. - \param szFullPath + \param lpszFullPath the full path of the file \see SetFullPath */ - CZipPathComponent(const CZipString& szFullPath) + CZipPathComponent(LPCTSTR lpszFullPath) { - SetFullPath(szFullPath); + SetFullPath(lpszFullPath); } // full path of the file (not a directory alone) /** Set the path. - \param szFullPath + \param lpszFullPath a full path to the file (including a filename - the last element in the path is assumed to be a filename) */ - void SetFullPath(const CZipString& szFullPath); + void SetFullPath(LPCTSTR lpszFullPath); /** \return the filename (without an extension) */ - CZipString GetFileName() { return m_szFileName;} + CZipString GetFileTitle() const { return m_szFileTitle;} /** - Set the filename only (without extension). - \param szFileName + Set the file title (without an extension). + \param lpszFileTitle \return */ - void SetFileName(const CZipString& szFileName) { m_szFileName = szFileName;} + void SetFileTitle(LPCTSTR lpszFileTitle) { m_szFileTitle = lpszFileTitle;} /** @@ -92,22 +138,22 @@ public: /** \return the file extension without a dot */ - CZipString GetFileExt() { return m_szFileExt;} + CZipString GetFileExt() const { return m_szFileExt;} /** \return the drive (no path separator at the end) */ - CZipString GetFileDrive() { return m_szDrive;} + CZipString GetFileDrive() const { return m_szDrive;} /** \return the full path without the drive (no separator at the beginning) */ - CZipString GetNoDrive(); + CZipString GetNoDrive() const ; /** - \return the filename including the extension + \return the filename including an extension */ - CZipString GetFullFileName() + CZipString GetFileName() const { - CZipString szFullFileName = m_szFileName; + CZipString szFullFileName = m_szFileTitle; if (!m_szFileExt.IsEmpty()) { szFullFileName += _T("."); @@ -118,10 +164,10 @@ public: /** \return the full path of the file (including the filename) */ - CZipString GetFullPath() + CZipString GetFullPath() const { CZipString szFullPath = GetFilePath(); - CZipString szFileName = GetFullFileName(); + CZipString szFileName = GetFileName(); if (!szFileName.IsEmpty()) { szFullPath += m_cSeparator; @@ -133,7 +179,7 @@ public: /** \return the path of the file (without the separator at the end) */ - CZipString GetFilePath() + CZipString GetFilePath() const { CZipString szDrive = m_szDrive; CZipString szDir = m_szDirectory; @@ -149,7 +195,7 @@ protected: */ //@{ CZipString m_szDirectory, ///< a directory(ies) (one or more) without the path separators at the end and the beginning - m_szFileName, ///< a filename without an extension + m_szFileTitle, ///< a filename without an extension m_szFileExt, ///< a file extension without a dot m_szDrive, ///< a drive (if the system path standard uses it) without a path separator at the end m_szPrefix; ///< a prefix (e.g. for the UNC path or Unicode path under Windows) diff --git a/harbour/contrib/hbzlib/zipplatform.h b/harbour/contrib/hbzlib/include/zipplatform.h similarity index 54% rename from harbour/contrib/hbzlib/zipplatform.h rename to harbour/contrib/hbzlib/include/zipplatform.h index 60e6feeb24..52effdd263 100644 --- a/harbour/contrib/hbzlib/zipplatform.h +++ b/harbour/contrib/hbzlib/include/zipplatform.h @@ -1,12 +1,11 @@ -/** -* \file ZipPlatform.h -* ZipPlatform namespace declaration. -* -* \author Tadeusz Dracz -*/ -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipPlatform.h $ +// $Archive: /ZipArchive/ZipPlatform.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -15,6 +14,11 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// +/** +* \file ZipPlatform.h +* ZipPlatform namespace declaration. +* +*/ #if !defined(AFX_ZipPlatform_H__E2FE6343_9D03_4F3C_A1F7_706C9F0ED978__INCLUDED_) #define AFX_ZipPlatform_H__E2FE6343_9D03_4F3C_A1F7_706C9F0ED978__INCLUDED_ @@ -25,7 +29,8 @@ class CZipFileHeader; class CZipAutoBuffer; #include "zipstring.h" #include "zippathcomponent.h" -#include +#include +#include "ZipExport.h" /** Interface to the system API. @@ -34,57 +39,62 @@ class CZipAutoBuffer; namespace ZipPlatform { + /** + return the default system case-sensitivity + */ + ZIP_API bool GetSystemCaseSensitivity(); + /** \return A current system name tag. May be one of ZipCompatibility::ZipPlatforms values. \see CZipArchive::GetSystemCompatibility */ -ZIPINLINE int GetSystemID(); + ZIP_API int GetSystemID(); /** - \return the default file attributes for + \return the default file attributes for the current system */ -// DWORD GetDefaultAttributes(); + ZIP_API DWORD GetDefaultAttributes(); /** - Get the current directory and store it in \e sz - \param sz - - \return \c true if successful + \return the default directory attributes for the current system */ - - - - + ZIP_API DWORD GetDefaultDirAttributes(); /** Get the free space on the device pointed by \e lpszPath */ - DWORD GetDeviceFreeSpace(LPCTSTR lpszPath); + ZIP_API DWORD GetDeviceFreeSpace(LPCTSTR lpszPath); +/** + Return the temporary file name ensuring there is enough size in the destination directory,. + Checking for the size is disabled by default. +*/ + ZIP_API CZipString GetTmpFileName(LPCTSTR lpszPath = NULL, DWORD iSizeNeeded = DWORD(-1)); /** \name Various operations on files and directories. All the functions which are returning a \c bool value, return \c true when the operation was successful. */ //@{ - bool GetCurrentDirectory(CZipString& sz); - bool ChangeDirectory(LPCTSTR lpDirectory); - bool SetFileAttr(LPCTSTR lpFileName, DWORD uAttr); - bool GetFileAttr(LPCTSTR lpFileName, DWORD& uAttr); - bool GetFileModTime(LPCTSTR lpFileName, time_t & ttime); ///< get the file modification time - bool SetFileModTime(LPCTSTR lpFileName, time_t ttime); ///< set the file modification time -ZIPINLINE bool CreateDirectory(LPCTSTR lpDirectory); -ZIPINLINE bool SetVolLabel(LPCTSTR lpszPath, LPCTSTR lpszLabel); ///< \c lpszPath may point to a file on the device - bool ForceDirectory(LPCTSTR lpDirectory); ///< create nested directories at once -ZIPINLINE void RemoveFile(LPCTSTR lpszFileName); -ZIPINLINE void RenameFile( LPCTSTR lpszOldName, LPCTSTR lpszNewName ); + ZIP_API bool GetCurrentDirectory(CZipString& sz); ///< Get the current directory and store it in \e sz + ZIP_API bool ChangeDirectory(LPCTSTR lpDirectory); + ZIP_API bool SetFileAttr(LPCTSTR lpFileName, DWORD uAttr); + ZIP_API bool GetFileAttr(LPCTSTR lpFileName, DWORD& uAttr); + ZIP_API bool GetFileModTime(LPCTSTR lpFileName, time_t & ttime); ///< get the file modification time + ZIP_API bool GetFileSize(LPCTSTR lpszFileName, DWORD& dSize); + ZIP_API bool SetFileModTime(LPCTSTR lpFileName, time_t ttime); ///< set the file modification time + ZIP_API bool CreateDirectory(LPCTSTR lpDirectory); + ZIP_API bool SetVolLabel(LPCTSTR lpszPath, LPCTSTR lpszLabel); ///< \c lpszPath may point to a file on the device + ZIP_API bool ForceDirectory(LPCTSTR lpDirectory); ///< create nested directories at once + ZIP_API bool RemoveFile(LPCTSTR lpszFileName, bool bThrow = true); + ZIP_API bool RenameFile( LPCTSTR lpszOldName, LPCTSTR lpszNewName, bool bThrow = true); #ifndef _MFC_VER - bool TruncateFile(int iDes, DWORD iSize); - int OpenFile(LPCTSTR lpszFileName, UINT iMode, int iShareMode); - bool FlushFile(int iDes); ///< flush the file to the disk. - int GetFileSystemHandle(int iDes); ///< return the underlying system handle + ZIP_API bool TruncateFile(int iDes, DWORD iSize); + ZIP_API int OpenFile(LPCTSTR lpszFileName, UINT iMode, int iShareMode); + ZIP_API bool FlushFile(int iDes); ///< flush the file to the disk. + ZIP_API int GetFileSystemHandle(int iDes); ///< return the underlying system handle #endif //@} @@ -93,20 +103,20 @@ ZIPINLINE void RenameFile( LPCTSTR lpszOldName, LPCTSTR lpszNewName ); \return \c true, if \e lpszDir directory exists; otherwise \c false; */ - bool DirectoryExists(LPCTSTR lpszDir); + ZIP_API bool DirectoryExists(LPCTSTR lpszDir); /** \param lpszFilePath may point to a file path or a directory on the device \return \c true if the drive is removable. Implemented only on Windows system, in all others always returns \c true. */ - ZIPINLINE bool IsDriveRemovable(LPCTSTR lpszFilePath); + ZIP_API bool IsDriveRemovable(LPCTSTR lpszFilePath); /** \param uAttr attributes value to test \return \c true if the attributes are the directory attributes */ - ZIPINLINE bool IsDirectory(DWORD uAttr); + ZIP_API bool IsDirectory(DWORD uAttr); /** Perform the translation between ANSI and OEM character sets. @@ -122,7 +132,7 @@ ZIPINLINE void RenameFile( LPCTSTR lpszOldName, LPCTSTR lpszNewName ); if \c true, convert ANSI to OEM if \c false, OEM to ANSI */ -ZIPINLINE void AnsiOem(CZipAutoBuffer& buffer, bool bAnsiToOem); + ZIP_API void AnsiOem(CZipAutoBuffer& buffer, bool bAnsiToOem); /** Check if the given file or directory exists. \param lpszName @@ -132,7 +142,8 @@ ZIPINLINE void AnsiOem(CZipAutoBuffer& buffer, bool bAnsiToOem); - 1 a file - 0 if there is no such a file */ - int FileExists(LPCTSTR lpszName); + ZIP_API int FileExists(LPCTSTR lpszName); + #ifdef _UNICODE /** @@ -145,7 +156,7 @@ ZIPINLINE void AnsiOem(CZipAutoBuffer& buffer, bool bAnsiToOem); the \e szSingle buffer length, or \c -1 when not succeeded \note Only in UNICODE version. */ - int WideToSingle(LPCTSTR lpWide, CZipAutoBuffer &szSingle); + ZIP_API int WideToSingle(LPCTSTR lpWide, CZipAutoBuffer &szSingle); /** Convert single character string to wide character string. \param szSingle @@ -156,7 +167,7 @@ ZIPINLINE void AnsiOem(CZipAutoBuffer& buffer, bool bAnsiToOem); or \c -1 when not succeeded \note Only in UNICODE version. */ - int SingleToWide(const CZipAutoBuffer &szSingle, CZipString& szWide); + ZIP_API int SingleToWide(const CZipAutoBuffer &szSingle, CZipString& szWide); #endif }; diff --git a/harbour/contrib/hbzlib/include/zipstorage.h b/harbour/contrib/hbzlib/include/zipstorage.h new file mode 100644 index 0000000000..aeaf8ddcdd --- /dev/null +++ b/harbour/contrib/hbzlib/include/zipstorage.h @@ -0,0 +1,588 @@ +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipStorage.h $ +// $Archive: /ZipArchive/ZipStorage.h $ +// $Date$ $Author$. +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// For the licensing details see the file License.txt +//////////////////////////////////////////////////////////////////////////////// + +/** +* \file ZipStorage.h +* Interface for the CZipStorage class. +* +*/ + +#if !defined(AFX_ZIPSTORAGE_H__941824FE_3320_4794_BDE3_BE334ED8984B__INCLUDED_) +#define AFX_ZIPSTORAGE_H__941824FE_3320_4794_BDE3_BE334ED8984B__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#include "zipfile.h" +#include "zipautobuffer.h" +#include "zipstring.h" +#include "zipmemfile.h" +#include "ZipExport.h" + + + +/** + A base class for functional objects (functors) that are used as a callbacks during various actions. + You need to derive your own class and overload \c Callback method to use it. + Do not derive from CZipCallback directly but from CZipSpanCallback (as a callback when there is a need + for a disk change in a disk-spanning archive) or from CZipActionCallback for other actions. +*/ +struct ZIP_API CZipCallback +{ + /** + Method called as a callback. + Return \c false from inside the method to abort the current operation. If it is a span callback functor, + a CZipException with CZipException::aborted code will be thrown, otherwise the code will be CZipException::abortedAction or CZipException::abortedSafely. + The following actions can be safely aborted (without having the archive corrupted): + - counting bytes before deleting files + - testing + - saving central directory on non-disk-spanning archive + (saved data is removed in case of break and you can save it again); + it the archive is disk-spanning and if saving is aborted, the archive + will not be damaged, but saved part of the central directory will be not removed + and the new central directory will have to be saved after it + + \note Overrride this method in the derived class. If you define this method inside the class declaration, it should be inlined + by the compiler making the action progress faster. + */ + virtual bool Callback(int iProgress) = 0; + + + CZipString m_szExternalFile; ///< if the action (adding, extracting or disk-spanning) uses an external file, its filename is stored here +}; + +/** + Derive from this a class to be used as a callback functor for the disk change callback. + You need to override member function CZipCallback::Callback. The meaning of \e iProgress parameter is the reason for calling: + - -1 : a disk needed for reading
+ other codes occurs during writing: + - >=0 : min. number of bytes needed + - -2 : the file with the archive name already exists on the disk + - -3 : the disk is probably write - protected + - -4 : couldn't create a file + + + Return \c false from the callback function to abort operation: the proper exception will be thrown. + + \see CZipCallback::Callback + \see CZipArchive::SetSpanCallback +*/ +struct ZIP_API CZipSpanCallback : public CZipCallback +{ + DWORD m_uDiskNeeded; ///< the number of a disk needed (counting from 1) +}; + + + +/** + Derive from this a class to be used as a callback functors when adding, extracting, deleting, testing a file + or saving central directory. + You need to override member function CZipCallback::Callback. The meaning of \e iProgress parameter is the count + of data just processed. It is a smallest number of bytes after which the callback method is called and it depends + on the value of \e nBufSize in the CZipArchive methods that uses the callback feature. In case of saving the central + directory action it is the count of file headers just written (see CZipArchive::cbSave) + \see CZipCallback::Callback + \see CZipArchive::SetCallback +*/ +struct ZIP_API CZipActionCallback : public CZipCallback +{ + + CZipActionCallback() + { + m_uTotalToDo = 0; + m_uTotalSoFar = 0; + } + + /** + The type of the callback. It is set to one of CZipArchive::CallbackType values when the action begins. + It's useful if you have more than one callback assigned to the same functor. + */ + int m_iType; + + /** + Used by the ZipArchive library to init the callback function with the filenames. Resets #m_uTotalToDo and #m_uTotalSoFar variables to 0. + #m_iType variable is already set to the proper value. Called at the beginning of the action. + */ + virtual void Init(LPCTSTR lpszFileInZip = NULL, LPCTSTR lpszExternalFile = NULL) + { + m_szFileInZip = lpszFileInZip; + m_szExternalFile = lpszExternalFile; + m_uTotalToDo = 0; // not yet known + m_uTotalSoFar = 0; // nothing yet done + } + + /** + Called by the ZipArchive functions that use the callback feature after calculating total data to process. + \param uTotalToDo + total data to process; set #m_uTotalToDo to this value + */ + virtual void SetTotal(DWORD uTotalToDo) + { + m_uTotalToDo = uTotalToDo; +// m_uTotalSoFar = 0; // already done in CZipArchive::CZipClbckStrg::Get + } + + + + /** + Total number of data to process. The value of this variable is set after calling by the library #SetTotal method (it is 0 before). + Depending on the action it is set then to: + - adding file: the size the external file being added (or if callback is CZipArchive::cbAddTmp, the size of compressed data: CZipFileHeader::m_uComprSize) + - extracting file: the size of uncompressed data (CZipFileHeader::m_uUncomprSize) + - testing file: the same as above + - deleting file: the count of bytes to move - the size of all files to remain above the first file to delete (calculated from offsets CZipFileHeader::m_uOffset + - saving central directory: the number of files in the archive + + */ + DWORD m_uTotalToDo; + DWORD m_uTotalSoFar; ///< total number of bytes processed so far + CZipString m_szFileInZip; ///< file in zip archive being currently processed + + + /** + \return the number of bytes left to process + */ + DWORD LeftToDo() {return m_uTotalToDo - m_uTotalSoFar;} + + + /** + Called after the action finishes (it is not called in case of an exception, but + it is called before throwing CZipException::abortedAction or CZipException::abortedSafely) + */ + virtual void CallbackEnd() + { + ASSERT(m_uTotalSoFar == m_uTotalToDo); + }; + + /** + Used internally to call Callback and increase #m_uTotalSoFar by \e iProgress + */ + virtual bool operator()(int iProgress) + { + m_uTotalSoFar += iProgress; + return Callback(iProgress); + } + + /** + Used only when creating map before deletion (see CZipArchive::cbDeleteCnt) or + saving the central directory record. You'll be notified every nth step (n is \e m_iStep value) with \e iProgress set to + \e m_iStep . Do not set it to low values or you can have a long waiting on archives + with huge number of files. + + \b Default: 256. + */ + static int m_iStep; + + + /** + Used internally to return #m_iStep value but not 0 (return 1 in this case). + */ + int GetStep(){return m_iStep ? m_iStep : 1;} // do not allow 0 (crash) + +}; + + +/** + A low-level class - operates physically on archive (CZipArchive operates logically) +*/ +class ZIP_API CZipStorage +{ + friend class CZipCentralDir; +public: + + /** + The type of the disk spanning archive. + \see CZipArchive::GetSpanMode + */ + enum ZipSpanMode { + noSpan, ///< no disk spanning + pkzipSpan, ///< \ref PKSpan "disk spanning compatible with PKZIP" + tdSpan, ///< \ref TDSpan "TD mode disk spanning archive" + /** + Detect the type automatically. + If the archive is on the removable device assume PKZIP compatible, + otherwise TD mode compatible. + */ + suggestedAuto, + /** + If the disk spanning archive is on the removable device + assume it is TD mode compatible + */ + suggestedTd + }; + + CZipStorage(); + virtual ~CZipStorage(); + +/** + Open the archive in memory (new or existing). + The parameters are the same as CZipArchive::OpenMode. + \param mf + \param iMode + \note Throws exceptions. + + \see CZipArchive::Open(LPCTSTR, int, int) +*/ + void Open(CZipMemFile& mf, int iMode); + +/** + Open or create an archive. + The parameters are the same as CZipArchive::Open. + \param szPathName + \param iMode + \param iVolumeSize + \note Throws exceptions. + + \see CZipArchive::Open(CZipMemFile& , int); +*/ + void Open(LPCTSTR szPathName, int iMode, int iVolumeSize); + + + /** + Close the disk-spanning archive and reopens as an existing disk-spanning archive or set mode to #noSpan + */ + void FinalizeSpan(); + + +/** + Called only by CZipCentralDir::Read() when opening an existing archive. + \param uLastDisk + the disk number the central directory is on + \note Throws exceptions. + +*/ + void UpdateSpanMode(WORD uLastDisk); + + +/** + Write chunk of data to the archive. + \param pBuf + buffer with data + \param iSize + bytes to write + \param bAtOnce + if \c true, the whole data must fit in the current volume, + otherwise the disk change is performed + \note Throws exceptions. +*/ + void Write(const void *pBuf, DWORD iSize, bool bAtOnce); + +/** + Read chunk of data from the archive. + \param pBuf + buffer to receive data + \param iSize + bytes to read + \param bAtOnce + if \c true, the specified number of bytes must be read from the same + volume (no disk change allowed) + \note Throws exceptions. +*/ + DWORD Read(void* pBuf, DWORD iSize, bool bAtOnce); + + /** + Return the position in the file, taking into account the bytes in the write buffer. + \note Throws exceptions. + */ + DWORD GetPosition() const {return (DWORD)(m_pFile->GetPosition()) + m_uBytesInWriteBuffer;} + + + /** + Flush the data from the read buffer to the disk. + \note Throws exceptions. + */ + void Flush(); + + + /** + Forces any data remaining in the file buffer to be written to the disk + */ + void FlushFile() + { + if (!m_bInMemory && !IsReadOnly()) + m_pFile->Flush(); + } + +/** + A method used to change disks during writing to the disk spanning archive. + \param iNeeded + no of bytes needed on the disk + \param lpszFileName + the archive filename + \note Throws exceptions. +*/ + void NextDisk(int iNeeded, LPCTSTR lpszFileName = NULL); + + +/** + \return a zero-based number of the current disk +*/ + int GetCurrentDisk() const {return m_iCurrentDisk;} + + +/** + Change the disk during extract operations. + \param iNumber + a zero-based disk number requested + \return +*/ + void ChangeDisk(int iNumber); + +/** + Detect the span mode. + \return + - -1 - existing disk spanning archive opened + - 0 - no disk spanning archive + - 1 - disk spanning archive in creation + +*/ + int IsSpanMode() const + { + return m_iSpanMode == noSpan ? 0 : (m_bNewSpan ? 1 : -1); + } + + /** + return \c true if the archive cannot be modified. + */ + bool IsReadOnly() + { + return m_bReadOnly || IsSpanMode() < 0; + } + +/** + + \param bAfterException + set to \c true after the library has throw an exception. + The simplified mode is used then. + In this case it'll be possible to reuse the object to operate on another + archive, but the current archive file will not be valid anyway. + \return the filepath of the archive (used by CZipArchive::Close) + \note Throws exceptions. +*/ + CZipString Close(bool bAfterException); + + + /** + The size of the write buffer. + Set before opening the archive. + It is usually set with CZipArchive::SetAdvanced + (specify this value as the first argument). + \see CZipArchive::SetAdvanced + */ + int m_iWriteBufferSize; + + + /** + The physical archive file (on a storage device). + Not used when opening archive in memory + with Open(CZipMemFile& , int). + */ + CZipFile m_internalfile; + + /** + The buffer representing the archive. + It is a physical file or a memory buffer depending on what + method was used to open the archive. In the first case it is + a pointer to #m_internalfile. + \see Open(LPCTSTR, int, int); + \see Open(CZipMemFile& mf, int) + + */ + CZipAbstractFile* m_pFile; + + /** + Takes one of the values of #ZipSpanMode. + */ + int m_iSpanMode; + + /** + A callback functor which method \c Callback is called when there is a need for a disk change + while operating on a #pkzipSpan archive. + \see CZipArchive::SetSpanCallback + */ + CZipSpanCallback* m_pChangeDiskFunc; + + /** + The signature of the extended header + */ + static char m_gszExtHeaderSignat[]; +protected: + + /** + Flush without writing. Can be used only on non-disk spanning archives. + */ + void EmptyWriteBuffer() + { + m_uBytesInWriteBuffer = 0; + } + +/** + Open a physical file. + \param lpszName + the name of the file to open + \param uFlags + file open flags + \param bThrow + if \c true then throw an exception in case of failure + \return \c true if successful +*/ + bool OpenFile(LPCTSTR lpszName, UINT uFlags, bool bThrow = true); +/** + Throw an exception with the given code. + \param err + \see CZipException::Throw +*/ + void ThrowError(int err); + +/** + Return the number of bytes left on the current volume. +*/ + DWORD VolumeLeft() const; + + /** + Rename last file in TD mode disk spanning archive when done with creating + */ + CZipString RenameLastFileInTDSpan(); +/** + Write data to the internal buffer. + \param *pBuf + the buffer to copy data from + \param uSize + bytes to write + \note Throws exceptions. +*/ + void WriteInternalBuffer(const char *pBuf, DWORD uSize); + +/** + \return the number of free bytes on the current removable disk +*/ + DWORD GetFreeVolumeSpace() const; + +/** + Call the callback functor. + Throw an exception if the callback functor's method \c Callback returns \c false. + \param iCode + a code to be passed to the callback functor + \param szTemp + a string to be used as a filename (the second argument + of CZipException::Throw) when the exception must be thrown + \note Throws exceptions. + \see CZipArchive::SetSpanCallback + \see CZipException::Throw +*/ + void CallCallback(int iCode, CZipString szTemp); + + +/** + Construct the name of the volume in #tdSpan mode. + \param bLast + must be \c true if constructing the last volume name (an extension "zip" is given) + \param lpszZipName + the name of the archive + \return + the new volume name +*/ + CZipString GetTdVolumeName(bool bLast, LPCTSTR lpszZipName = NULL) const; + + /** + Change the disk in #tdSpan mode + */ + CZipString ChangeTdRead(); + + /** + Change the disk in #pkzipSpan mode + */ + CZipString ChangePkzipRead(); + + + /** + Used only in \ref TDSpan "TD span mode" . The value it holds depends on the open mode. + - Opened existing disk spanning archive - store the number of the last + disk ( the one with "zip" extension). + - Disk spanning archive in creation - the size of the volume. + + \see CZipArchive::Open + \see CZipArchive::GetSpanMode + + */ + int m_iTdSpanData; + + /** + The extension of the last volume. + */ + CZipString m_szSpanExtension; + + /** + \return the count bytes left free in the write buffer + */ + DWORD GetFreeInBuffer() const {return m_pWriteBuffer.GetSize() - m_uBytesInWriteBuffer;} + + /** + Number of bytes available in the write buffer. + */ + DWORD m_uBytesInWriteBuffer; + +/** + The value it holds depends on the open mode: + \par + - #tdSpan : the total size of the current volume + - #pkzipSpan: a free space on the current volume +*/ + DWORD m_uCurrentVolSize; + + + /** + number of bytes left free in the write buffer + */ + DWORD m_uVolumeFreeInBuffer; + + /** + Write buffer caching data. + */ + CZipAutoBuffer m_pWriteBuffer; + + + /** + Used only during disk spanning archive creation. + Tells how many bytes have been written physically to the current volume. + */ + DWORD m_iBytesWritten; + + /** + \c True, if the current archive is a new disk spanning archive. + */ + bool m_bNewSpan; + + /** + The current disk in a disk spanning archive. + Disk no 0 is the first disk. + */ + int m_iCurrentDisk; + + /** + It is set to \e true when an archive is created in memory; \e false otherwise. + */ + bool m_bInMemory; + + /** + It is set to \e true if OpenMode::zipOpenReadOnly was specified when opening the archive + */ + bool m_bReadOnly; + +}; + +#endif // !defined(AFX_ZIPSTORAGE_H__941824FE_3320_4794_BDE3_BE334ED8984B__INCLUDED_) diff --git a/harbour/contrib/hbzlib/zipstring.h b/harbour/contrib/hbzlib/include/zipstring.h similarity index 56% rename from harbour/contrib/hbzlib/zipstring.h rename to harbour/contrib/hbzlib/include/zipstring.h index fcc8d40235..5ddd86fae9 100644 --- a/harbour/contrib/hbzlib/zipstring.h +++ b/harbour/contrib/hbzlib/include/zipstring.h @@ -1,7 +1,11 @@ -// ZipString.cpp : CZipString STL implemmentation -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. +//////////////////////////////////////////////////////////////////////////////// +// $Workfile: ZipString.h $ +// $Archive: /ZipArchive_STL/ZipString.h $ +// $Date$ $Author$ +//////////////////////////////////////////////////////////////////////////////// +// This source file is part of the ZipArchive library source distribution and +// is Copyright 2000-2003 by Tadeusz Dracz (http://www.artpol-software.com/) +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 @@ -10,7 +14,6 @@ // For the licensing details see the file License.txt //////////////////////////////////////////////////////////////////////////////// - #ifndef __ZIPSTRING_H__ #define __ZIPSTRING_H__ #include "stdafx.h" @@ -19,35 +22,42 @@ #pragma warning( push, 3 ) // STL requrements #endif +/** + If you wish the class to respect your locale (if it is different from + English), you need to set it in your program with function + std::locale::global(std::locale("")) (to set it to be the same as your + system locale) or e.g. std::locale::global(std::locale("French")) + ( to set it to a specified value); setlocale() function is not sufficient here. +*/ + + #include #include -#include #include #include +#include "ZipExport.h" - -#ifndef _vsntprintf +#ifndef __GNUC__ + #ifndef _vsntprintf #ifdef _UNICODE #define _vsntprintf _vsnwprintf #else #define _vsntprintf _vsnprintf #endif -#endif - - -#if defined _MSC_VER && !defined __BORLANDC__/*_MSC_VER may be defined in Borland after converting the VC project */ - #define _ZIPUSEFACET(loc, fac) std::use_facet(loc, (fac *)0, true) + #endif +#include #else - #define _ZIPUSEFACET(loc, fac) std::use_facet< fac > (loc) + #define _vsntprintf vsnprintf #endif + typedef std::basic_string stdbs; /** This is not a full MFC - CString replacement. For now it contains mostly the methods required by ZipArchive library. */ -class CZipString : public stdbs +class ZIP_API CZipString : public stdbs { void TrimInternalL(size_type iPos) { @@ -62,19 +72,45 @@ class CZipString : public stdbs erase (); erase(++iPos); } +#ifndef __GNUC__ static int zslen(const TCHAR* lpsz) { - return lpsz ? std::char_traits::length(lpsz) : 0; + return lpsz ? (int)std::char_traits::length(lpsz) : 0; } + static TCHAR tl(TCHAR c) + { + return std::tolower(c, std::locale()); + } + static TCHAR tu(TCHAR c) + { + return std::toupper(c, std::locale()); + } +#else +#if __GNUC__ <3 + static int zslen(const TCHAR* lpsz) + { + return lpsz ? std::string_char_traits::length(lpsz) : 0; + } +#else + static int zslen(const TCHAR* lpsz) + { + return lpsz ? std::char_traits::length(lpsz) : 0; + } + +#endif +#endif + + + public: CZipString(){} explicit CZipString (TCHAR ch, int nRepeat = 1):stdbs(nRepeat, ch){} CZipString( const CZipString& stringSrc ) {assign(stringSrc);} CZipString( const stdbs& stringSrc ) {assign(stringSrc);} - CZipString( LPCTSTR lpsz ):stdbs(lpsz){} + CZipString( LPCTSTR lpsz ){if (!lpsz) Empty(); else assign(lpsz);} operator LPCTSTR() const{return c_str();} - int GetLength() const {return size();} + int GetLength() const {return (int) size();} bool IsEmpty() const {return empty();} void Empty() {erase(begin(), end());} TCHAR GetAt (int iIndex) const{return at(iIndex);} @@ -82,9 +118,9 @@ public: void SetAt( int nIndex, TCHAR ch ) {at(nIndex) = ch;} LPTSTR GetBuffer(int nMinBufLength) { - if (size() < nMinBufLength) + if ((int)size() < nMinBufLength) resize(nMinBufLength); - return empty() ? const_cast(data()) : &(at(0)); + return empty() ? const_cast(data()) : &(at(0)); } void ReleaseBuffer( int nNewLength = -1 ) { resize(nNewLength > -1 ? nNewLength : zslen(c_str()));} void TrimLeft( TCHAR chTarget ) @@ -131,14 +167,14 @@ public: } while (true); va_end (arguments); - *this = pBuf; + *this = pBuf; free(pBuf); } void Insert( int nIndex, LPCTSTR pstr ){insert(nIndex, pstr, zslen(pstr));} void Insert( int nIndex, TCHAR ch ) {insert(nIndex, 1, ch);} int Delete( int nIndex, int nCount = 1 ) { - int iSize = size(); + int iSize = (int) size(); int iToDelete = iSize < nIndex + nCount ? iSize - nIndex : nCount; if (iToDelete > 0) { @@ -149,13 +185,23 @@ public: } void MakeLower() { - TCHAR* pBegin = &(at(0)); - _ZIPUSEFACET(std::locale(), std::ctype).tolower(pBegin, pBegin + size()); +#ifndef __GNUC__ + // use_facet doesn't work here well (doesn't convert all the local characters properly) + std::transform(begin(),end(),begin(),tl); +#else + + std::transform(begin(),end(),begin(),tolower); +#endif } void MakeUpper() { - TCHAR* pBegin = &(at(0)); - _ZIPUSEFACET(std::locale(), std::ctype).toupper(pBegin, pBegin + size()); +#ifndef __GNUC__ + // use_facet doesn't work here well (doesn't convert all the local characters properly) + std::transform(begin(),end(),begin(),tu); +#else + std::transform(begin(),end(),begin(),toupper); +#endif + } void MakeReverse() { @@ -165,14 +211,24 @@ public: CZipString Left( int nCount ) const { return substr(0, nCount);} CZipString Right( int nCount) const { - nCount = size() < nCount ? size() : nCount; + nCount = (int)size() < nCount ? (int)size() : nCount; return substr(size() - nCount); } CZipString Mid( int nFirst ) const {return substr(nFirst);} CZipString Mid( int nFirst, int nCount ) const {return substr(nFirst, nCount);} int Collate( LPCTSTR lpsz ) const { - return _ZIPUSEFACET(std::locale(), std::collate).compare(c_str(), c_str() + size(), lpsz, lpsz + zslen(lpsz)); +#ifndef __GNUC__ + #ifdef _UNICODE + return wcscoll(c_str(), lpsz); + #else + return strcoll(c_str(), lpsz); + #endif +#else +// return compare(lpsz); + return strcoll(c_str(), lpsz); +#endif + } int CollateNoCase( LPCTSTR lpsz ) const { @@ -196,16 +252,57 @@ public: { return Compare(lpsz) != 0; } + #if __GNUC__ >=3 + #else bool operator == (LPCTSTR lpsz) { return Compare(lpsz) == 0; } + #endif + + int Find( TCHAR ch, int nStart = 0) const + { + return (int) find(ch, nStart); + } + + int Find( LPCTSTR pstr, int nStart = 0) const + { + return (int) find(pstr, nStart); + } + + int Replace( TCHAR chOld, TCHAR chNew ) + { + int iCount = 0; + for (iterator it = begin(); it != end(); ++it) + if (*it == chOld) + { + *it = chNew; + iCount++; + } + return iCount; + } + + + }; +/** + A poiter type to point to CZipString to Collate or CollateNoCase + or Compare or CompareNoCase +*/ +typedef int (CZipString::*ZIPSTRINGCOMPARE)( LPCTSTR ) const; + +/** + return a pointer to the function in CZipString structure, + used to compare elements depending on the arguments +*/ + ZIP_API ZIPSTRINGCOMPARE GetCZipStrCompFunc(bool bCaseSensitive, bool bCollate = true); + + #if defined(_MSC_VER) && (_MSC_VER > 1100) #pragma warning( pop) #endif -#endif //__ZIPSTRING_H__ \ No newline at end of file +#endif //__ZIPSTRING_H__ diff --git a/harbour/contrib/hbzlib/zutil.h b/harbour/contrib/hbzlib/include/zutil.h similarity index 95% rename from harbour/contrib/hbzlib/zutil.h rename to harbour/contrib/hbzlib/include/zutil.h index 6f2cb97ca1..5cf5d5f2ef 100644 --- a/harbour/contrib/hbzlib/zutil.h +++ b/harbour/contrib/hbzlib/include/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-1998 Jean-loup Gailly. + * Copyright (C) 1995-2002 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -13,7 +13,7 @@ #ifndef _Z_UTIL_H #define _Z_UTIL_H -#include "zlib.h" +#include "hbcomprs.h" #ifdef STDC # include @@ -206,15 +206,13 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ # define Tracecv(c,x) #endif +typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf, uInt len)); -typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf, - uInt len)); voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); void zcfree OF((voidpf opaque, voidpf ptr)); -#define ZALLOC(strm, items, size) \ - (*((strm)->zalloc))((strm)->opaque, (items), (size)) -#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) +#define ZALLOC(strm, items, size) (*((strm)->zalloc))((strm)->opaque, (items), (size)) +#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) #define TRY_FREE(s, p) {if (p) ZFREE(s, p);} #endif /* _Z_UTIL_H */ diff --git a/harbour/contrib/hbzlib/infblock.c b/harbour/contrib/hbzlib/infblock.c deleted file mode 100644 index f4920faa5e..0000000000 --- a/harbour/contrib/hbzlib/infblock.c +++ /dev/null @@ -1,398 +0,0 @@ -/* infblock.c -- interpret and process block types to last block - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "infblock.h" -#include "inftrees.h" -#include "infcodes.h" -#include "infutil.h" - -struct inflate_codes_state {int dummy;}; /* for buggy compilers */ - -/* simplify the use of the inflate_huft type with some defines */ -#define exop word.what.Exop -#define bits word.what.Bits - -/* Table for deflate from PKZIP's appnote.txt. */ -local const uInt border[] = { /* Order of the bit length code lengths */ - 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - -/* - Notes beyond the 1.93a appnote.txt: - - 1. Distance pointers never point before the beginning of the output - stream. - 2. Distance pointers can point back across blocks, up to 32k away. - 3. There is an implied maximum of 7 bits for the bit length table and - 15 bits for the actual data. - 4. If only one code exists, then it is encoded using one bit. (Zero - would be more efficient, but perhaps a little confusing.) If two - codes exist, they are coded using one bit each (0 and 1). - 5. There is no way of sending zero distance codes--a dummy must be - sent if there are none. (History: a pre 2.0 version of PKZIP would - store blocks with no distance codes, but this was discovered to be - too harsh a criterion.) Valid only for 1.93a. 2.04c does allow - zero distance codes, which is sent as one code of zero bits in - length. - 6. There are up to 286 literal/length codes. Code 256 represents the - end-of-block. Note however that the static length tree defines - 288 codes just to fill out the Huffman codes. Codes 286 and 287 - cannot be used though, since there is no length base or extra bits - defined for them. Similarily, there are up to 30 distance codes. - However, static trees define 32 codes (all 5 bits) to fill out the - Huffman codes, but the last two had better not show up in the data. - 7. Unzip can check dynamic Huffman blocks for complete code sets. - The exception is that a single code would not be complete (see #4). - 8. The five bits following the block type is really the number of - literal codes sent minus 257. - 9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits - (1+6+6). Therefore, to output three times the length, you output - three codes (1+1+1), whereas to output four times the same length, - you only need two codes (1+3). Hmm. - 10. In the tree reconstruction algorithm, Code = Code + Increment - only if BitLength(i) is not zero. (Pretty obvious.) - 11. Correction: 4 Bits: # of Bit Length codes - 4 (4 - 19) - 12. Note: length code 284 can represent 227-258, but length code 285 - really is 258. The last length deserves its own, short code - since it gets used a lot in very redundant files. The length - 258 is special since 258 - 3 (the min match length) is 255. - 13. The literal/length and distance code bit lengths are read as a - single stream of lengths. It is possible (and advantageous) for - a repeat code (16, 17, or 18) to go across the boundary between - the two sets of lengths. - */ - - -void inflate_blocks_reset(s, z, c) -inflate_blocks_statef *s; -z_streamp z; -uLongf *c; -{ - if (c != Z_NULL) - *c = s->check; - if (s->mode == BTREE || s->mode == DTREE) - ZFREE(z, s->sub.trees.blens); - if (s->mode == CODES) - inflate_codes_free(s->sub.decode.codes, z); - s->mode = TYPE; - s->bitk = 0; - s->bitb = 0; - s->read = s->write = s->window; - if (s->checkfn != Z_NULL) - z->adler = s->check = (*s->checkfn)(0L, (const Bytef *)Z_NULL, 0); - Tracev((stderr, "inflate: blocks reset\n")); -} - - -inflate_blocks_statef *inflate_blocks_new(z, c, w) -z_streamp z; -check_func c; -uInt w; -{ - inflate_blocks_statef *s; - - if ((s = (inflate_blocks_statef *)ZALLOC - (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL) - return s; - if ((s->hufts = - (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL) - { - ZFREE(z, s); - return Z_NULL; - } - if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL) - { - ZFREE(z, s->hufts); - ZFREE(z, s); - return Z_NULL; - } - s->end = s->window + w; - s->checkfn = c; - s->mode = TYPE; - Tracev((stderr, "inflate: blocks allocated\n")); - inflate_blocks_reset(s, z, Z_NULL); - return s; -} - - -int inflate_blocks(s, z, r) -inflate_blocks_statef *s; -z_streamp z; -int r; -{ - uInt t; /* temporary storage */ - uLong b; /* bit buffer */ - uInt k; /* bits in bit buffer */ - Bytef *p; /* input data pointer */ - uInt n; /* bytes available there */ - Bytef *q; /* output window write pointer */ - uInt m; /* bytes to end of window or read pointer */ - - /* copy input/output information to locals (UPDATE macro restores) */ - LOAD - - /* process input based on current state */ - while (1) switch (s->mode) - { - case TYPE: - NEEDBITS(3) - t = (uInt)b & 7; - s->last = t & 1; - switch (t >> 1) - { - case 0: /* stored */ - Tracev((stderr, "inflate: stored block%s\n", - s->last ? " (last)" : "")); - DUMPBITS(3) - t = k & 7; /* go to byte boundary */ - DUMPBITS(t) - s->mode = LENS; /* get length of stored block */ - break; - case 1: /* fixed */ - Tracev((stderr, "inflate: fixed codes block%s\n", - s->last ? " (last)" : "")); - { - uInt bl, bd; - inflate_huft *tl, *td; - - inflate_trees_fixed(&bl, &bd, &tl, &td, z); - s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z); - if (s->sub.decode.codes == Z_NULL) - { - r = Z_MEM_ERROR; - LEAVE - } - } - DUMPBITS(3) - s->mode = CODES; - break; - case 2: /* dynamic */ - Tracev((stderr, "inflate: dynamic codes block%s\n", - s->last ? " (last)" : "")); - DUMPBITS(3) - s->mode = TABLE; - break; - case 3: /* illegal */ - DUMPBITS(3) - s->mode = BAD; - z->msg = (char*)"invalid block type"; - r = Z_DATA_ERROR; - LEAVE - } - break; - case LENS: - NEEDBITS(32) - if ((((~b) >> 16) & 0xffff) != (b & 0xffff)) - { - s->mode = BAD; - z->msg = (char*)"invalid stored block lengths"; - r = Z_DATA_ERROR; - LEAVE - } - s->sub.left = (uInt)b & 0xffff; - b = k = 0; /* dump bits */ - Tracev((stderr, "inflate: stored length %u\n", s->sub.left)); - s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE); - break; - case STORED: - if (n == 0) - LEAVE - NEEDOUT - t = s->sub.left; - if (t > n) t = n; - if (t > m) t = m; - zmemcpy(q, p, t); - p += t; n -= t; - q += t; m -= t; - if ((s->sub.left -= t) != 0) - break; - Tracev((stderr, "inflate: stored end, %lu total out\n", - z->total_out + (q >= s->read ? q - s->read : - (s->end - s->read) + (q - s->window)))); - s->mode = s->last ? DRY : TYPE; - break; - case TABLE: - NEEDBITS(14) - s->sub.trees.table = t = (uInt)b & 0x3fff; -#ifndef PKZIP_BUG_WORKAROUND - if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29) - { - s->mode = BAD; - z->msg = (char*)"too many length or distance symbols"; - r = Z_DATA_ERROR; - LEAVE - } -#endif - t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f); - if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL) - { - r = Z_MEM_ERROR; - LEAVE - } - DUMPBITS(14) - s->sub.trees.index = 0; - Tracev((stderr, "inflate: table sizes ok\n")); - s->mode = BTREE; - case BTREE: - while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10)) - { - NEEDBITS(3) - s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7; - DUMPBITS(3) - } - while (s->sub.trees.index < 19) - s->sub.trees.blens[border[s->sub.trees.index++]] = 0; - s->sub.trees.bb = 7; - t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb, - &s->sub.trees.tb, s->hufts, z); - if (t != Z_OK) - { - ZFREE(z, s->sub.trees.blens); - r = t; - if (r == Z_DATA_ERROR) - s->mode = BAD; - LEAVE - } - s->sub.trees.index = 0; - Tracev((stderr, "inflate: bits tree ok\n")); - s->mode = DTREE; - case DTREE: - while (t = s->sub.trees.table, - s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f)) - { - inflate_huft *h; - uInt i, j, c; - - t = s->sub.trees.bb; - NEEDBITS(t) - h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]); - t = h->bits; - c = h->base; - if (c < 16) - { - DUMPBITS(t) - s->sub.trees.blens[s->sub.trees.index++] = c; - } - else /* c == 16..18 */ - { - i = c == 18 ? 7 : c - 14; - j = c == 18 ? 11 : 3; - NEEDBITS(t + i) - DUMPBITS(t) - j += (uInt)b & inflate_mask[i]; - DUMPBITS(i) - i = s->sub.trees.index; - t = s->sub.trees.table; - if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) || - (c == 16 && i < 1)) - { - ZFREE(z, s->sub.trees.blens); - s->mode = BAD; - z->msg = (char*)"invalid bit length repeat"; - r = Z_DATA_ERROR; - LEAVE - } - c = c == 16 ? s->sub.trees.blens[i - 1] : 0; - do { - s->sub.trees.blens[i++] = c; - } while (--j); - s->sub.trees.index = i; - } - } - s->sub.trees.tb = Z_NULL; - { - uInt bl, bd; - inflate_huft *tl, *td; - inflate_codes_statef *c; - - bl = 9; /* must be <= 9 for lookahead assumptions */ - bd = 6; /* must be <= 9 for lookahead assumptions */ - t = s->sub.trees.table; - t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), - s->sub.trees.blens, &bl, &bd, &tl, &td, - s->hufts, z); - ZFREE(z, s->sub.trees.blens); - if (t != Z_OK) - { - if (t == (uInt)Z_DATA_ERROR) - s->mode = BAD; - r = t; - LEAVE - } - Tracev((stderr, "inflate: trees ok\n")); - if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL) - { - r = Z_MEM_ERROR; - LEAVE - } - s->sub.decode.codes = c; - } - s->mode = CODES; - case CODES: - UPDATE - if ((r = inflate_codes(s, z, r)) != Z_STREAM_END) - return inflate_flush(s, z, r); - r = Z_OK; - inflate_codes_free(s->sub.decode.codes, z); - LOAD - Tracev((stderr, "inflate: codes end, %lu total out\n", - z->total_out + (q >= s->read ? q - s->read : - (s->end - s->read) + (q - s->window)))); - if (!s->last) - { - s->mode = TYPE; - break; - } - s->mode = DRY; - case DRY: - FLUSH - if (s->read != s->write) - LEAVE - s->mode = DONE; - case DONE: - r = Z_STREAM_END; - LEAVE - case BAD: - r = Z_DATA_ERROR; - LEAVE - default: - r = Z_STREAM_ERROR; - LEAVE - } -} - - -int inflate_blocks_free(s, z) -inflate_blocks_statef *s; -z_streamp z; -{ - inflate_blocks_reset(s, z, Z_NULL); - ZFREE(z, s->window); - ZFREE(z, s->hufts); - ZFREE(z, s); - Tracev((stderr, "inflate: blocks freed\n")); - return Z_OK; -} - - -void inflate_set_dictionary(s, d, n) -inflate_blocks_statef *s; -const Bytef *d; -uInt n; -{ - zmemcpy(s->window, d, n); - s->read = s->write = s->window + n; -} - - -/* Returns true if inflate is currently at the end of a block generated - * by Z_SYNC_FLUSH or Z_FULL_FLUSH. - * IN assertion: s != Z_NULL - */ -int inflate_blocks_sync_point(s) -inflate_blocks_statef *s; -{ - return s->mode == LENS; -} diff --git a/harbour/contrib/hbzlib/infblock.h b/harbour/contrib/hbzlib/infblock.h deleted file mode 100644 index bd25c80753..0000000000 --- a/harbour/contrib/hbzlib/infblock.h +++ /dev/null @@ -1,39 +0,0 @@ -/* infblock.h -- header to use infblock.c - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -struct inflate_blocks_state; -typedef struct inflate_blocks_state FAR inflate_blocks_statef; - -extern inflate_blocks_statef * inflate_blocks_new OF(( - z_streamp z, - check_func c, /* check function */ - uInt w)); /* window size */ - -extern int inflate_blocks OF(( - inflate_blocks_statef *, - z_streamp , - int)); /* initial return code */ - -extern void inflate_blocks_reset OF(( - inflate_blocks_statef *, - z_streamp , - uLongf *)); /* check value on output */ - -extern int inflate_blocks_free OF(( - inflate_blocks_statef *, - z_streamp)); - -extern void inflate_set_dictionary OF(( - inflate_blocks_statef *s, - const Bytef *d, /* dictionary */ - uInt n)); /* dictionary length */ - -extern int inflate_blocks_sync_point OF(( - inflate_blocks_statef *s)); diff --git a/harbour/contrib/hbzlib/infcodes.c b/harbour/contrib/hbzlib/infcodes.c deleted file mode 100644 index d4e5ee9a55..0000000000 --- a/harbour/contrib/hbzlib/infcodes.c +++ /dev/null @@ -1,257 +0,0 @@ -/* infcodes.c -- process literals and length/distance pairs - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "inftrees.h" -#include "infblock.h" -#include "infcodes.h" -#include "infutil.h" -#include "inffast.h" - -/* simplify the use of the inflate_huft type with some defines */ -#define exop word.what.Exop -#define bits word.what.Bits - -typedef enum { /* waiting for "i:"=input, "o:"=output, "x:"=nothing */ - START, /* x: set up for LEN */ - LEN, /* i: get length/literal/eob next */ - LENEXT, /* i: getting length extra (have base) */ - DIST, /* i: get distance next */ - DISTEXT, /* i: getting distance extra */ - COPY, /* o: copying bytes in window, waiting for space */ - LIT, /* o: got literal, waiting for output space */ - WASH, /* o: got eob, possibly still output waiting */ - END, /* x: got eob and all data flushed */ - BADCODE} /* x: got error */ -inflate_codes_mode; - -/* inflate codes private state */ -struct inflate_codes_state { - - /* mode */ - inflate_codes_mode mode; /* current inflate_codes mode */ - - /* mode dependent information */ - uInt len; - union { - struct { - inflate_huft *tree; /* pointer into tree */ - uInt need; /* bits needed */ - } code; /* if LEN or DIST, where in tree */ - uInt lit; /* if LIT, literal */ - struct { - uInt get; /* bits to get for extra */ - uInt dist; /* distance back to copy from */ - } copy; /* if EXT or COPY, where and how much */ - } sub; /* submode */ - - /* mode independent information */ - Byte lbits; /* ltree bits decoded per branch */ - Byte dbits; /* dtree bits decoder per branch */ - inflate_huft *ltree; /* literal/length/eob tree */ - inflate_huft *dtree; /* distance tree */ - -}; - - -inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z) -uInt bl, bd; -inflate_huft *tl; -inflate_huft *td; /* need separate declaration for Borland C++ */ -z_streamp z; -{ - inflate_codes_statef *c; - - if ((c = (inflate_codes_statef *) - ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL) - { - c->mode = START; - c->lbits = (Byte)bl; - c->dbits = (Byte)bd; - c->ltree = tl; - c->dtree = td; - Tracev((stderr, "inflate: codes new\n")); - } - return c; -} - - -int inflate_codes(s, z, r) -inflate_blocks_statef *s; -z_streamp z; -int r; -{ - uInt j; /* temporary storage */ - inflate_huft *t; /* temporary pointer */ - uInt e; /* extra bits or operation */ - uLong b; /* bit buffer */ - uInt k; /* bits in bit buffer */ - Bytef *p; /* input data pointer */ - uInt n; /* bytes available there */ - Bytef *q; /* output window write pointer */ - uInt m; /* bytes to end of window or read pointer */ - Bytef *f; /* pointer to copy strings from */ - inflate_codes_statef *c = s->sub.decode.codes; /* codes state */ - - /* copy input/output information to locals (UPDATE macro restores) */ - LOAD - - /* process input and output based on current state */ - while (1) switch (c->mode) - { /* waiting for "i:"=input, "o:"=output, "x:"=nothing */ - case START: /* x: set up for LEN */ -#ifndef SLOW - if (m >= 258 && n >= 10) - { - UPDATE - r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z); - LOAD - if (r != Z_OK) - { - c->mode = r == Z_STREAM_END ? WASH : BADCODE; - break; - } - } -#endif /* !SLOW */ - c->sub.code.need = c->lbits; - c->sub.code.tree = c->ltree; - c->mode = LEN; - case LEN: /* i: get length/literal/eob next */ - j = c->sub.code.need; - NEEDBITS(j) - t = c->sub.code.tree + ((uInt)b & inflate_mask[j]); - DUMPBITS(t->bits) - e = (uInt)(t->exop); - if (e == 0) /* literal */ - { - c->sub.lit = t->base; - Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", t->base)); - c->mode = LIT; - break; - } - if (e & 16) /* length */ - { - c->sub.copy.get = e & 15; - c->len = t->base; - c->mode = LENEXT; - break; - } - if ((e & 64) == 0) /* next table */ - { - c->sub.code.need = e; - c->sub.code.tree = t + t->base; - break; - } - if (e & 32) /* end of block */ - { - Tracevv((stderr, "inflate: end of block\n")); - c->mode = WASH; - break; - } - c->mode = BADCODE; /* invalid code */ - z->msg = (char*)"invalid literal/length code"; - r = Z_DATA_ERROR; - LEAVE - case LENEXT: /* i: getting length extra (have base) */ - j = c->sub.copy.get; - NEEDBITS(j) - c->len += (uInt)b & inflate_mask[j]; - DUMPBITS(j) - c->sub.code.need = c->dbits; - c->sub.code.tree = c->dtree; - Tracevv((stderr, "inflate: length %u\n", c->len)); - c->mode = DIST; - case DIST: /* i: get distance next */ - j = c->sub.code.need; - NEEDBITS(j) - t = c->sub.code.tree + ((uInt)b & inflate_mask[j]); - DUMPBITS(t->bits) - e = (uInt)(t->exop); - if (e & 16) /* distance */ - { - c->sub.copy.get = e & 15; - c->sub.copy.dist = t->base; - c->mode = DISTEXT; - break; - } - if ((e & 64) == 0) /* next table */ - { - c->sub.code.need = e; - c->sub.code.tree = t + t->base; - break; - } - c->mode = BADCODE; /* invalid code */ - z->msg = (char*)"invalid distance code"; - r = Z_DATA_ERROR; - LEAVE - case DISTEXT: /* i: getting distance extra */ - j = c->sub.copy.get; - NEEDBITS(j) - c->sub.copy.dist += (uInt)b & inflate_mask[j]; - DUMPBITS(j) - Tracevv((stderr, "inflate: distance %u\n", c->sub.copy.dist)); - c->mode = COPY; - case COPY: /* o: copying bytes in window, waiting for space */ -#ifndef __TURBOC__ /* Turbo C bug for following expression */ - f = (uInt)(q - s->window) < c->sub.copy.dist ? - s->end - (c->sub.copy.dist - (q - s->window)) : - q - c->sub.copy.dist; -#else - f = q - c->sub.copy.dist; - if ((uInt)(q - s->window) < c->sub.copy.dist) - f = s->end - (c->sub.copy.dist - (uInt)(q - s->window)); -#endif - while (c->len) - { - NEEDOUT - OUTBYTE(*f++) - if (f == s->end) - f = s->window; - c->len--; - } - c->mode = START; - break; - case LIT: /* o: got literal, waiting for output space */ - NEEDOUT - OUTBYTE(c->sub.lit) - c->mode = START; - break; - case WASH: /* o: got eob, possibly more output */ - if (k > 7) /* return unused byte, if any */ - { - Assert(k < 16, "inflate_codes grabbed too many bytes") - k -= 8; - n++; - p--; /* can always return one */ - } - FLUSH - if (s->read != s->write) - LEAVE - c->mode = END; - case END: - r = Z_STREAM_END; - LEAVE - case BADCODE: /* x: got error */ - r = Z_DATA_ERROR; - LEAVE - default: - r = Z_STREAM_ERROR; - LEAVE - } -#ifdef NEED_DUMMY_RETURN - return Z_STREAM_ERROR; /* Some dumb compilers complain without this */ -#endif -} - - -void inflate_codes_free(c, z) -inflate_codes_statef *c; -z_streamp z; -{ - ZFREE(z, c); - Tracev((stderr, "inflate: codes free\n")); -} diff --git a/harbour/contrib/hbzlib/infcodes.h b/harbour/contrib/hbzlib/infcodes.h deleted file mode 100644 index 6c750d896f..0000000000 --- a/harbour/contrib/hbzlib/infcodes.h +++ /dev/null @@ -1,27 +0,0 @@ -/* infcodes.h -- header to use infcodes.c - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -struct inflate_codes_state; -typedef struct inflate_codes_state FAR inflate_codes_statef; - -extern inflate_codes_statef *inflate_codes_new OF(( - uInt, uInt, - inflate_huft *, inflate_huft *, - z_streamp )); - -extern int inflate_codes OF(( - inflate_blocks_statef *, - z_streamp , - int)); - -extern void inflate_codes_free OF(( - inflate_codes_statef *, - z_streamp )); - diff --git a/harbour/contrib/hbzlib/inffast.c b/harbour/contrib/hbzlib/inffast.c deleted file mode 100644 index 61a78ee933..0000000000 --- a/harbour/contrib/hbzlib/inffast.c +++ /dev/null @@ -1,170 +0,0 @@ -/* inffast.c -- process literals and length/distance pairs fast - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "inftrees.h" -#include "infblock.h" -#include "infcodes.h" -#include "infutil.h" -#include "inffast.h" - -struct inflate_codes_state {int dummy;}; /* for buggy compilers */ - -/* simplify the use of the inflate_huft type with some defines */ -#define exop word.what.Exop -#define bits word.what.Bits - -/* macros for bit input with no checking and for returning unused bytes */ -#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<avail_in-n;c=(k>>3)>3:c;n+=c;p-=c;k-=c<<3;} - -/* Called with number of bytes left to write in window at least 258 - (the maximum string length) and number of input bytes available - at least ten. The ten bytes are six bytes for the longest length/ - distance pair plus four bytes for overloading the bit buffer. */ - -int inflate_fast(bl, bd, tl, td, s, z) -uInt bl, bd; -inflate_huft *tl; -inflate_huft *td; /* need separate declaration for Borland C++ */ -inflate_blocks_statef *s; -z_streamp z; -{ - inflate_huft *t; /* temporary pointer */ - uInt e; /* extra bits or operation */ - uLong b; /* bit buffer */ - uInt k; /* bits in bit buffer */ - Bytef *p; /* input data pointer */ - uInt n; /* bytes available there */ - Bytef *q; /* output window write pointer */ - uInt m; /* bytes to end of window or read pointer */ - uInt ml; /* mask for literal/length tree */ - uInt md; /* mask for distance tree */ - uInt c; /* bytes to copy */ - uInt d; /* distance back to copy from */ - Bytef *r; /* copy source pointer */ - - /* load input, output, bit values */ - LOAD - - /* initialize masks */ - ml = inflate_mask[bl]; - md = inflate_mask[bd]; - - /* do until not enough input or output space for fast loop */ - do { /* assume called with m >= 258 && n >= 10 */ - /* get literal/length code */ - GRABBITS(20) /* max bits for literal/length code */ - if ((e = (t = tl + ((uInt)b & ml))->exop) == 0) - { - DUMPBITS(t->bits) - Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ? - "inflate: * literal '%c'\n" : - "inflate: * literal 0x%02x\n", t->base)); - *q++ = (Byte)t->base; - m--; - continue; - } - do { - DUMPBITS(t->bits) - if (e & 16) - { - /* get extra bits for length */ - e &= 15; - c = t->base + ((uInt)b & inflate_mask[e]); - DUMPBITS(e) - Tracevv((stderr, "inflate: * length %u\n", c)); - - /* decode distance base of block to copy */ - GRABBITS(15); /* max bits for distance code */ - e = (t = td + ((uInt)b & md))->exop; - do { - DUMPBITS(t->bits) - if (e & 16) - { - /* get extra bits to add to distance base */ - e &= 15; - GRABBITS(e) /* get extra bits (up to 13) */ - d = t->base + ((uInt)b & inflate_mask[e]); - DUMPBITS(e) - Tracevv((stderr, "inflate: * distance %u\n", d)); - - /* do the copy */ - m -= c; - if ((uInt)(q - s->window) >= d) /* offset before dest */ - { /* just copy */ - r = q - d; - *q++ = *r++; c--; /* minimum count is three, */ - *q++ = *r++; c--; /* so unroll loop a little */ - } - else /* else offset after destination */ - { - e = d - (uInt)(q - s->window); /* bytes from offset to end */ - r = s->end - e; /* pointer to offset */ - if (c > e) /* if source crosses, */ - { - c -= e; /* copy to end of window */ - do { - *q++ = *r++; - } while (--e); - r = s->window; /* copy rest from start of window */ - } - } - do { /* copy all or what's left */ - *q++ = *r++; - } while (--c); - break; - } - else if ((e & 64) == 0) - { - t += t->base; - e = (t += ((uInt)b & inflate_mask[e]))->exop; - } - else - { - z->msg = (char*)"invalid distance code"; - UNGRAB - UPDATE - return Z_DATA_ERROR; - } - } while (1); - break; - } - if ((e & 64) == 0) - { - t += t->base; - if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0) - { - DUMPBITS(t->bits) - Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ? - "inflate: * literal '%c'\n" : - "inflate: * literal 0x%02x\n", t->base)); - *q++ = (Byte)t->base; - m--; - break; - } - } - else if (e & 32) - { - Tracevv((stderr, "inflate: * end of block\n")); - UNGRAB - UPDATE - return Z_STREAM_END; - } - else - { - z->msg = (char*)"invalid literal/length code"; - UNGRAB - UPDATE - return Z_DATA_ERROR; - } - } while (1); - } while (m >= 258 && n >= 10); - - /* not enough input or output--restore pointers and return */ - UNGRAB - UPDATE - return Z_OK; -} diff --git a/harbour/contrib/hbzlib/inffast.h b/harbour/contrib/hbzlib/inffast.h deleted file mode 100644 index 8facec5531..0000000000 --- a/harbour/contrib/hbzlib/inffast.h +++ /dev/null @@ -1,17 +0,0 @@ -/* inffast.h -- header to use inffast.c - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -extern int inflate_fast OF(( - uInt, - uInt, - inflate_huft *, - inflate_huft *, - inflate_blocks_statef *, - z_streamp )); diff --git a/harbour/contrib/hbzlib/inffixed.h b/harbour/contrib/hbzlib/inffixed.h deleted file mode 100644 index 77f7e76314..0000000000 --- a/harbour/contrib/hbzlib/inffixed.h +++ /dev/null @@ -1,151 +0,0 @@ -/* inffixed.h -- table for decoding fixed codes - * Generated automatically by the maketree.c program - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -local uInt fixed_bl = 9; -local uInt fixed_bd = 5; -local inflate_huft fixed_tl[] = { - {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115}, - {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192}, - {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160}, - {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224}, - {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144}, - {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208}, - {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176}, - {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240}, - {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227}, - {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200}, - {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168}, - {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232}, - {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152}, - {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216}, - {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184}, - {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248}, - {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163}, - {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196}, - {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164}, - {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228}, - {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148}, - {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212}, - {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180}, - {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244}, - {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0}, - {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204}, - {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172}, - {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236}, - {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156}, - {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220}, - {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188}, - {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252}, - {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131}, - {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194}, - {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162}, - {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226}, - {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146}, - {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210}, - {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178}, - {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242}, - {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258}, - {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202}, - {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170}, - {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234}, - {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154}, - {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218}, - {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186}, - {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250}, - {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195}, - {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198}, - {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166}, - {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230}, - {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150}, - {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214}, - {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182}, - {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246}, - {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0}, - {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206}, - {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174}, - {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238}, - {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158}, - {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222}, - {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190}, - {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254}, - {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115}, - {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193}, - {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161}, - {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225}, - {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145}, - {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209}, - {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177}, - {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241}, - {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227}, - {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201}, - {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169}, - {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233}, - {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153}, - {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217}, - {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185}, - {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249}, - {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163}, - {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197}, - {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165}, - {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229}, - {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149}, - {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213}, - {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181}, - {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245}, - {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0}, - {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205}, - {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173}, - {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237}, - {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157}, - {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221}, - {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189}, - {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253}, - {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131}, - {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195}, - {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163}, - {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227}, - {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147}, - {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211}, - {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179}, - {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243}, - {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258}, - {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203}, - {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171}, - {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235}, - {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155}, - {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219}, - {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187}, - {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251}, - {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195}, - {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199}, - {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167}, - {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231}, - {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151}, - {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215}, - {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183}, - {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247}, - {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0}, - {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207}, - {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175}, - {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239}, - {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159}, - {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223}, - {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191}, - {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255} - }; -local inflate_huft fixed_td[] = { - {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097}, - {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385}, - {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193}, - {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577}, - {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145}, - {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577}, - {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289}, - {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577} - }; diff --git a/harbour/contrib/hbzlib/inflate.c b/harbour/contrib/hbzlib/inflate.c deleted file mode 100644 index 32e9b8de67..0000000000 --- a/harbour/contrib/hbzlib/inflate.c +++ /dev/null @@ -1,366 +0,0 @@ -/* inflate.c -- zlib interface to inflate modules - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "infblock.h" - -struct inflate_blocks_state {int dummy;}; /* for buggy compilers */ - -typedef enum { - METHOD, /* waiting for method byte */ - FLAG, /* waiting for flag byte */ - DICT4, /* four dictionary check bytes to go */ - DICT3, /* three dictionary check bytes to go */ - DICT2, /* two dictionary check bytes to go */ - DICT1, /* one dictionary check byte to go */ - DICT0, /* waiting for inflateSetDictionary */ - BLOCKS, /* decompressing blocks */ - CHECK4, /* four check bytes to go */ - CHECK3, /* three check bytes to go */ - CHECK2, /* two check bytes to go */ - CHECK1, /* one check byte to go */ - DONE, /* finished check, done */ - BAD} /* got an error--stay here */ -inflate_mode; - -/* inflate private state */ -struct internal_state { - - /* mode */ - inflate_mode mode; /* current inflate mode */ - - /* mode dependent information */ - union { - uInt method; /* if FLAGS, method byte */ - struct { - uLong was; /* computed check value */ - uLong need; /* stream check value */ - } check; /* if CHECK, check values to compare */ - uInt marker; /* if BAD, inflateSync's marker bytes count */ - } sub; /* submode */ - - /* mode independent information */ - int nowrap; /* flag for no wrapper */ - uInt wbits; /* log2(window size) (8..15, defaults to 15) */ - inflate_blocks_statef - *blocks; /* current inflate_blocks state */ - -}; - - -int ZEXPORT inflateReset(z) -z_streamp z; -{ - if (z == Z_NULL || z->state == Z_NULL) - return Z_STREAM_ERROR; - z->total_in = z->total_out = 0; - z->msg = Z_NULL; - z->state->mode = z->state->nowrap ? BLOCKS : METHOD; - inflate_blocks_reset(z->state->blocks, z, Z_NULL); - Tracev((stderr, "inflate: reset\n")); - return Z_OK; -} - - -int ZEXPORT inflateEnd(z) -z_streamp z; -{ - if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL) - return Z_STREAM_ERROR; - if (z->state->blocks != Z_NULL) - inflate_blocks_free(z->state->blocks, z); - ZFREE(z, z->state); - z->state = Z_NULL; - Tracev((stderr, "inflate: end\n")); - return Z_OK; -} - - -int ZEXPORT inflateInit2_(z, w, version, stream_size) -z_streamp z; -int w; -const char *version; -int stream_size; -{ - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - stream_size != sizeof(z_stream)) - return Z_VERSION_ERROR; - - /* initialize state */ - if (z == Z_NULL) - return Z_STREAM_ERROR; - z->msg = Z_NULL; - if (z->zalloc == Z_NULL) - { - z->zalloc = zcalloc; - z->opaque = (voidpf)0; - } - if (z->zfree == Z_NULL) z->zfree = zcfree; - if ((z->state = (struct internal_state FAR *) - ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL) - return Z_MEM_ERROR; - z->state->blocks = Z_NULL; - - /* handle undocumented nowrap option (no zlib header or check) */ - z->state->nowrap = 0; - if (w < 0) - { - w = - w; - z->state->nowrap = 1; - } - - /* set window size */ - if (w < 8 || w > 15) - { - inflateEnd(z); - return Z_STREAM_ERROR; - } - z->state->wbits = (uInt)w; - - /* create inflate_blocks state */ - if ((z->state->blocks = - inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, (uInt)1 << w)) - == Z_NULL) - { - inflateEnd(z); - return Z_MEM_ERROR; - } - Tracev((stderr, "inflate: allocated\n")); - - /* reset state */ - inflateReset(z); - return Z_OK; -} - - -int ZEXPORT inflateInit_(z, version, stream_size) -z_streamp z; -const char *version; -int stream_size; -{ - return inflateInit2_(z, DEF_WBITS, version, stream_size); -} - - -#define NEEDBYTE {if(z->avail_in==0)return r;r=f;} -#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++) - -int ZEXPORT inflate(z, f) -z_streamp z; -int f; -{ - int r; - uInt b; - - if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL) - return Z_STREAM_ERROR; - f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK; - r = Z_BUF_ERROR; - while (1) switch (z->state->mode) - { - case METHOD: - NEEDBYTE - if (((z->state->sub.method = NEXTBYTE) & 0xf) != Z_DEFLATED) - { - z->state->mode = BAD; - z->msg = (char*)"unknown compression method"; - z->state->sub.marker = 5; /* can't try inflateSync */ - break; - } - if ((z->state->sub.method >> 4) + 8 > z->state->wbits) - { - z->state->mode = BAD; - z->msg = (char*)"invalid window size"; - z->state->sub.marker = 5; /* can't try inflateSync */ - break; - } - z->state->mode = FLAG; - case FLAG: - NEEDBYTE - b = NEXTBYTE; - if (((z->state->sub.method << 8) + b) % 31) - { - z->state->mode = BAD; - z->msg = (char*)"incorrect header check"; - z->state->sub.marker = 5; /* can't try inflateSync */ - break; - } - Tracev((stderr, "inflate: zlib header ok\n")); - if (!(b & PRESET_DICT)) - { - z->state->mode = BLOCKS; - break; - } - z->state->mode = DICT4; - case DICT4: - NEEDBYTE - z->state->sub.check.need = (uLong)NEXTBYTE << 24; - z->state->mode = DICT3; - case DICT3: - NEEDBYTE - z->state->sub.check.need += (uLong)NEXTBYTE << 16; - z->state->mode = DICT2; - case DICT2: - NEEDBYTE - z->state->sub.check.need += (uLong)NEXTBYTE << 8; - z->state->mode = DICT1; - case DICT1: - NEEDBYTE - z->state->sub.check.need += (uLong)NEXTBYTE; - z->adler = z->state->sub.check.need; - z->state->mode = DICT0; - return Z_NEED_DICT; - case DICT0: - z->state->mode = BAD; - z->msg = (char*)"need dictionary"; - z->state->sub.marker = 0; /* can try inflateSync */ - return Z_STREAM_ERROR; - case BLOCKS: - r = inflate_blocks(z->state->blocks, z, r); - if (r == Z_DATA_ERROR) - { - z->state->mode = BAD; - z->state->sub.marker = 0; /* can try inflateSync */ - break; - } - if (r == Z_OK) - r = f; - if (r != Z_STREAM_END) - return r; - r = f; - inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was); - if (z->state->nowrap) - { - z->state->mode = DONE; - break; - } - z->state->mode = CHECK4; - case CHECK4: - NEEDBYTE - z->state->sub.check.need = (uLong)NEXTBYTE << 24; - z->state->mode = CHECK3; - case CHECK3: - NEEDBYTE - z->state->sub.check.need += (uLong)NEXTBYTE << 16; - z->state->mode = CHECK2; - case CHECK2: - NEEDBYTE - z->state->sub.check.need += (uLong)NEXTBYTE << 8; - z->state->mode = CHECK1; - case CHECK1: - NEEDBYTE - z->state->sub.check.need += (uLong)NEXTBYTE; - - if (z->state->sub.check.was != z->state->sub.check.need) - { - z->state->mode = BAD; - z->msg = (char*)"incorrect data check"; - z->state->sub.marker = 5; /* can't try inflateSync */ - break; - } - Tracev((stderr, "inflate: zlib check ok\n")); - z->state->mode = DONE; - case DONE: - return Z_STREAM_END; - case BAD: - return Z_DATA_ERROR; - default: - return Z_STREAM_ERROR; - } -#ifdef NEED_DUMMY_RETURN - return Z_STREAM_ERROR; /* Some dumb compilers complain without this */ -#endif -} - - -int ZEXPORT inflateSetDictionary(z, dictionary, dictLength) -z_streamp z; -const Bytef *dictionary; -uInt dictLength; -{ - uInt length = dictLength; - - if (z == Z_NULL || z->state == Z_NULL || z->state->mode != DICT0) - return Z_STREAM_ERROR; - - if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR; - z->adler = 1L; - - if (length >= ((uInt)1<state->wbits)) - { - length = (1<state->wbits)-1; - dictionary += dictLength - length; - } - inflate_set_dictionary(z->state->blocks, dictionary, length); - z->state->mode = BLOCKS; - return Z_OK; -} - - -int ZEXPORT inflateSync(z) -z_streamp z; -{ - uInt n; /* number of bytes to look at */ - Bytef *p; /* pointer to bytes */ - uInt m; /* number of marker bytes found in a row */ - uLong r, w; /* temporaries to save total_in and total_out */ - - /* set up */ - if (z == Z_NULL || z->state == Z_NULL) - return Z_STREAM_ERROR; - if (z->state->mode != BAD) - { - z->state->mode = BAD; - z->state->sub.marker = 0; - } - if ((n = z->avail_in) == 0) - return Z_BUF_ERROR; - p = z->next_in; - m = z->state->sub.marker; - - /* search */ - while (n && m < 4) - { - static const Byte mark[4] = {0, 0, 0xff, 0xff}; - if (*p == mark[m]) - m++; - else if (*p) - m = 0; - else - m = 4 - m; - p++, n--; - } - - /* restore */ - z->total_in += p - z->next_in; - z->next_in = p; - z->avail_in = n; - z->state->sub.marker = m; - - /* return no joy or set up to restart on a new block */ - if (m != 4) - return Z_DATA_ERROR; - r = z->total_in; w = z->total_out; - inflateReset(z); - z->total_in = r; z->total_out = w; - z->state->mode = BLOCKS; - return Z_OK; -} - - -/* Returns true if inflate is currently at the end of a block generated - * by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP - * implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH - * but removes the length bytes of the resulting empty stored block. When - * decompressing, PPP checks that at the end of input packet, inflate is - * waiting for these length bytes. - */ -int ZEXPORT inflateSyncPoint(z) -z_streamp z; -{ - if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL) - return Z_STREAM_ERROR; - return inflate_blocks_sync_point(z->state->blocks); -} diff --git a/harbour/contrib/hbzlib/inftrees.c b/harbour/contrib/hbzlib/inftrees.c deleted file mode 100644 index ef1e0b6b87..0000000000 --- a/harbour/contrib/hbzlib/inftrees.c +++ /dev/null @@ -1,455 +0,0 @@ -/* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "inftrees.h" - -#if !defined(BUILDFIXED) && !defined(STDC) -# define BUILDFIXED /* non ANSI compilers may not accept inffixed.h */ -#endif - -const char inflate_copyright[] = - " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; -/* - If you use the zlib library in a product, an acknowledgment is welcome - in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this - copyright string in the executable of your product. - */ -struct internal_state {int dummy;}; /* for buggy compilers */ - -/* simplify the use of the inflate_huft type with some defines */ -#define exop word.what.Exop -#define bits word.what.Bits - - -local int huft_build OF(( - uIntf *, /* code lengths in bits */ - uInt, /* number of codes */ - uInt, /* number of "simple" codes */ - const uIntf *, /* list of base values for non-simple codes */ - const uIntf *, /* list of extra bits for non-simple codes */ - inflate_huft * FAR*,/* result: starting table */ - uIntf *, /* maximum lookup bits (returns actual) */ - inflate_huft *, /* space for trees */ - uInt *, /* hufts used in space */ - uIntf * )); /* space for values */ - -/* Tables for deflate from PKZIP's appnote.txt. */ -local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */ - 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, - 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; - /* see note #13 above about 258 */ -local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */ - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, - 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */ -local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */ - 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, - 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, - 8193, 12289, 16385, 24577}; -local const uInt cpdext[30] = { /* Extra bits for distance codes */ - 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, - 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, - 12, 12, 13, 13}; - -/* - Huffman code decoding is performed using a multi-level table lookup. - The fastest way to decode is to simply build a lookup table whose - size is determined by the longest code. However, the time it takes - to build this table can also be a factor if the data being decoded - is not very long. The most common codes are necessarily the - shortest codes, so those codes dominate the decoding time, and hence - the speed. The idea is you can have a shorter table that decodes the - shorter, more probable codes, and then point to subsidiary tables for - the longer codes. The time it costs to decode the longer codes is - then traded against the time it takes to make longer tables. - - This results of this trade are in the variables lbits and dbits - below. lbits is the number of bits the first level table for literal/ - length codes can decode in one step, and dbits is the same thing for - the distance codes. Subsequent tables are also less than or equal to - those sizes. These values may be adjusted either when all of the - codes are shorter than that, in which case the longest code length in - bits is used, or when the shortest code is *longer* than the requested - table size, in which case the length of the shortest code in bits is - used. - - There are two different values for the two tables, since they code a - different number of possibilities each. The literal/length table - codes 286 possible values, or in a flat code, a little over eight - bits. The distance table codes 30 possible values, or a little less - than five bits, flat. The optimum values for speed end up being - about one bit more than those, so lbits is 8+1 and dbits is 5+1. - The optimum values may differ though from machine to machine, and - possibly even between compilers. Your mileage may vary. - */ - - -/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */ -#define BMAX 15 /* maximum bit length of any code */ - -local int huft_build(b, n, s, d, e, t, m, hp, hn, v) -uIntf *b; /* code lengths in bits (all assumed <= BMAX) */ -uInt n; /* number of codes (assumed <= 288) */ -uInt s; /* number of simple-valued codes (0..s-1) */ -const uIntf *d; /* list of base values for non-simple codes */ -const uIntf *e; /* list of extra bits for non-simple codes */ -inflate_huft * FAR *t; /* result: starting table */ -uIntf *m; /* maximum lookup bits, returns actual */ -inflate_huft *hp; /* space for trees */ -uInt *hn; /* hufts used in space */ -uIntf *v; /* working area: values in order of bit length */ -/* Given a list of code lengths and a maximum table size, make a set of - tables to decode that set of codes. Return Z_OK on success, Z_BUF_ERROR - if the given code set is incomplete (the tables are still built in this - case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of - lengths), or Z_MEM_ERROR if not enough memory. */ -{ - - uInt a; /* counter for codes of length k */ - uInt c[BMAX+1]; /* bit length count table */ - uInt f; /* i repeats in table every f entries */ - int g; /* maximum code length */ - int h; /* table level */ - register uInt i; /* counter, current code */ - register uInt j; /* counter */ - register int k; /* number of bits in current code */ - int l; /* bits per table (returned in m) */ - uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */ - register uIntf *p; /* pointer into c[], b[], or v[] */ - inflate_huft *q; /* points to current table */ - struct inflate_huft_s r; /* table entry for structure assignment */ - inflate_huft *u[BMAX]; /* table stack */ - register int w; /* bits before this table == (l * h) */ - uInt x[BMAX+1]; /* bit offsets, then code stack */ - uIntf *xp; /* pointer into x */ - int y; /* number of dummy codes added */ - uInt z; /* number of entries in current table */ - - - /* Generate counts for each bit length */ - p = c; -#define C0 *p++ = 0; -#define C2 C0 C0 C0 C0 -#define C4 C2 C2 C2 C2 - C4 /* clear c[]--assume BMAX+1 is 16 */ - p = b; i = n; - do { - c[*p++]++; /* assume all entries <= BMAX */ - } while (--i); - if (c[0] == n) /* null input--all zero length codes */ - { - *t = (inflate_huft *)Z_NULL; - *m = 0; - return Z_OK; - } - - - /* Find minimum and maximum length, bound *m by those */ - l = *m; - for (j = 1; j <= BMAX; j++) - if (c[j]) - break; - k = j; /* minimum code length */ - if ((uInt)l < j) - l = j; - for (i = BMAX; i; i--) - if (c[i]) - break; - g = i; /* maximum code length */ - if ((uInt)l > i) - l = i; - *m = l; - - - /* Adjust last length count to fill out codes, if needed */ - for (y = 1 << j; j < i; j++, y <<= 1) - if ((y -= c[j]) < 0) - return Z_DATA_ERROR; - if ((y -= c[i]) < 0) - return Z_DATA_ERROR; - c[i] += y; - - - /* Generate starting offsets into the value table for each length */ - x[1] = j = 0; - p = c + 1; xp = x + 2; - while (--i) { /* note that i == g from above */ - *xp++ = (j += *p++); - } - - - /* Make a table of values in order of bit lengths */ - p = b; i = 0; - do { - if ((j = *p++) != 0) - v[x[j]++] = i; - } while (++i < n); - n = x[g]; /* set n to length of v */ - - - /* Generate the Huffman codes and for each, make the table entries */ - x[0] = i = 0; /* first Huffman code is zero */ - p = v; /* grab values in bit order */ - h = -1; /* no tables yet--level -1 */ - w = -l; /* bits decoded == (l * h) */ - u[0] = (inflate_huft *)Z_NULL; /* just to keep compilers happy */ - q = (inflate_huft *)Z_NULL; /* ditto */ - z = 0; /* ditto */ - - /* go through the bit lengths (k already is bits in shortest code) */ - for (; k <= g; k++) - { - a = c[k]; - while (a--) - { - /* here i is the Huffman code of length k bits for value *p */ - /* make tables up to required level */ - while (k > w + l) - { - h++; - w += l; /* previous table always l bits */ - - /* compute minimum size table less than or equal to l bits */ - z = g - w; - z = z > (uInt)l ? l : z; /* table size upper limit */ - if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ - { /* too few codes for k-w bit table */ - f -= a + 1; /* deduct codes from patterns left */ - xp = c + k; - if (j < z) - while (++j < z) /* try smaller tables up to z bits */ - { - if ((f <<= 1) <= *++xp) - break; /* enough codes to use up j bits */ - f -= *xp; /* else deduct codes from patterns */ - } - } - z = 1 << j; /* table entries for j-bit table */ - - /* allocate new table */ - if (*hn + z > MANY) /* (note: doesn't matter for fixed) */ - return Z_MEM_ERROR; /* not enough memory */ - u[h] = q = hp + *hn; - *hn += z; - - /* connect to last table, if there is one */ - if (h) - { - x[h] = i; /* save pattern for backing up */ - r.bits = (Byte)l; /* bits to dump before this table */ - r.exop = (Byte)j; /* bits in this table */ - j = i >> (w - l); - r.base = (uInt)(q - u[h-1] - j); /* offset to this table */ - u[h-1][j] = r; /* connect to last table */ - } - else - *t = q; /* first table is returned result */ - } - - /* set up table entry in r */ - r.bits = (Byte)(k - w); - if (p >= v + n) - r.exop = 128 + 64; /* out of values--invalid code */ - else if (*p < s) - { - r.exop = (Byte)(*p < 256 ? 0 : 32 + 64); /* 256 is end-of-block */ - r.base = *p++; /* simple code is just the value */ - } - else - { - r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */ - r.base = d[*p++ - s]; - } - - /* fill code-like entries with r */ - f = 1 << (k - w); - for (j = i >> w; j < z; j += f) - q[j] = r; - - /* backwards increment the k-bit code i */ - for (j = 1 << (k - 1); i & j; j >>= 1) - i ^= j; - i ^= j; - - /* backup over finished tables */ - mask = (1 << w) - 1; /* needed on HP, cc -O bug */ - while ((i & mask) != x[h]) - { - h--; /* don't need to update q */ - w -= l; - mask = (1 << w) - 1; - } - } - } - - - /* Return Z_BUF_ERROR if we were given an incomplete table */ - return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK; -} - - -int inflate_trees_bits(c, bb, tb, hp, z) -uIntf *c; /* 19 code lengths */ -uIntf *bb; /* bits tree desired/actual depth */ -inflate_huft * FAR *tb; /* bits tree result */ -inflate_huft *hp; /* space for trees */ -z_streamp z; /* for messages */ -{ - int r; - uInt hn = 0; /* hufts used in space */ - uIntf *v; /* work area for huft_build */ - - if ((v = (uIntf*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL) - return Z_MEM_ERROR; - r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL, - tb, bb, hp, &hn, v); - if (r == Z_DATA_ERROR) - z->msg = (char*)"oversubscribed dynamic bit lengths tree"; - else if (r == Z_BUF_ERROR || *bb == 0) - { - z->msg = (char*)"incomplete dynamic bit lengths tree"; - r = Z_DATA_ERROR; - } - ZFREE(z, v); - return r; -} - - -int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, hp, z) -uInt nl; /* number of literal/length codes */ -uInt nd; /* number of distance codes */ -uIntf *c; /* that many (total) code lengths */ -uIntf *bl; /* literal desired/actual bit depth */ -uIntf *bd; /* distance desired/actual bit depth */ -inflate_huft * FAR *tl; /* literal/length tree result */ -inflate_huft * FAR *td; /* distance tree result */ -inflate_huft *hp; /* space for trees */ -z_streamp z; /* for messages */ -{ - int r; - uInt hn = 0; /* hufts used in space */ - uIntf *v; /* work area for huft_build */ - - /* allocate work area */ - if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL) - return Z_MEM_ERROR; - - /* build literal/length tree */ - r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v); - if (r != Z_OK || *bl == 0) - { - if (r == Z_DATA_ERROR) - z->msg = (char*)"oversubscribed literal/length tree"; - else if (r != Z_MEM_ERROR) - { - z->msg = (char*)"incomplete literal/length tree"; - r = Z_DATA_ERROR; - } - ZFREE(z, v); - return r; - } - - /* build distance tree */ - r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v); - if (r != Z_OK || (*bd == 0 && nl > 257)) - { - if (r == Z_DATA_ERROR) - z->msg = (char*)"oversubscribed distance tree"; - else if (r == Z_BUF_ERROR) { -#ifdef PKZIP_BUG_WORKAROUND - r = Z_OK; - } -#else - z->msg = (char*)"incomplete distance tree"; - r = Z_DATA_ERROR; - } - else if (r != Z_MEM_ERROR) - { - z->msg = (char*)"empty distance tree with lengths"; - r = Z_DATA_ERROR; - } - ZFREE(z, v); - return r; -#endif - } - - /* done */ - ZFREE(z, v); - return Z_OK; -} - - -/* build fixed tables only once--keep them here */ -#ifdef BUILDFIXED -local int fixed_built = 0; -#define FIXEDH 544 /* number of hufts used by fixed tables */ -local inflate_huft fixed_mem[FIXEDH]; -local uInt fixed_bl; -local uInt fixed_bd; -local inflate_huft *fixed_tl; -local inflate_huft *fixed_td; -#else -#include "inffixed.h" -#endif - - -int inflate_trees_fixed(bl, bd, tl, td, z) -uIntf *bl; /* literal desired/actual bit depth */ -uIntf *bd; /* distance desired/actual bit depth */ -inflate_huft * FAR *tl; /* literal/length tree result */ -inflate_huft * FAR *td; /* distance tree result */ -z_streamp z; /* for memory allocation */ -{ -#ifdef BUILDFIXED - /* build fixed tables if not already */ - if (!fixed_built) - { - int k; /* temporary variable */ - uInt f = 0; /* number of hufts used in fixed_mem */ - uIntf *c; /* length list for huft_build */ - uIntf *v; /* work area for huft_build */ - - /* allocate memory */ - if ((c = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL) - return Z_MEM_ERROR; - if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL) - { - ZFREE(z, c); - return Z_MEM_ERROR; - } - - /* literal table */ - for (k = 0; k < 144; k++) - c[k] = 8; - for (; k < 256; k++) - c[k] = 9; - for (; k < 280; k++) - c[k] = 7; - for (; k < 288; k++) - c[k] = 8; - fixed_bl = 9; - huft_build(c, 288, 257, cplens, cplext, &fixed_tl, &fixed_bl, - fixed_mem, &f, v); - - /* distance table */ - for (k = 0; k < 30; k++) - c[k] = 5; - fixed_bd = 5; - huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd, - fixed_mem, &f, v); - - /* done */ - ZFREE(z, v); - ZFREE(z, c); - fixed_built = 1; - } -#endif - *bl = fixed_bl; - *bd = fixed_bd; - *tl = fixed_tl; - *td = fixed_td; - return Z_OK; -} diff --git a/harbour/contrib/hbzlib/inftrees.h b/harbour/contrib/hbzlib/inftrees.h deleted file mode 100644 index 85853e097b..0000000000 --- a/harbour/contrib/hbzlib/inftrees.h +++ /dev/null @@ -1,58 +0,0 @@ -/* inftrees.h -- header to use inftrees.c - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* Huffman code lookup table entry--this entry is four bytes for machines - that have 16-bit pointers (e.g. PC's in the small or medium model). */ - -typedef struct inflate_huft_s FAR inflate_huft; - -struct inflate_huft_s { - union { - struct { - Byte Exop; /* number of extra bits or operation */ - Byte Bits; /* number of bits in this code or subcode */ - } what; - uInt pad; /* pad structure to a power of 2 (4 bytes for */ - } word; /* 16-bit, 8 bytes for 32-bit int's) */ - uInt base; /* literal, length base, distance base, - or table offset */ -}; - -/* Maximum size of dynamic tree. The maximum found in a long but non- - exhaustive search was 1004 huft structures (850 for length/literals - and 154 for distances, the latter actually the result of an - exhaustive search). The actual maximum is not known, but the - value below is more than safe. */ -#define MANY 1440 - -extern int inflate_trees_bits OF(( - uIntf *, /* 19 code lengths */ - uIntf *, /* bits tree desired/actual depth */ - inflate_huft * FAR *, /* bits tree result */ - inflate_huft *, /* space for trees */ - z_streamp)); /* for messages */ - -extern int inflate_trees_dynamic OF(( - uInt, /* number of literal/length codes */ - uInt, /* number of distance codes */ - uIntf *, /* that many (total) code lengths */ - uIntf *, /* literal desired/actual bit depth */ - uIntf *, /* distance desired/actual bit depth */ - inflate_huft * FAR *, /* literal/length tree result */ - inflate_huft * FAR *, /* distance tree result */ - inflate_huft *, /* space for trees */ - z_streamp)); /* for messages */ - -extern int inflate_trees_fixed OF(( - uIntf *, /* literal desired/actual bit depth */ - uIntf *, /* distance desired/actual bit depth */ - inflate_huft * FAR *, /* literal/length tree result */ - inflate_huft * FAR *, /* distance tree result */ - z_streamp)); /* for memory allocation */ diff --git a/harbour/contrib/hbzlib/infutil.c b/harbour/contrib/hbzlib/infutil.c deleted file mode 100644 index 824dab5712..0000000000 --- a/harbour/contrib/hbzlib/infutil.c +++ /dev/null @@ -1,87 +0,0 @@ -/* inflate_util.c -- data and routines common to blocks and codes - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "infblock.h" -#include "inftrees.h" -#include "infcodes.h" -#include "infutil.h" - -struct inflate_codes_state {int dummy;}; /* for buggy compilers */ - -/* And'ing with mask[n] masks the lower n bits */ -uInt inflate_mask[17] = { - 0x0000, - 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff, - 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff -}; - - -/* copy as much as possible from the sliding window to the output area */ -int inflate_flush(s, z, r) -inflate_blocks_statef *s; -z_streamp z; -int r; -{ - uInt n; - Bytef *p; - Bytef *q; - - /* local copies of source and destination pointers */ - p = z->next_out; - q = s->read; - - /* compute number of bytes to copy as far as end of window */ - n = (uInt)((q <= s->write ? s->write : s->end) - q); - if (n > z->avail_out) n = z->avail_out; - if (n && r == Z_BUF_ERROR) r = Z_OK; - - /* update counters */ - z->avail_out -= n; - z->total_out += n; - - /* update check information */ - if (s->checkfn != Z_NULL) - z->adler = s->check = (*s->checkfn)(s->check, q, n); - - /* copy as far as end of window */ - zmemcpy(p, q, n); - p += n; - q += n; - - /* see if more to copy at beginning of window */ - if (q == s->end) - { - /* wrap pointers */ - q = s->window; - if (s->write == s->end) - s->write = s->window; - - /* compute bytes to copy */ - n = (uInt)(s->write - q); - if (n > z->avail_out) n = z->avail_out; - if (n && r == Z_BUF_ERROR) r = Z_OK; - - /* update counters */ - z->avail_out -= n; - z->total_out += n; - - /* update check information */ - if (s->checkfn != Z_NULL) - z->adler = s->check = (*s->checkfn)(s->check, q, n); - - /* copy */ - zmemcpy(p, q, n); - p += n; - q += n; - } - - /* update pointers */ - z->next_out = p; - s->read = q; - - /* done */ - return r; -} diff --git a/harbour/contrib/hbzlib/infutil.h b/harbour/contrib/hbzlib/infutil.h deleted file mode 100644 index 99d1135d06..0000000000 --- a/harbour/contrib/hbzlib/infutil.h +++ /dev/null @@ -1,98 +0,0 @@ -/* infutil.h -- types and macros common to blocks and codes - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -#ifndef _INFUTIL_H -#define _INFUTIL_H - -typedef enum { - TYPE, /* get type bits (3, including end bit) */ - LENS, /* get lengths for stored */ - STORED, /* processing stored block */ - TABLE, /* get table lengths */ - BTREE, /* get bit lengths tree for a dynamic block */ - DTREE, /* get length, distance trees for a dynamic block */ - CODES, /* processing fixed or dynamic block */ - DRY, /* output remaining window bytes */ - DONE, /* finished last block, done */ - BAD} /* got a data error--stuck here */ -inflate_block_mode; - -/* inflate blocks semi-private state */ -struct inflate_blocks_state { - - /* mode */ - inflate_block_mode mode; /* current inflate_block mode */ - - /* mode dependent information */ - union { - uInt left; /* if STORED, bytes left to copy */ - struct { - uInt table; /* table lengths (14 bits) */ - uInt index; /* index into blens (or border) */ - uIntf *blens; /* bit lengths of codes */ - uInt bb; /* bit length tree depth */ - inflate_huft *tb; /* bit length decoding tree */ - } trees; /* if DTREE, decoding info for trees */ - struct { - inflate_codes_statef - *codes; - } decode; /* if CODES, current state */ - } sub; /* submode */ - uInt last; /* true if this block is the last block */ - - /* mode independent information */ - uInt bitk; /* bits in bit buffer */ - uLong bitb; /* bit buffer */ - inflate_huft *hufts; /* single malloc for tree space */ - Bytef *window; /* sliding window */ - Bytef *end; /* one byte after sliding window */ - Bytef *read; /* window read pointer */ - Bytef *write; /* window write pointer */ - check_func checkfn; /* check function */ - uLong check; /* check on output */ - -}; - - -/* defines for inflate input/output */ -/* update pointers and return */ -#define UPDBITS {s->bitb=b;s->bitk=k;} -#define UPDIN {z->avail_in=n;z->total_in+=p-z->next_in;z->next_in=p;} -#define UPDOUT {s->write=q;} -#define UPDATE {UPDBITS UPDIN UPDOUT} -#define LEAVE {UPDATE return inflate_flush(s,z,r);} -/* get bytes and bits */ -#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;} -#define NEEDBYTE {if(n)r=Z_OK;else LEAVE} -#define NEXTBYTE (n--,*p++) -#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<>=(j);k-=(j);} -/* output bytes */ -#define WAVAIL (uInt)(qread?s->read-q-1:s->end-q) -#define LOADOUT {q=s->write;m=(uInt)WAVAIL;} -#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}} -#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT} -#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;} -#define OUTBYTE(a) {*q++=(Byte)(a);m--;} -/* load local pointers */ -#define LOAD {LOADIN LOADOUT} - -/* masks for lower bits (size given to avoid silly warnings with Visual C++) */ -extern uInt inflate_mask[17]; - -/* copy as much as possible from the sliding window to the output area */ -extern int inflate_flush OF(( - inflate_blocks_statef *, - z_streamp , - int)); - -struct internal_state {int dummy;}; /* for buggy compilers */ - -#endif diff --git a/harbour/contrib/hbzlib/lincompile.sh b/harbour/contrib/hbzlib/lincompile.sh new file mode 100644 index 0000000000..dae9481a52 --- /dev/null +++ b/harbour/contrib/hbzlib/lincompile.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp Linux/ZipFileMapping.h zipfilemapping.h +make diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat new file mode 100644 index 0000000000..e6c1472eb5 --- /dev/null +++ b/harbour/contrib/hbzlib/make_b32.bat @@ -0,0 +1,29 @@ +@echo off +rem +rem $Id$ +rem + +if not exist obj md obj +if not exist obj\b32 md obj\b32 + +:BUILD + + make -fmakefile.bc %1 %2 %3 > make_b32.log + if "%1" == "clean" goto CLEAN + if "%1" == "CLEAN" goto CLEAN + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + copy ..\..\lib\b32\hbzip.lib ..\..\lib > nul + goto EXIT + +:BUILD_ERR + + notepad make_b32.log + goto EXIT + +:CLEAN + if exist make_b32.log del make_b32.log + +:EXIT + diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat new file mode 100644 index 0000000000..778ba2c38c --- /dev/null +++ b/harbour/contrib/hbzlib/make_vc.bat @@ -0,0 +1,21 @@ +@echo off +rem +rem $Id$ +rem + +if not exist obj md obj + +:BUILD + + nmake -fmakefile.vc %1 %2 %3 > make_vc.log + if errorlevel 1 goto BUILD_ERR + +:BUILD_OK + copy ..\..\lib\vc\hbzip.lib ..\..\lib > nul + goto EXIT + +:BUILD_ERR + + notepad make_vc.log + +:EXIT diff --git a/harbour/contrib/hbzlib/makefile.bc b/harbour/contrib/hbzlib/makefile.bc deleted file mode 100644 index 680eb4b764..0000000000 --- a/harbour/contrib/hbzlib/makefile.bc +++ /dev/null @@ -1,182 +0,0 @@ -# -# $Id$ -# - -# -# Makefile for Zlib library for Borland C/C++ 3.x, 4.x, 5.x compilers -# - - -CC = bcc32 -IL = implib -ID = impdef -# NOTE: Using TASM for some reason, this should be normally TASM32. -# I'll leave it to TASM until a better solution is found -AS = tasm - -BIN_DIR = ..\..\bin\b32 -OBJ_DIR = ..\..\obj\b32 -LIB_DIR = ..\..\lib\b32 - -COMMON_LIB = $(LIB_DIR)\common.lib -DBFCDX_LIB = $(LIB_DIR)\dbfcdx.lib -DBFNTX_LIB = $(LIB_DIR)\dbfntx.lib -DEBUG_LIB = $(LIB_DIR)\debug.lib -LANG_LIB = $(LIB_DIR)\lang.lib -MACRO_LIB = $(LIB_DIR)\macro.lib -NULSYS_LIB = $(LIB_DIR)\nulsys.lib -PP_LIB = $(LIB_DIR)\pp.lib -RDD_LIB = $(LIB_DIR)\rdd.lib -RTL_LIB = $(LIB_DIR)\rtl.lib -VM_LIB = $(LIB_DIR)\vm.lib -GTWIN_LIB = $(LIB_DIR)\gtwin.lib -SAMPLES_LIB = $(LIB_DIR)\samples.lib -HB_GT_LIB = $(GTWIN_LIB) -# This is needed, otherwise the libs may overflow when -# debug info is requested with -v -y -ARFLAGS = /P32 - - -#!if !$d(BCC_NOOPTIM) -#CFLAGS = -O2- $(CFLAGS) -#!endif - -# -# Directory macros. These should never have to change. -# - -INCLUDE_DIR = ..\..\include -ZLIB_DIR = . -WINSYS_DIR = \WINDOWS\SYSTEM -CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) -CLIBFLAGS =$(CFLAGS) -v -y -HARBOUR_EXE = $(BIN_DIR)\harbour.exe -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) -LDFLAGS = $(LDFLAGS) - -# -# Macros to access our library names -# - -ZLIB_LIB = $(LIB_DIR)\zlib.lib -ZLIB_EXE = $(ZLIB_DIR)\test.exe -ZLIB_EXE2 = $(ZLIB_DIR)\test2.exe -ZLIB_BOR_DLL = $(ZLIB_DIR)\hbzlib.dll -ZLIB_BOR_DEF = $(LIB_DIR)\zlib.def -ZLIB_BOR_LIB = $(LIB_DIR)\zlib_bor.lib -ZLIB_LIB_OBJS = \ - $(OBJ_DIR)\zipfile.obj \ - $(OBJ_DIR)\zipfile2.obj \ - $(OBJ_DIR)\zlibapi1.obj \ - $(OBJ_DIR)\tzipfile.obj -ZLIB_EXE_OBJS = \ - $(OBJ_DIR)\test.obj - -ZLIB_EXE2_OBJS = \ - $(OBJ_DIR)\test2.obj - -ZLIB_DEF_OBJ = $(ZLIB_DIR)\hbzlib.dll -ZLIB_BOR_LIB_OBJ = $(LIB_DIR)\zlib.def - -all: \ - $(ZLIB_LIB) \ - $(ZLIB_BOR_DEF) \ - $(ZLIB_BOR_LIB) \ - $(ZLIB_EXE_OBJS) \ - $(ZLIB_EXE2_OBJS) \ - $(ZLIB_EXE) \ - $(ZLIB_EXE2) - - -$(ZLIB_LIB) = $(ZLIB_LIB_OBJS) - -$(ZLIB_EXE) = $(ZLIB_EXE_OBJS) -$(ZLIB_EXE2) = $(ZLIB_EXE2_OBJS) -$(ZLIB_BOR_DEF) = $(ZLIB_DEF_OBJ) - -$(ZLIB_BOR_LIB) = $(ZLIB_BOR_LIB_OBJ) - -$(ZLIB_LIB) : $(ZLIB_LIB_OBJS) - -$(OBJ_DIR)\zipfile.obj : $(ZLIB_DIR)\zipfile.c - $(CC) -v -c $(CLIBFLAGS) -o$@ $** - tlib $(ZLIB_LIB) $(ARFLAGS) -+$@,, - -$(OBJ_DIR)\zipfile2.obj : $(ZLIB_DIR)\zipfile2.c - $(CC) -v -c $(CLIBFLAGS) -o$@ $** - tlib $(ZLIB_LIB) $(ARFLAGS) -+$@,, - -$(OBJ_DIR)\zlibapi1.obj : $(ZLIB_DIR)\zlibapi1.c - $(CC) -c -v $(CLIBFLAGS) -o$@ $** - tlib $(ZLIB_LIB) $(ARFLAGS) -+$@,, - -$(OBJ_DIR)\tzipfile.c : $(ZLIB_DIR)\tzipfile.prg - $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ - -$(OBJ_DIR)\tzipfile.obj : $(OBJ_DIR)\tzipfile.c - $(CC) -c $(CLIBFLAGS) -o$@ $** - tlib $(ZLIB_LIB) $(ARFLAGS) -+$@,, -$(ZLIB_BOR_DEF) : $(ZLIB_DEF_OBJ) - $(ID) $(LIB_DIR)\zlib.def $(ZLIB_DIR)\hbzlib.dll - -$(ZLIB_BOR_LIB) : $(ZLIB_BOR_LIB_OBJ) - $(IL) $(LIB_DIR)\zlib_bor.lib $(LIB_DIR)\zlib.def - -$(ZLIB_EXE) : $(ZLIB_EXE_OBJS) - - echo. $(CFLAGS) -v -y > make.tmp - echo. -M -e$(ZLIB_EXE) >> make.tmp - echo. -I$(INCLUDE_DIR) >> make.tmp - echo. $(OBJ_DIR)\test.obj >> make.tmp - echo. $(SAMPLES_LIB) >> make.tmp - echo. $(ZLIB_LIB) >> make.tmp - echo. $(ZLIB_BOR_LIB) >> make.tmp - echo. $(PP_LIB) >> make.tmp - echo. $(COMMON_LIB) >> make.tmp - echo. $(VM_LIB) >> make.tmp - echo. $(RTL_LIB) >> make.tmp - echo. $(HB_GT_LIB) >> make.tmp - echo. $(LANG_LIB) >> make.tmp - echo. $(RDD_LIB) >> make.tmp - echo. $(MACRO_LIB) >> make.tmp - echo. $(DBFNTX_LIB) >> make.tmp - echo. $(DBFCDX_LIB) >> make.tmp - $(CC) @make.tmp - del make.tmp - -$(OBJ_DIR)\test.c : $(ZLIB_DIR)\test.prg - $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ - -$(OBJ_DIR)\test.obj : $(OBJ_DIR)\test.c - $(CC) -c $(CLIBFLAGS) -o$@ $** - - -$(ZLIB_EXE2) : $(ZLIB_EXE2_OBJS) - - echo. $(CFLAGS) -y -v> make.tmp - echo. -M -e$(ZLIB_EXE2) >> make.tmp - echo. -I$(INCLUDE_DIR) >> make.tmp - echo. $(OBJ_DIR)\test2.obj >> make.tmp - echo. $(SAMPLES_LIB) >> make.tmp - echo. $(ZLIB_LIB) >> make.tmp - echo. $(ZLIB_BOR_LIB) >> make.tmp - echo. $(PP_LIB) >> make.tmp - echo. $(COMMON_LIB) >> make.tmp - echo. $(VM_LIB) >> make.tmp - echo. $(RTL_LIB) >> make.tmp - echo. $(HB_GT_LIB) >> make.tmp - echo. $(LANG_LIB) >> make.tmp - echo. $(RDD_LIB) >> make.tmp - echo. $(MACRO_LIB) >> make.tmp - echo. $(DBFNTX_LIB) >> make.tmp - echo. $(DBFCDX_LIB) >> make.tmp - $(CC) @make.tmp - del make.tmp - -$(OBJ_DIR)\test2.c : $(ZLIB_DIR)\test2.prg - $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ - -$(OBJ_DIR)\test2.obj : $(OBJ_DIR)\test2.c - $(CC) -c $(CLIBFLAGS) -o$@ $** - - diff --git a/harbour/contrib/hbzlib/makefile2.bc b/harbour/contrib/hbzlib/makefile2.bc deleted file mode 100644 index d3e573bc07..0000000000 --- a/harbour/contrib/hbzlib/makefile2.bc +++ /dev/null @@ -1,126 +0,0 @@ -# -# $Id$ -# - -# -# Makefile for Zlib library for Borland C/C++ 3.x, 4.x, 5.x compilers -# -.autodepend - -CC = bcc32 -IL = implib -ID = impdef -# NOTE: Using TASM for some reason, this should be normally TASM32. -# I'll leave it to TASM until a better solution is found -AS = tasm - -BIN_DIR = ..\..\bin -OBJ_DIR = ..\..\obj\b32 -LIB_DIR = ..\..\lib\b32 - -COMMON_LIB = $(LIB_DIR)\common.lib -DBFCDX_LIB = $(LIB_DIR)\dbfcdx.lib -DBFNTX_LIB = $(LIB_DIR)\dbfntx.lib -DEBUG_LIB = $(LIB_DIR)\debug.lib -LANG_LIB = $(LIB_DIR)\lang.lib -MACRO_LIB = $(LIB_DIR)\macro.lib -NULSYS_LIB = $(LIB_DIR)\nulsys.lib -PP_LIB = $(LIB_DIR)\pp.lib -RDD_LIB = $(LIB_DIR)\rdd.lib -RTL_LIB = $(LIB_DIR)\rtl.lib -VM_LIB = $(LIB_DIR)\vm.lib -GTWIN_LIB = $(LIB_DIR)\gtwin.lib -SAMPLES_LIB = $(LIB_DIR)\samples.lib -HB_GT_LIB = $(GTWIN_LIB) -# This is needed, otherwise the libs may overflow when -# debug info is requested with -v -y -ARFLAGS = /P32 - - -#!if !$d(BCC_NOOPTIM) -#CFLAGS = -O2- $(CFLAGS) -#!endif - -# -# Directory macros. These should never have to change. -# - -INCLUDE_DIR = ..\..\include;. -ZLIB_DIR = . -WINSYS_DIR = \WINDOWS\SYSTEM -CFLAGS = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) -DWIN32 -CLIBFLAGS = $(CFLAGS) -HARBOUR_EXE = $(BIN_DIR)\harbour.exe -HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS) -LDFLAGS = $(LDFLAGS) - -# -# Macros to access our library names -# - -ZLIB_LIB = $(LIB_DIR)\zlib1.lib -ZLIB_EXE = $(ZLIB_DIR)\test.exe - - -ZLIB_BOR_LIB = $(LIB_DIR)\ziparchive.lib -ZLIB_LIB_OBJS = \ - $(OBJ_DIR)\zipnew.obj \ - $(OBJ_DIR)\zipcomp.obj \ - $(OBJ_DIR)\zip.obj - -ZLIB_EXE_OBJS = \ - $(OBJ_DIR)\test.obj - -all: \ - $(ZLIB_LIB) \ - $(ZLIB_EXE_OBJS) \ - $(ZLIB_EXE) - - -$(ZLIB_LIB) = $(ZLIB_LIB_OBJS) - -$(ZLIB_EXE) = $(ZLIB_EXE_OBJS) - -$(ZLIB_LIB) : $(ZLIB_LIB_OBJS) - - -$(OBJ_DIR)\zipnew.obj : $(ZLIB_DIR)\zipnew.cpp - $(CC) -u -c $(CLIBFLAGS) -P -o$@ $** - tlib $(ZLIB_LIB) $(ARFLAGS) -+$@,, - -$(OBJ_DIR)\zip.obj : $(ZLIB_DIR)\zip.c - $(CC) -c $(CLIBFLAGS) -o$@ $** - tlib $(ZLIB_LIB) $(ARFLAGS) -+$@,, - -$(OBJ_DIR)\zipcomp.obj : $(ZLIB_DIR)\zipcomp.cpp - $(CC) -P -u -c $(CLIBFLAGS) -o$@ $** - tlib $(ZLIB_LIB) $(ARFLAGS) -+$@,, - - -$(ZLIB_EXE) : $(ZLIB_EXE_OBJS) - - echo. $(CFLAGS) > make.tmp - echo. -M -e$(ZLIB_EXE) >> make.tmp - echo. -I$(INCLUDE_DIR) >> make.tmp - echo. $(OBJ_DIR)\test.obj >> make.tmp - echo. $(ZLIB_LIB) >> make.tmp - echo. $(ZLIB_BOR_LIB) >> make.tmp - echo. $(PP_LIB) >> make.tmp - echo. $(COMMON_LIB) >> make.tmp - echo. $(VM_LIB) >> make.tmp - echo. $(RTL_LIB) >> make.tmp - echo. $(HB_GT_LIB) >> make.tmp - echo. $(LANG_LIB) >> make.tmp - echo. $(RDD_LIB) >> make.tmp - echo. $(MACRO_LIB) >> make.tmp - echo. $(DBFNTX_LIB) >> make.tmp - echo. $(DBFCDX_LIB) >> make.tmp - echo. $(SAMPLES_LIB) >> make.tmp - $(CC) @make.tmp - del make.tmp - -$(OBJ_DIR)\test.c : $(ZLIB_DIR)\test.prg - $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ - -$(OBJ_DIR)\test.obj : $(OBJ_DIR)\test.c - $(CC) -u -c $(CLIBFLAGS) -o$@ $** diff --git a/harbour/contrib/hbzlib/maketree.c b/harbour/contrib/hbzlib/maketree.c deleted file mode 100644 index 949d786418..0000000000 --- a/harbour/contrib/hbzlib/maketree.c +++ /dev/null @@ -1,85 +0,0 @@ -/* maketree.c -- make inffixed.h table for decoding fixed codes - * Copyright (C) 1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* This program is included in the distribution for completeness. - You do not need to compile or run this program since inffixed.h - is already included in the distribution. To use this program - you need to compile zlib with BUILDFIXED defined and then compile - and link this program with the zlib library. Then the output of - this program can be piped to inffixed.h. */ - -#include -#include -#include "zutil.h" -#include "inftrees.h" - -/* simplify the use of the inflate_huft type with some defines */ -#define exop word.what.Exop -#define bits word.what.Bits - -/* generate initialization table for an inflate_huft structure array */ -void maketree(uInt b, inflate_huft *t) -{ - int i, e; - - i = 0; - while (1) - { - e = t[i].exop; - if (e && (e & (16+64)) == 0) /* table pointer */ - { - fprintf(stderr, "maketree: cannot initialize sub-tables!\n"); - exit(1); - } - if (i % 4 == 0) - printf("\n "); - printf(" {{{%u,%u}},%u}", t[i].exop, t[i].bits, t[i].base); - if (++i == (1< -#endif - -/* =========================================================================== - * Constants - */ - -#define MAX_BL_BITS 7 -/* Bit length codes must not exceed MAX_BL_BITS bits */ - -#define END_BLOCK 256 -/* end of block literal code */ - -#define REP_3_6 16 -/* repeat previous bit length 3-6 times (2 bits of repeat count) */ - -#define REPZ_3_10 17 -/* repeat a zero length 3-10 times (3 bits of repeat count) */ - -#define REPZ_11_138 18 -/* repeat a zero length 11-138 times (7 bits of repeat count) */ - -local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ - = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; - -local const int extra_dbits[D_CODES] /* extra bits for each distance code */ - = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; - -local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ - = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; - -local const uch bl_order[BL_CODES] - = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; -/* The lengths of the bit length codes are sent in order of decreasing - * probability, to avoid transmitting the lengths for unused bit length codes. - */ - -#define Buf_size (8 * 2*sizeof(char)) -/* Number of bits used within bi_buf. (bi_buf might be implemented on - * more than 16 bits on some systems.) - */ - -/* =========================================================================== - * Local data. These are initialized only once. - */ - -#define DIST_CODE_LEN 512 /* see definition of array dist_code below */ - -#if defined(GEN_TREES_H) || !defined(STDC) -/* non ANSI compilers may not accept trees.h */ - -local ct_data static_ltree[L_CODES+2]; -/* The static literal tree. Since the bit lengths are imposed, there is no - * need for the L_CODES extra codes used during heap construction. However - * The codes 286 and 287 are needed to build a canonical tree (see _tr_init - * below). - */ - -local ct_data static_dtree[D_CODES]; -/* The static distance tree. (Actually a trivial tree since all codes use - * 5 bits.) - */ - -uch _dist_code[DIST_CODE_LEN]; -/* Distance codes. The first 256 values correspond to the distances - * 3 .. 258, the last 256 values correspond to the top 8 bits of - * the 15 bit distances. - */ - -uch _length_code[MAX_MATCH-MIN_MATCH+1]; -/* length code for each normalized match length (0 == MIN_MATCH) */ - -local int base_length[LENGTH_CODES]; -/* First normalized length for each code (0 = MIN_MATCH) */ - -local int base_dist[D_CODES]; -/* First normalized distance for each code (0 = distance of 1) */ - -#else -# include "trees.h" -#endif /* GEN_TREES_H */ - -struct static_tree_desc_s { - const ct_data *static_tree; /* static tree or NULL */ - const intf *extra_bits; /* extra bits for each code or NULL */ - int extra_base; /* base index for extra_bits */ - int elems; /* max number of elements in the tree */ - int max_length; /* max bit length for the codes */ -}; - -local static_tree_desc static_l_desc = -{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; - -local static_tree_desc static_d_desc = -{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; - -local static_tree_desc static_bl_desc = -{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; - -/* =========================================================================== - * Local (static) routines in this file. - */ - -local void tr_static_init OF((void)); -local void init_block OF((deflate_state *s)); -local void pqdownheap OF((deflate_state *s, ct_data *tree, int k)); -local void gen_bitlen OF((deflate_state *s, tree_desc *desc)); -local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count)); -local void build_tree OF((deflate_state *s, tree_desc *desc)); -local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code)); -local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); -local int build_bl_tree OF((deflate_state *s)); -local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, - int blcodes)); -local void compress_block OF((deflate_state *s, ct_data *ltree, - ct_data *dtree)); -local void set_data_type OF((deflate_state *s)); -local unsigned bi_reverse OF((unsigned value, int length)); -local void bi_windup OF((deflate_state *s)); -local void bi_flush OF((deflate_state *s)); -local void copy_block OF((deflate_state *s, charf *buf, unsigned len, - int header)); - -#ifdef GEN_TREES_H -local void gen_trees_header OF((void)); -#endif - -#ifndef DEBUG -# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) - /* Send a code of the given tree. c and tree must not have side effects */ - -#else /* DEBUG */ -# define send_code(s, c, tree) \ - { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ - send_bits(s, tree[c].Code, tree[c].Len); } -#endif - -/* =========================================================================== - * Output a short LSB first on the stream. - * IN assertion: there is enough room in pendingBuf. - */ -#define put_short(s, w) { \ - put_byte(s, (uch)((w) & 0xff)); \ - put_byte(s, (uch)((ush)(w) >> 8)); \ -} - -/* =========================================================================== - * Send a value on a given number of bits. - * IN assertion: length <= 16 and value fits in length bits. - */ -#ifdef DEBUG -local void send_bits OF((deflate_state *s, int value, int length)); - -local void send_bits(s, value, length) - deflate_state *s; - int value; /* value to send */ - int length; /* number of bits */ -{ - Tracevv((stderr," l %2d v %4x ", length, value)); - Assert(length > 0 && length <= 15, "invalid length"); - s->bits_sent += (ulg)length; - - /* If not enough room in bi_buf, use (valid) bits from bi_buf and - * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) - * unused bits in value. - */ - if (s->bi_valid > (int)Buf_size - length) { - s->bi_buf |= (value << s->bi_valid); - put_short(s, s->bi_buf); - s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); - s->bi_valid += length - Buf_size; - } else { - s->bi_buf |= value << s->bi_valid; - s->bi_valid += length; - } -} -#else /* !DEBUG */ - -#define send_bits(s, value, length) \ -{ int len = length;\ - if (s->bi_valid > (int)Buf_size - len) {\ - int val = value;\ - s->bi_buf |= (val << s->bi_valid);\ - put_short(s, s->bi_buf);\ - s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ - s->bi_valid += len - Buf_size;\ - } else {\ - s->bi_buf |= (value) << s->bi_valid;\ - s->bi_valid += len;\ - }\ -} -#endif /* DEBUG */ - - -#define MAX(a,b) (a >= b ? a : b) -/* the arguments must not have side effects */ - -/* =========================================================================== - * Initialize the various 'constant' tables. - */ -local void tr_static_init() -{ -#if defined(GEN_TREES_H) || !defined(STDC) - static int static_init_done = 0; - int n; /* iterates over tree elements */ - int bits; /* bit counter */ - int length; /* length value */ - int code; /* code value */ - int dist; /* distance index */ - ush bl_count[MAX_BITS+1]; - /* number of codes at each bit length for an optimal tree */ - - if (static_init_done) return; - - /* For some embedded targets, global variables are not initialized: */ - static_l_desc.static_tree = static_ltree; - static_l_desc.extra_bits = extra_lbits; - static_d_desc.static_tree = static_dtree; - static_d_desc.extra_bits = extra_dbits; - static_bl_desc.extra_bits = extra_blbits; - - /* Initialize the mapping length (0..255) -> length code (0..28) */ - length = 0; - for (code = 0; code < LENGTH_CODES-1; code++) { - base_length[code] = length; - for (n = 0; n < (1< dist code (0..29) */ - dist = 0; - for (code = 0 ; code < 16; code++) { - base_dist[code] = dist; - for (n = 0; n < (1<>= 7; /* from now on, all distances are divided by 128 */ - for ( ; code < D_CODES; code++) { - base_dist[code] = dist << 7; - for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { - _dist_code[256 + dist++] = (uch)code; - } - } - Assert (dist == 256, "tr_static_init: 256+dist != 512"); - - /* Construct the codes of the static literal tree */ - for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; - n = 0; - while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; - while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; - while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; - while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; - /* Codes 286 and 287 do not exist, but we must include them in the - * tree construction to get a canonical Huffman tree (longest code - * all ones) - */ - gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count); - - /* The static distance tree is trivial: */ - for (n = 0; n < D_CODES; n++) { - static_dtree[n].Len = 5; - static_dtree[n].Code = bi_reverse((unsigned)n, 5); - } - static_init_done = 1; - -# ifdef GEN_TREES_H - gen_trees_header(); -# endif -#endif /* defined(GEN_TREES_H) || !defined(STDC) */ -} - -/* =========================================================================== - * Genererate the file trees.h describing the static trees. - */ -#ifdef GEN_TREES_H -# ifndef DEBUG -# include -# endif - -# define SEPARATOR(i, last, width) \ - ((i) == (last)? "\n};\n\n" : \ - ((i) % (width) == (width)-1 ? ",\n" : ", ")) - -void gen_trees_header() -{ - FILE *header = fopen("trees.h", "w"); - int i; - - Assert (header != NULL, "Can't open trees.h"); - fprintf(header, - "/* header created automatically with -DGEN_TREES_H */\n\n"); - - fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n"); - for (i = 0; i < L_CODES+2; i++) { - fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code, - static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5)); - } - - fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n"); - for (i = 0; i < D_CODES; i++) { - fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code, - static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); - } - - fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n"); - for (i = 0; i < DIST_CODE_LEN; i++) { - fprintf(header, "%2u%s", _dist_code[i], - SEPARATOR(i, DIST_CODE_LEN-1, 20)); - } - - fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); - for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { - fprintf(header, "%2u%s", _length_code[i], - SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); - } - - fprintf(header, "local const int base_length[LENGTH_CODES] = {\n"); - for (i = 0; i < LENGTH_CODES; i++) { - fprintf(header, "%1u%s", base_length[i], - SEPARATOR(i, LENGTH_CODES-1, 20)); - } - - fprintf(header, "local const int base_dist[D_CODES] = {\n"); - for (i = 0; i < D_CODES; i++) { - fprintf(header, "%5u%s", base_dist[i], - SEPARATOR(i, D_CODES-1, 10)); - } - - fclose(header); -} -#endif /* GEN_TREES_H */ - -/* =========================================================================== - * Initialize the tree data structures for a new zlib stream. - */ -void _tr_init(s) - deflate_state *s; -{ - tr_static_init(); - - s->l_desc.dyn_tree = s->dyn_ltree; - s->l_desc.stat_desc = &static_l_desc; - - s->d_desc.dyn_tree = s->dyn_dtree; - s->d_desc.stat_desc = &static_d_desc; - - s->bl_desc.dyn_tree = s->bl_tree; - s->bl_desc.stat_desc = &static_bl_desc; - - s->bi_buf = 0; - s->bi_valid = 0; - s->last_eob_len = 8; /* enough lookahead for inflate */ -#ifdef DEBUG - s->compressed_len = 0L; - s->bits_sent = 0L; -#endif - - /* Initialize the first block of the first file: */ - init_block(s); -} - -/* =========================================================================== - * Initialize a new block. - */ -local void init_block(s) - deflate_state *s; -{ - int n; /* iterates over tree elements */ - - /* Initialize the trees. */ - for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0; - for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0; - for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0; - - s->dyn_ltree[END_BLOCK].Freq = 1; - s->opt_len = s->static_len = 0L; - s->last_lit = s->matches = 0; -} - -#define SMALLEST 1 -/* Index within the heap array of least frequent node in the Huffman tree */ - - -/* =========================================================================== - * Remove the smallest element from the heap and recreate the heap with - * one less element. Updates heap and heap_len. - */ -#define pqremove(s, tree, top) \ -{\ - top = s->heap[SMALLEST]; \ - s->heap[SMALLEST] = s->heap[s->heap_len--]; \ - pqdownheap(s, tree, SMALLEST); \ -} - -/* =========================================================================== - * Compares to subtrees, using the tree depth as tie breaker when - * the subtrees have equal frequency. This minimizes the worst case length. - */ -#define smaller(tree, n, m, depth) \ - (tree[n].Freq < tree[m].Freq || \ - (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m])) - -/* =========================================================================== - * Restore the heap property by moving down the tree starting at node k, - * exchanging a node with the smallest of its two sons if necessary, stopping - * when the heap property is re-established (each father smaller than its - * two sons). - */ -local void pqdownheap(s, tree, k) - deflate_state *s; - ct_data *tree; /* the tree to restore */ - int k; /* node to move down */ -{ - int v = s->heap[k]; - int j = k << 1; /* left son of k */ - while (j <= s->heap_len) { - /* Set j to the smallest of the two sons: */ - if (j < s->heap_len && - smaller(tree, s->heap[j+1], s->heap[j], s->depth)) { - j++; - } - /* Exit if v is smaller than both sons */ - if (smaller(tree, v, s->heap[j], s->depth)) break; - - /* Exchange v with the smallest son */ - s->heap[k] = s->heap[j]; k = j; - - /* And continue down the tree, setting j to the left son of k */ - j <<= 1; - } - s->heap[k] = v; -} - -/* =========================================================================== - * Compute the optimal bit lengths for a tree and update the total bit length - * for the current block. - * IN assertion: the fields freq and dad are set, heap[heap_max] and - * above are the tree nodes sorted by increasing frequency. - * OUT assertions: the field len is set to the optimal bit length, the - * array bl_count contains the frequencies for each bit length. - * The length opt_len is updated; static_len is also updated if stree is - * not null. - */ -local void gen_bitlen(s, desc) - deflate_state *s; - tree_desc *desc; /* the tree descriptor */ -{ - ct_data *tree = desc->dyn_tree; - int max_code = desc->max_code; - const ct_data *stree = desc->stat_desc->static_tree; - const intf *extra = desc->stat_desc->extra_bits; - int base = desc->stat_desc->extra_base; - int max_length = desc->stat_desc->max_length; - int h; /* heap index */ - int n, m; /* iterate over the tree elements */ - int bits; /* bit length */ - int xbits; /* extra bits */ - ush f; /* frequency */ - int overflow = 0; /* number of elements with bit length too large */ - - for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0; - - /* In a first pass, compute the optimal bit lengths (which may - * overflow in the case of the bit length tree). - */ - tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */ - - for (h = s->heap_max+1; h < HEAP_SIZE; h++) { - n = s->heap[h]; - bits = tree[tree[n].Dad].Len + 1; - if (bits > max_length) bits = max_length, overflow++; - tree[n].Len = (ush)bits; - /* We overwrite tree[n].Dad which is no longer needed */ - - if (n > max_code) continue; /* not a leaf node */ - - s->bl_count[bits]++; - xbits = 0; - if (n >= base) xbits = extra[n-base]; - f = tree[n].Freq; - s->opt_len += (ulg)f * (bits + xbits); - if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits); - } - if (overflow == 0) return; - - Trace((stderr,"\nbit length overflow\n")); - /* This happens for example on obj2 and pic of the Calgary corpus */ - - /* Find the first bit length which could increase: */ - do { - bits = max_length-1; - while (s->bl_count[bits] == 0) bits--; - s->bl_count[bits]--; /* move one leaf down the tree */ - s->bl_count[bits+1] += 2; /* move one overflow item as its brother */ - s->bl_count[max_length]--; - /* The brother of the overflow item also moves one step up, - * but this does not affect bl_count[max_length] - */ - overflow -= 2; - } while (overflow > 0); - - /* Now recompute all bit lengths, scanning in increasing frequency. - * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all - * lengths instead of fixing only the wrong ones. This idea is taken - * from 'ar' written by Haruhiko Okumura.) - */ - for (bits = max_length; bits != 0; bits--) { - n = s->bl_count[bits]; - while (n != 0) { - m = s->heap[--h]; - if (m > max_code) continue; - if (tree[m].Len != (unsigned) bits) { - Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); - s->opt_len += ((long)bits - (long)tree[m].Len) - *(long)tree[m].Freq; - tree[m].Len = (ush)bits; - } - n--; - } - } -} - -/* =========================================================================== - * Generate the codes for a given tree and bit counts (which need not be - * optimal). - * IN assertion: the array bl_count contains the bit length statistics for - * the given tree and the field len is set for all tree elements. - * OUT assertion: the field code is set for all tree elements of non - * zero code length. - */ -local void gen_codes (tree, max_code, bl_count) - ct_data *tree; /* the tree to decorate */ - int max_code; /* largest code with non zero frequency */ - ushf *bl_count; /* number of codes at each bit length */ -{ - ush next_code[MAX_BITS+1]; /* next code value for each bit length */ - ush code = 0; /* running code value */ - int bits; /* bit index */ - int n; /* code index */ - - /* The distribution counts are first used to generate the code values - * without bit reversal. - */ - for (bits = 1; bits <= MAX_BITS; bits++) { - next_code[bits] = code = (code + bl_count[bits-1]) << 1; - } - /* Check that the bit counts in bl_count are consistent. The last code - * must be all ones. - */ - Assert (code + bl_count[MAX_BITS]-1 == (1<dyn_tree; - const ct_data *stree = desc->stat_desc->static_tree; - int elems = desc->stat_desc->elems; - int n, m; /* iterate over heap elements */ - int max_code = -1; /* largest code with non zero frequency */ - int node; /* new node being created */ - - /* Construct the initial heap, with least frequent element in - * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. - * heap[0] is not used. - */ - s->heap_len = 0, s->heap_max = HEAP_SIZE; - - for (n = 0; n < elems; n++) { - if (tree[n].Freq != 0) { - s->heap[++(s->heap_len)] = max_code = n; - s->depth[n] = 0; - } else { - tree[n].Len = 0; - } - } - - /* The pkzip format requires that at least one distance code exists, - * and that at least one bit should be sent even if there is only one - * possible code. So to avoid special checks later on we force at least - * two codes of non zero frequency. - */ - while (s->heap_len < 2) { - node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0); - tree[node].Freq = 1; - s->depth[node] = 0; - s->opt_len--; if (stree) s->static_len -= stree[node].Len; - /* node is 0 or 1 so it does not have extra bits */ - } - desc->max_code = max_code; - - /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, - * establish sub-heaps of increasing lengths: - */ - for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n); - - /* Construct the Huffman tree by repeatedly combining the least two - * frequent nodes. - */ - node = elems; /* next internal node of the tree */ - do { - pqremove(s, tree, n); /* n = node of least frequency */ - m = s->heap[SMALLEST]; /* m = node of next least frequency */ - - s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */ - s->heap[--(s->heap_max)] = m; - - /* Create a new node father of n and m */ - tree[node].Freq = tree[n].Freq + tree[m].Freq; - s->depth[node] = (uch) (MAX(s->depth[n], s->depth[m]) + 1); - tree[n].Dad = tree[m].Dad = (ush)node; -#ifdef DUMP_BL_TREE - if (tree == s->bl_tree) { - fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", - node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); - } -#endif - /* and insert the new node in the heap */ - s->heap[SMALLEST] = node++; - pqdownheap(s, tree, SMALLEST); - - } while (s->heap_len >= 2); - - s->heap[--(s->heap_max)] = s->heap[SMALLEST]; - - /* At this point, the fields freq and dad are set. We can now - * generate the bit lengths. - */ - gen_bitlen(s, (tree_desc *)desc); - - /* The field len is now set, we can generate the bit codes */ - gen_codes ((ct_data *)tree, max_code, s->bl_count); -} - -/* =========================================================================== - * Scan a literal or distance tree to determine the frequencies of the codes - * in the bit length tree. - */ -local void scan_tree (s, tree, max_code) - deflate_state *s; - ct_data *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ -{ - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - if (nextlen == 0) max_count = 138, min_count = 3; - tree[max_code+1].Len = (ush)0xffff; /* guard */ - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - s->bl_tree[curlen].Freq += count; - } else if (curlen != 0) { - if (curlen != prevlen) s->bl_tree[curlen].Freq++; - s->bl_tree[REP_3_6].Freq++; - } else if (count <= 10) { - s->bl_tree[REPZ_3_10].Freq++; - } else { - s->bl_tree[REPZ_11_138].Freq++; - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } -} - -/* =========================================================================== - * Send a literal or distance tree in compressed form, using the codes in - * bl_tree. - */ -local void send_tree (s, tree, max_code) - deflate_state *s; - ct_data *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ -{ - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - /* tree[max_code+1].Len = -1; */ /* guard already set */ - if (nextlen == 0) max_count = 138, min_count = 3; - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - do { send_code(s, curlen, s->bl_tree); } while (--count != 0); - - } else if (curlen != 0) { - if (curlen != prevlen) { - send_code(s, curlen, s->bl_tree); count--; - } - Assert(count >= 3 && count <= 6, " 3_6?"); - send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2); - - } else if (count <= 10) { - send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3); - - } else { - send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7); - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } -} - -/* =========================================================================== - * Construct the Huffman tree for the bit lengths and return the index in - * bl_order of the last bit length code to send. - */ -local int build_bl_tree(s) - deflate_state *s; -{ - int max_blindex; /* index of last bit length code of non zero freq */ - - /* Determine the bit length frequencies for literal and distance trees */ - scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code); - scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code); - - /* Build the bit length tree: */ - build_tree(s, (tree_desc *)(&(s->bl_desc))); - /* opt_len now includes the length of the tree representations, except - * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. - */ - - /* Determine the number of bit length codes to send. The pkzip format - * requires that at least 4 bit length codes be sent. (appnote.txt says - * 3 but the actual value used is 4.) - */ - for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { - if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; - } - /* Update opt_len to include the bit length tree and counts */ - s->opt_len += 3*(max_blindex+1) + 5+5+4; - Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", - s->opt_len, s->static_len)); - - return max_blindex; -} - -/* =========================================================================== - * Send the header for a block using dynamic Huffman trees: the counts, the - * lengths of the bit length codes, the literal tree and the distance tree. - * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. - */ -local void send_all_trees(s, lcodes, dcodes, blcodes) - deflate_state *s; - int lcodes, dcodes, blcodes; /* number of codes for each tree */ -{ - int rank; /* index in bl_order */ - - Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); - Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, - "too many codes"); - Tracev((stderr, "\nbl counts: ")); - send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */ - send_bits(s, dcodes-1, 5); - send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */ - for (rank = 0; rank < blcodes; rank++) { - Tracev((stderr, "\nbl code %2d ", bl_order[rank])); - send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); - } - Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent)); - - send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */ - Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent)); - - send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */ - Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent)); -} - -/* =========================================================================== - * Send a stored block - */ -void _tr_stored_block(s, buf, stored_len, eof) - deflate_state *s; - charf *buf; /* input block */ - ulg stored_len; /* length of input block */ - int eof; /* true if this is the last block for a file */ -{ - send_bits(s, (STORED_BLOCK<<1)+eof, 3); /* send block type */ -#ifdef DEBUG - s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; - s->compressed_len += (stored_len + 4) << 3; -#endif - copy_block(s, buf, (unsigned)stored_len, 1); /* with header */ -} - -/* =========================================================================== - * Send one empty static block to give enough lookahead for inflate. - * This takes 10 bits, of which 7 may remain in the bit buffer. - * The current inflate code requires 9 bits of lookahead. If the - * last two codes for the previous block (real code plus EOB) were coded - * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode - * the last real code. In this case we send two empty static blocks instead - * of one. (There are no problems if the previous block is stored or fixed.) - * To simplify the code, we assume the worst case of last real code encoded - * on one bit only. - */ -void _tr_align(s) - deflate_state *s; -{ - send_bits(s, STATIC_TREES<<1, 3); - send_code(s, END_BLOCK, static_ltree); -#ifdef DEBUG - s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ -#endif - bi_flush(s); - /* Of the 10 bits for the empty block, we have already sent - * (10 - bi_valid) bits. The lookahead for the last real code (before - * the EOB of the previous block) was thus at least one plus the length - * of the EOB plus what we have just sent of the empty static block. - */ - if (1 + s->last_eob_len + 10 - s->bi_valid < 9) { - send_bits(s, STATIC_TREES<<1, 3); - send_code(s, END_BLOCK, static_ltree); -#ifdef DEBUG - s->compressed_len += 10L; -#endif - bi_flush(s); - } - s->last_eob_len = 7; -} - -/* =========================================================================== - * Determine the best encoding for the current block: dynamic trees, static - * trees or store, and output the encoded block to the zip file. - */ -void _tr_flush_block(s, buf, stored_len, eof) - deflate_state *s; - charf *buf; /* input block, or NULL if too old */ - ulg stored_len; /* length of input block */ - int eof; /* true if this is the last block for a file */ -{ - ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ - int max_blindex = 0; /* index of last bit length code of non zero freq */ - - /* Build the Huffman trees unless a stored block is forced */ - if (s->level > 0) { - - /* Check if the file is ascii or binary */ - if (s->data_type == Z_UNKNOWN) set_data_type(s); - - /* Construct the literal and distance trees */ - build_tree(s, (tree_desc *)(&(s->l_desc))); - Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, - s->static_len)); - - build_tree(s, (tree_desc *)(&(s->d_desc))); - Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len, - s->static_len)); - /* At this point, opt_len and static_len are the total bit lengths of - * the compressed block data, excluding the tree representations. - */ - - /* Build the bit length tree for the above two trees, and get the index - * in bl_order of the last bit length code to send. - */ - max_blindex = build_bl_tree(s); - - /* Determine the best encoding. Compute first the block length in bytes*/ - opt_lenb = (s->opt_len+3+7)>>3; - static_lenb = (s->static_len+3+7)>>3; - - Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", - opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, - s->last_lit)); - - if (static_lenb <= opt_lenb) opt_lenb = static_lenb; - - } else { - Assert(buf != (char*)0, "lost buf"); - opt_lenb = static_lenb = stored_len + 5; /* force a stored block */ - } - -#ifdef FORCE_STORED - if (buf != (char*)0) { /* force stored block */ -#else - if (stored_len+4 <= opt_lenb && buf != (char*)0) { - /* 4: two words for the lengths */ -#endif - /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. - * Otherwise we can't have processed more than WSIZE input bytes since - * the last block flush, because compression would have been - * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to - * transform a block into a stored block. - */ - _tr_stored_block(s, buf, stored_len, eof); - -#ifdef FORCE_STATIC - } else if (static_lenb >= 0) { /* force static trees */ -#else - } else if (static_lenb == opt_lenb) { -#endif - send_bits(s, (STATIC_TREES<<1)+eof, 3); - compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); -#ifdef DEBUG - s->compressed_len += 3 + s->static_len; -#endif - } else { - send_bits(s, (DYN_TREES<<1)+eof, 3); - send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, - max_blindex+1); - compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree); -#ifdef DEBUG - s->compressed_len += 3 + s->opt_len; -#endif - } - Assert (s->compressed_len == s->bits_sent, "bad compressed size"); - /* The above check is made mod 2^32, for files larger than 512 MB - * and uLong implemented on 32 bits. - */ - init_block(s); - - if (eof) { - bi_windup(s); -#ifdef DEBUG - s->compressed_len += 7; /* align on byte boundary */ -#endif - } - Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, - s->compressed_len-7*eof)); -} - -/* =========================================================================== - * Save the match info and tally the frequency counts. Return true if - * the current block must be flushed. - */ -int _tr_tally (s, dist, lc) - deflate_state *s; - unsigned dist; /* distance of matched string */ - unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ -{ - s->d_buf[s->last_lit] = (ush)dist; - s->l_buf[s->last_lit++] = (uch)lc; - if (dist == 0) { - /* lc is the unmatched char */ - s->dyn_ltree[lc].Freq++; - } else { - s->matches++; - /* Here, lc is the match length - MIN_MATCH */ - dist--; /* dist = match distance - 1 */ - Assert((ush)dist < (ush)MAX_DIST(s) && - (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && - (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match"); - - s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; - s->dyn_dtree[d_code(dist)].Freq++; - } - -#ifdef TRUNCATE_BLOCK - /* Try to guess if it is profitable to stop the current block here */ - if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { - /* Compute an upper bound for the compressed length */ - ulg out_length = (ulg)s->last_lit*8L; - ulg in_length = (ulg)((long)s->strstart - s->block_start); - int dcode; - for (dcode = 0; dcode < D_CODES; dcode++) { - out_length += (ulg)s->dyn_dtree[dcode].Freq * - (5L+extra_dbits[dcode]); - } - out_length >>= 3; - Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", - s->last_lit, in_length, out_length, - 100L - out_length*100L/in_length)); - if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; - } -#endif - return (s->last_lit == s->lit_bufsize-1); - /* We avoid equality with lit_bufsize because of wraparound at 64K - * on 16 bit machines and because stored blocks are restricted to - * 64K-1 bytes. - */ -} - -/* =========================================================================== - * Send the block data compressed using the given Huffman trees - */ -local void compress_block(s, ltree, dtree) - deflate_state *s; - ct_data *ltree; /* literal tree */ - ct_data *dtree; /* distance tree */ -{ - unsigned dist; /* distance of matched string */ - int lc; /* match length or unmatched char (if dist == 0) */ - unsigned lx = 0; /* running index in l_buf */ - unsigned code; /* the code to send */ - int extra; /* number of extra bits to send */ - - if (s->last_lit != 0) do { - dist = s->d_buf[lx]; - lc = s->l_buf[lx++]; - if (dist == 0) { - send_code(s, lc, ltree); /* send a literal byte */ - Tracecv(isgraph(lc), (stderr," '%c' ", lc)); - } else { - /* Here, lc is the match length - MIN_MATCH */ - code = _length_code[lc]; - send_code(s, code+LITERALS+1, ltree); /* send the length code */ - extra = extra_lbits[code]; - if (extra != 0) { - lc -= base_length[code]; - send_bits(s, lc, extra); /* send the extra length bits */ - } - dist--; /* dist is now the match distance - 1 */ - code = d_code(dist); - Assert (code < D_CODES, "bad d_code"); - - send_code(s, code, dtree); /* send the distance code */ - extra = extra_dbits[code]; - if (extra != 0) { - dist -= base_dist[code]; - send_bits(s, dist, extra); /* send the extra distance bits */ - } - } /* literal or match pair ? */ - - /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ - Assert(s->pending < s->lit_bufsize + 2*lx, "pendingBuf overflow"); - - } while (lx < s->last_lit); - - send_code(s, END_BLOCK, ltree); - s->last_eob_len = ltree[END_BLOCK].Len; -} - -/* =========================================================================== - * Set the data type to ASCII or BINARY, using a crude approximation: - * binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise. - * IN assertion: the fields freq of dyn_ltree are set and the total of all - * frequencies does not exceed 64K (to fit in an int on 16 bit machines). - */ -local void set_data_type(s) - deflate_state *s; -{ - int n = 0; - unsigned ascii_freq = 0; - unsigned bin_freq = 0; - while (n < 7) bin_freq += s->dyn_ltree[n++].Freq; - while (n < 128) ascii_freq += s->dyn_ltree[n++].Freq; - while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq; - s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII); -} - -/* =========================================================================== - * Reverse the first len bits of a code, using straightforward code (a faster - * method would use a table) - * IN assertion: 1 <= len <= 15 - */ -local unsigned bi_reverse(code, len) - unsigned code; /* the value to invert */ - int len; /* its bit length */ -{ - register unsigned res = 0; - do { - res |= code & 1; - code >>= 1, res <<= 1; - } while (--len > 0); - return res >> 1; -} - -/* =========================================================================== - * Flush the bit buffer, keeping at most 7 bits in it. - */ -local void bi_flush(s) - deflate_state *s; -{ - if (s->bi_valid == 16) { - put_short(s, s->bi_buf); - s->bi_buf = 0; - s->bi_valid = 0; - } else if (s->bi_valid >= 8) { - put_byte(s, (Byte)s->bi_buf); - s->bi_buf >>= 8; - s->bi_valid -= 8; - } -} - -/* =========================================================================== - * Flush the bit buffer and align the output on a byte boundary - */ -local void bi_windup(s) - deflate_state *s; -{ - if (s->bi_valid > 8) { - put_short(s, s->bi_buf); - } else if (s->bi_valid > 0) { - put_byte(s, (Byte)s->bi_buf); - } - s->bi_buf = 0; - s->bi_valid = 0; -#ifdef DEBUG - s->bits_sent = (s->bits_sent+7) & ~7; -#endif -} - -/* =========================================================================== - * Copy a stored block, storing first the length and its - * one's complement if requested. - */ -local void copy_block(s, buf, len, header) - deflate_state *s; - charf *buf; /* the input data */ - unsigned len; /* its length */ - int header; /* true if block header must be written */ -{ - bi_windup(s); /* align on byte boundary */ - s->last_eob_len = 8; /* enough lookahead for inflate */ - - if (header) { - put_short(s, (ush)len); - put_short(s, (ush)~len); -#ifdef DEBUG - s->bits_sent += 2*16; -#endif - } -#ifdef DEBUG - s->bits_sent += (ulg)len<<3; -#endif - while (len--) { - put_byte(s, *buf++); - } -} diff --git a/harbour/contrib/hbzlib/trees.h b/harbour/contrib/hbzlib/trees.h deleted file mode 100644 index 72facf900f..0000000000 --- a/harbour/contrib/hbzlib/trees.h +++ /dev/null @@ -1,128 +0,0 @@ -/* header created automatically with -DGEN_TREES_H */ - -local const ct_data static_ltree[L_CODES+2] = { -{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, -{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, -{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, -{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, -{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, -{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, -{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, -{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, -{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, -{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, -{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, -{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, -{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, -{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, -{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, -{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, -{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, -{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, -{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, -{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, -{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, -{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, -{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, -{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, -{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, -{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, -{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, -{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, -{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, -{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, -{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, -{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, -{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, -{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, -{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, -{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, -{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, -{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, -{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, -{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, -{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, -{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, -{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, -{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, -{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, -{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, -{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, -{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, -{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, -{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, -{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, -{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, -{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, -{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, -{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, -{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, -{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, -{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} -}; - -local const ct_data static_dtree[D_CODES] = { -{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, -{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, -{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, -{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, -{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, -{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} -}; - -const uch _dist_code[DIST_CODE_LEN] = { - 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, - 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, -10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, -11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, -12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, -13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, -13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, -15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, -15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, -15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, -18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, -23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, -26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, -26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, -27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, -27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, -29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, -29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, -29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 -}; - -const uch _length_code[MAX_MATCH-MIN_MATCH+1]= { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, -13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, -17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, -19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, -21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, -22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, -23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, -25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, -26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, -26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, -27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 -}; - -local const int base_length[LENGTH_CODES] = { -0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, -64, 80, 96, 112, 128, 160, 192, 224, 0 -}; - -local const int base_dist[D_CODES] = { - 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, - 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, - 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 -}; - diff --git a/harbour/contrib/hbzlib/tzipfile.ch b/harbour/contrib/hbzlib/tzipfile.ch deleted file mode 100644 index 17596c9d53..0000000000 --- a/harbour/contrib/hbzlib/tzipfile.ch +++ /dev/null @@ -1,9 +0,0 @@ -#xtranslate CREATE ZIPFILE File [METHOD ] [BLOCK ] ; - [] [] => ; - :=tZipFile():New(,,<{bBlock}>,<.comp.>,<.over.>) -#xtranslate ADD FILE to => :AddFile() -#xtranslate ACTIVATE ZIP => :DoCompress() -#xtranslate ACTIVATE UNZIP => :DoUnzip() -#xtranslate GET FILELIST => :Getlist() -#xtranslate SHOW FILELIST => :ShowList() - diff --git a/harbour/contrib/hbzlib/uncompr.c b/harbour/contrib/hbzlib/uncompr.c deleted file mode 100644 index d103321378..0000000000 --- a/harbour/contrib/hbzlib/uncompr.c +++ /dev/null @@ -1,58 +0,0 @@ -/* uncompr.c -- decompress a memory buffer - * Copyright (C) 1995-1998 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zlib.h" - -/* =========================================================================== - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be large enough to hold the - entire uncompressed data. (The size of the uncompressed data must have - been saved previously by the compressor and transmitted to the decompressor - by some mechanism outside the scope of this compression library.) - Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to decompress a whole file at once if the - input file is mmap'ed. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted. -*/ -int ZEXPORT uncompress (dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; -{ - z_stream stream; - int err; - - stream.next_in = (Bytef*)source; - stream.avail_in = (uInt)sourceLen; - /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; - - stream.next_out = dest; - stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; - - stream.zalloc = (alloc_func)0; - stream.zfree = (free_func)0; - - err = inflateInit(&stream); - if (err != Z_OK) return err; - - err = inflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - inflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; - } - *destLen = stream.total_out; - - err = inflateEnd(&stream); - return err; -} diff --git a/harbour/contrib/hbzlib/zipabstractfile.h b/harbour/contrib/hbzlib/zipabstractfile.h deleted file mode 100644 index 3cf78cca87..0000000000 --- a/harbour/contrib/hbzlib/zipabstractfile.h +++ /dev/null @@ -1,47 +0,0 @@ -// ZipAbstractFile.h: interface for the ZipAbstractFile class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_ZIPABSTRACTFILE_H__46F247DE_21A6_4D12_AF64_B5A6B3CF4D57__INCLUDED_) -#define AFX_ZIPABSTRACTFILE_H__46F247DE_21A6_4D12_AF64_B5A6B3CF4D57__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -#include "zipstring.h" -class CZipAbstractFile -{ -public: - - enum { begin = SEEK_SET, - end = SEEK_END, - current = SEEK_CUR - }; - CZipAbstractFile(){} - virtual bool Open(LPCTSTR lpszFileName, UINT openFlags, bool bThrow) = 0; - virtual void Close() = 0; - virtual void Flush() = 0; - virtual long GetPosition() = 0; - virtual void SeekToBegin(){Seek(0, begin);} - virtual void SeekToEnd(){Seek(0, end);} - virtual CZipString GetFilePath() = 0; - virtual void SetLength(long nNewLen) = 0; - virtual UINT Read(void *lpBuf, UINT nCount) = 0; - virtual void Write(const void* lpBuf, UINT nCount) = 0; - virtual long Seek(long lOff, int nFrom) = 0; - virtual bool IsClosed() = 0; - virtual DWORD GetLength() = 0; - virtual ~CZipAbstractFile(){}; - -}; - - - -#endif // !defined(AFX_ZIPABSTRACTFILE_H__46F247DE_21A6_4D12_AF64_B5A6B3CF4D57__INCLUDED_) diff --git a/harbour/contrib/hbzlib/ziparchive.cpp b/harbour/contrib/hbzlib/ziparchive.cpp deleted file mode 100644 index 9d93f920b4..0000000000 --- a/harbour/contrib/hbzlib/ziparchive.cpp +++ /dev/null @@ -1,1440 +0,0 @@ -// ZipArchive.cpp: implementation of the CZipArchive class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - - -#include "stdafx.h" -#include "ziparchive.h" -// #include "zippathcomponent.h" -#include "zipplatform.h" -#include "zipcompatibility.h" - -#include - -#ifndef DEF_MEM_LEVEL -#if MAX_MEM_LEVEL >= 8 -# define DEF_MEM_LEVEL 8 -#else -# define DEF_MEM_LEVEL MAX_MEM_LEVEL -#endif -#endif -#define ENCR_HEADER_LEN 12 -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// -const TCHAR CZipArchive::m_gszCopyright[] = {_T("ZipArchive library Copyright 2000 - 2001 Tadeusz Dracz")}; -CZipArchive::CZipArchive() -{ - m_bDetectZlibMemoryLeaks = true; - m_centralDir.m_pStorage= &m_storage; - m_info.m_stream.zalloc = (alloc_func)_zliballoc; - m_info.m_stream.zfree = (free_func)_zlibfree; - m_iFileOpened = nothing; -} - - -CZipArchive::~CZipArchive() -{ - // Close(); // cannot be here: if an exception is thrown strange things can happen - EmptyPtrList(); - -} - - - -void CZipArchive::Open(LPCTSTR szPathName, int iMode, int iVolumeSize) -{ - if (!IsClosed()) - { - TRACE(_T("ZipArchive already opened.\n")); - return; - } - m_storage.Open(szPathName, iMode, iVolumeSize); - OpenInternal(iMode); -} - -void CZipArchive::Open(CZipMemFile& mf,int iMode) -{ - if (!IsClosed()) - { - TRACE(_T("ZipArchive already opened.\n")); - return; - } - if (iMode != zipOpen && iMode != zipOpenReadOnly && iMode != zipCreate) - { - TRACE(_T("Mode not supported.\n")); - return; - } - m_storage.Open(mf, iMode); - OpenInternal(iMode); -} - - -void CZipArchive::OpenInternal(int iMode) -{ - m_pszPassword.Release(); - m_iFileOpened = nothing; - m_centralDir.Init(); - m_iArchiveSystCompatib = ZipPlatform::GetSystemID(); - m_szRootPath.Empty(); - if ((iMode == zipOpen) ||(iMode == zipOpenReadOnly)) - { - m_centralDir.Read(); - // if there is at least one file, get system comp. from the first one - if (m_centralDir.IsValidIndex(0)) - { - m_iArchiveSystCompatib = m_centralDir[0]->GetSystemCompatibility(); - if (!ZipCompatibility::IsPlatformSupported(m_iArchiveSystCompatib)) - CZipException::Throw(CZipException::platfNotSupp); - } - } - -} - - -bool CZipArchive::IsClosed(bool bArchive) -{ - return bArchive ?(m_storage.GetCurrentDisk() == -1):(!m_storage.m_pFile || m_storage.m_pFile->IsClosed()); -} - - -void CZipArchive::ThrowError(int err, bool bZlib) -{ - if (bZlib) - err = CZipException::ZlibErrToZip(err); - CZipException::Throw(err, IsClosed() ? _T("") : (LPCTSTR)m_storage.m_pFile->GetFilePath()); -} - -bool CZipArchive::DeleteFile(WORD uIndex) -{ - if (m_storage.IsSpanMode()) - { - TRACE(_T("You cannot delete files from the disk spannig archive.\n")); - return false; - } - - if (m_iFileOpened) - { - TRACE(_T("You cannot delete files if there is a file opened.\n")); - return false; - } - - if (!m_centralDir.IsValidIndex(uIndex)) - return false; - - m_info.Init(); - m_centralDir.RemoveFromDisk(); - DeleteInternal(uIndex); - m_info.m_pBuffer.Release(); - return true; -} - -int CZipArchive::GetNoEntries() -{ - return m_centralDir.m_headers.GetCount(); -} - - -bool CZipArchive::GetFileInfo(CZipFileHeader & fhInfo, WORD uIndex) -{ - if (IsClosed()) - { - TRACE(_T("ZipArchive is closed.\n")); - return false; - } - - if (!m_centralDir.IsValidIndex(uIndex)) - return false; - - fhInfo = *(m_centralDir[uIndex]); - m_centralDir.ConvertFileName(true, false, &fhInfo); - return true; -} - -int CZipArchive::FindFile(LPCTSTR lpszFileName, bool bCaseSensitive) -{ - if (IsClosed()) - { - TRACE(_T("ZipArchive is closed.\n")); - return (int)-1; - } - // this is required for fast finding and is done only once - if (!m_centralDir.m_bConvertAfterOpen) - { - TRACE(_T("Converting all filenames.")); - m_centralDir.ConvertAll(); - } - if (!m_centralDir.m_bFindFastEnabled) - EnableFindFast(); - int iResult = m_centralDir.FindFileNameIndex(lpszFileName, bCaseSensitive); - return iResult == -1 ? -1 : m_centralDir.m_findarray[iResult].m_uIndex; -} - -bool CZipArchive::OpenFile(WORD uIndex) -{ - if (!m_centralDir.IsValidIndex(uIndex)) - return false; - if (m_storage.IsSpanMode() == 1) - { - TRACE(_T("You cannot extract from the span in creation.\n")); - return false; - } - - - if (m_iFileOpened) - { - TRACE(_T("A file already opened.\n")); - return false; - } - - m_info.Init(); - m_centralDir.OpenFile(uIndex); - if (CurrentFile()->IsEncrypted()) - { - - if (m_pszPassword.GetSize() == 0) - { - TRACE(_T("Password not set for the encrypted file.\n")); - return false; - } - CryptInitKeys(); - if (!CryptCheck()) - ThrowError(CZipException::badPassword); // invalid password - - } - else if (m_pszPassword.GetSize() != 0) - { - TRACE(_T("Password set for a not encrypted file. Ignoring password.\n")); - } - - WORD uMethod = CurrentFile()->m_uMethod; - - if ((uMethod != 0) &&(uMethod != Z_DEFLATED)) - ThrowError(CZipException::badZipFile); - - if (uMethod == Z_DEFLATED) - { - m_info.m_stream.opaque = m_bDetectZlibMemoryLeaks ? &m_list : 0; - int err = inflateInit2(&m_info.m_stream, -MAX_WBITS); - // * windowBits is passed < 0 to tell that there is no zlib header. - // * Note that in this case inflate *requires* an extra "dummy" byte - // * after the compressed stream in order to complete decompression and - // * return Z_STREAM_END. - CheckForError(err); - } - m_info.m_uComprLeft = CurrentFile()->m_uComprSize; - if (CurrentFile()->IsEncrypted()) - m_info.m_uComprLeft -= ENCR_HEADER_LEN; - m_info.m_uUncomprLeft = CurrentFile()->m_uUncomprSize; - m_info.m_uCrc32 = 0; - m_info.m_stream.total_out = 0; - m_info.m_stream.avail_in = 0; - - m_iFileOpened = extract; - return true; -} - - -int CZipArchive::GetLocalExtraField(char *pBuf, int iSize) -{ - if (IsClosed()) - { - TRACE(_T("ZipArchive is closed.\n")); - return -1; - } - - if (m_iFileOpened != extract) - { - TRACE(_T("A file must be opened to get the local extra field.\n")); - return -1; - } - - int size = m_centralDir.m_pLocalExtraField.GetSize(); - if (!pBuf|| !size) - return size; - - if (iSize < size) - size = iSize; - - memcpy(pBuf, m_centralDir.m_pLocalExtraField, size); - return size; -} - -void* CZipArchive::_zliballoc(void* opaque, UINT items, UINT size) -{ - void* p = new char[size * items]; - if (opaque) - { - CZipPtrList* list = (CZipPtrList*) opaque; - list->AddTail(p); - } - return p; -} - -void CZipArchive::_zlibfree(void* opaque, void* address) -{ - if (opaque) - { - CZipPtrList* list = (CZipPtrList*) opaque; - CZipPtrListIter iter = list->Find(address); - if (list->IteratorValid(iter)) - list->RemoveAt(iter); - } - delete[] address; -} - -void CZipArchive::CheckForError(int iErr) -{ - if ((iErr == Z_OK) ||(iErr == Z_NEED_DICT)) - return; - - ThrowError(iErr, true); -} - -CZipFileHeader* CZipArchive::CurrentFile() -{ - ASSERT(m_centralDir.m_pOpenedFile); - return m_centralDir.m_pOpenedFile; -} - -DWORD CZipArchive::ReadFile(void *pBuf, - DWORD iSize) -{ - if (m_iFileOpened != extract) - { - TRACE(_T("Current file must be opened.\n")); - return 0; - } - - if (!pBuf || !iSize) - return 0; - - m_info.m_stream.next_out = (Bytef*)pBuf; - m_info.m_stream.avail_out = iSize > m_info.m_uUncomprLeft - ? m_info.m_uUncomprLeft : iSize; - - - DWORD iRead = 0; - - // may happen when the file is 0 sized - bool bForce = m_info.m_stream.avail_out == 0 && m_info.m_uComprLeft > 0; - while (m_info.m_stream.avail_out > 0 || (bForce && m_info.m_uComprLeft > 0)) - { - if ((m_info.m_stream.avail_in == 0) && - (m_info.m_uComprLeft > 0)) - { - DWORD uToRead = m_info.m_pBuffer.GetSize(); - if (m_info.m_uComprLeft < uToRead) - uToRead = m_info.m_uComprLeft; - - if (uToRead == 0) - return 0; - - m_storage.Read(m_info.m_pBuffer, uToRead, false); - CryptDecodeBuffer(uToRead); - m_info.m_uComprLeft -= uToRead; - - m_info.m_stream.next_in = (Bytef*)(char*)m_info.m_pBuffer; - m_info.m_stream.avail_in = uToRead; - } - - if (CurrentFile()->m_uMethod == 0) - { - DWORD uToCopy = m_info.m_stream.avail_out < m_info.m_stream.avail_in - ? m_info.m_stream.avail_out : m_info.m_stream.avail_in; - - memcpy(m_info.m_stream.next_out, m_info.m_stream.next_in, uToCopy); - - m_info.m_uCrc32 = crc32(m_info.m_uCrc32, m_info.m_stream.next_out, uToCopy); - - m_info.m_uUncomprLeft -= uToCopy; - m_info.m_stream.avail_in -= uToCopy; - m_info.m_stream.avail_out -= uToCopy; - m_info.m_stream.next_out += uToCopy; - m_info.m_stream.next_in += uToCopy; - m_info.m_stream.total_out += uToCopy; - iRead += uToCopy; - } - else - { - DWORD uTotal = m_info.m_stream.total_out; - Bytef* pOldBuf = m_info.m_stream.next_out; - int err = inflate(&m_info.m_stream, Z_SYNC_FLUSH); - DWORD uToCopy = m_info.m_stream.total_out - uTotal; - - m_info.m_uCrc32 = crc32(m_info.m_uCrc32, pOldBuf, uToCopy); - - m_info.m_uUncomprLeft -= uToCopy; - iRead += uToCopy; - - if (err == Z_STREAM_END) - return iRead; - - CheckForError(err); - } - } - - return iRead; -} - -void CZipArchive::Close(bool bAfterException) -{ - // if after an exception - the archive may be closed, but the file may be opened - if (IsClosed() && (!bAfterException || IsClosed(false))) - { - TRACE(_T("ZipArchive is already closed.\n")); - return; - } - - if (!bAfterException) - { - if (m_iFileOpened == extract) - CloseFile(NULL); - - if (m_iFileOpened == compress) - CloseNewFile(); - - // write central directory - m_centralDir.Write(); - } - else - { - m_info.m_pBuffer.Release(); - m_iFileOpened = nothing; - EmptyPtrList(); - } - - m_centralDir.Clear(); - m_storage.Close(bAfterException); - -} - -void CZipArchive::SetSpanCallback(ZIPCALLBACKFUN pFunc, void* pData) -{ - m_storage.m_pChangeDiskFunc = pFunc; - m_storage.m_pCallbackData = pData; -} - -void CZipArchive::SetAdvanced(int iWriteBuffer, int iExtractBuffer, int iSearchBuffer) -{ - if (!IsClosed()) - { - TRACE(_T("Set this options before opening the archive.\n")); - return; - } - - m_storage.m_iWriteBufferSize = iWriteBuffer < 1024 ? 1024 : iWriteBuffer; - m_info.m_iBufferSize = iExtractBuffer < 1024 ? 1024 : iExtractBuffer; - m_centralDir.m_iBufferSize = iSearchBuffer < 1024 ? 1024 : iSearchBuffer; -} - -int CZipArchive::CloseFile(CZipFile &file) -{ - CZipString temp = file.GetFilePath(); - file.Close(); - return CloseFile(temp); -} - -int CZipArchive::CloseFile(LPCTSTR lpszFilePath, bool bAfterException) -{ - if (m_iFileOpened != extract) - { - TRACE(_T("No opened file.\n")); - return false; - } - - int iRet = 1; - if (!bAfterException) - { - if (m_info.m_uUncomprLeft == 0) - { - if (m_info.m_uCrc32 != CurrentFile()->m_uCrc32) - ThrowError(CZipException::badCrc); - } - else - iRet = -1; - - - if (CurrentFile()->m_uMethod == Z_DEFLATED) - inflateEnd(&m_info.m_stream); - - - if (lpszFilePath) - { - - if (!ZipCompatibility::IsPlatformSupported(CurrentFile()->GetSystemCompatibility()) - // the line above is to avoid exception in GetSystemAttr(), we cannot - // catch it here because we wouldn't know what to do with it (delete or what) - ||!ZipPlatform::SetFileModTime(lpszFilePath, CurrentFile()->GetTime()) - ||!ZipPlatform::SetFileAttr(lpszFilePath, CurrentFile()->GetSystemAttr())) - iRet = -2; - } - } - m_centralDir.CloseFile(); - m_iFileOpened = nothing; - m_info.m_pBuffer.Release(); - EmptyPtrList(); - return iRet; -} - -bool CZipArchive::OpenNewFile(CZipFileHeader & header, - int iLevel, - LPCTSTR lpszFilePath) -{ - if (IsClosed()) - { - TRACE(_T("ZipArchive is closed.\n")); - return false; - } - - if (m_iFileOpened) - { - TRACE(_T("A file already opened.\n")); - return false; - } - - if (m_storage.IsSpanMode() == -1) - { - TRACE(_T("You cannot add the files to the existing disk spannig archive.\n")); - return false; - } - - if (GetNoEntries() ==(WORD)USHRT_MAX) - { - TRACE(_T("Maximum file count inside archive reached.\n")); - return false; - } - - DWORD uAttr = 0; // ..compiler - time_t ttime; - int iCode = 0; - if (lpszFilePath) - { - iCode = (ZipPlatform::GetFileAttr(lpszFilePath, uAttr) - && ZipPlatform::GetFileModTime(lpszFilePath, ttime)) ? 1 : -1; - if (iCode == -1) - // do not continue - if the file was a directory then not recognizing it will cause - // serious errors (need uAttr to recognize it) - return false; - } - - m_info.Init(); - - - if (iCode == 1) - { - header.SetTime(ttime); - SetFileHeaderAttr(header, uAttr); // set system compatibility as well - } - else - header.SetSystemCompatibility(m_iArchiveSystCompatib); - - m_centralDir.AddNewFile(header); - - - CZipString szFileName = CurrentFile()->GetFileName(); - if (szFileName.IsEmpty()) - { - szFileName.Format(_T("file%i"), GetNoEntries()); - CurrentFile()->SetFileName(szFileName); - } - - bool bIsDirectory = CurrentFile()->IsDirectory(); - if (bIsDirectory) - { - CZipString szEnding = szFileName.Right(1); - if (szEnding != _T("/") && szEnding != _T("\\")) - { - szFileName += CZipPathComponent::m_cSeparator; - CurrentFile()->SetFileName(szFileName); - } - } - - - - - // this ensures the conversion will take place anyway (must take because we are going - // to write the local header in a moment - m_centralDir.ConvertFileName(false, m_centralDir.m_bConvertAfterOpen); - - - - bool bEncrypted = m_pszPassword.GetSize() != 0; - -#ifdef _DEBUG - if (bIsDirectory && bEncrypted) - TRACE(_T("Warning! Encrypting a directory. Possible but pointless.\n\ - Clear the password before adding a directory.\n")); -#endif - - if (!CurrentFile()->PrepareData(iLevel, m_storage.IsSpanMode() == 1, bEncrypted)) - ThrowError(CZipException::tooLongFileName); - - CurrentFile()->WriteLocal(m_storage); - - // we have written the local header, but if we keep filenames not converted - // in memory , we have to restore the non-converted value - if (m_centralDir.m_bConvertAfterOpen) - CurrentFile()->SetFileName(szFileName); - - if (bEncrypted) - { - CZipAutoBuffer buf(ENCR_HEADER_LEN); - // use pseudo-crc since we don't know it yet - CryptCryptHeader((long)header.m_uModTime << 16, buf); - m_storage.Write(buf, ENCR_HEADER_LEN, false); - } - - - m_info.m_uComprLeft = 0; - m_info.m_stream.avail_in = (uInt)0; - m_info.m_stream.avail_out = (uInt)m_info.m_pBuffer.GetSize(); - m_info.m_stream.next_out = (Bytef*)(char*)m_info.m_pBuffer; - m_info.m_stream.total_in = 0; - m_info.m_stream.total_out = 0; - - if (bIsDirectory && (CurrentFile()->m_uMethod != 0)) - CurrentFile()->m_uMethod = 0; - - if (CurrentFile()->m_uMethod == Z_DEFLATED) - { - m_info.m_stream.opaque = m_bDetectZlibMemoryLeaks ? &m_list : 0; - - int err = deflateInit2(&m_info.m_stream, iLevel, - Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY); - - CheckForError(err); - } - m_iFileOpened = compress; - return true; -} - - -bool CZipArchive::ExtractFile(WORD uIndex, - LPCTSTR lpszPath, - bool bFullPath, - LPCTSTR lpszNewName, - ZIPCALLBACKFUN pCallback, - void* pUserData, - DWORD nBufSize) -{ - if (!nBufSize && !lpszPath) - return false; - - CZipFileHeader header; - GetFileInfo(header, uIndex); // to ensure that slash and oem conversions take place - CZipString szFile = lpszPath; - CZipPathComponent::AppendSeparator(szFile); - CZipPathComponent zpc(lpszNewName ? lpszNewName : (LPCTSTR)header.GetFileName()); - szFile += bFullPath ? zpc.GetNoDrive() : TrimRootPath(zpc); - - if (header.IsDirectory()) - { - ZipPlatform::ForceDirectory(szFile); - ZipPlatform::SetFileAttr(szFile, header.GetSystemAttr()); - } - else - { - if (!OpenFile(uIndex)) - return false; - - CZipPathComponent zpc(szFile); - ZipPlatform::ForceDirectory(zpc.GetFilePath()); - CZipFile f(szFile, CZipFile::modeWrite | - CZipFile::modeCreate | CZipFile::shareDenyWrite); - DWORD iRead, iFileLength = pCallback ? header.GetSize() : 0, iSoFar = 0; - CZipAutoBuffer buf(nBufSize); - do - { - iRead = ReadFile(buf, buf.GetSize()); - if (iRead) - { - f.Write(buf, iRead); - iSoFar += iRead; - if (pCallback) - if (!pCallback(iFileLength, iSoFar, pUserData)) - break; - } - } - while (iRead == buf.GetSize()); - return CloseFile(f) == 1; - } - return true; -} - -void CZipArchive::SetExtraField(const char *pBuf, WORD iSize) -{ - if (m_iFileOpened != compress) - { - TRACE(_T("A new file must be opened.\n")); - return; - } - if (!pBuf || !iSize) - return; - - CurrentFile()->m_pExtraField.Allocate(iSize); - memcpy(CurrentFile()->m_pExtraField, pBuf, iSize); -} - -bool CZipArchive::WriteNewFile(const void *pBuf, DWORD iSize) -{ - if (m_iFileOpened != compress) - { - TRACE(_T("A new file must be opened.\n")); - return false; - } - - - m_info.m_stream.next_in = (Bytef*)pBuf; - m_info.m_stream.avail_in = iSize; - CurrentFile()->m_uCrc32 = crc32(CurrentFile()->m_uCrc32, (Bytef*)pBuf, iSize); - - - while (m_info.m_stream.avail_in > 0) - { - if (m_info.m_stream.avail_out == 0) - { - CryptEncodeBuffer(); - m_storage.Write(m_info.m_pBuffer, m_info.m_uComprLeft, false); - m_info.m_uComprLeft = 0; - m_info.m_stream.avail_out = m_info.m_pBuffer.GetSize(); - m_info.m_stream.next_out = (Bytef*)(char*)m_info.m_pBuffer; - } - - if (CurrentFile()->m_uMethod == Z_DEFLATED) - { - DWORD uTotal = m_info.m_stream.total_out; - int err = deflate(&m_info.m_stream, Z_NO_FLUSH); - CheckForError(err); - m_info.m_uComprLeft += m_info.m_stream.total_out - uTotal; - } - else - { - DWORD uToCopy = (m_info.m_stream.avail_in < m_info.m_stream.avail_out) - ? m_info.m_stream.avail_in : m_info.m_stream.avail_out; - - memcpy(m_info.m_stream.next_out, m_info.m_stream.next_in, uToCopy); - - m_info.m_stream.avail_in -= uToCopy; - m_info.m_stream.avail_out -= uToCopy; - m_info.m_stream.next_in += uToCopy; - m_info.m_stream.next_out += uToCopy; - m_info.m_stream.total_in += uToCopy; - m_info.m_stream.total_out += uToCopy; - m_info.m_uComprLeft += uToCopy; - } - } - - return true; -} - -bool CZipArchive::CloseNewFile() -{ - if (m_iFileOpened != compress) - { - TRACE(_T("A new file must be opened.\n")); - return false; - } - - m_info.m_stream.avail_in = 0; - - int err = Z_OK; - if (CurrentFile()->m_uMethod == Z_DEFLATED) - while (err == Z_OK) - { - if (m_info.m_stream.avail_out == 0) - { - CryptEncodeBuffer(); - m_storage.Write(m_info.m_pBuffer, m_info.m_uComprLeft, false); - m_info.m_uComprLeft = 0; - m_info.m_stream.avail_out = m_info.m_pBuffer.GetSize(); - m_info.m_stream.next_out = (Bytef*)(char*)m_info.m_pBuffer; - } - DWORD uTotal = m_info.m_stream.total_out; - err = deflate(&m_info.m_stream, Z_FINISH); - m_info.m_uComprLeft += m_info.m_stream.total_out - uTotal; - } - - if (err == Z_STREAM_END) - err = Z_OK; - CheckForError(err); - - if (m_info.m_uComprLeft > 0) - { - CryptEncodeBuffer(); - m_storage.Write(m_info.m_pBuffer, m_info.m_uComprLeft, false); - } - - if (CurrentFile()->m_uMethod == Z_DEFLATED) - { - err = deflateEnd(&m_info.m_stream); - CheckForError(err); - } - - - // it may be increased by the encrypted header size - CurrentFile()->m_uComprSize += m_info.m_stream.total_out; - CurrentFile()->m_uUncomprSize = m_info.m_stream.total_in; - - m_centralDir.CloseNewFile(); - m_iFileOpened = nothing; - m_info.m_pBuffer.Release(); - EmptyPtrList(); - return true; -} - -void CZipArchive::DeleteFiles(const CZipStringArray &aNames, - bool bCaseSensitive) -{ - CZipWordArray indexes; - - for (WORD i = 0; i < GetNoEntries(); i++) - { - CZipFileHeader fh; - GetFileInfo(fh, i); - CZipString szFileName = fh.GetFileName(); - for (int j = 0; j < aNames.GetSize(); j++) - { - bool bEqual = (bCaseSensitive ? aNames[j].Collate(szFileName) - : aNames[j].CollateNoCase(szFileName)) == 0; - if (bEqual) - { - indexes.Add(i); - break; - } - } - } - - DeleteFiles(indexes); -} - - -void CZipArchive::DeleteFiles(CZipWordArray &aIndexes) -{ - if (IsClosed()) - { - TRACE(_T("ZipArchive is closed.\n")); - return; - } - - if (m_storage.IsSpanMode()) - { - TRACE(_T("You cannot delete files from the disk spannig archive.\n")); - return; - } - - if (m_iFileOpened) - { - TRACE(_T("You cannot delete files if there is a file opened.\n")); - return; - } - - // sorting the index table - - int uSize = aIndexes.GetSize(); - if (!uSize) - return; - - aIndexes.Sort(true); - - m_centralDir.RemoveFromDisk(); - - m_info.Init(); - // remove in a reverse order - for (int i = uSize - 1; i >= 0; i--) - DeleteInternal(aIndexes[i]); - m_info.m_pBuffer.Release(); -} - -DWORD CZipArchive::RemovePackedFile(DWORD uStartOffset, DWORD uEndOffset) -{ - uStartOffset += m_centralDir.m_uBytesBeforeZip; - uEndOffset += m_centralDir.m_uBytesBeforeZip; - DWORD BytesToCopy = m_storage.m_pFile->GetLength() - uEndOffset; - DWORD uTotalToWrite = BytesToCopy; - - char* buf = (char*)m_info.m_pBuffer; - if (BytesToCopy > m_info.m_pBuffer.GetSize()) - BytesToCopy = m_info.m_pBuffer.GetSize(); - - DWORD TotalWritten = 0; - DWORD size_read; - - do - { - m_storage.m_pFile->Seek(uEndOffset + TotalWritten, CZipAbstractFile::begin); - size_read = m_storage.m_pFile->Read(buf, BytesToCopy); - if (size_read > 0) - { - m_storage.m_pFile->Seek(uStartOffset + TotalWritten, CZipAbstractFile::begin); - m_storage.m_pFile->Write(buf, size_read); - TotalWritten += size_read; - } - - } - while (size_read == BytesToCopy); - if (uTotalToWrite != TotalWritten) - ThrowError(CZipException::generic); - DWORD uRemoved = (uEndOffset - uStartOffset); - m_storage.m_pFile->SetLength(m_storage.m_pFile->GetLength() - uRemoved); - return uRemoved; -} - - -void CZipArchive::DeleteInternal(WORD uIndex) -{ - CZipFileHeader* pfh = m_centralDir[uIndex]; - DWORD uOtherOffsetChanged = 0; - - if (uIndex == GetNoEntries() - 1) // last entry or the only one entry - m_storage.m_pFile->SetLength(pfh->m_uOffset + m_centralDir.m_uBytesBeforeZip); - else - uOtherOffsetChanged = RemovePackedFile(pfh->m_uOffset, m_centralDir[uIndex + 1]->m_uOffset); - - - m_centralDir.RemoveFile(uIndex); - - // teraz uaktualnij offsety w pozosta³ych pozycjach central dir - // (update offsets in file headers in the central dir) - if (uOtherOffsetChanged) - { - for (CZipCentralDir::CZipFileHdrLstIter iter = m_centralDir.GetIterator(uIndex); - m_centralDir.m_headers.IteratorValid(iter); ) - { - CZipFileHeader* pHeader = m_centralDir.m_headers.GetNext(iter); - pHeader->m_uOffset -= uOtherOffsetChanged; - } - } -} - -bool CZipArchive::AddNewFile(LPCTSTR lpszFilePath, - int iLevel, - bool bFullPath, - ZIPCALLBACKFUN pCallback, - void* pUserData, - unsigned long nBufSize) -{ - if (!nBufSize) - return false; - - CZipFileHeader header; - CZipPathComponent zpc(lpszFilePath); - header.SetFileName(bFullPath ? zpc.GetNoDrive() : - TrimRootPath(zpc)); - if (header.GetFileNameSize() == 0) - return false; - - - DWORD uAttr; - time_t ttime; - if (!ZipPlatform::GetFileAttr(lpszFilePath, uAttr) || !ZipPlatform::GetFileModTime(lpszFilePath, ttime)) - return false; - SetFileHeaderAttr(header, uAttr); - header.SetTime(ttime); - - if (header.IsDirectory()) - { - // clear password for a directory - bool bRet = false; - CZipString sz = GetPassword(); - if (!sz.IsEmpty()) - SetPassword(); - try - { - bRet = OpenNewFile(header, iLevel); - CloseNewFile(); - } - catch(...) - { - if (!sz.IsEmpty()) - SetPassword(sz); - throw; - } - if (!sz.IsEmpty()) - SetPassword(sz); - return bRet; - } - - CZipFile f; - - // try to open before adding - if (!f.Open(lpszFilePath, CZipFile::modeRead | CZipFile::shareDenyWrite, false) - || !OpenNewFile(header, iLevel)) - return false; - - DWORD iRead, iFileLength = pCallback ? f.GetLength() : 0, iSoFar = 0; - CZipAutoBuffer buf(nBufSize); - do - { - iRead = f.Read(buf, nBufSize); - if (iRead) - { - WriteNewFile(buf, iRead); - iSoFar += iRead; - if (pCallback) - if (!pCallback(iFileLength, iSoFar, pUserData)) - break; - } - - } - while (iRead == buf.GetSize()); - CloseNewFile(); - return true; -} - -bool CZipArchive::AddNewFileDrv(LPCTSTR lpszFilePath, - int iLevel, - bool bFullPath, - ZIPCALLBACKFUN pCallback, - void* pUserData, - unsigned long nBufSize) -{ - if (!nBufSize) - return false; - - CZipFileHeader header; - CZipPathComponent zpc(lpszFilePath); - header.SetFileName(lpszFilePath); - - if (header.GetFileNameSize() == 0) - return false; - - - DWORD uAttr; - time_t ttime; - if (!ZipPlatform::GetFileAttr(lpszFilePath, uAttr) || !ZipPlatform::GetFileModTime(lpszFilePath, ttime)) - return false; - SetFileHeaderAttr(header, uAttr); - header.SetTime(ttime); - - if (header.IsDirectory()) - { - // clear password for a directory - bool bRet = false; - CZipString sz = GetPassword(); - if (!sz.IsEmpty()) - SetPassword(); - try - { - bRet = OpenNewFile(header, iLevel); - CloseNewFile(); - } - catch(...) - { - if (!sz.IsEmpty()) - SetPassword(sz); - throw; - } - if (!sz.IsEmpty()) - SetPassword(sz); - return bRet; - } - - CZipFile f; - - // try to open before adding - if (!f.Open(lpszFilePath, CZipFile::modeRead | CZipFile::shareDenyWrite, false) - || !OpenNewFile(header, iLevel)) - return false; - - DWORD iRead, iFileLength = pCallback ? f.GetLength() : 0, iSoFar = 0; - CZipAutoBuffer buf(nBufSize); - do - { - iRead = f.Read(buf, nBufSize); - if (iRead) - { - WriteNewFile(buf, iRead); - iSoFar += iRead; - if (pCallback) - if (!pCallback(iFileLength, iSoFar, pUserData)) - break; - } - - } - while (iRead == buf.GetSize()); - CloseNewFile(); - return true; -} - -int CZipArchive::GetSpanMode() -{ - return m_storage.m_iSpanMode * m_storage.IsSpanMode(); -} - -CZipString CZipArchive::GetArchivePath() -{ - return m_storage.m_pFile->GetFilePath(); -} - -CZipString CZipArchive::GetGlobalComment() -{ - if (IsClosed()) - { - TRACE(_T("ZipArchive is closed.\n")); - return _T(""); - } - CZipString temp; - return SingleToWide(m_centralDir.m_pszComment, temp) != -1 ? (LPCTSTR)temp : _T(""); -} - -bool CZipArchive::SetGlobalComment(LPCTSTR lpszComment) -{ - if (IsClosed()) - { - TRACE(_T("ZipArchive is closed.\n")); - return false; - } - if (m_storage.IsSpanMode() == -1) - { - TRACE(_T("You cannot modify the global comment of the existing disk spanning archive.\n")); - return false; - } - - WideToSingle(lpszComment, m_centralDir.m_pszComment); - m_centralDir.RemoveFromDisk(); - return true; -} - - - -int CZipArchive::GetCurrentDisk() -{ - return m_storage.GetCurrentDisk() + 1; -} - -bool CZipArchive::SetFileComment(WORD uIndex, LPCTSTR lpszComment) -{ - if (IsClosed()) - { - TRACE(_T("ZipArchive is closed.\n")); - return false; - } - if (m_storage.IsSpanMode() == -1) - { - TRACE(_T("You cannot modify the file comment in the existing disk spanning archive.\n")); - return false; - } - - if (!m_centralDir.IsValidIndex(uIndex)) - return false; - m_centralDir[uIndex]->SetComment(lpszComment); - m_centralDir.RemoveFromDisk(); - return true; -} - - -void CZipArchive::CryptInitKeys() -{ - ASSERT(m_pszPassword.GetSize()); - m_keys[0] = 305419896L; - m_keys[1] = 591751049L; - m_keys[2] = 878082192L; - for (DWORD i = 0; i < m_pszPassword.GetSize(); i++) - CryptUpdateKeys(m_pszPassword[i]); -} - -void CZipArchive::CryptUpdateKeys(char c) -{ - - m_keys[0] = CryptCRC32(m_keys[0], c); - m_keys[1] += m_keys[0] & 0xff; - m_keys[1] = m_keys[1] * 134775813L + 1; - c = char(m_keys[1] >> 24); - m_keys[2] = CryptCRC32(m_keys[2], c); -} - -bool CZipArchive::CryptCheck() -{ - CZipAutoBuffer buf(ENCR_HEADER_LEN); - m_storage.Read(buf, ENCR_HEADER_LEN, false); - BYTE b = 0; - for (int i = 0; i < ENCR_HEADER_LEN; i++) - { - b = buf[i]; // only temporary - CryptDecode((char&)b); - } - // check the last byte - return CurrentFile()->IsDataDescr() ? - (BYTE(CurrentFile()->m_uModTime >> 8) == b) : (BYTE(CurrentFile()->m_uCrc32 >> 24) == b); -} - -char CZipArchive::CryptDecryptByte() -{ - int temp = (m_keys[2] & 0xffff) | 2; - return (char)(((temp * (temp ^ 1)) >> 8) & 0xff); -} - -void CZipArchive::CryptDecode(char &c) -{ - c ^= CryptDecryptByte(); - CryptUpdateKeys(c); -} - -bool CZipArchive::SetPassword(LPCTSTR lpszPassword) -{ - if (m_iFileOpened != nothing) - { - TRACE(_T("You cannot change the password when the file is opened\n")); - return false; // it's important not to change the password when the file inside archive is opened - } - if (IsClosed()) - { - TRACE(_T("Setting the password for a closed archive has no effect.\n")); - } - if (lpszPassword) - { - int iLen = WideToSingle(lpszPassword, m_pszPassword); - if (iLen == -1) - return false; - for (size_t i = 0; (int)i < iLen; i++) - if (m_pszPassword[i] > 127) - { - m_pszPassword.Release(); - TRACE(_T("The password contains forbidden characters. Password cleared.\n")); - return false; - } - } - else - m_pszPassword.Release(); - return true; -} - -CZipString CZipArchive::GetPassword() -{ - CZipString temp; - CZipArchive::SingleToWide(m_pszPassword, temp); - return temp; -} - -DWORD CZipArchive::CryptCRC32(DWORD l, char c) -{ - const DWORD *CRC_TABLE = get_crc_table(); - return CRC_TABLE[(l ^ c) & 0xff] ^ (l >> 8); -} - -void CZipArchive::CryptCryptHeader(long iCrc, CZipAutoBuffer &buf) -{ - CryptInitKeys(); - srand(UINT(GetTickCount()*time(NULL))); - // genereate pseudo-random sequence - char c; - for (int i = 0; i < ENCR_HEADER_LEN - 2; i++) - { - int t1 = rand(); - c = (char)(t1 >> 6); - if (!c) - c = (char)t1; - CryptEncode(c); - buf[i] = c; - - } - c = (char)((iCrc >> 16) & 0xff); - CryptEncode(c); - buf[ENCR_HEADER_LEN - 2] = c; - c = (char)((iCrc >> 24) & 0xff); - CryptEncode(c); - buf[ENCR_HEADER_LEN - 1] = c; -} - -void CZipArchive::CryptEncode(char &c) -{ - char t = CryptDecryptByte(); - CryptUpdateKeys(c); - c ^= t; -} - -void CZipArchive::CryptEncodeBuffer() -{ - if (CurrentFile()->IsEncrypted()) - for (DWORD i = 0; i < m_info.m_uComprLeft; i++) - CryptEncode(m_info.m_pBuffer[i]); -} - -void CZipArchive::CloseFileAfterTestFailed() -{ - if (m_iFileOpened != extract) - { - TRACE(_T("No file opened.\n")); - return; - } - m_info.m_pBuffer.Release(); - m_centralDir.Clear(false); - m_iFileOpened = nothing; -} - -bool CZipArchive::TestFile(WORD uIndex, ZIPCALLBACKFUN pCallback, void* pUserData, DWORD uBufSize) -{ - if (!uBufSize) - return false; - CZipFileHeader* pHeader = m_centralDir[uIndex]; - if (pHeader->IsDirectory()) - { - // we do not test whether the password for the encrypted directory - // is correct, since it seems to be senseless (anyway password - // encrypted directories should be avoided - it adds 12 bytes) - DWORD iSize = pHeader->m_uComprSize; - if ((iSize != 0 || iSize != pHeader->m_uUncomprSize) - // different treating compressed directories - && !(pHeader->IsEncrypted() && iSize == 12 && !pHeader->m_uUncomprSize)) - CZipException::Throw(CZipException::dirWithSize); - return true; - } - else - { - try - { - if (!OpenFile(uIndex)) - return false; - CZipAutoBuffer buf(uBufSize); - DWORD iRead, iSoFar = 0; - do - { - iRead = ReadFile(buf, buf.GetSize()); - iSoFar += iRead; - if (pCallback) - if (!pCallback(pHeader->m_uUncomprSize, iSoFar, pUserData)) - break; - } - while (iRead == buf.GetSize()); - CloseFile(); - } - catch(...) - { - CloseFileAfterTestFailed(); - throw; - } - } - return true; - -} - -int CZipArchive::WideToSingle(LPCTSTR lpWide, CZipAutoBuffer &szSingle) -{ -#ifdef _UNICODE - return ZipPlatform::WideToSingle(lpWide, szSingle); -#else - - size_t iLen = strlen(lpWide); - // if not UNICODE just copy - // iLen does not include the NULL character - szSingle.Allocate(iLen); - memcpy(szSingle, lpWide, iLen); - return iLen; -#endif - -} - -int CZipArchive::SingleToWide(const CZipAutoBuffer &szSingle, CZipString& szWide) -{ - -#ifdef _UNICODE - return ZipPlatform::SingleToWide(szSingle, szWide); -#else // if not UNICODE just copy - int singleLen = szSingle.GetSize(); - // iLen does not include the NULL character - memcpy(szWide.GetBuffer(singleLen),szSingle.GetBuffer(), singleLen); - szWide.ReleaseBuffer(singleLen); - return singleLen; -#endif -} - -const DWORD* CZipArchive::GetCRCTable() -{ - return get_crc_table(); -} - -void CZipArchive::CryptDecodeBuffer(DWORD uCount) -{ - if (CurrentFile()->IsEncrypted()) - for (DWORD i = 0; i < uCount; i++) - CryptDecode(m_info.m_pBuffer[i]); -} - -void CZipArchive::EmptyPtrList() -{ - if (m_list.GetCount()) - { - // if some memory hasn't been freed due to an error in zlib, so free it now - CZipPtrListIter iter = m_list.GetHeadPosition(); - while (m_list.IteratorValid(iter)) - delete[] m_list.GetNext(iter); - } - m_list.RemoveAll(); -} - - - -void CZipArchive::SetFileHeaderAttr(CZipFileHeader& header, DWORD uAttr) -{ - header.SetSystemCompatibility(m_iArchiveSystCompatib); - header.SetSystemAttr(uAttr); -} - -void CZipArchive::EnableFindFast(bool bEnable) -{ - if (IsClosed()) - { - TRACE(_T("Set it after opening the archive")); - return; - } - - if (m_centralDir.m_bFindFastEnabled == bEnable) - return; - m_centralDir.m_bFindFastEnabled = bEnable; - if (bEnable) - m_centralDir.BuildFindFastArray(); - else - m_centralDir.m_findarray.RemoveAll(); -} - -bool CZipArchive::SetSystemCompatibility(int iSystemComp) -{ - if (IsClosed()) - { - TRACE(_T("Set it after opening the archive")); - return false; - } - - if (m_iFileOpened == compress) - { - TRACE(_T("Set it before opening a file inside archive.\n")); - return false; - } - - if (!ZipCompatibility::IsPlatformSupported(iSystemComp)) - return false; - m_iArchiveSystCompatib = iSystemComp; - return true; -} - -void CZipArchive::SetRootPath(LPCTSTR szPath) -{ - if (szPath) - { - m_szRootPath = szPath; - CZipPathComponent::AppendSeparator(m_szRootPath); - } - else - m_szRootPath.Empty(); -} - -CZipString CZipArchive::TrimRootPath(CZipPathComponent &zpc) -{ - if (m_szRootPath.IsEmpty()) - return zpc.GetFullFileName(); - CZipString szPath = zpc.GetFullPath(); - - if (szPath.Left(m_szRootPath.GetLength()).CompareNoCase(m_szRootPath) == 0) - return szPath.Mid(m_szRootPath.GetLength()); - else - return zpc.GetFullFileName(); -} diff --git a/harbour/contrib/hbzlib/ziparchive.h b/harbour/contrib/hbzlib/ziparchive.h deleted file mode 100644 index 9cb72651d9..0000000000 --- a/harbour/contrib/hbzlib/ziparchive.h +++ /dev/null @@ -1,1063 +0,0 @@ -/** -* \file ZipArchive.h -* Interface for the CZipArchive class. -* -* \author Tadeusz Dracz -*/ -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -// -// Check the site http://software.artpol.com.pl for the updated version of the library. -//////////////////////////////////////////////////////////////////////////////// -// -// The following information files are distributed along with this library: -// license.txt - licensing information -// gpl.txt - General Public License text -// readme.txt - general information -// changelog.txt - revision history -// faq.txt - frequently asked questions -// appnote.txt - details on the zip format -// ( also available at ftp://ftp.pkware.com/appnote.zip) -// -// - - -#if !defined(AFX_ZIPARCHIVE_H__A7F528A6_1872_4071_BE66_D56CC2DDE0E6__INCLUDED_) -#define AFX_ZIPARCHIVE_H__A7F528A6_1872_4071_BE66_D56CC2DDE0E6__INCLUDED_ - -/** - \namespace ziparchv - A helper namespace. - \par Members - - CZipFileMapping - -*/ - -/** - \struct CZipFileMapping ZipFileMapping.h - - Maps a file to the memory. A system-specific implementation. - Stored in ziparchv namespace. - - \c #include "ZipFileMapping.h" -*/ - - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -// to ensure that the correct files are copied -// (see "Compatibility" chapter in the documentation). -// Rebuild the project after copying the files. -#ifdef ZIP_ARCHIVE_MFC_PROJ - #ifndef ZIP_ARCHIVE_MFC - #error You need to copy files from the MFC subdirectory \ - to the ZipArchive root directory - #endif -#elif defined ZIP_ARCHIVE_STL_PROJ - #ifndef ZIP_ARCHIVE_STL - #error You need to copy files from the STL subdirectory \ - to the ZipArchive root directory - #endif -#endif // - -#include "zipexception.h" -#include "zipcentraldir.h" -#include "zipstorage.h" -#include "zipinternalinfo.h" -#include "zippathcomponent.h" -#include "zipstring.h" - - -/** - The representation of the archive file. - This class provides all the operarions on the zip archive. -*/ -ZEXPORT class CZipArchive -{ - -public: - - - CZipArchive(); - virtual ~CZipArchive(); - -/** - In non-UNICODE version just copy \e szSingle to \e szWide. - In UNICODE version works the same way as ZipPlatform::SingleToWide - \param szSingle - \param szWide - - \return (in non-UNICODE version the number of characters copied) - \see ZipPlatform::SingleToWide -*/ - static int SingleToWide(const CZipAutoBuffer &szSingle, CZipString& szWide); - -/** - In non-UNICODE version just copy \e lpWide to \e szSingle. - In UNICODE version works the same way as ZipPlatform::WideToSingle - \param lpWide - \param szSingle - \return (in non-UNICODE version the number of characters copied) - \see ZipPlatform::WideToSingle - -*/ - static int WideToSingle(LPCTSTR lpWide, CZipAutoBuffer &szSingle); - - -/** - Set the password for the file to be opened or created. - Use this method BEFORE opening or adding a file - \param lpszPassword - set it to NULL to clear password - \return \c false if the password contains ASCII characters - with values 128 or higher or the file inside archive is opened - -*/ - bool SetPassword(LPCTSTR lpszPassword = NULL); - -/** - \return the current archive password or an empty string if there is no password -*/ - CZipString GetPassword(); - -/** - Set the buffer sizes. No buffer can be set smaller than 1024. - Use this method before opening the archive. The optimal size for - the write buffer in the disk spanning archive is the size of the volume. - - \param iWriteBuffer - buffer used during write operation to the disk - \see CZipStorage::m_iWriteBufferSize - \param iExtractBuffer - buffer used in extracting and compressing files - \see CZipInternalInfo::m_iBufferSize - \param iSearchBuffer - the buffer used in searching for the central dir - \see CZipCentralDir::m_iBufferSize -*/ - void SetAdvanced(int iWriteBuffer = 65535, int iExtractBuffer = 16384, int iSearchBuffer = 32768); - - - -/** - Set callback function used during operations on a - PKZIP compatible disk spanning archive to change disks. - Set it before opening the archive for reading. If you open the archive - in the \ref PKSpan "PKZIP compatible mode" and don't set the callback function, - the exception CZipException::noCallback will be thrown. - - \anchor callDes - - Callback function description. - - - Callback function is called when there is a need for a disk change. - Calling CZipArchive methods from inside this function may result in an unexpected behavior - - The callback function is defined as follows:
- typedef bool (*ZIPCALLBACKFUN )(DWORD, int , void* ); - - - the first argument \c (DWORD) - a disk number needed (counting from 1); - - the second \c (int) - the reason for calling: - - -1 : a disk needed for reading
- other codes occurs during writing and signalize errors: - - >=0 : number of bytes needed (not enough disk space) - - -2 : the file with the archive name already exists on the disk - - -3 : the disk is probably write - protected - - -4 : couldn't create a file - - the third argument \c (void*) - user defined data passed to #SetSpanCallback - as the second parameter. - - Return \c false from the callback function to abort operation: the proper exception will be thrown. - - \param pFunc - callback function - \param pData - user data to be passed to the callback function as the last parameter - \see GetSpanMode -*/ - void SetSpanCallback(ZIPCALLBACKFUN pFunc, void* pData = NULL); - - /** - archive open modes - */ - enum ZipOpenMode - { - zipOpen, ///< open an existing archive - /** - Open an existing archive as a read only file. - This mode is intended to use in a self extract code, - if you try to add or delete a file in this mode, - an exception will be thrown. - */ - zipOpenReadOnly, - zipCreate, ///< create a new archive - zipCreateSpan ///< create a disk spanning archive - }; - - - -/** - Open or create a zip archive. - - The archive creation mode depends on \e iMode and \e iVolumesSize values: - - if \e iMode == #zipCreateSpan and \e iVolumeSize <= 0 then create disk spanning - archive in \ref PKSpan "PKZIP compatible mode" (pkzipSpan) - - if \e iMode == #zipCreateSpan and \e iVolumeSize > 0 then create disk spanning - archive in \ref TDSpan "TD compatible mode" (tdSpan) - - if \e iMode == #zipOpen and the existing archive is a spanned archive - then pkzipSpan mode is assumed if the archive is on a removable device - or tdSpan otherwise;
- if you want to open tdSpan archive on a removable device, set \e iVolumeSize - to a value different from 0 - - if \e iMode == #zipCreate then \e iVolumeSize doesn't matter - - \param szPathName - the path to the archive - \param iMode - the open mode - \param iVolumeSize - the volume size in the disk spanning archive - \note Throws exceptions. - \see GetSpanMode -*/ - void Open(LPCTSTR szPathName, int iMode = zipOpen, int iVolumeSize = 0); - - -/** - Open or create the archive in memory. The CZipMemFile object is not closed - after closing the archive, so that is it possible to work with it afterwards. - \param mf - CZipMemFile structure to create archive in or extract from - \param iMode - Open mode. - The following modes are valid: #zipOpen, #zipOpenReadOnly, #zipCreate - \note Throws exceptions. -*/ - void Open(CZipMemFile& mf, int iMode = zipOpen); - -/** - Set #m_szRootPath to a specified value. Use it if you don't want to set - \e bFullPath argument in #AddNewFile or #ExtractFile to true and you - don't want to strip the whole path neither, but only a specific beginning. - Use it after opening the archive and before using #AddNewFile or #ExtractFile. - See \ref q9 "the FAQ" for the example of use. - \param szPath - Set it to the string that you want to be omitted from the beginning of the path of the file - in the archive - - if \c NULL - clears the #m_szRootPath and no path beginning will be matched against it - \see #AddNewFile - \see #ExtractFile. - -*/ - void SetRootPath(LPCTSTR szPath = NULL); - -/** - Add a new file to the archive. - - \anchor callbFas - - Callback function description. - - - To set the callback function for this operation pass its pointer as the - argument (do not use \c SetSpanCallback for it - its for different purposes). - - The callback function, if set, is called after reading and writing one portion of data. - - the first argument \c (DWORD): - total number of bytes to read (the size of the file) - - the second one \c (int) : - total number bytes already read - - the third argument \c (void*): - pUserData argument passed to #AddNewFile - - Return \c true from inside the callback function to continue - or \c false to abort the operation (an exception will be most probably thrown). - - \param lpszFilePath - the full path to the file to be added - \param iLevel - the compression level, see #OpenNewFile - \param bFullPath
- - if \c true, include full path of the file inside the archive; - - if \c false only the filename without a path is stored in the archive
- in this case if #m_szRootPath is set previously with #SetRootPath - and if the beginning of \e lpszFilePath equals #m_szRootPath - then the filename is set to the remaining part of \e lpszFilePath - (you can say to \e lpszFilePath minus #m_szRootPath) - - - \param pCallback - callback function (may be NULL) - \param pUserData - user - defined data passed on to the callback function - (doesn't matter if there is no callback function defined) - \param nBufSize - the size of the buffer used - \return \c if it returns false then the file was not added, but the internal - state allows you to add other files (which is not possible after throwing - an exception) - \note Throws exceptions. -*/ - bool AddNewFile(LPCTSTR lpszFilePath, int iLevel = -1, bool bFullPath = true, ZIPCALLBACKFUN pCallback = NULL, void* pUserData = NULL, unsigned long nBufSize = 65535); - bool AddNewFileDrv(LPCTSTR lpszFilePath, int iLevel = -1, bool bFullPath = true, ZIPCALLBACKFUN pCallback = NULL, void* pUserData = NULL, unsigned long nBufSize = 65535); - -/** - Add a new file to the opened zip archive. The zip archive cannot be - an existing disk spanning archive (existing at the moment of opening archive), - because modifying such an archive is not possible (at least not with this - version ). - - \param header - The structure that provides additional information about the added file. - The following fields are valid: - - \e m_uMethod - file compression method; can be 0 (storing) or Z_DEFLATE (deflating) - otherwise Z_DEFLATE is assumed - - \e m_uModDate, \e m_uModTime - Use CZipFileHeader::SetTime to set them. - If \e lpszFilePath is not NULL this fields are overwritten and updated automatically. - See CZipFileHeader::SetTime - - \e m_uExternalAttr - Attributes of the file. - If \e lpszFilePath is not NULL this field is overwritten and updated automatically. - Use #SetFileHeaderAttr to set them. See #SetFileHeaderAttr. - - \e m_szFileName - A filename (may be with path) to be stored inside archive - to represent this file. See CZipFileHeader::SetFileName - - \e m_szComment - A file comment. See CZipFileHeader::SetComment - - \e m_pExtraField - LOCAL extra field, use #SetExtraField after opening - a new file, but before closing it to set the not local extra field - in the header in the central directory. See #SetExtraField
- Other fields are ignored - they are updated automatically. - If the function returns \c true, \link #GetSystemCompatibility - system compatibility \endlink for this object is - set to the correct value (the same as #m_iArchiveSystCompatib), - additionally if \e lpszFilePath was not NULL, the attributes and - the time fields are filled with information retrieved from - the file pointed by \e lpszFilePath. - \param iLevel - The level of compression (-1, 0 - 9). - The are several preset values for the decompression level: - - Z_DEFAULT_COMPRESSION : -1 - - Z_NO_COMPRESSION : 0 - - Z_BEST_SPEED : 1 - - Z_BEST_COMPRESSION : 9 - \param lpszFilePath - The path to the file to retrieve date stamp and attributes from. - These values are stored inside the archive. - - \return \c false in the following cases: - - the \e lpszFilePath is not NULL and the file attributes and data was not correctly retrieved - - a file is already opened for extraction or compression - - archive is an existing disk span archive - - maximum file count inside archive already reached (65535) - \note Throws exceptions. - -*/ - bool OpenNewFile(CZipFileHeader & header, int iLevel = Z_DEFAULT_COMPRESSION, LPCTSTR lpszFilePath = NULL); - -/** - Compress the contents of the buffer and write it to a new file. - \param pBuf - the buffer containing the data to be compressed and written - \param iSize - the number of bytes to be written from the buffer - \return \c false if the new file hasn't been opened yet - \note Throws exceptions. - \see OpenNewFile -*/ - bool WriteNewFile(const void *pBuf, DWORD iSize); - - -/** - Set the extra field in the central directory of the currently opened file. - Must be used after opening a new file in the archive, but before closing it - To set the local extra field, set it in the CZipFileHeader structure passed - as the argument to the #OpenNewFile - \param pBuf - the bufer with the data to be copied - \param iSize - the size of the extra field in the buffer - \see OpenNewFile -*/ - void SetExtraField(const char *pBuf, WORD iSize); - -/** - Close the new file in the archive. - \return \c false if there is no new file opened - \note Throws exceptions. - \see OpenNewFile -*/ - bool CloseNewFile(); - -/** - Extract the file from the archive. - The argument \e lpszNewName may point to the full path and is influenced by \e bFullPath - argument (if \e lpszNewName contains drive specification then it is removed) - \param uIndex - the index of the file to extract - \param lpszPath - The PATH only to extract the file to. May not be NULL. If you wish to - use UNC path you need to replace \\\\ at the beginning of UNC path with \\\\?\UNC\ . - \param bFullPath
- - if \c true, then extract with the full path - in this case the resulting - file path is \e lpszPath plus the path stored in the archive or plus \e lpszNewName - if \e lpszNewName is not NULL.
- If the path of the file stored in the archive or \e lpszNewName contains a drive letter, - it is removed. - - if \c false, the destination file path is \e lpszPath + \e the filename only - extracted from the path stored in the archive or from \e lpszNewName if - \e lpszNewName is specified;
- if #m_szRootPath is set previously with #SetRootPath then to \e lpszPath - is added the path stored in the archive (or \e lpszNewName if - \e lpszNewName is specified) that has removed the beginning that equals - #m_szRootPath (if there is no common beginning then is behaves like - #m_szRootPath was empty) - \param lpszNewName - The new name of the file after extraction. - If NULL the original filename stored in the archive is used. - May point to the full path but, if \e bFullPath is \c false, only the filename is extracted from this argument, - if the \e bFullPath is \c true, the drive letter (if exists) is removed. - \param pCallback - A callback function called after reading and writing a portion of data. - See a note at \ref callbFas "CZipArchive::AddNewFile" - \param pUserData - user - defined data passed on to the callback function - \param nBufSize - the size of the buffer used - \return \c true if successful - \note Throws exceptions. -*/ - bool ExtractFile(WORD uIndex, LPCTSTR lpszPath, bool bFullPath = true, LPCTSTR lpszNewName = NULL, ZIPCALLBACKFUN pCallback = NULL, void* pUserData = NULL, DWORD nBufSize = 65535); - -/** - Open the file with the given index in the archive for extracting. - Not successfull opening the file doesn't lock the whole archive, so - you can try to open another one (after catching an exception if it was - thrown). - \param uIndex - the index of the file - \return \c true if successful - \note Throws exceptions. -*/ - bool OpenFile(WORD uIndex); - -/** - Decompress currently opened file to the buffer. - \param pBuf - buffer to receive data - \param iSize - the size of the buffer - \return the number of bytes read - \see OpenFile - \note Throws exceptions. -*/ - DWORD ReadFile(void *pBuf, DWORD iSize); - - -/** - Test the file with the given index for the integrity. - The method throws exceptions but performs all the necessary cleanup - before, so that the next file can be tested after catching the exception. - \param uIndex - index of the file to test - \param pCallback - \ref callbFas "callback function" (may be NULL) - \param pUserData - user - defined data passed on to the callback function - (doesn't matter if there is no callback function defined) - \param uBufSize - the size of the buffer used during extraction - \return \c false if the incorrect action has been taken by - the user or the programmer (it is when #OpenFile or - #GetFileInfo returned \c false or \e uBufSize is 0. If the file is didn't - passed the test or there was a disk I/O error, an exception is thrown. - \note Throws exceptions. - -*/ - bool TestFile(WORD uIndex, ZIPCALLBACKFUN pCallback = NULL, void* pUserData = NULL, DWORD uBufSize = 65535); - -/** - Perform the necessary cleanup after an exception was thrown - while testing the archive so that next files in the archive can be tested. - Called by #TestFile. Does not remove the file headers - information from the central directory. - \see TestFile - \see CZipCentralDir::Clear -*/ - void CloseFileAfterTestFailed(); - -/** - Get the local extra filed of the currently opened - for extraction file in the archive. - \param pBuf - the buffer to receive the data - \param iSize - the size of the buffer - \return If \e pBuf is NULL or iSize is 0, returns the size of the local extra field. - Returns -1 if there is no file opened for the extraction. -*/ - int GetLocalExtraField(char* pBuf, int iSize); - -/** - The same as CZipArchive::CloseFile(LPCTSTR), but additionally - closes \e file. - \param file - OPENED CZipFile structure of the extracted file - \return - \note Throws exceptions. - \see CZipArchive::CloseFile(LPCTSTR) -*/ - int CloseFile(CZipFile &file); - - -/** - Close the file opened for extraction in the archive and copy its date and - attributes to the file pointed by \e lpszFilePath - \param lpszFilePath - Points to the path of the file to have the date and attributes information updated. - \param bAfterException - Set to \c true to close the file inside archive after an exception has been - thrown, to allow futher operations on the archive. - \warning Close the file pointed by \e lpszFilePath before using this method, - because the system may not be able to retrieve information from it. - \return
- - "1" = ok - - "-1" = some bytes left to uncompress - probably due to a bad password - - "-2" = setting extracted file date and attributes was not successful - \note Throws exceptions. -*/ - int CloseFile(LPCTSTR lpszFilePath = NULL, bool bAfterException = false); - -/** - Delete the file from the archive with the given index. - - \param uIndex - a zero-based index - \return \c false if: - - \e uIndex is not a valid index - - there is no file opened - - the archive is an existing disk spanning archive (you cannot modify - an existing disk spanning archive) - \note Throws exceptions. - \see AddNewFile -*/ - bool DeleteFile(WORD uIndex); - -/** - Delete files from the archive. - Sort \e aIndexes array in an ascending order. - \param aIndexes - an array of zero-based indexes of the files inside the archive - \note Throws exceptions. -*/ - void DeleteFiles(CZipWordArray &aIndexes); - - -/** - Delete files from the archive. - \param &aNames - an array of filenames inside the archive; they must be the - same as they appear in the archive (the name and the path - if persists - - is required) - \param bCaseSensitive - if \c true, perform a case sensitive comparison - \note Throws exceptions. -*/ - void DeleteFiles(const CZipStringArray &aNames, bool bCaseSensitive = false); - - -/** - Set the global comment in the archive. - \param lpszComment - the file comment - \return \c false if the archive is closed or if it is an existing disk spanning archive - \note Throws exceptions. -*/ - bool SetGlobalComment(LPCTSTR lpszComment); - - -/** - \return the global comment or an empty string if the archive is closed -*/ - CZipString GetGlobalComment(); - - -/** - Set the comment of the file with the given index inside the archive. - \param uIndex - zero-based index of the file in the archive - \param lpszComment - a comment to add - \return \c false if the comment change is impossible - \note Throws exceptions. -*/ - bool SetFileComment(WORD uIndex, LPCTSTR lpszComment); - -/** - \return the path of the currently opened archive volume -*/ - CZipString GetArchivePath(); - -/** - \return
- - a one-based number of the current disk - - 0 if there is no current disk (the archive is closed) -*/ - int GetCurrentDisk(); - -/** - Return the disk spanning mode of the current archive. - - Disk spanning archive modes: - - \anchor PKSpan - PKZIP compatible mode (pkzipSpan): - - only on removable devices - - auto-detect the size of the volume - - write a label to the disk - - there is a need to set the span callback function - - \anchor TDSpan - TD mode (tdSpan): - - may be created on non removable devices - - uses user-defined volume size - - no need to set the span callback function - - \return
- - -2 - exisiting TD mode compatible disk spanning archive - - -1 - exisiting PKZIP compatible - - 0 - no disk spanning - - 1 - PKZIP compatible in creation - - 2 - TD compatible in creation - - This two disk spanning modes create volumes with compatible internal - structure. It means that you can easily convert the volumes created - in one mode to the other one by renaming the files - (in TD mode each volume but last has a number as an extension). - To convert the archive from TD to PKZIP compatible archive, - Copy each file to the removable media, giving them the extension. - ".zip". You should also label each disk with the appropriate label - starting from "pkback# 001". - -*/ - int GetSpanMode(); - - -/** - Find the file in the archive. - If the archive wasn't opened with #m_bConvertAfterOpen set to \c true, - this function automatically convert all the filenames with the function - CZipCentralDir::ConvertAll and set #m_bConvertAfterOpen to \c true. - This function requires \link CZipCentralDir::m_bFindFastEnabled FindFast \endlink - feature enabled. - \param lpszFileName - the name of the file to be found - \param bCaseSensitive - if \c true - perform a case sensitive search - \return
- - the index of the file found - - -1 if there is no such a file in the archive - - \see CZipCentralDir::FindFileNameIndex - \see EnableFindFast - \see CZipCentralDir::ConvertAll - \see SetConvertAfterOpen -*/ - int FindFile(LPCTSTR lpszFileName, bool bCaseSensitive); - -/** - Get the info of the file with the given index. - \param fhInfo - the structure to receive info - \param uIndex - a zero-based index of the file inside the archive - \return \c true if successful -*/ - bool GetFileInfo(CZipFileHeader & fhInfo, WORD uIndex); - - -/** - \return the number of files in the archive -*/ - int GetNoEntries(); - -/** - Close the archive. - \param bAfterException - set it to \c true if you want to close and reuse CZipArchive after is has thrown an exception - ( this method doesn't write any data to the file then but only makes some cleaning) - \note Throws exceptions if \e bAfterException is \c false -*/ - void Close(bool bAfterException = false); - - -/** - Test if the archive is closed (a whole or the current volume only) - \param bArchive
- - \c true: test for the whole archive - - \c false: test for the volume file only - - \return \c true if closed -*/ - bool IsClosed(bool bArchive = true); - - - -/** - Return the system compatibility of the current archive. - System compatibility value for the single file in the archive - (represented by CZipFileHeader) influences file attributes conversion - (the file attributes are defined differently across the platforms). - When opening an existing archive CZipArchive assumes the system compatibility - of the whole archive to be the same as of the first file in the archive - (if present). In other cases the current system value is assumed which is - taken from ZipPlatform::GetSystemID during creating or opening an archive - \remark - If the existing archive during opening is empty, ZipPlatform::GetSystemID - is assumed to be the default system for the files that will be added to the archive. - - \return - one of the enum values defined in \link ZipCompatibility::ZipPlatforms - ZipCompatibility.h \endlink - \see ZipCompatibility::ZipPlatforms - \see ZipPlatform::GetSystemID - \see CZipFileHeader::GetSystemCompatibility -*/ - int GetSystemCompatibility() {return m_iArchiveSystCompatib;} - -/** - Set the system compatibility of the archive. By default it is set to the - current system value (the one returned by ZipPlatform::GetSystemID() function). - Use it after opening the archive, but before adding a new file or using - SetFileHeaderAttr() function - \param iSystemComp - can be one of ZipCompatibility::ZipPlatforms values - \return - return \c false if the value \e iSystemComp is not supported - (ZipCompatibility::IsPlatformSupported returns \c false for the value) - or it is not possible to set it right now -*/ - bool SetSystemCompatibility(int iSystemComp); - -/** - Set the attributes for CZipFileHeader structure to be used - in #OpenNewFile method as an argument. - This special procedure is taken, because the system compatibility must - be set for CZipFileHeader prior to the value, which must be identical to - the return value of #GetSystemCompatibility method. - \param header - the structure to have attributes set - \param uAttr - attributes to set - \note Throws exceptions if the archive system or the current system - is not supported by the ZipArchive library. - \see GetSystemCompatibility -*/ - void SetFileHeaderAttr(CZipFileHeader& header, DWORD uAttr); - - -/** - A helper for a various purposes. - \return the pointer to the static CRC table in the zlib library - -*/ - static const DWORD* GetCRCTable(); - -/** - Return the underlying archive storage medium. - \warning A method for a very advanced use - you normally never need it. - \return the pointer to #m_storage - \see CZipStorage -*/ - CZipStorage* GetStorage(){return &m_storage;} - - -/** - Set #m_bDetectZlibMemoryLeaks value. - \param bDetect - \note Use before opening a file in the archive. - \see m_bDetectZlibMemoryLeaks - -*/ - void SetDetectZlibMemoryLeaks(bool bDetect) - { - if (m_iFileOpened != nothing) - { - TRACE(_T("Set it before opening a file in the archive")); - return; - } - m_bDetectZlibMemoryLeaks = bDetect; - - } - -/** - Set CZipCentralDir::m_bConvertAfterOpen value. - \param bConvertAfterOpen - \note Use before opening the archive. - \see CZipCentralDir::m_bConvertAfterOpen -*/ - void SetConvertAfterOpen (bool bConvertAfterOpen) - { - if (!IsClosed()) - { - TRACE(_T("Set it before opening the archive")); - return; - } - m_centralDir.m_bConvertAfterOpen = bConvertAfterOpen; - - } - -/** - Enable fast finding by the file name of the files inside the archive. - Set CZipCentralDir::m_bFindFastEnabled to \c true, which is required by #FindFile. - \note call after opening the archive. - \param bEnable - \see CZipCentralDir::m_bFindFastEnabled - \see FindFile -*/ - void EnableFindFast(bool bEnable = true); -protected: - /** - Internal data. - \see CZipInternalInfo - */ - CZipInternalInfo m_info; - - - /** - Physical layer of the archive. - \see CZipStorage - */ - CZipStorage m_storage; - - /** - A central directory object. - \see CZipCentralDir - */ - CZipCentralDir m_centralDir; - - /** - The open mode of the current file inside archive. - */ - enum ZipOpenFileType - { - extract = -1, ///< current file opened for extraction - nothing, ///< no file inside archive opened - compress ///< a new file opened for compression - }; - - /** - Takes one of the #ZipOpenFileType enum values. - */ - char m_iFileOpened; - -/** - The root path to be omitted in #AddNewFile and #ExtractFile functions - from the beginning of the full file path. Set by #SetRootPath - \see TrimRootPath - \see SetRootPath -*/ - CZipString m_szRootPath; - -/** - Open the archive in the given mode. - Called by #Open(LPCTSTR, int, int) and #Open(CZipMemFile&, int). - \param iMode - an opening mode - \note Throws exceptions. -*/ - void OpenInternal(int iMode); - - /** - The system code of the current archive. All new files in the archive - will be created regarding this value. Can be one of the enum values - defined in \link ZipCompatibility::ZipPlatforms ZipCompatibility.h - \endlink - - \see GetSystemCompatibility - */ - int m_iArchiveSystCompatib; - -/** - Free the memory allocated by the zlib library that hasn't been freed - due to an error in the zlib library (usually never happens). -*/ - void EmptyPtrList(); - - -/** - - \internal - \param uIndex - \note Throws exceptions. - \todo eliminate unnecessary copying when removing more than one file. -*/ - void DeleteInternal(WORD uIndex); - -/** - Remove the range of data from the archive specified by the \e uStartOffset - and \e uEndOffset - \param uStartOffset - - \param uEndOffset - - \return the count of removed bytes - -*/ - DWORD RemovePackedFile(DWORD uStartOffset, DWORD uEndOffset); -/** - \return the currently opened for compression or decompression - file inside the archive NULL if there is no file opened -*/ - CZipFileHeader* CurrentFile(); - -/** - If the parameter \e iErr signalizes a zlib library error, throw CZipException - \param iErr - a zlib library error to check - \note Throws exceptions. -*/ - void CheckForError(int iErr); - -/** - Throw a CZipException error. - \param err - the error code - \see CZipException::ZipErrors - \param bZlib - if \c true, treat \e err as a zlib error code and perform the conversion to the one of CZipException codes. - \see CZipException::Throw -*/ - void ThrowError(int err, bool bZlib = false); - - -/** - Function used in cojunction with #m_szRootPath to trim paths in #AddNewFile and #ExtractFile - \param zpc - \see SetRootPath - -*/ - CZipString TrimRootPath(CZipPathComponent& zpc); - - typedef CZipPtrList::iterator CZipPtrListIter; - CZipPtrList m_list; ///< a list holding pointers to the memory areas allocated by the zlib library - - - static void* _zliballoc(void* opaque, UINT items, UINT size); ///< memory allocator called by the zlib library - static void _zlibfree(void* opaque, void* address); ///< memory deallocator called by the zlib library - - - /** - Specify whether to control memory allocation and freeing by the zlib library. - It is strongly suggested to set it to \c true. - - \b Default: \c true - \note Set it before opening a file (new or existing) in the archive. - \see SetDetectZlibMemoryLeaks - - */ - bool m_bDetectZlibMemoryLeaks; - - - - /** - Copyright string. - */ - static const TCHAR m_gszCopyright[]; - /** - \name Crypthography - Methods performing data encryption and decryption - and attributes used by them. - */ - //@{ -/** - Decode \e nCount bytes from the internal buffer. - \see m_info - \see CZipInternalInfo::m_pBuffer - \param uCount -*/ - void CryptDecodeBuffer(DWORD uCount); -/** - Encode the internal buffer. - \see m_info - \see CZipInternalInfo::m_pBuffer -*/ - void CryptEncodeBuffer(); - -/** - Encode the character \e c and update \link #m_keys encryption keys \endlink. - \param &c -*/ - void CryptEncode(char &c); -/** - Create an encryption header for the new file in the archive. - \param iCrc - A control value. Use the two lower bytes of CZipFileHeader::m_uModTime. - This entails the need for a data description presence at the end of - the compressed data. We cannot use the real CRC now, because we don't know - it yet. - \param buf - a buffer to receive the header - \see CryptCheck -*/ - void CryptCryptHeader(long iCrc, CZipAutoBuffer& buf); -/** - \internal - \param l - \param c - \return -*/ - DWORD CryptCRC32(DWORD l, char c); -/** - Decode the character \e c and update \link #m_keys encryption keys \endlink. - \param &c -*/ - void CryptDecode(char &c); - /** - \internal - */ - char CryptDecryptByte(); - -/** - Decrypt the encryption header and check its control value. - The control value depends on the presence of the data descriptor. - \return \c true if the control value is correct - \see CryptCryptHeader -*/ - bool CryptCheck(); -/** - Update \link #m_keys encryption keys \endlink with the given value. - \param c - -*/ - void CryptUpdateKeys(char c); -/** - Initialize \link #m_keys encryption keys \endlink. -*/ - void CryptInitKeys(); - /** - The archive password. If empty, the new file will not be encrypted. - */ - CZipAutoBuffer m_pszPassword; - - /** - Encryption keys. - The key values are initialized using a supplied encryption password. - \see CryptInitKeys - */ - DWORD m_keys[3]; - - //@} - - -}; - -#endif // !defined(AFX_ZIPARCHIVE_H__A7F528A6_1872_4071_BE66_D56CC2DDE0E6__INCLUDED_) diff --git a/harbour/contrib/hbzlib/ziparchive2.mak b/harbour/contrib/hbzlib/ziparchive2.mak deleted file mode 100644 index 4ccc2111fe..0000000000 --- a/harbour/contrib/hbzlib/ziparchive2.mak +++ /dev/null @@ -1,278 +0,0 @@ -# -# Borland C++ IDE generated makefile -# Generated 11/04/01 at 19:22:16 -# -.AUTODEPEND - - -# -# Borland C++ tools -# -!ifndef BCB -BCB = $(MAKEDIR)\.. -!endif - -IMPLIB = Implib -BCC32 = Bcc32 +BccW32.cfg -TLINK32 = TLink32 -TLIB = TLib -BRC32 = Brc32 -TASM32 = Tasm32 -# -# IDE macros -# - - -# -# Options -# -IDE_LinkFLAGS32 = -L$(BCB)\LIB -LinkerLocalOptsAtC32_ziparddll = -L$(BCB)\LIB -Tpe -ap -c -ResLocalOptsAtC32_ziparddll = -BLocalOptsAtC32_ziparddll = -CompInheritOptsAt_ziparddll = -I.;$(BCB)\INCLUDE -DNDEBUG;_MBCS;WIN32;_WINDOWS;ZLIB_DLL;_NO_VCL;_ASSERTE;NO_STRICT -LinkerInheritOptsAt_ziparddll = -x -LinkerOptsAt_ziparddll = $(LinkerLocalOptsAtC32_ziparddll) -ResOptsAt_ziparddll = $(ResLocalOptsAtC32_ziparddll) -BOptsAt_ziparddll = $(BLocalOptsAtC32_ziparddll) - -# -# Dependency List -# -Dep_zipar = \ - ziparchive.lib - -ziparchive : BccW32.cfg $(Dep_zipar) - echo MakeNode - -Dep_ziparddll = \ - zutil.obj\ - uncompr.obj\ - adler32.obj\ - infutil.obj\ - inftrees.obj\ - inflate.obj\ - inffast.obj\ - infcodes.obj\ - infblock.obj\ - gzio.obj\ - trees.obj\ - deflate.obj\ - crc32.obj\ - compress.obj\ - zipplatform.obj\ - zipstorage.obj\ - zipplatformcomm.obj\ - zippathcomponent.obj\ - zipmemfile.obj\ - zipinternalinfo.obj\ - zipfileheader.obj\ - zipfile.obj\ - zipexception.obj\ - zipcompatibility.obj\ - zipcollections.obj\ - zipcentraldir.obj\ - zipautobuffer.obj\ - ziparchive.obj\ - stdafx.obj - -ziparchive.lib : $(Dep_ziparddll) - $(TLIB) $< $(IDE_BFLAGS) /P32 $(BOptsAt_ziparddll) @&&| - -+zutil.obj & --+uncompr.obj & --+adler32.obj & --+trees.obj & --+infutil.obj & --+inftrees.obj & --+inflate.obj & --+inffast.obj & --+infcodes.obj & --+infblock.obj & --+gzio.obj & --+deflate.obj & --+crc32.obj & --+compress.obj & --+makebcdll.obj & --+zipstorage.obj & --+zipplatformcomm.obj & --+zipplatform.obj & --+zippathcomponent.obj & --+zipmemfile.obj & --+zipinternalinfo.obj & --+zipfileheader.obj & --+zipfile.obj & --+zipexception.obj & --+zipcompatibility.obj & --+zipcollections.obj & --+zipcentraldir.obj & --+zipautobuffer.obj & --+ziparchive.obj & --+stdafx.obj -| - -zutil.obj : zutil.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zutil.c -| - - -uncompr.obj : uncompr.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ uncompr.c -| - -adler32.obj : adler32.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ adler32.c -| - -trees.obj : trees.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ trees.c -| - -infutil.obj : infutil.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ infutil.c -| - -inftrees.obj : inftrees.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ inftrees.c -| - -inflate.obj : inflate.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ inflate.c -| - -inffast.obj : inffast.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ inffast.c -| - -infcodes.obj : infcodes.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ infcodes.c -| - -infblock.obj : infblock.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ infblock.c -| - -gzio.obj : gzio.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ gzio.c -| - -deflate.obj : deflate.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ deflate.c -| - -crc32.obj : crc32.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ crc32.c -| - -compress.obj : compress.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ compress.c -| - -makebcdll.obj : makebcdll.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ makebcdll.cpp -| - -zipstorage.obj : zipstorage.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipstorage.cpp -| - -zipplatformcomm.obj : zipplatformcomm.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipplatformcomm.cpp -| - -zipplatform.obj : zipplatform.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipplatform.cpp -| - -zippathcomponent.obj : zippathcomponent.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zippathcomponent.cpp -| - -zipmemfile.obj : zipmemfile.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipmemfile.cpp -| - -zipinternalinfo.obj : zipinternalinfo.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipinternalinfo.cpp -| - -zipfileheader.obj : zipfileheader.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipfileheader.cpp -| - -zipfile.obj : zipfile.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipfile.cpp -| - -zipexception.obj : zipexception.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipexception.cpp -| - -zipcompatibility.obj : zipcompatibility.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipcompatibility.cpp -| - -zipcollections.obj : zipcollections.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipcollections.cpp -| - -zipcentraldir.obj : zipcentraldir.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipcentraldir.cpp -| - -zipautobuffer.obj : zipautobuffer.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipautobuffer.cpp -| - -ziparchive.obj : ziparchive.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ ziparchive.cpp -| - -stdafx.obj : stdafx.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ stdafx.cpp -| - -# Compiler configuration file -BccW32.cfg : - Copy &&| --vi --Ve --R- --H- --5 --6 --OS --w- --O2 -X- -a8 -b -k- -| $@ - - diff --git a/harbour/contrib/hbzlib/ziparchivemt.mak b/harbour/contrib/hbzlib/ziparchivemt.mak deleted file mode 100644 index 344556b248..0000000000 --- a/harbour/contrib/hbzlib/ziparchivemt.mak +++ /dev/null @@ -1,271 +0,0 @@ -# -# Borland C++ IDE generated makefile -# Generated 11/04/01 at 19:22:16 -# -.AUTODEPEND - - -# -# Borland C++ tools -# -!ifndef BCB -BCB = $(MAKEDIR)\.. -!endif - -IMPLIB = Implib -BCC32 = Bcc32 +BccW32.cfg -TLINK32 = TLink32 -TLIB = TLib -BRC32 = Brc32 -TASM32 = Tasm32 -# -# IDE macros -# - - -# -# Options -# -IDE_LinkFLAGS32 = -L$(BCB)\LIB -LinkerLocalOptsAtC32_ziparddll = -L$(BCB)\LIB -Tpe -ap -c -ResLocalOptsAtC32_ziparddll = -BLocalOptsAtC32_ziparddll = -CompInheritOptsAt_ziparddll = -I$(BCB)\INCLUDE -DWIN32;ZLIB_DLL -u $(CFLAGS) -LinkerInheritOptsAt_ziparddll = -x -LinkerOptsAt_ziparddll = $(LinkerLocalOptsAtC32_ziparddll) -ResOptsAt_ziparddll = $(ResLocalOptsAtC32_ziparddll) -BOptsAt_ziparddll = $(BLocalOptsAtC32_ziparddll) - -# -# Dependency List -# -Dep_zipar = \ - ziparchivemt.lib - -ziparchive : BccW32.cfg $(Dep_zipar) - echo MakeNode - -Dep_ziparddll = \ - ziparchive.obj\ - zutil.obj\ - uncompr.obj\ - adler32.obj\ - infutil.obj\ - inftrees.obj\ - inflate.obj\ - inffast.obj\ - infcodes.obj\ - infblock.obj\ - gzio.obj\ - trees.obj\ - deflate.obj\ - crc32.obj\ - compress.obj\ - zipplatform.obj\ - zipstorage.obj\ - zipplatformcomm.obj\ - zippathcomponent.obj\ - zipmemfile.obj\ - zipinternalinfo.obj\ - zipfileheader.obj\ - zipfile.obj\ - zipexception.obj\ - zipcompatibility.obj\ - zipcollections.obj\ - zipcentraldir.obj\ - zipautobuffer.obj\ - stdafx.obj - -ziparchivemt.lib : $(Dep_ziparddll) - $(TLIB) $< $(IDE_BFLAGS) /P32 $(BOptsAt_ziparddll) @&&| - -+zutil.obj & --+uncompr.obj & --+adler32.obj & --+trees.obj & --+infutil.obj & --+inftrees.obj & --+inflate.obj & --+inffast.obj & --+infcodes.obj & --+infblock.obj & --+gzio.obj & --+deflate.obj & --+crc32.obj & --+compress.obj & --+makebcdll.obj & --+zipstorage.obj & --+zipplatformcomm.obj & --+zipplatform.obj & --+zippathcomponent.obj & --+zipmemfile.obj & --+zipinternalinfo.obj & --+zipfileheader.obj & --+zipfile.obj & --+zipexception.obj & --+zipcompatibility.obj & --+zipcollections.obj & --+zipcentraldir.obj & --+zipautobuffer.obj & --+ziparchive.obj & --+stdafx.obj -| - -zutil.obj : zutil.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ zutil.c -| - -uncompr.obj : uncompr.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ uncompr.c -| - -adler32.obj : adler32.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ adler32.c -| - -trees.obj : trees.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ trees.c -| - -infutil.obj : infutil.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ infutil.c -| - -inftrees.obj : inftrees.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ inftrees.c -| - -inflate.obj : inflate.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ inflate.c -| - -inffast.obj : inffast.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ inffast.c -| - -infcodes.obj : infcodes.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ infcodes.c -| - -infblock.obj : infblock.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ infblock.c -| - -gzio.obj : gzio.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ gzio.c -| - -deflate.obj : deflate.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ deflate.c -| - -crc32.obj : crc32.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ crc32.c -| - -compress.obj : compress.c - $(BCC32) -P- -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -DZLIB_DLL -o$@ compress.c -| - -zipstorage.obj : zipstorage.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipstorage.cpp -| - -zipplatformcomm.obj : zipplatformcomm.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipplatformcomm.cpp -| - -zipplatform.obj : zipplatform.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipplatform.cpp -| - -zippathcomponent.obj : zippathcomponent.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zippathcomponent.cpp -| - -zipmemfile.obj : zipmemfile.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipmemfile.cpp -| - -zipinternalinfo.obj : zipinternalinfo.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipinternalinfo.cpp -| - -zipfileheader.obj : zipfileheader.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipfileheader.cpp -| - -zipfile.obj : zipfile.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipfile.cpp -| - -zipexception.obj : zipexception.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipexception.cpp -| - -zipcompatibility.obj : zipcompatibility.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipcompatibility.cpp -| - -zipcollections.obj : zipcollections.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipcollections.cpp -| - -zipcentraldir.obj : zipcentraldir.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipcentraldir.cpp -| - -zipautobuffer.obj : zipautobuffer.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ zipautobuffer.cpp -| - -ziparchive.obj : ziparchive.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ ziparchive.cpp -| - -stdafx.obj : stdafx.cpp - $(BCC32) -c @&&| - $(CompOptsAt_ziparddll) $(CompInheritOptsAt_ziparddll) -o$@ stdafx.cpp -| - -# Compiler configuration file -BccW32.cfg : - Copy &&| --vi --Ve --R- --H- --5 --OS --w- --O2 -X- -a8 -b -k- -| $@ - - diff --git a/harbour/contrib/hbzlib/zipautobuffer.cpp b/harbour/contrib/hbzlib/zipautobuffer.cpp deleted file mode 100644 index be19309ed0..0000000000 --- a/harbour/contrib/hbzlib/zipautobuffer.cpp +++ /dev/null @@ -1,104 +0,0 @@ -// ZipAutoBuffer.cpp: implementation of the CZipAutoBuffer class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - - -#include "stdafx.h" -#include "zipautobuffer.h" -#include - -// #ifdef _DEBUG -// #undef THIS_FILE -// static char THIS_FILE[]=__FILE__; -// #define new DEBUG_NEW -// #endif - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -CZipAutoBuffer::CZipAutoBuffer() -{ - m_iSize = 0; - m_pBuffer = NULL; -} - -CZipAutoBuffer::CZipAutoBuffer(DWORD iSize, bool bZeroMemory) -{ - m_iSize = 0; - m_pBuffer = NULL; - Allocate(iSize, bZeroMemory); -} - -CZipAutoBuffer::~CZipAutoBuffer() -{ - Release(); -} - - -void CZipAutoBuffer::Release() -{ - if (m_pBuffer) - { - delete [] m_pBuffer; - m_iSize = 0; - m_pBuffer = NULL; - } -} - -char* CZipAutoBuffer::Allocate(DWORD iSize, bool bZeroMemory) -{ - if (iSize != m_iSize) - Release(); - else - { - if (bZeroMemory) - memset(m_pBuffer, 0, iSize); // zerowanie bufora - return m_pBuffer; - } - - if (iSize > 0) - { - m_pBuffer = new char [iSize]; - if (bZeroMemory) - memset(m_pBuffer, 0, iSize); // zerowanie bufora - m_iSize = iSize; - } - else - m_pBuffer = NULL; - - return m_pBuffer; -} - - -CZipAutoBuffer::CZipAutoBuffer(const CZipAutoBuffer& buffer) -{ - m_pBuffer = NULL; - m_iSize = 0; - - if (buffer.m_pBuffer) - { - Allocate(buffer.m_iSize); - memcpy(m_pBuffer, buffer.m_pBuffer, buffer.m_iSize); - } -} -CZipAutoBuffer& CZipAutoBuffer::operator=(const CZipAutoBuffer& buffer) -{ - if (this == &buffer) - return *this; - Release(); - if (buffer.m_pBuffer) - { - Allocate(buffer.m_iSize); - memcpy(m_pBuffer, buffer.m_pBuffer, buffer.m_iSize); - } - return *this; -} diff --git a/harbour/contrib/hbzlib/zipbaseexception.h b/harbour/contrib/hbzlib/zipbaseexception.h deleted file mode 100644 index 2721fd0e6a..0000000000 --- a/harbour/contrib/hbzlib/zipbaseexception.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ZIPBASEEXCEPTION_H__ -#define __ZIPBASEEXCEPTION_H__ - -typedef std::exception CZipBaseException; - -#endif //__ZIPBASEEXCEPTION_H__ \ No newline at end of file diff --git a/harbour/contrib/hbzlib/zipcentraldir.cpp b/harbour/contrib/hbzlib/zipcentraldir.cpp deleted file mode 100644 index accd95d424..0000000000 --- a/harbour/contrib/hbzlib/zipcentraldir.cpp +++ /dev/null @@ -1,676 +0,0 @@ -// ZipCentralDir.cpp: implementation of the CZipCentralDir class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - - -#include "stdafx.h" -#include "zipcentraldir.h" -#include "ziparchive.h" -#include "zipfilemapping.h" - - -#define CENTRALDIRSIZE 22 - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -char CZipCentralDir::m_gszSignature[] = {0x50, 0x4b, 0x05, 0x06}; -CZipCentralDir::CZipCentralDir() -{ - m_bConvertAfterOpen = true; - m_bFindFastEnabled = false; - m_pStorage = NULL; - m_pOpenedFile = NULL; - m_iBufferSize = 32768; - -} - -void CZipCentralDir::Init() -{ - m_bOnDisk = false; - m_uBytesBeforeZip = m_uCentrDirPos = 0; - m_pOpenedFile = NULL; - m_pszComment.Release(); -} - -CZipCentralDir::~CZipCentralDir() -{ - Clear(); -} - -void CZipCentralDir::Read() -{ - ASSERT(m_pStorage); - WORD uCommentSize; - m_uCentrDirPos = Locate(); - m_pStorage->m_pFile->Seek(m_uCentrDirPos, CZipAbstractFile::begin); - CZipAutoBuffer buf(CENTRALDIRSIZE); - - int uRead = m_pStorage->m_pFile->Read(buf, CENTRALDIRSIZE); - if (uRead != CENTRALDIRSIZE) - ThrowError(CZipException::badZipFile); - memcpy(&m_szSignature, buf, 4); - memcpy(&m_uThisDisk, buf + 4, 2); - memcpy(&m_uDiskWithCD, buf + 6, 2); - memcpy(&m_uDiskEntriesNo, buf + 8, 2); - memcpy(&m_uEntriesNumber, buf + 10, 2); - memcpy(&m_uSize, buf + 12, 4); - memcpy(&m_uOffset, buf + 16, 4); - memcpy(&uCommentSize, buf + 20, 2); - buf.Release(); - - - m_pStorage->UpdateSpanMode(m_uThisDisk); - // if m_uThisDisk is not zero, it is enough to say that it is a multi disk archive - ASSERT((!m_uThisDisk && (m_uEntriesNumber == m_uDiskEntriesNo) && !m_uDiskWithCD) || m_uThisDisk); - - - - if (!m_pStorage->IsSpanMode() && ((DWORD)m_uCentrDirPos < m_uOffset + m_uSize)) - ThrowError(CZipException::badZipFile); - - if (uCommentSize) - { - m_pszComment.Allocate(uCommentSize); - uRead = m_pStorage->m_pFile->Read(m_pszComment, uCommentSize); - if (uRead != uCommentSize) - ThrowError(CZipException::badZipFile); - } - - m_uBytesBeforeZip = m_pStorage->IsSpanMode() ? 0 : m_uCentrDirPos - m_uSize - m_uOffset; - - if ((!m_uSize && m_uEntriesNumber) || (!m_uEntriesNumber && m_uSize)) - ThrowError(CZipException::badZipFile); - - m_bOnDisk = true; - m_pStorage->ChangeDisk(m_uDiskWithCD); - - if (!m_uSize) - return; - - ReadHeaders(); -} - -DWORD CZipCentralDir::Locate() -{ - - // maximum size of end of central dir record - long uMaxRecordSize = 0xffff + CENTRALDIRSIZE; - DWORD uFileSize = m_pStorage->m_pFile->GetLength(); - - if ((DWORD)uMaxRecordSize > uFileSize) - uMaxRecordSize = uFileSize; - - CZipAutoBuffer buf(m_iBufferSize); - - long uPosInFile = 0; - int uRead = 0; - // backward reading - while (uPosInFile < uMaxRecordSize) - { - uPosInFile = uRead + m_iBufferSize; - if (uPosInFile > uMaxRecordSize) - uPosInFile = uMaxRecordSize; - - int iToRead = uPosInFile - uRead; - - m_pStorage->m_pFile->Seek(-uPosInFile, CZipAbstractFile::end); - int iActuallyRead = m_pStorage->m_pFile->Read(buf, iToRead); - if (iActuallyRead != iToRead) - ThrowError(CZipException::badZipFile); - // search from the very last bytes to prevent an error if inside archive - // there are packed other arhives - for (int i = iToRead - 4; i >=0 ; i--) - if (!memcmp((char*)buf + i, m_gszSignature, 4)) - return uFileSize - (uPosInFile - i); - - uRead += iToRead - 3; - - } - - ThrowError(CZipException::cdirNotFound); - return 0; -} - -void CZipCentralDir::ThrowError(int err) -{ - CZipException::Throw(err, m_pStorage->m_pFile->GetFilePath()); -} - - -void CZipCentralDir::ReadHeaders() -{ - m_pStorage->m_pFile->Seek(m_uOffset + m_uBytesBeforeZip, CZipAbstractFile::begin); - RemoveHeaders(); //just in case - for (int i = 0; i < m_uEntriesNumber; i++) - { - CZipFileHeader* pHeader = new CZipFileHeader; - m_headers.AddTail(pHeader); // bezpoœrednio nastêpuje w razie wyj¹tku - - if (!pHeader->Read(m_pStorage)) - ThrowError(CZipException::badZipFile); - ConvertFileName(true, true, pHeader); - } - if (m_bFindFastEnabled) - BuildFindFastArray(); -} - -void CZipCentralDir::Clear(bool bEverything) -{ - m_pOpenedFile = NULL; - m_pLocalExtraField.Release(); - - if (bEverything) - { - RemoveHeaders(); - m_findarray.RemoveAll(); - m_pszComment.Release(); - - } -} - - -bool CZipCentralDir::IsValidIndex(int uIndex) -{ - - bool ret = uIndex < m_headers.GetCount(); -#ifdef _DEBUG - if (!ret) - TRACE(_T("Not a valid index.\n")); -#endif - return ret; -} - - -void CZipCentralDir::OpenFile(WORD uIndex) -{ - WORD uLocalExtraFieldSize; - m_pOpenedFile = (*this)[uIndex]; - m_pStorage->ChangeDisk(m_pOpenedFile->m_uDiskStart); - m_pStorage->m_pFile->Seek(m_pOpenedFile->m_uOffset + m_uBytesBeforeZip, CZipAbstractFile::begin); - if (!m_pOpenedFile->ReadLocal(m_pStorage, uLocalExtraFieldSize)) - ThrowError(CZipException::badZipFile); - - - m_pLocalExtraField.Release(); // just in case - if (uLocalExtraFieldSize) - { - int iCurrDsk = m_pStorage->GetCurrentDisk(); - m_pLocalExtraField.Allocate(uLocalExtraFieldSize); - m_pStorage->Read(m_pLocalExtraField, uLocalExtraFieldSize, true); - if (m_pStorage->GetCurrentDisk() != iCurrDsk) - ThrowError(CZipException::badZipFile); - } - -} - -void CZipCentralDir::CloseFile() -{ - if (!m_pOpenedFile) - return; - m_pLocalExtraField.Release(); - if (m_pOpenedFile->IsDataDescr()) - { - CZipAutoBuffer buf(12); - m_pStorage->Read(buf, 4, false); - // in span mode, files that are divided between disks have bit 3 of flag set - // which tell about the presence of the data descriptor after the compressed data - // This signature may be in the disk spanning archive that is one volume only - // (it is detected as a non disk spanning archive) - if (memcmp(buf, CZipStorage::m_gszExtHeaderSignat, 4) != 0) // there is no signature - m_pStorage->m_pFile->Seek(-4, CZipAbstractFile::current); - - - m_pStorage->Read(buf, 12, false); - if (!m_pOpenedFile->CheckCrcAndSizes(buf)) - ThrowError(CZipException::badZipFile); - } - m_pOpenedFile = NULL; -} - -// add new header using the argument as a template -void CZipCentralDir::AddNewFile(const CZipFileHeader & header) -{ - CZipFileHeader* pHeader = new CZipFileHeader(header); - m_pOpenedFile = pHeader; - m_headers.AddTail(pHeader); - if (m_bFindFastEnabled) - InsertFindFastElement(pHeader, WORD(m_headers.GetCount() - 1)); // GetCount > 0, 'cos we've just added a header - RemoveFromDisk(); - m_pStorage->m_pFile->SeekToEnd(); -} - - -void CZipCentralDir::RemoveFromDisk() -{ - if (m_bOnDisk) - { - ASSERT(!m_pStorage->IsSpanMode()); // you can't add files to the existing disk span archive or to delete them from it - m_pStorage->m_pFile->SetLength(m_uBytesBeforeZip + m_uOffset); - m_bOnDisk = false; - } -} - - -void CZipCentralDir::CloseNewFile() -{ - CZipAutoBuffer buf(12 + 4); - short iToWrite = 0; - bool bIsSpan = m_pStorage->IsSpanMode() != 0; - bool bEncrypted = m_pOpenedFile->IsEncrypted(); - if (m_pOpenedFile->IsDataDescr()) - { - if (bIsSpan || bEncrypted) - { - memcpy(buf, m_pStorage->m_gszExtHeaderSignat, 4); - iToWrite += 4; - } - } - else /*if (!IsSpan)*/ - { - ASSERT(!bIsSpan && !bEncrypted); - m_pStorage->Flush(); - m_pStorage->m_pFile->Seek(m_pOpenedFile->m_uOffset + 14, CZipAbstractFile::begin); - // we don't have to restore the pointer, because before adding a new file, - // the pointer is moved to the end - } - - m_pOpenedFile->GetCrcAndSizes(buf + iToWrite); - iToWrite += 12; - - // offset set during writing the local header - m_pOpenedFile->m_uOffset -= m_uBytesBeforeZip; - - // write the data descriptor and a disk spanning signature at once - m_pStorage->Write(buf, iToWrite, true); - if (!bIsSpan && bEncrypted) - { - // write the information to the local header too - m_pStorage->Flush(); - m_pStorage->m_pFile->Seek(m_pOpenedFile->m_uOffset + 14, CZipAbstractFile::begin); - m_pStorage->Write(buf + 4, 12, true); - } - - if (!bIsSpan) - m_pStorage->Flush(); - - m_pOpenedFile = NULL; - -} - -void CZipCentralDir::Write() -{ - if (m_bOnDisk) - return; - if (!m_pStorage->IsSpanMode()) - { - m_pStorage->Flush(); - m_pStorage->m_pFile->SeekToEnd(); - } - m_uEntriesNumber = (WORD)m_headers.GetCount(); - m_uSize = 0; - bool bDontAllowDiskChange = false; - // if there is a disk spanning archive in creation and it is only one-volume, - // (current disk is 0 so far, no bytes has been written so we know they are - // all in the buffer) make sure that it will be after writing central dir - // and make it a non disk spanning archive - if (m_pStorage->IsSpanMode() && m_pStorage->GetCurrentDisk() == 0) - { - DWORD uVolumeFree = m_pStorage->VolumeLeft(); - // calculate the size of data descriptors already in the buffer or on the disk - // (they will be removed in the non disk spanning archive): - // multi span signature at the beginnig (4 bytes) + the size of the data - // descr. for each file (multi span signature + 12 bytes data) - // the count of bytes to add: central dir size - total to remove; - DWORD uToGrow = GetSize(true) - (4 + m_uEntriesNumber * (4 + 12)); - if (uVolumeFree >= uToGrow) - // lets make sure it will be one-disk archive - { - // can the operation be done only in the buffer? - if (!m_pStorage->m_iBytesWritten && // no bytes on the disk yet - (m_pStorage->GetFreeInBuffer() >= uToGrow)) // is the buffer big enough? - { - RemoveDataDescr(true); - bDontAllowDiskChange = true; // if the disk change occurs somehow, we'll throw an error later - } - else - { - m_pStorage->Flush(); - m_pStorage->m_pFile->Flush(); - if (RemoveDataDescr(false)) - bDontAllowDiskChange = true; // if the disk change occurs somehow, we'll throw an error later - } - } - } - - WriteHeaders(); - m_uThisDisk = (WORD)m_pStorage->GetCurrentDisk(); - DWORD uSize = WriteCentralEnd(); - if (bDontAllowDiskChange && (m_pStorage->GetCurrentDisk() != 0)) - ThrowError(CZipException::badZipFile); - // if after adding a central directory there is a disk change, - // update the information and write it again - if (m_uThisDisk != m_pStorage->GetCurrentDisk()) - { - m_uThisDisk = (WORD)m_pStorage->GetCurrentDisk(); - if (m_uEntriesNumber) - { - m_uDiskEntriesNo = 0; - } - else - { - m_uDiskWithCD = m_uThisDisk; - m_uOffset = 0; - } - - if (m_pStorage->m_uBytesInWriteBuffer >= uSize) - // if the data is still in the buffer, simply remove it - m_pStorage->m_uBytesInWriteBuffer -= uSize; - else - { - m_pStorage->Flush(); - m_pStorage->m_iBytesWritten -= uSize; - m_pStorage->m_pFile->SeekToBegin(); - } - - WriteCentralEnd(); - } - -} - -void CZipCentralDir::WriteHeaders() -{ - m_uDiskEntriesNo = 0; - m_uDiskWithCD = (WORD)m_pStorage->GetCurrentDisk(); - m_uOffset = m_pStorage->GetPosition() - m_uBytesBeforeZip; - if (!m_uEntriesNumber) - return; - - WORD iDisk = m_uDiskWithCD; - for (int i = 0; i < m_uEntriesNumber; i++) - { - CZipFileHeader* pHeader = (*this)[i]; - ConvertFileName(false, true, pHeader); - m_uSize += pHeader->Write(m_pStorage); - if (m_pStorage->GetCurrentDisk() != iDisk) - { - m_uDiskEntriesNo = 1; - iDisk = (WORD)m_pStorage->GetCurrentDisk(); - // update the information about the offset and starting disk if the - // first header was written on the new disk - if (i == 0) - { - m_uOffset = 0; - m_uDiskWithCD = iDisk; - } - } - else - m_uDiskEntriesNo++; - } -} - -DWORD CZipCentralDir::WriteCentralEnd() -{ - DWORD uSize = GetSize(); - CZipAutoBuffer buf(uSize); - WORD uCommentSize = (WORD)m_pszComment.GetSize(); - memcpy(buf, m_gszSignature, 4); - memcpy(buf + 4, &m_uThisDisk, 2); - memcpy(buf + 6, &m_uDiskWithCD, 2); - memcpy(buf + 8, &m_uDiskEntriesNo, 2); - memcpy(buf + 10, &m_uEntriesNumber, 2); - memcpy(buf + 12, &m_uSize, 4); - memcpy(buf + 16, &m_uOffset, 4); - memcpy(buf + 20, &uCommentSize, 2); - memcpy(buf + 22, m_pszComment, uCommentSize); - m_pStorage->Write(buf, uSize, true); - return uSize; -} - - -void CZipCentralDir::RemoveFile(WORD uIndex) -{ - CZipFileHdrLstIter iterator = GetIterator(uIndex); - CZipFileHeader* pHeader = GetFileHeader(iterator); - if (m_bFindFastEnabled) - { - int i = FindFileNameIndex(pHeader->GetFileName(), true); - ASSERT(i != -1); - int uIndex = m_findarray[i].m_uIndex; - m_findarray.RemoveAt(i); - // shift down the indexes - for (int j = 0; j < m_findarray.GetSize(); j++) - { - if (m_findarray[j].m_uIndex > uIndex) - m_findarray[j].m_uIndex--; - } - } - delete pHeader; - m_headers.RemoveAt(iterator); -} - - -DWORD CZipCentralDir::GetSize(bool bWhole) -{ - DWORD uHeaders = 0; - if (bWhole) - { - for (CZipFileHdrLstIter iter = m_headers.GetHeadPosition(); m_headers.IteratorValid(iter); ) - { - CZipFileHeader* pHeader = m_headers.GetNext(iter); - uHeaders += pHeader->GetSize(); - } - } - return CENTRALDIRSIZE + m_pszComment.GetSize() + uHeaders; -} - -bool CZipCentralDir::RemoveDataDescr(bool bFromBuffer) -{ - ziparchv::CZipFileMapping fm; - char* pFile = NULL; - DWORD uSize; - if (bFromBuffer) - { - uSize = m_pStorage->m_uBytesInWriteBuffer; - pFile = m_pStorage->m_pWriteBuffer; - } - else - { - uSize = m_pStorage->m_pFile->GetLength(); - // we cannot use CZipMemFile in multidisk archive - // so it MUST be CZipFile - if (!fm.CreateMapping((HANDLE)static_cast(m_pStorage->m_pFile)->operator HFILE())) - return false; - pFile = fm.GetMappedMemory(); - } - - DWORD uOffsetToChange = 4; - DWORD uToCopy = 0; - DWORD uPosInBuffer = 0; - DWORD uExtraHeaderLen; - // this will work providing the order in the m_headers is the same as - // in the archive - int i = 0; - for (CZipFileHdrLstIter iter = m_headers.GetHeadPosition(); m_headers.IteratorValid(iter); i++) - { - // update the flag value in the local and central header -// int uDataDescr = (m_headers[i]->m_uFlag & 8) ? (4 + 12) : 0; - - CZipFileHeader* pHeader = m_headers.GetNext(iter); - - - char* pSour = pFile + pHeader->m_uOffset; - - if (!pHeader->IsEncrypted()) - { - // removing data descriptor - pHeader->m_uFlag &= ~8; - // update local header: - // write modified flag in the local header - memcpy(pSour + 6, &pHeader->m_uFlag, 2); - uExtraHeaderLen = 4/*ext. header signature*/ + 12/*data descriptor*/; - } - else - // do not remove data descriptors from encrypted files - uExtraHeaderLen = 0; - - // update crc32 and sizes' values - pHeader->GetCrcAndSizes(pSour+ 14); - - uToCopy = (i == (m_headers.GetCount() - 1) ? uSize : (*this)[i + 1]->m_uOffset) - - pHeader->m_uOffset - uExtraHeaderLen; - - memmove(pFile + uPosInBuffer, pSour, uToCopy); - - uPosInBuffer += uToCopy; - pHeader->m_uOffset -= uOffsetToChange; - uOffsetToChange += uExtraHeaderLen; - } - - if (bFromBuffer) - m_pStorage->m_uBytesInWriteBuffer = uPosInBuffer; - else - { - m_pStorage->m_iBytesWritten = uPosInBuffer; - fm.RemoveMapping(); - m_pStorage->m_pFile->SetLength(uPosInBuffer); - } - return true; -} - -CZipFileHeader* CZipCentralDir::operator[](int iIndex) -{ - return GetFileHeader(GetIterator(iIndex)); -} - -void CZipCentralDir::RemoveHeaders() -{ - for (CZipFileHdrLstIter iter = m_headers.GetHeadPosition(); m_headers.IteratorValid(iter); ) - delete m_headers.GetNext(iter); - m_headers.RemoveAll(); -} - -CZipCentralDir::CZipFileHdrLstIter CZipCentralDir::GetIterator(int iIndex) -{ - if (!IsValidIndex(iIndex)) - CZipException::Throw(CZipException::internal); - - return m_headers.FindIndex(iIndex); -} - -CZipFileHeader* CZipCentralDir::GetFileHeader(const CZipFileHdrLstIter &iterator) -{ - CZipFileHeader* pHeader = m_headers.GetAt(iterator); - ASSERT(pHeader); - if (!pHeader) - CZipException::Throw(CZipException::internal); - return pHeader; -} - -void CZipCentralDir::ConvertAll() -{ - ASSERT(!m_bConvertAfterOpen); - for (CZipFileHdrLstIter iter = m_headers.GetHeadPosition(); m_headers.IteratorValid(iter); ) - ConvertFileName(true, false, m_headers.GetNext(iter)); - m_bConvertAfterOpen = true; -} - -void CZipCentralDir::BuildFindFastArray() -{ - m_findarray.RemoveAll();// just in case - WORD iIndex = 0; - for (CZipFileHdrLstIter iter = m_headers.GetHeadPosition(); m_headers.IteratorValid(iter); iIndex++) - InsertFindFastElement(m_headers.GetNext(iter), iIndex); -} - -void CZipCentralDir::InsertFindFastElement(CZipFileHeader* pHeader, WORD uIndex) -{ - CZipString fileName = pHeader->GetFileName(); - - - int iSize = m_findarray.GetSize(); - - // Our initial binary search range encompasses the entire array of filenames: - int start = 0; - int end = iSize; - - // Keep halving our search range until we find the right place - // to insert the new element: - while ( start < end ) - { - // Find the midpoint of the search range: - int midpoint = ( start + end ) / 2; - - // Compare the filename with the filename at the midpoint of the current search range: - int result = CompareElement(fileName, (WORD)midpoint, true); - - // If our filename is larger, it must fall in the first half of the search range: - if ( result > 0 ) - { - end = midpoint; - } - - // If it's smaller, it must fall in the last half: - else if ( result < 0 ) - { - start = midpoint + 1; - } - - // If they're equal, we can go ahead and insert here: - else - { - start = midpoint; break; - } - } - m_findarray.InsertAt(start, CZipFindFast(pHeader, WORD(uIndex == -1 ? iSize : uIndex /* just in case */))); -} - -int CZipCentralDir::FindFileNameIndex(LPCTSTR lpszFileName, bool bCaseSensitive) -{ - int start = 0; - int end = m_findarray.GetUpperBound(); - - // Keep halving our search range until we find the given element: - while ( start <= end ) - { - // Find the midpoint of the search range: - int midpoint = ( start + end ) / 2; - - // Compare the given filename with the filename at the midpoint of the search range: - int result = CompareElement(lpszFileName, (WORD)midpoint, bCaseSensitive); - - // If our filename is smaller, it must fall in the first half of the search range: - if ( result > 0 ) - { - end = midpoint - 1; - } - - // If it's larger, it must fall in the last half: - else if ( result < 0 ) - { - start = midpoint + 1; - } - - // If they're equal, return the result: - else - { - return midpoint; - } - } - - // Signal failure: - return -1; -} - -ZIPINLINE int CZipCentralDir::CompareElement(LPCTSTR lpszFileName, WORD uIndex, bool bCaseSensitive) -{ - return bCaseSensitive ? m_findarray[uIndex].m_pHeader->GetFileName().Collate(lpszFileName) - : m_findarray[uIndex].m_pHeader->GetFileName().CollateNoCase(lpszFileName); -} diff --git a/harbour/contrib/hbzlib/zipcollections.cpp b/harbour/contrib/hbzlib/zipcollections.cpp deleted file mode 100644 index 2daf8d32be..0000000000 --- a/harbour/contrib/hbzlib/zipcollections.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// ZipCollections.cpp: -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "zipcollections.h" - - -//************************* CZipWordArray **************************** - - -void CZipWordArray::Sort(bool bAscending) -{ - if (bAscending) - std::sort (begin (), end (), std::less ()); - else - std::sort (begin (), end (), std::greater ()); -} diff --git a/harbour/contrib/hbzlib/zipcollections.h b/harbour/contrib/hbzlib/zipcollections.h deleted file mode 100644 index 84f754c39a..0000000000 --- a/harbour/contrib/hbzlib/zipcollections.h +++ /dev/null @@ -1,107 +0,0 @@ -// ZipCollections.h: various platform-dependent definitions to try to make -// sanity of cross platform datatyping. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - -#ifndef ZIPCOLLECTIONS_DOT_H -#define ZIPCOLLECTIONS_DOT_H - -#if _MSC_VER > 1000 - #pragma warning( push, 3 ) // STL requrements - #pragma warning (disable : 4284) - #pragma warning (disable : 4018) -#endif - -#include -#include -#include -#include - - -struct CZipFindFast; -#include "zipstring.h" - - -template -class CZipArray : public std::vector -{ -public: - typedef std::vector::iterator iterator; -protected: - iterator GetIterFromIndex(int uIndex) - { - iterator iter = begin(); - int t = 0; while (t != uIndex) {iter++;t++;} - return iter; - } -public: - int GetSize() const{return size(); } - int GetUpperBound() const {return size() - 1;} - void Add(const TYPE& x) {push_back(x);} - void RemoveAll() {clear();} - void RemoveAt(int uIndex) { erase(GetIterFromIndex(uIndex));} - void InsertAt(int uIndex, const TYPE& x){insert(GetIterFromIndex(uIndex), x);} -}; - -typedef CZipArray CZipStringArray; -typedef CZipArray CZipFindFastArray; - -ZEXPORT class CZipWordArray : public CZipArray -{ -public: - void Sort(bool bAscending); -}; - -template -class CZipPtrList : public std::list -{ - -public: - typedef std::list::iterator iterator; - int GetCount() const {return size();} - void AddTail(const TYPE& x){push_back(x);} - void AddHead(const TYPE& x){push_front(x);} - void RemoveHead() {pop_front();} - void RemoveTail() {pop_back();} - void RemoveAll() {clear();} - TYPE& GetHead() {return front();} - TYPE GetHead() const {return front();} - TYPE& GetTail() {return back();} - TYPE GetTail() const {return back();} - iterator GetHeadPosition() { return begin();} - iterator GetTailPosition() { return back();} - TYPE& GetNext(iterator& pos) { return *pos++;} - TYPE GetNext(iterator& pos) const{ return *pos++;} - TYPE& GetPrev(iterator& pos) { return *pos--;} - TYPE GetPrev(iterator& pos) const{ return *pos--;} - iterator Find(TYPE& x) { return std::find(begin(), end(), x);} - void RemoveAt(iterator& pos) { erase(pos);} - bool IteratorValid(const iterator &iter) - { - return iter != end(); - } - iterator FindIndex(int iIndex) - { - iterator iter = begin(); - int t = 0; while (t != iIndex) {iter++;t++;} - return iter; - } - TYPE& GetAt(const iterator& pos) { return *pos;} - TYPE GetAt(const iterator& pos) const{ return *pos;} - -}; - - -#if defined(_MSC_VER) && (_MSC_VER > 1100) - #pragma warning( pop) -#endif - -#endif /* ZIPCOLLECTIONS_DOT_H */ diff --git a/harbour/contrib/hbzlib/zipcompatibility.cpp b/harbour/contrib/hbzlib/zipcompatibility.cpp deleted file mode 100644 index cab0914435..0000000000 --- a/harbour/contrib/hbzlib/zipcompatibility.cpp +++ /dev/null @@ -1,207 +0,0 @@ -// ZipCompatibility.cpp: implementation of the ZipCompatibility class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "zipcompatibility.h" -#include "zipplatform.h" -#include "zipexception.h" -#include "zipautobuffer.h" -#include "zipfileheader.h" -enum iInternalAttr -{ - attROnly = 0x01, - attHidd = 0x02, - attSys = 0x04, - attDir = 0x10, - attArch = 0x20 -}; -// *********************** WINDOWS ************************** -#ifndef _WIN32 - #define FILE_ATTRIBUTE_READONLY 0x00000001 - #define FILE_ATTRIBUTE_HIDDEN 0x00000002 - #define FILE_ATTRIBUTE_SYSTEM 0x00000004 - #define FILE_ATTRIBUTE_DIRECTORY 0x00000010 - #define FILE_ATTRIBUTE_ARCHIVE 0x00000020 -#endif -// *********************** UINX ************************** -#define USER_PERMISSIONS_MASK 0x01C00000 -#define EXTRACT_USER_PERMISSIONS(x) ((x & USER_PERMISSIONS_MASK) >> 22) -#define CREATE_USER_PERMISSIONS(x) ((x & 0x0007) << 22) - -#define GROUP_PERMISSIONS_MASK 0x00380000 -#define EXTRACT_GROUP_PERMISSIONS ((x & GROUP_PERMISSIONS_MASK) >> 19) -#define CREATE_GROUP_PERMISSIONS(x) ((x & 0x0007) << 19) - -#define OTHER_PERMISSIONS_MASK 0x00070000 -#define EXTRACT_OTHER_PERMISSIONS ((x & OTHER_PERMISSIONS_MASK) >> 16) -#define CREATE_OTHER_PERMISSIONS(x) ((x & 0x0007) << 16) - -#define UNIX_DIRECTORY_ATTRIBUTE 0x40000000 -#define UNIX_FILE_ATTRIBUTE 0x80000000 - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// -using namespace ZipCompatibility; - -typedef DWORD(*conv_func)(DWORD , bool ); - -DWORD AttrDos(DWORD , bool ); -DWORD AttrUnix(DWORD, bool); -DWORD AttrMac(DWORD , bool ); - -// more to come... -conv_func conv_funcs[11] = {AttrDos, - NULL, - NULL, - AttrUnix, - NULL, - NULL, - AttrDos, - AttrMac, - NULL, - NULL, - AttrDos -}; - - - -DWORD ZipCompatibility::ConvertToSystem(DWORD uAttr, int iFromSystem, int iToSystem) -{ - - if (iToSystem != iFromSystem && iFromSystem < 11 && iToSystem < 11) - { - conv_func p = conv_funcs[iFromSystem], q = conv_funcs[iToSystem]; - if (p && q) - uAttr = q( p(uAttr, true), false); - else - CZipException::Throw(CZipException::platfNotSupp); - } - return uAttr; -} - - -DWORD AttrDos(DWORD uAttr, bool ) -{ - return uAttr; -} - - - -DWORD AttrUnix(DWORD uAttr, bool bFrom) -{ - DWORD uNewAttr = 0; - if (bFrom) - { - if (uAttr & UNIX_DIRECTORY_ATTRIBUTE) - uNewAttr = attDir; - - uAttr = EXTRACT_USER_PERMISSIONS (uAttr); - - // we may set archive attribute if the file hasn't the execute permissions - // - if (!(uAttr & 1)) - uNewAttr |= attArch ; - - if (!(uAttr & 2)) - uNewAttr |= attROnly; - - if (!(uAttr & 4)) - uNewAttr |= attHidd; - } - else - { - - uNewAttr = 0; // we cannot assume that if the file hasn't the archive attribute set - - //then it is executable and set execute permissions - - if (!(uAttr & attHidd)) - uNewAttr |= (CREATE_OTHER_PERMISSIONS (4) | - CREATE_GROUP_PERMISSIONS (4)) - | CREATE_USER_PERMISSIONS (4); - - if (!(uAttr & attROnly)) - uNewAttr |= (CREATE_GROUP_PERMISSIONS (2) | - CREATE_USER_PERMISSIONS (2)); - if (uAttr & attDir) - uNewAttr |= UNIX_DIRECTORY_ATTRIBUTE | attDir /*necessary for other archivers (such as Info-Zip)*/; - } - - return uNewAttr; -} - -DWORD AttrMac(DWORD uAttr, bool ) -{ - DWORD uNewAttr = uAttr & (attDir | attROnly); -// if (bFrom) -// { -// -// } -// else -// { -// -// } - return uNewAttr; -} - -// ************************************************************************ -ZIPINLINE bool ZipCompatibility::IsPlatformSupported(int iCode) -{ - return iCode == zcDosFat || iCode == zcUnix || iCode == zcMacintosh - || iCode == zcNtfs || iCode == zcOs2Hpfs || iCode >= 11; -} - - -void ZipCompatibility::FileNameUpdate(CZipFileHeader& header, bool bFromZip) -{ - int iSysHeader = header.GetSystemCompatibility(); - int iCurSystem = ZipPlatform::GetSystemID(); - if (bFromZip) - { - if (iCurSystem == zcDosFat) - SlashBackslashChg(header.m_pszFileName, true); - if (iSysHeader == zcDosFat) - ZipPlatform::AnsiOem(header.m_pszFileName, false); - } - else - { - if (iSysHeader == zcDosFat) - { - ZipPlatform::AnsiOem(header.m_pszFileName, true); - - - } - SlashBackslashChg(header.m_pszFileName, false); - } -} - -void ZipCompatibility::SlashBackslashChg(CZipAutoBuffer& buffer, bool bReplaceSlash) -{ - char t1 = '\\' /*backslash*/, t2 = '/', c1, c2; - if (bReplaceSlash) - { - c1 = t1; - c2 = t2; - } - else - { - c1 = t2; - c2 = t1; - } - for (DWORD i = 0; i < buffer.GetSize(); i++) - { - if (buffer[i] == c2) - buffer[i] = c1; - } - -} diff --git a/harbour/contrib/hbzlib/zipexception.cpp b/harbour/contrib/hbzlib/zipexception.cpp deleted file mode 100644 index dbabc3d3c1..0000000000 --- a/harbour/contrib/hbzlib/zipexception.cpp +++ /dev/null @@ -1,73 +0,0 @@ -// ZipException.cpp: implementation of the CZipException class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "zipexception.h" - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// -#ifdef _MFC_VER - IMPLEMENT_DYNAMIC( CZipException, CException) -#endif - -CZipException::CZipException(int iCause, LPCTSTR lpszZipName) -#ifdef _MFC_VER - :CException(TRUE) -#endif -{ - m_iCause = iCause; - - if (lpszZipName) - m_szFileName = lpszZipName; -} - -CZipException::~CZipException() -{ - -} - -void CZipException::Throw(int iZipError, LPCTSTR lpszZipName) -{ -#ifdef _MFC_VER - throw new CZipException(iZipError, lpszZipName); -#else - CZipException e(iZipError, lpszZipName); - throw e; -#endif -} - -int CZipException::ZlibErrToZip(int iZlibError) -{ - switch (iZlibError) - { - case 2://Z_NEED_DICT: - return CZipException::needDict; - case 1://Z_STREAM_END: - return CZipException::streamEnd; - case -1://Z_ERRNO: - return CZipException::errNo; - case -2://Z_STREAM_ERROR: - return CZipException::streamError; - case -3://Z_DATA_ERROR: - return CZipException::dataError; - case -4://Z_MEM_ERROR: - return CZipException::memError; - case -5://Z_BUF_ERROR: - return CZipException::bufError; - case -6://Z_VERSION_ERROR: - return CZipException::versionError; - default: - return CZipException::generic; - } - -} diff --git a/harbour/contrib/hbzlib/zipfile.c b/harbour/contrib/hbzlib/zipfile.c deleted file mode 100644 index 5f89506436..0000000000 --- a/harbour/contrib/hbzlib/zipfile.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * HB_ZIPFILE() FUNCTION Harbour zip file compress function - * - * Copyright 2000 Luiz Rafael Culik - * www - http://www.harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -#include "hbzip.h" -HB_FUNC(HB_ZIPFILE) -{ - if( ISCHAR(1) && ISCHAR(2)) { - int iCompLevel; - BOOL iOverWrite; - BOOL lExist; - char szFile[_POSIX_PATH_MAX]; - strcpy(szFile,hb_parc(1)); - lExist =hb_fsFile(hb___CheckFile(szFile)); - if( ISNUM(3)) { - iCompLevel=hb_parni(3); - } - else { - iCompLevel= (-1); - } - if( ISLOG(5)) { - iOverWrite=hb_parl(5); - - } - else { - iOverWrite= 1; - } - if (lExist){ - PHB_ITEM pArray=hb___GetFilesNamesFromZip(hb___CheckFile(szFile),0); - PHB_ITEM pItem = hb_itemPutC(NULL,hb_parc(2)); - hb_arrayAdd(pArray,pItem); - hb_itemRelease(pItem); - hb_retl(hb___CompressMultipleFile(hb___CheckFile(szFile),pArray,iCompLevel,hb_param( 4,HB_IT_BLOCK),iOverWrite)); - hb_itemRelease(pArray); - } - else { - hb_retl(hb___CompressOneFile(hb___CheckFile(szFile),hb_parc(2),iCompLevel,hb_param( 4, HB_IT_BLOCK) ,iOverWrite)); - } - -} - - if(ISCHAR(1) && ISARRAY(2)) { - int iCompLevel; - BOOL iOverWrite; - char szFile[_POSIX_PATH_MAX]; - strcpy(szFile,hb_parc(1)); - - if( ISNUM(3)) { - iCompLevel=hb_parni(3); - - } - else { - iCompLevel= (-1); - } - if( ISLOG(5)) { - iOverWrite=hb_parl(5); - - } - else { - iOverWrite= 1; - } - hb_retl(hb___CompressMultipleFile(hb___CheckFile(szFile),hb_param( 2, HB_IT_ARRAY ),iCompLevel,hb_param( 4,HB_IT_BLOCK),iOverWrite)); - - } - -} -HB_FUNC(HB_UNZIPFILE) - -{ - if( ISCHAR(1) ){ - BOOL iExtractPath; - char szFile[_POSIX_PATH_MAX]; - strcpy(szFile,hb_parc(1)); - - if( ISLOG(3)) { - iExtractPath=hb_parl(3); - } - else { - iExtractPath= 0; - } - hb_retl(hb___unZipFiles(hb___CheckFile(szFile),hb_param( 2, HB_IT_BLOCK),iExtractPath)); - - } -} - -HB_FUNC(HB_GETUNZIPFILE) -{ - if( ISCHAR(1) ){ - char szFile[_POSIX_PATH_MAX]; - strcpy(szFile,hb_parc(1)); - - hb_retni(hb___GetNumbersofFilestoUnzip(hb___CheckFile(szFile))); -} -} - -HB_FUNC(HB_GETFILESINZIP) -{ - if( ISCHAR(1) ){ - PHB_ITEM pArray=NULL; - BOOL bExtended; - char szFile[_POSIX_PATH_MAX]; - strcpy(szFile,hb_parc(1)); - - if( ISLOG(2)) { - bExtended=hb_parl(2); - } - else { - bExtended= 0; - } - pArray=hb___GetFilesNamesFromZip(hb___CheckFile(szFile),bExtended); - hb_itemReturn(pArray); - hb_itemRelease(pArray); - -} -} - diff --git a/harbour/contrib/hbzlib/zipfile.cpp b/harbour/contrib/hbzlib/zipfile.cpp deleted file mode 100644 index f470bd1da0..0000000000 --- a/harbour/contrib/hbzlib/zipfile.cpp +++ /dev/null @@ -1,101 +0,0 @@ -// ZipFile.cpp: implementation of the ZipFiles class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "zipfile.h" -#include "zipexception.h" -#include "zipplatform.h" - -#include - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -CZipFile::CZipFile() -{ - m_hFile = -1; -} - - - - -void CZipFile::ThrowError() -{ - CZipException::Throw(errno, m_szFileName); -} - - -DWORD CZipFile::GetLength() -{ - - DWORD dwLen, dwCur; - dwCur = Seek(0L, current); - dwLen = Seek(0L, end); - Seek(dwCur, begin); - return dwLen; - -} - - -bool CZipFile::Open(LPCTSTR lpszFileName, UINT openFlags, bool bThrow) -{ - if (!IsClosed()) - Close(); - UINT iNewFlags = O_BINARY; - bool bReadOnly = false; - if (openFlags & CZipFile::modeCreate) - iNewFlags |= O_CREAT; - if ((openFlags & CZipFile::modeReadWrite) == CZipFile::modeReadWrite) - iNewFlags |= O_RDWR; - else if (openFlags & CZipFile::modeRead) - { - // O_RDONLY is defined as 0 - bReadOnly = true; - iNewFlags |= O_RDONLY; - } - else if (openFlags & CZipFile::modeWrite) - iNewFlags |= O_WRONLY; - - if (!(openFlags & CZipFile::modeNoTruncate) && !bReadOnly) - iNewFlags |= O_TRUNC; - - m_hFile = ZipPlatform::OpenFile(lpszFileName, iNewFlags, openFlags & 0x1C); - if (m_hFile == -1) - if (bThrow) - ThrowError(); - else - return false; - m_szFileName = lpszFileName; - return true; -} - - -void CZipFile::SetLength(long nNewLen) -{ - ZipPlatform::TruncateFile(m_hFile, nNewLen); -} - - -void CZipFile::Flush() -{ - if (!ZipPlatform::FlushFile(m_hFile)) - ThrowError(); -} - -CZipFile::operator HFILE() -{ - HFILE hf = ZipPlatform::GetFileSystemHandle(m_hFile); - if (hf == -1) - ThrowError(); - return hf; -} diff --git a/harbour/contrib/hbzlib/zipfile2.c b/harbour/contrib/hbzlib/zipfile2.c deleted file mode 100644 index 304d8f54bd..0000000000 --- a/harbour/contrib/hbzlib/zipfile2.c +++ /dev/null @@ -1,631 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * Low level zip functions for Zlib dll Call - * - * Copyright 2000 Luiz Rafael Culik - * www - http://www.harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -#include - -#include "hbzip.h" -#include -#include -#include -#include -#include -#include - -#if defined(HB_OS_UNIX) || defined(HARBOUR_GCC_OS2) || defined(__DJGPP__) -# include -# include -# include -# include -#else -# include -# include -#endif - -#include "unzip.h" -#define CASESENSITIVITY (0) -#define WRITEBUFFERSIZE (8192) - -extern int err; -extern int Size_Buf; -uLong uiCounter; -char szTempTime[80]; -unzFile szUnzipFile=NULL; -void hb_____GetTime(unz_file_info file_info); - - -void hb____ChangeFileDate(char *filename,uLong dosdate,tm_unz tmu_date) -{ -#if defined(HB_OS_WIN_32) - HANDLE hFile; - FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite; - HB_SYMBOL_UNUSED(tmu_date); - hFile = CreateFile(filename,GENERIC_READ | GENERIC_WRITE, - 0,NULL,OPEN_EXISTING,0,NULL); - GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite); - DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal); - LocalFileTimeToFileTime(&ftLocal,&ftm); - SetFileTime(hFile,&ftm,&ftLastAcc,&ftm); - CloseHandle(hFile); -#elif defined(HB_OS_UNIX) || defined(HARBOUR_GCC_OS2) || defined(__DJGPP__) - struct utimbuf ut; - struct tm newdate; - newdate.tm_sec = tmu_date.tm_sec; - newdate.tm_min=tmu_date.tm_min; - newdate.tm_hour=tmu_date.tm_hour; - newdate.tm_mday=tmu_date.tm_mday; - newdate.tm_mon=tmu_date.tm_mon; - if (tmu_date.tm_year > 1900) - newdate.tm_year=tmu_date.tm_year - 1900; - else - newdate.tm_year=tmu_date.tm_year ; - newdate.tm_isdst=-1; - ut.actime=ut.modtime=mktime(&newdate); - utime(filename,&ut); - -#endif - -} - - -/* mymkdir and change_file_date are not 100 % portable - As I don't know well Unix, I wait feedback for the unix portion */ -int hb___MakeDir(char *szNewDirectory) -{ - char *szBuffer ; - char *szTemp; - int uiLen = strlen(szNewDirectory); - - if (uiLen <= 0) - return 0; - - szBuffer = (void*)hb_xalloc(uiLen+1); - strcpy(szBuffer,szNewDirectory); - - if (szBuffer[uiLen-1] == '/') { - szBuffer[uiLen-1] = '\0'; - } - - if (hb_fsMkDir(szBuffer)) - { - hb_xfree((void*) szBuffer); - - return 1; - } - - szTemp = szBuffer+1; - while (1) - { - char szHold; - int iResult; - while(*szTemp && *szTemp != '\\' && *szTemp != '/') - szTemp++; - szHold = *szTemp; - *szTemp = 0; - - iResult=hb_fsMkDir(szBuffer); - if (( iResult== -1) && (errno == ENOENT)) - { - hb_xfree((void*) szBuffer); - - return 0; - } - if (szHold == 0) - break; - *szTemp++ = szHold; - } - - hb_xfree((void*) szBuffer); - - return 1; -} - -int hb___ExtractOneFile(unzFile szUnzipFile,const char* filename,BOOL opt_extract_without_path,BOOL opt_overwrite,PHB_ITEM pBlock) -{ - err = UNZ_OK; - if (unzLocateFile(szUnzipFile,filename,CASESENSITIVITY)!=UNZ_OK) - { - return 2; - } - - if (hb___ExtractCurrentFile(szUnzipFile,opt_extract_without_path, - opt_overwrite,pBlock) == UNZ_OK) - return 1; - else - return 0; -} - -int hb___Extract(unzFile szUnzipFile,BOOL bExtractPath,BOOL opt_overwrite,PHB_ITEM pBlock) -{ - unz_global_info szGlobalUnzipInfo; - - err = unzGetGlobalInfo (szUnzipFile,&szGlobalUnzipInfo); - - if (err!=UNZ_OK) - { -/* printf("error %d with zipfile in unzGetGlobalInfo \n",err);*/ - } - - for (uiCounter=1;uiCounter<=(uLong)szGlobalUnzipInfo.number_entry;uiCounter++) - { - - if (hb___ExtractCurrentFile(szUnzipFile,bExtractPath, - opt_overwrite, pBlock) != UNZ_OK) - { - break; - } - if (uiCounter+1<=szGlobalUnzipInfo.number_entry) - { - err = unzGoToNextFile(szUnzipFile); - if (err!=UNZ_OK) - { - break; - } - } - } - - return 1; -} - - -BOOL hb___unZipFiles(char *szFile,PHB_ITEM pBlock,BOOL bExtractPath) -{ - const char *szZipFileName=NULL; - const char *szFilename_to_Extract=NULL; - - BOOL opt_do_extract=1; - - int opt_overwrite=0; - char szFilename_Try[512]; -/* unzFile szUnzipFile=NULL;*/ - - if (szZipFileName == NULL) - { - szZipFileName = szFile; - } - - if (szZipFileName!=NULL) - { - strcpy(szFilename_Try,szZipFileName); - szUnzipFile = unzOpen(szZipFileName); - if (szUnzipFile==NULL) - { - strcat(szFilename_Try,".zip"); - szUnzipFile = unzOpen(szFilename_Try); - } - } - - if (szUnzipFile==NULL) - { - - return -1; - } - - if (opt_do_extract) - { - if (szFilename_to_Extract == NULL) - return hb___Extract(szUnzipFile,bExtractPath,opt_overwrite,pBlock); - else - return hb___ExtractOneFile(szUnzipFile,szFilename_to_Extract, - bExtractPath,opt_overwrite,pBlock); - } - unzCloseCurrentFile(szUnzipFile); - - return 1; /* to avoid warning */ -} - -int hb___ExtractCurrentFile(unzFile szUnzipFile,BOOL popt_extract_without_path,BOOL popt_overwrite,PHB_ITEM pBlock) -{ - char filename_inzip[256]; - char* filename_withoutpath; - char* p; - char NewFileToWrite[256]; - FHANDLE nFileHandle=0; - BYTE * szBuffer; - - - unz_file_info file_info; - - err=UNZ_OK; - err = unzGetCurrentFileInfo(szUnzipFile,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0); - - if (err!=UNZ_OK) - { - return err; - } - - Size_Buf = WRITEBUFFERSIZE; - - szBuffer = (void*) hb_xalloc(Size_Buf); - if (szBuffer==NULL) - { - return UNZ_INTERNALERROR; - } - strcpy(NewFileToWrite,filename_inzip); - p = filename_withoutpath = filename_inzip; - while ((*p) != '\0') - { - if (((*p)=='/') || ((*p)=='\\')) - filename_withoutpath = p+1; - p++; - } - - if ((*filename_withoutpath)=='\0') - { - if (popt_extract_without_path) - { - hb_fsMkDir(filename_inzip); - } - } - else - { - - char* write_filename; - int skip=0; - - if ((popt_extract_without_path)) - { - write_filename = filename_inzip; - } - else - { - write_filename = filename_withoutpath; - } - if(pBlock !=NULL){ - - PHB_ITEM pFileName=hb_itemPutC(NULL, (char *)write_filename); - PHB_ITEM pFilePos=hb_itemPutNI(NULL,uiCounter); - hb_vmEvalBlockV( pBlock, 2, pFileName, pFilePos ); - hb_itemRelease(pFileName); - hb_itemRelease(pFilePos); - } - - err = unzOpenCurrentFile(szUnzipFile); - if (err!=UNZ_OK) - { - } - - if ((skip==0) && (err==UNZ_OK)) - { - nFileHandle=(FHANDLE) hb_fsCreate((char *) write_filename,FC_NORMAL); - - /* some zipfile don't contain directory alone before file */ - if ((nFileHandle==-1) && ((popt_extract_without_path)) && - (filename_withoutpath!=(char*)filename_inzip)) - { - char c=*(filename_withoutpath-1); - *(filename_withoutpath-1)='\0'; - hb___MakeDir((char *)write_filename); - *(filename_withoutpath-1)=c; - - nFileHandle=hb_fsCreate((char *)write_filename,FC_NORMAL); - } - - } - - if (nFileHandle!=NULL) - { - - do - { - err = unzReadCurrentFile(szUnzipFile,szBuffer,Size_Buf); - if (err<0) - { - - break; - } - if (err>0) - - if (hb_fsWrite(nFileHandle,szBuffer,err)==0) - { - err=UNZ_ERRNO; - break; - } - } - while (err>0); - hb_fsClose(nFileHandle); - - if (err==0) - hb____ChangeFileDate(write_filename,file_info.dosDate,file_info.tmu_date); - } - - if (err==UNZ_OK) - { - err = unzCloseCurrentFile (szUnzipFile); - if (err!=UNZ_OK) - { - } - } - else - unzCloseCurrentFile(szUnzipFile); /* don't lose the error */ - } - - hb_xfree((void*)szBuffer); - return err; -} - - -int hb___GetNumbersofFilestoUnzip(char *szFile) -{ -/* int iNumbersOfFiles;*/ - - const char *szZipFileName=NULL; - char szFilename_Try[512]; - unz_global_info szGlobalUnzipInfo; - szZipFileName = szFile; - -/* - if (szZipFileName == NULL) - { - szZipFileName = szFile; - } -*/ - - if (szZipFileName!=NULL) - { - strcpy(szFilename_Try,szZipFileName); - szUnzipFile = unzOpen(szZipFileName); - if (szUnzipFile==NULL) - { - strcat(szFilename_Try,".zip"); - szUnzipFile = unzOpen(szFilename_Try); - } - } - - if (szUnzipFile==NULL) - { - return 0; - } - err = unzGetGlobalInfo (szUnzipFile,&szGlobalUnzipInfo); - -/* - if (err==ZIP_OK) - { - iNumbersOfFiles=szGlobalUnzipInfo.number_entry; - } -*/ - - unzCloseCurrentFile(szUnzipFile); - -/* return iNumbersOfFiles; to avoid warning */ - - return szGlobalUnzipInfo.number_entry; -} - - -PHB_ITEM hb___GetFilesNamesFromZip(char *szFile,BOOL iMode) -{ - const char *szZipFileName=NULL; - char szFilename_Try[_POSIX_PATH_MAX]; - char szFileNameinZip[_POSIX_PATH_MAX]; - int iNumbersOfFiles=0; - - PHB_ITEM pItem=NULL; - PHB_ITEM pArray=NULL; - - int uiCount; - unz_global_info szGlobalUnzipInfo; - if (szZipFileName == NULL) - { - szZipFileName = szFile; - } - - if (szZipFileName!=NULL) - { - strcpy(szFilename_Try,szZipFileName); - szUnzipFile = unzOpen(szZipFileName); - if (szUnzipFile==NULL) - { - strcat(szFilename_Try,".zip"); - szUnzipFile = unzOpen(szFilename_Try); - } - } - - if (szUnzipFile==NULL) - { - exit(1); - } - err = unzGetGlobalInfo (szUnzipFile,&szGlobalUnzipInfo); - if (err==ZIP_OK) - { - iNumbersOfFiles=(uLong)szGlobalUnzipInfo.number_entry; - pArray=hb_itemArrayNew( iNumbersOfFiles ); - } - for(uiCount=0;uiCount0) - { - - pItem=hb_itemPutNL(NULL,file_info.uncompressed_size); - hb_itemArrayPut(pTempArray,Lenght,pItem); - hb_itemRelease(pItem); - pItem=hb_itemPutNL(NULL,file_info.compressed_size); - hb_itemArrayPut(pTempArray,Size,pItem); - hb_itemRelease(pItem); - iRatio=100-((file_info.compressed_size*100)/file_info.uncompressed_size); - if (iRatio <0) - { - iRatio=0; - } - pItem=hb_itemPutNL(NULL,iRatio); - hb_itemArrayPut(pTempArray,Ratio,pItem); - hb_itemRelease(pItem); - } - else - { - pItem=hb_itemPutNL(NULL,file_info.uncompressed_size); - hb_itemArrayPut(pTempArray,Lenght,pItem); - hb_itemRelease(pItem); - pItem=hb_itemPutNL(NULL,file_info.compressed_size); - hb_itemArrayPut(pTempArray,Size,pItem); - hb_itemRelease(pItem); - iRatio=0; - pItem=hb_itemPutNL(NULL,iRatio); - hb_itemArrayPut(pTempArray,Ratio,pItem); - hb_itemRelease(pItem); - } - - if (file_info.compression_method==0) - { - szMethod="Stored"; - } - if (file_info.compression_method==Z_DEFLATED) - { - uInt iLevel=(uInt)((file_info.flag & 0x6)/2); - if (iLevel==0) - { - szMethod="Defl:N"; - } - else if (iLevel==1) - { - szMethod="Defl:X"; - } - else if ((iLevel==2) || (iLevel==3)) - { - szMethod="Defl:F"; - } - else - { - szMethod="Unknow"; - } - - pItem=hb_itemPutC(NULL,szMethod); - hb_itemArrayPut(pTempArray,Method,pItem); - hb_itemRelease(pItem); - } - sprintf(szCRC,"%8.8lx\n",(uLong)file_info.crc); - - pItem=hb_itemPutCL(NULL,szCRC,8); - hb_itemArrayPut(pTempArray,Crc32,pItem); - hb_itemRelease(pItem); - pItem=hb_itemPutD(NULL, (long)file_info.tmu_date.tm_year ,(long)file_info.tmu_date.tm_mon + 1,(long)file_info.tmu_date.tm_mday); - hb_itemArrayPut(pTempArray,Date,pItem); - hb_itemRelease(pItem); - hb_____GetTime(file_info); - iLen=strlen(szTempTime); - - for(iCount=10;iCount<19;iCount++) - { - if( (iCount>10) && (iCount<19)) - { - szTime[iiCount]=szTempTime[iCount]; - iiCount++; - } - } - pItem=hb_itemPutCL(NULL,szTime,8); - hb_itemArrayPut(pTempArray,Time,pItem); - hb_itemRelease(pItem); - hb_itemArrayPut(pArray,uiCount+1,pTempArray); - hb_itemRelease(pTempArray); - } - else - { - - pItem=hb_itemPutC(NULL,szFileNameinZip); - hb_itemArrayPut(pArray,uiCount+1,pItem); - hb_itemRelease(pItem); - - } - if ((uiCount+1) - -#define FILEHEADERSIZE 46 -#define LOCALFILEHEADERSIZE 30 -#define ENCR_HEADER_LEN 12 -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// -char CZipFileHeader::m_gszSignature[] = {0x50, 0x4b, 0x01, 0x02}; -char CZipFileHeader::m_gszLocalSignature[] = {0x50, 0x4b, 0x03, 0x04}; -CZipFileHeader::CZipFileHeader() -{ - m_uExternalAttr = 0;//ZipPlatform::GetDefaultAttributes(); - m_uModDate = m_uModTime = 0; - m_uMethod = Z_DEFLATED; -// SetSystemCompatibility(ZipPlatform::m_sSystemID); -} - -CZipFileHeader::~CZipFileHeader() -{ - -} - -// read the header from the central dir -bool CZipFileHeader::Read(CZipStorage *pStorage) -{ -// // just in case -// m_pszComment.Release(); -// m_pszFileName.Release(); - WORD uFileNameSize, uCommentSize, uExtraFieldSize; - CZipAutoBuffer buf(FILEHEADERSIZE); - pStorage->Read(buf, FILEHEADERSIZE, true); - memcpy(&m_szSignature, buf, 4); - memcpy(&m_uVersionMadeBy, buf + 4, 2); - memcpy(&m_uVersionNeeded, buf + 6, 2); - memcpy(&m_uFlag, buf + 8, 2); - memcpy(&m_uMethod, buf + 10, 2); - memcpy(&m_uModTime, buf + 12, 2); - memcpy(&m_uModDate, buf + 14, 2); - memcpy(&m_uCrc32, buf + 16, 4); - memcpy(&m_uComprSize, buf + 20, 4); - memcpy(&m_uUncomprSize, buf + 24, 4); - memcpy(&uFileNameSize, buf + 28, 2); - memcpy(&uExtraFieldSize, buf + 30, 2); - memcpy(&uCommentSize, buf + 32, 2); - memcpy(&m_uDiskStart, buf + 34, 2); - memcpy(&m_uInternalAttr, buf + 36, 2); - memcpy(&m_uExternalAttr, buf + 38, 4); - memcpy(&m_uOffset, buf + 42, 4); - buf.Release(); - - if (memcmp(m_szSignature, m_gszSignature, 4) != 0) - return false; - - int iCurDsk = pStorage->GetCurrentDisk(); - m_pszFileName.Allocate(uFileNameSize); // don't add NULL at the end - pStorage->Read(m_pszFileName, uFileNameSize, true); - if (uExtraFieldSize) - { - ASSERT(!m_pExtraField.IsAllocated()); - m_pExtraField.Allocate(uExtraFieldSize); - pStorage->Read(m_pExtraField, uExtraFieldSize, true); - } - if (uCommentSize) - { - m_pszComment.Allocate(uCommentSize); - pStorage->Read(m_pszComment, uCommentSize, true); - } - - return pStorage->GetCurrentDisk() == iCurDsk; // check that the whole header is on the one disk -} - -time_t CZipFileHeader::GetTime() -{ - struct tm atm; - atm.tm_sec = (m_uModTime & ~0xFFE0) << 1; - atm.tm_min = (m_uModTime & ~0xF800) >> 5; - atm.tm_hour = m_uModTime >> 11; - - atm.tm_mday = m_uModDate & ~0xFFE0; - atm.tm_mon = ((m_uModDate & ~0xFE00) >> 5) - 1; - atm.tm_year = (m_uModDate >> 9) + 80; - atm.tm_isdst = -1; - return mktime(&atm); -} - -// write the header to the central dir -DWORD CZipFileHeader::Write(CZipStorage *pStorage) -{ - WORD uFileNameSize = GetFileNameSize(), uCommentSize = GetCommentSize(), - uExtraFieldSize = GetExtraFieldSize(); - DWORD iSize = GetSize(); - CZipAutoBuffer buf(iSize); - memcpy(buf, &m_szSignature, 4); - memcpy(buf + 4, &m_uVersionMadeBy, 2); - memcpy(buf + 6, &m_uVersionNeeded, 2); - memcpy(buf + 8, &m_uFlag, 2); - memcpy(buf + 10, &m_uMethod, 2); - memcpy(buf + 12, &m_uModTime, 2); - memcpy(buf + 14, &m_uModDate, 2); - memcpy(buf + 16, &m_uCrc32, 4); - memcpy(buf + 20, &m_uComprSize, 4); - memcpy(buf + 24, &m_uUncomprSize, 4); - memcpy(buf + 28, &uFileNameSize, 2); - memcpy(buf + 30, &uExtraFieldSize, 2); - memcpy(buf + 32, &uCommentSize, 2); - memcpy(buf + 34, &m_uDiskStart, 2); - memcpy(buf + 36, &m_uInternalAttr, 2); - memcpy(buf + 38, &m_uExternalAttr, 4); - memcpy(buf + 42, &m_uOffset, 4); - - memcpy(buf + 46, m_pszFileName, uFileNameSize); - - if (uExtraFieldSize) - memcpy(buf + 46 + uFileNameSize, m_pExtraField, uExtraFieldSize); - - if (uCommentSize) - memcpy(buf + 46 + uFileNameSize + uExtraFieldSize, m_pszComment, uCommentSize); - - pStorage->Write(buf, iSize, true); - return iSize; -} - -bool CZipFileHeader::ReadLocal(CZipStorage *pStorage, WORD& iLocExtrFieldSize) -{ - char buf[LOCALFILEHEADERSIZE]; - pStorage->Read(buf, LOCALFILEHEADERSIZE, true); - if (memcmp(buf, m_gszLocalSignature, 4) != 0) - return false; - - bool bIsDataDescr = (((WORD)*(buf + 6)) & 8) != 0; - - WORD uFileNameSize = GetFileNameSize(); - if ((memcmp(buf + 6, &m_uFlag, 2) != 0) - ||(memcmp(buf + 8, &m_uMethod, 2) != 0) - || (m_uMethod && (m_uMethod != Z_DEFLATED)) - || (memcmp(buf + 26, &uFileNameSize, 2) != 0)) - return false; - -// jeszcze mo¿naby porównaæ nazwy plików - - if (!bIsDataDescr/* || !pStorage->IsSpanMode()*/) - if (!CheckCrcAndSizes(buf + 14)) - return false; - - memcpy(&iLocExtrFieldSize, buf + 28, 2); - pStorage->m_pFile->Seek(uFileNameSize, CZipAbstractFile::current); - - return true; -} - -void CZipFileHeader::SetTime(const time_t & ttime) -{ - tm* gt = localtime(&ttime); - WORD year = (WORD)(gt->tm_year + 1900); - if (year <= 1980) - year = 0; - else - year -= 1980; - m_uModDate = (WORD) (gt->tm_mday + ((gt->tm_mon + 1)<< 5) + (year << 9)); - m_uModTime = (WORD) ((gt->tm_sec >> 1) + (gt->tm_min << 5) + - (gt->tm_hour << 11)); -} -// the buffer contains crc32, compressed and uncompressed sizes to be compared -// with the actual values -bool CZipFileHeader::CheckCrcAndSizes(char *pBuf) -{ - return (memcmp(pBuf, &m_uCrc32, 4) == 0) && (memcmp(pBuf + 4, &m_uComprSize, 4) == 0) - && (memcmp(pBuf + 8, &m_uUncomprSize, 4) == 0); -} - -// write the local header -void CZipFileHeader::WriteLocal(CZipStorage& storage) -{ - // extra field is local by now - WORD uFileNameSize = GetFileNameSize(), uExtraFieldSize = GetExtraFieldSize(); - DWORD iLocalSize = LOCALFILEHEADERSIZE + uExtraFieldSize + uFileNameSize; - CZipAutoBuffer buf(iLocalSize); - memcpy(buf, m_gszLocalSignature, 4); - memcpy(buf + 4, &m_uVersionNeeded, 2); - memcpy(buf + 6, &m_uFlag, 2); - memcpy(buf + 8, &m_uMethod, 2); - memcpy(buf + 10, &m_uModTime, 2); - memcpy(buf + 12, &m_uModDate, 2); - memcpy(buf + 14, &m_uCrc32, 4); - memcpy(buf + 18, &m_uComprSize, 4); - memcpy(buf + 22, &m_uUncomprSize, 4); - memcpy(buf + 26, &uFileNameSize, 2); - memcpy(buf + 28, &uExtraFieldSize, 2); - memcpy(buf + 30, m_pszFileName, uFileNameSize); - memcpy(buf + 30 + uFileNameSize, m_pExtraField, uExtraFieldSize); - - // possible disk change before writing to the file in the disk spanning mode - // so write the local header first - storage.Write(buf, iLocalSize, true); - // it was only local information, use CZipArchive::SetExtraField to set the file extra field in the central directory - m_pExtraField.Release(); - - m_uDiskStart = (WORD)storage.GetCurrentDisk(); - m_uOffset = storage.GetPosition() - iLocalSize; -} - -// prepare the data before adding a new file -bool CZipFileHeader::PrepareData(int iLevel, bool bExtraHeader, bool bEncrypted) -{ - memcpy(m_szSignature, m_gszSignature, 4); - m_uInternalAttr = 0; - m_uVersionNeeded = 0x14; // 20 - SetVersion(0x14); - - m_uCrc32 = 0; - m_uComprSize = 0; - m_uUncomprSize = 0; - if (iLevel == 0) - m_uMethod = 0; - - if ((m_uMethod != Z_DEFLATED) && (m_uMethod != 0)) - m_uMethod = Z_DEFLATED; - - m_uFlag = 0; - if (m_uMethod == Z_DEFLATED) - switch (iLevel) - { - case 1: - m_uFlag |= 6; - break; - case 2: - m_uFlag |= 4; - break; - case 8: - case 9: - m_uFlag |= 2; - break; - } - - if (bExtraHeader) - m_uFlag |= 8; // data descriptor present - - if (bEncrypted) - { - m_uComprSize = ENCR_HEADER_LEN; // encrypted header - m_uFlag |= 9; // encrypted file - } - - return !(m_pszComment.GetSize() > USHRT_MAX || m_pszFileName.GetSize() > USHRT_MAX - || m_pExtraField.GetSize() > USHRT_MAX); -} - -void CZipFileHeader::GetCrcAndSizes(char * pBuffer) -{ - memcpy(pBuffer, &m_uCrc32, 4); - memcpy(pBuffer + 4, &m_uComprSize, 4); - memcpy(pBuffer + 8, &m_uUncomprSize, 4); -} - -DWORD CZipFileHeader::GetSize() -{ - return FILEHEADERSIZE + GetExtraFieldSize() + GetFileNameSize() + GetCommentSize(); -} - - -bool CZipFileHeader::IsEncrypted() -{ - return (m_uFlag & (WORD) 1) != 0; -} - -bool CZipFileHeader::IsDataDescr() -{ - return (m_uFlag & (WORD) 8) != 0; -} - -bool CZipFileHeader::SetComment(LPCTSTR lpszComment) -{ - return CZipArchive::WideToSingle(lpszComment, m_pszComment) != -1; -} - -CZipString CZipFileHeader::GetComment() -{ - CZipString temp; - CZipArchive::SingleToWide(m_pszComment, temp); - return temp; - -} - -bool CZipFileHeader::SetFileName(LPCTSTR lpszFileName) -{ - return CZipArchive::WideToSingle(lpszFileName, m_pszFileName) != -1; -} - -CZipString CZipFileHeader::GetFileName() -{ - CZipString temp; - CZipArchive::SingleToWide(m_pszFileName, temp); - return temp; -} - -bool CZipFileHeader::IsDirectory() -{ - return ZipPlatform::IsDirectory(GetSystemAttr()); -} - -DWORD CZipFileHeader::GetSystemAttr() -{ - return ZipCompatibility::ConvertToSystem(m_uExternalAttr, GetSystemCompatibility(), ZipPlatform::GetSystemID()); -} - - -void CZipFileHeader::SetSystemAttr(DWORD uAttr) -{ - m_uExternalAttr = ZipCompatibility::ConvertToSystem(uAttr, ZipPlatform::GetSystemID(), GetSystemCompatibility()); -} diff --git a/harbour/contrib/hbzlib/zipmemfile.cpp b/harbour/contrib/hbzlib/zipmemfile.cpp deleted file mode 100644 index f94caa8a33..0000000000 --- a/harbour/contrib/hbzlib/zipmemfile.cpp +++ /dev/null @@ -1,99 +0,0 @@ -// ZipMemFile.cpp: implementation of the CZipMemFile class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "zipmemfile.h" -#include "zipexception.h" - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -void CZipMemFile::Grow(long nGrowTo) -{ - if (m_nBufSize < (UINT)nGrowTo) - { - if (m_nGrowBy == 0) - CZipException::Throw(CZipException::memError); - long nNewSize = m_nBufSize; - while (nNewSize < nGrowTo) - nNewSize += m_nGrowBy; - BYTE* lpNew; - if (m_lpBuf) - lpNew = (BYTE*)realloc((void*) m_lpBuf, nNewSize); - else - lpNew = (BYTE*)malloc(nNewSize); - - if (!lpNew) - CZipException::Throw(CZipException::memError); - m_nBufSize = nNewSize; - m_lpBuf = lpNew; - } -} - -void CZipMemFile::SetLength(long nNewLen) -{ - if (m_nBufSize < (UINT)nNewLen) - Grow(nNewLen); - else - m_nPos = nNewLen; - m_nDataSize = nNewLen; -} - -UINT CZipMemFile::Read(void *lpBuf, UINT nCount) -{ - if (m_nPos > m_nDataSize) - return 0; - UINT nToRead = (m_nPos + nCount > m_nDataSize) ? m_nDataSize - m_nPos : nCount; - memcpy(lpBuf, m_lpBuf + m_nPos, nToRead); - m_nPos += nToRead; - return nToRead; - -} - -void CZipMemFile::Write(const void *lpBuf, UINT nCount) -{ - if (!nCount) - return; - - if (m_nPos + nCount > m_nBufSize) - Grow(m_nPos + nCount); - memcpy(m_lpBuf + m_nPos, lpBuf, nCount); - m_nPos += nCount; - if (m_nPos > m_nDataSize) - m_nDataSize = m_nPos; -} - -long CZipMemFile::Seek(long lOff, int nFrom) -{ - long lNew = m_nPos; - - if (nFrom == CZipAbstractFile::begin) - lNew = lOff; - else if (nFrom == CZipAbstractFile::current) - lNew += lOff; - else if (nFrom == CZipAbstractFile::end) - lNew = m_nDataSize + lOff; - else - return lNew; - - if (lNew< 0) - CZipException::Throw(CZipException::memError); - - m_nPos = lNew; - return lNew; -} -bool CZipMemFile::Open(LPCTSTR lpszFileName, UINT openFlags, bool shareMode) -{ -return 1; -} - diff --git a/harbour/contrib/hbzlib/zippathcomponent.cpp b/harbour/contrib/hbzlib/zippathcomponent.cpp deleted file mode 100644 index 0d8fd871fe..0000000000 --- a/harbour/contrib/hbzlib/zippathcomponent.cpp +++ /dev/null @@ -1,73 +0,0 @@ -// ZipPathComponent.cpp: implementation of the CZipPathComponent class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "zippathcomponent.h" - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - - -CZipPathComponent::~CZipPathComponent() -{ - -} - -void CZipPathComponent::SetFullPath(const CZipString& szFullPath) -{ - TCHAR szDrive[_MAX_DRIVE]; - TCHAR szDir[_MAX_DIR]; - TCHAR szFname[_MAX_FNAME]; - TCHAR szExt[_MAX_EXT]; - m_szPrefix.Empty(); - CZipString szTempPath = szFullPath; - LPCTSTR szWinUNC = {_T("\\\\?\\UNC\\")}; - LPCTSTR szUnic = {_T("\\\\?\\")}; - LPCTSTR szUNC = {_T("\\\\")}; - - - if (szTempPath.Left(8) == szWinUNC) // UNC path meeting Windows File Name Conventions required for some functions - { - szTempPath = szTempPath.Mid(8); - m_szPrefix = szWinUNC; - } - else if (szTempPath.Left(4) == szUnic) // Unicode path - { - szTempPath = szTempPath.Mid(4); - m_szPrefix = szUnic; - } - else if (szTempPath.Left(2) == szUNC) // UNC path - m_szPrefix = szUNC; - - _tsplitpath(szTempPath, szDrive , szDir, szFname, szExt); - m_szDrive = szDrive; - m_szDirectory = szDir; - - m_szDirectory.TrimLeft(m_cSeparator); - m_szDirectory.TrimRight(m_cSeparator); - SetExtension(szExt); - m_szFileName = szFname; -} - - -CZipString CZipPathComponent::GetNoDrive() -{ - CZipString szPath = m_szDirectory; - CZipString szFileName = GetFullFileName(); - if (!szFileName.IsEmpty() && !szPath.IsEmpty()) - szPath += m_cSeparator; - - szPath += szFileName; - return szPath; -} - diff --git a/harbour/contrib/hbzlib/zipplatform.cpp b/harbour/contrib/hbzlib/zipplatform.cpp deleted file mode 100644 index 8edd5b3f10..0000000000 --- a/harbour/contrib/hbzlib/zipplatform.cpp +++ /dev/null @@ -1,270 +0,0 @@ -// ZipPlatform.cpp: implementation of the ZipPlatform namespace. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - - -#include "stdafx.h" -#include "zipplatform.h" -#include "zipfileheader.h" -#include "zipexception.h" -#include "zipautobuffer.h" -#include - -#if defined _MSC_VER && !defined __BORLANDC__ /*_MSC_VER may be defined in Borland after converting the VC project */ - #include -#else - #include -#endif - -#include -#include -#include - - -#include "zippathcomponent.h" -TCHAR CZipPathComponent::m_cSeparator = _T('\\'); - -#include "zipcompatibility.h" - -#ifndef _UTIMBUF_DEFINED -#define _utimbuf utimbuf -#endif - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// -DWORD ZipPlatform::GetDeviceFreeSpace(LPCTSTR lpszPath) -{ - DWORD SectorsPerCluster, BytesPerSector, NumberOfFreeClusters, TotalNumberOfClusters; - CZipPathComponent zpc (lpszPath); - if (!GetDiskFreeSpace( - zpc.GetFileDrive(), - &SectorsPerCluster, - &BytesPerSector, - &NumberOfFreeClusters, - &TotalNumberOfClusters)) - return 0; - __int64 total = SectorsPerCluster * BytesPerSector * NumberOfFreeClusters; - return (DWORD)total; -} -bool ZipPlatform::GetCurrentDirectory(CZipString& sz) -{ - DWORD i = ::GetCurrentDirectory(0, NULL); - if (!i) - return false; - TCHAR* pBuf = new TCHAR[i]; - bool b = true; - if (!::GetCurrentDirectory(i, pBuf)) - b = false; - else - sz = pBuf; - delete[] pBuf; - return b; -} - -bool ZipPlatform::SetFileAttr(LPCTSTR lpFileName, DWORD uAttr) -{ - return ::SetFileAttributes(lpFileName, uAttr) != 0; -} - -bool ZipPlatform::GetFileAttr(LPCTSTR lpFileName, DWORD& uAttr) -{ - // not using MFC due to MFC bug (attr is one byte there) - DWORD temp = ::GetFileAttributes(lpFileName); - if (temp == -1) - return false; - uAttr = temp; - return true; - -} - -bool ZipPlatform::GetFileModTime(LPCTSTR lpFileName, time_t & ttime) -{ -#if defined _MSC_VER && !defined __BORLANDC__ /*_MSC_VER may be defined in Borland after converting the VC project */ - struct _stat st; - if (_tstat(lpFileName, &st) != 0) -#else - struct stat st; - if (stat(lpFileName, &st) != 0) -#endif - return false; - - ttime = st.st_mtime; - return true; -} - -bool ZipPlatform::SetFileModTime(LPCTSTR lpFileName, time_t ttime) -{ - struct _utimbuf ub; - ub.actime = time(NULL); - ub.modtime = ttime; - return _tutime(lpFileName, &ub) == 0; -} - - -bool ZipPlatform::ChangeDirectory(LPCTSTR lpDirectory) -{ - return _tchdir(lpDirectory) == 0; // returns 0 if ok -} -int ZipPlatform::FileExists(LPCTSTR lpszName) -{ - if (_taccess(lpszName, 0) == 0) - { - if (DirectoryExists(lpszName)) - return -1; - return 1; - } - else - return 0; - -} - -ZIPINLINE bool ZipPlatform::IsDriveRemovable(LPCTSTR lpszFilePath) -{ - CZipPathComponent zpc(lpszFilePath); - return ::GetDriveType(zpc.GetFileDrive()) == DRIVE_REMOVABLE; -} - -ZIPINLINE bool ZipPlatform::SetVolLabel(LPCTSTR lpszPath, LPCTSTR lpszLabel) -{ - CZipPathComponent zpc(lpszPath); - CZipString szDrive = zpc.GetFileDrive(); - CZipPathComponent::AppendSeparator(szDrive); - return ::SetVolumeLabel(szDrive, lpszLabel) != 0; -} - -ZIPINLINE void ZipPlatform::AnsiOem(CZipAutoBuffer& buffer, bool bAnsiToOem) -{ - if (bAnsiToOem) - CharToOemBuffA(buffer, buffer, buffer.GetSize()); - else - OemToCharBuffA(buffer, buffer, buffer.GetSize()); -} - -ZIPINLINE void ZipPlatform::RemoveFile(LPCTSTR lpszFileName) -{ - if (!::DeleteFile((LPTSTR)lpszFileName)) - CZipException::Throw(CZipException::notRemoved, lpszFileName); - -} -ZIPINLINE void ZipPlatform::RenameFile( LPCTSTR lpszOldName, LPCTSTR lpszNewName ) -{ - if (!::MoveFile((LPTSTR)lpszOldName, (LPTSTR)lpszNewName)) - CZipException::Throw(CZipException::notRenamed, lpszOldName); -} -ZIPINLINE bool ZipPlatform::IsDirectory(DWORD uAttr) -{ - return (uAttr & FILE_ATTRIBUTE_DIRECTORY) != 0; -} -ZIPINLINE bool ZipPlatform::CreateDirectory(LPCTSTR lpDirectory) -{ - return ::CreateDirectory(lpDirectory, NULL) != 0; -} - -// ZIPINLINE DWORD ZipPlatform::GetDefaultAttributes() -// { -// return FILE_ATTRIBUTE_ARCHIVE; -// } - -ZIPINLINE int ZipPlatform::GetSystemID() -{ - return ZipCompatibility::zcDosFat; -} - -#ifdef _UNICODE -int ZipPlatform::WideToSingle(LPCTSTR lpWide, CZipAutoBuffer &szSingle) -{ - size_t wideLen = wcslen(lpWide); - if (wideLen == 0) - { - szSingle.Release(); - return 0; - } - - // iLen does not include terminating character - int iLen = WideCharToMultiByte(CP_ACP,0, lpWide, wideLen, szSingle, - 0, NULL, NULL); - if (iLen > 0) - { - szSingle.Allocate(iLen, true); - iLen = WideCharToMultiByte(CP_ACP,0, lpWide , wideLen, szSingle, - iLen, NULL, NULL); - ASSERT(iLen != 0); - } - else // here it means error - { - szSingle.Release(); - iLen --; - } - return iLen; - -} -int ZipPlatform::SingleToWide(const CZipAutoBuffer &szSingle, CZipString& szWide) -{ - int singleLen = szSingle.GetSize(); - // iLen doesn't include terminating character - int iLen = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szSingle.GetBuffer(), singleLen, NULL, 0); - if (iLen > 0) - { - iLen = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, szSingle.GetBuffer(), singleLen, - szWide.GetBuffer(iLen) , iLen); - szWide.ReleaseBuffer(iLen); - ASSERT(iLen != 0); - } - else - { - szWide.Empty(); - iLen --; // return -1 - } - return iLen; - -} -#endif - -#ifndef _MFC_VER -#include -#include -bool ZipPlatform::TruncateFile(int iDes, DWORD iSize) -{ - int ret = chsize(iDes, iSize); - return ret != -1; - -} - -int ZipPlatform::OpenFile(LPCTSTR lpszFileName, UINT iMode, int iShareMode) -{ - switch (iShareMode) - { - case (CZipFile::shareDenyWrite & CZipFile::shareDenyRead): - iShareMode = SH_DENYRW; - break; - case (CZipFile::shareDenyRead): - iShareMode = SH_DENYRD; - break; - case (CZipFile::shareDenyWrite): - iShareMode = SH_DENYWR; - break; - default: - iShareMode = SH_DENYNO; - } - return _tsopen(lpszFileName, iMode, iShareMode, S_IREAD | S_IWRITE /*required only when O_CREAT mode*/); -} - -bool ZipPlatform::FlushFile(int iDes) -{ - return _commit(iDes) == 0; -} - -int ZipPlatform::GetFileSystemHandle(int iDes) -{ - return _get_osfhandle(iDes); -} -#endif //_MFC_VER diff --git a/harbour/contrib/hbzlib/zipplatformcomm.cpp b/harbour/contrib/hbzlib/zipplatformcomm.cpp deleted file mode 100644 index 6162633ea1..0000000000 --- a/harbour/contrib/hbzlib/zipplatformcomm.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// ZipPlatformComm.cpp - functions portable across the systems -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - - -#include "stdafx.h" -#include "zipplatform.h" - -using namespace ZipPlatform; - -bool ZipPlatform::DirectoryExists(LPCTSTR lpszDir) -{ - CZipString sz; - if (!GetCurrentDirectory(sz)) - return false; - if (!ChangeDirectory(lpszDir)) - return false; - ChangeDirectory(sz); - return true; -} - -bool ZipPlatform::ForceDirectory(LPCTSTR lpDirectory) -{ - ASSERT(lpDirectory); - CZipString szDirectory = lpDirectory; - szDirectory.TrimRight(CZipPathComponent::m_cSeparator); - CZipPathComponent zpc(szDirectory); - if ((zpc.GetFilePath() == szDirectory) || - (FileExists(szDirectory) == -1)) - return true; - if (!ForceDirectory(zpc.GetFilePath())) - return false; - if (!CreateDirectory(szDirectory)) - return false; - return true; -} diff --git a/harbour/contrib/hbzlib/zipstorage.cpp b/harbour/contrib/hbzlib/zipstorage.cpp deleted file mode 100644 index e69fde0532..0000000000 --- a/harbour/contrib/hbzlib/zipstorage.cpp +++ /dev/null @@ -1,421 +0,0 @@ -// ZipStorage.cpp: implementation of the CZipStorage class. -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "zipstorage.h" -#include "ziparchive.h" -// #include "ZipPathComponent.h" -#include "zipplatform.h" - -////////////////////////////////////////////////////////////////////// -// disk spanning objectives: -// - sinature at the first disk at the beginning -// - headers and central dir records not divided between disks -// - each file has a data descriptor preceded by the signature -// (bit 3 set in flag); - - -char CZipStorage::m_gszExtHeaderSignat[] = {0x50, 0x4b, 0x07, 0x08}; -CZipStorage::CZipStorage() -{ - m_pCallbackData = m_pChangeDiskFunc = NULL; - m_iWriteBufferSize = 65535; - m_iCurrentDisk = -1; - m_pFile = NULL; -} - -CZipStorage::~CZipStorage() -{ - -} - -DWORD CZipStorage::Read(void *pBuf, DWORD iSize, bool bAtOnce) -{ - if (iSize == 0) - return 0; - DWORD iRead = 0; - while (!iRead) - { - iRead = m_pFile->Read(pBuf, iSize); - if (!iRead) - if (IsSpanMode()) - ChangeDisk(m_iCurrentDisk + 1); - else - ThrowError(CZipException::badZipFile); - } - - if (iRead == iSize) - return iRead; - else if (bAtOnce || !IsSpanMode()) - ThrowError(CZipException::badZipFile); - - while (iRead < iSize) - { - ChangeDisk(m_iCurrentDisk + 1); - UINT iNewRead = m_pFile->Read((char*)pBuf + iRead, iSize - iRead); - if (!iNewRead && iRead < iSize) - ThrowError(CZipException::badZipFile); - iRead += iNewRead; - } - - return iRead; -} - -void CZipStorage::Open(LPCTSTR szPathName, int iMode, int iVolumeSize) -{ - m_pWriteBuffer.Allocate(m_iWriteBufferSize); - m_uBytesInWriteBuffer = 0; - m_bNewSpan = false; - m_pFile = &m_internalfile; - m_bInMemory = false; - - if ((iMode == CZipArchive::zipCreate) ||(iMode == CZipArchive::zipCreateSpan)) // create new archive - { - m_iCurrentDisk = 0; - if (iMode == CZipArchive::zipCreate) - { - m_iSpanMode = noSpan; - OpenFile(szPathName, CZipFile::modeCreate | CZipFile::modeReadWrite); - } - else // create disk spanning archive - { - m_bNewSpan = true; - m_iBytesWritten = 0; - if (iVolumeSize <= 0) // pkzip span - { - if (!m_pChangeDiskFunc) - ThrowError(CZipException::noCallback); - if (!ZipPlatform::IsDriveRemovable(szPathName)) - ThrowError(CZipException::nonRemovable); - m_iSpanMode = pkzipSpan; - } - else - { - m_iTdSpanData = iVolumeSize; - m_iSpanMode = tdSpan; - } - - NextDisk(4, szPathName); - Write(m_gszExtHeaderSignat, 4, true); - } - } - else // open existing - { - OpenFile(szPathName, CZipFile::modeNoTruncate | - ((iMode == CZipArchive::zipOpenReadOnly) ? CZipFile::modeRead : CZipFile::modeReadWrite)); - // m_uData, m_bAllowModif i m_iSpanMode are automatically set during reading the central dir - m_iSpanMode = iVolumeSize == 0 ? suggestedAuto : suggestedTd; - } - -} - - -void CZipStorage::Open(CZipMemFile& mf, int iMode) -{ - m_pWriteBuffer.Allocate(m_iWriteBufferSize); - m_uBytesInWriteBuffer = 0; - m_bNewSpan = false; - m_pFile = &mf; - m_bInMemory = true; - - if (iMode == CZipArchive::zipCreate) - { - m_iCurrentDisk = 0; - m_iSpanMode = noSpan; - mf.SetLength(0); - } - else // open existing - { - mf.SeekToBegin(); - m_iSpanMode = suggestedAuto; - } -} - - -int CZipStorage::IsSpanMode() -{ - return m_iSpanMode == noSpan ? 0 : (m_bNewSpan ? 1 : -1); -} - -void CZipStorage::ChangeDisk(int iNumber) -{ - if (iNumber == m_iCurrentDisk) - return; - - ASSERT(m_iSpanMode != noSpan); - m_iCurrentDisk = iNumber; - OpenFile(m_iSpanMode == pkzipSpan ? ChangePkzipRead() : ChangeTdRead(), - CZipFile::modeNoTruncate | CZipFile::modeRead); -} - -void CZipStorage::ThrowError(int err) -{ - CZipException::Throw(err, m_pFile->GetFilePath()); -} - -bool CZipStorage::OpenFile(LPCTSTR lpszName, UINT uFlags, bool bThrow) -{ - return m_pFile->Open(lpszName, uFlags | CZipFile::shareDenyWrite, bThrow); -} - -int CZipStorage::GetCurrentDisk() -{ - return m_iCurrentDisk; -} - -CZipString CZipStorage::ChangePkzipRead() -{ - CZipString szTemp = m_pFile->GetFilePath(); - m_pFile->Close(); - CallCallback(-1 , szTemp); - return szTemp; -} - -CZipString CZipStorage::ChangeTdRead() -{ - CZipString szTemp = GetTdVolumeName(m_iCurrentDisk == m_iTdSpanData); - m_pFile->Close(); - return szTemp; -} - -void CZipStorage::Close(bool bAfterException) -{ - if (!bAfterException) - { - Flush(); - if ((m_iSpanMode == tdSpan) && (m_bNewSpan)) - { - // give to the last volume the zip extension - CZipString szFileName = m_pFile->GetFilePath(); - CZipString szNewFileName = GetTdVolumeName(true); - if (!m_bInMemory) - m_pFile->Close(); - if (ZipPlatform::FileExists(szNewFileName)) - ZipPlatform::RemoveFile(szNewFileName); - ZipPlatform::RenameFile(szFileName, szNewFileName); - } - else - { - if (!m_bInMemory) - m_pFile->Close(); - } - } - else - { - if (!m_bInMemory) - m_pFile->Close(); - } - - - - m_pWriteBuffer.Release(); - m_iCurrentDisk = -1; - m_iSpanMode = noSpan; - m_pFile = NULL; -} - -CZipString CZipStorage::GetTdVolumeName(bool bLast, LPCTSTR lpszZipName) -{ - CZipString szFilePath = lpszZipName ? lpszZipName : (LPCTSTR)m_pFile->GetFilePath(); - CZipPathComponent zpc(szFilePath); - CZipString szExt; - if (bLast) - szExt = _T("zip"); - else - szExt.Format(_T("%.3d"), m_iCurrentDisk); - zpc.SetExtension(szExt); - return zpc.GetFullPath(); -} - -void CZipStorage::NextDisk(int iNeeded, LPCTSTR lpszFileName) -{ - Flush(); - ASSERT(m_iSpanMode != noSpan); - if (m_iBytesWritten) - { - m_iBytesWritten = 0; - m_iCurrentDisk++; - if (m_iCurrentDisk >= 999) - ThrowError(CZipException::tooManyVolumes); - } - CZipString szFileName; - bool bPkSpan = (m_iSpanMode == pkzipSpan); - if (bPkSpan) - szFileName = lpszFileName ? lpszFileName : (LPCTSTR)m_pFile->GetFilePath(); - else - szFileName = GetTdVolumeName(false, lpszFileName); - - m_pFile->Close(); - - if (bPkSpan) - { - int iCode = iNeeded; - while (true) - { - CallCallback(iCode, szFileName); - if (ZipPlatform::FileExists(szFileName)) - iCode = -2; - else - { - CZipString label; - label.Format(_T("pkback# %.3d"), m_iCurrentDisk + 1); - if (!ZipPlatform::SetVolLabel(szFileName, label)) - iCode = -3; - else if (!OpenFile(szFileName, CZipFile::modeCreate | CZipFile::modeReadWrite, false)) - iCode = -4; - else - break; - } - - } - m_uCurrentVolSize = GetFreeVolumeSpace(); - } - else - { - m_uCurrentVolSize = m_iTdSpanData; - OpenFile(szFileName, CZipFile::modeCreate | CZipFile::modeReadWrite); - } -} - -void CZipStorage::CallCallback(int iCode, CZipString szTemp) -{ - ASSERT(m_pChangeDiskFunc); - if (!(*m_pChangeDiskFunc)(m_iCurrentDisk + 1, iCode, m_pCallbackData)) - CZipException::Throw(CZipException::aborted, szTemp); -} - -DWORD CZipStorage::GetFreeVolumeSpace() -{ - ASSERT (m_iSpanMode == pkzipSpan); - CZipString szTemp = m_pFile->GetFilePath(); - if (szTemp.IsEmpty()) // called once when creating a disk spanning archive - return 0; - else - return ZipPlatform::GetDeviceFreeSpace(szTemp); -} - - -void CZipStorage::UpdateSpanMode(WORD uLastDisk) -{ - m_iCurrentDisk = uLastDisk; - if (uLastDisk) - { - // disk spanning detected - - if (m_iSpanMode == suggestedAuto) - m_iSpanMode = ZipPlatform::IsDriveRemovable(m_pFile->GetFilePath()) ? - pkzipSpan : tdSpan; - else - m_iSpanMode = tdSpan; - - if (m_iSpanMode == pkzipSpan) - { - if (!m_pChangeDiskFunc) - ThrowError(CZipException::noCallback); - } - else /*if (m_iSpanMode == tdSpan)*/ - m_iTdSpanData = uLastDisk; // disk with .zip extension ( the last one) - - m_pWriteBuffer.Release(); // no need for this in this case - } - else - m_iSpanMode = noSpan; - -} - -void CZipStorage::Write(const void *pBuf, DWORD iSize, bool bAtOnce) -{ - if (!IsSpanMode()) - WriteInternalBuffer((char*)pBuf, iSize); - else - { - // if not at once, one byte is enough free space - DWORD iNeeded = bAtOnce ? iSize : 1; - DWORD uTotal = 0; - - while (uTotal < iSize) - { - DWORD uFree; - while ((uFree = VolumeLeft()) < iNeeded) - { - if ((m_iSpanMode == tdSpan) && !m_iBytesWritten && !m_uBytesInWriteBuffer) - // in the tdSpan mode, if the size of the archive is less - // than the size of the packet to be written at once, - // increase once the size of the volume - m_uCurrentVolSize = iNeeded; - else - NextDisk(iNeeded); - } - - DWORD uLeftToWrite = iSize - uTotal; - DWORD uToWrite = uFree < uLeftToWrite ? uFree : uLeftToWrite; - WriteInternalBuffer((char*)pBuf + uTotal, uToWrite); - if (bAtOnce) - return; - else - uTotal += uToWrite; - } - - } -} - - -void CZipStorage::WriteInternalBuffer(const char *pBuf, DWORD uSize) -{ - DWORD uWritten = 0; - while (uWritten < uSize) - { - DWORD uFreeInBuffer = GetFreeInBuffer(); - if (uFreeInBuffer == 0) - { - Flush(); - uFreeInBuffer = m_pWriteBuffer.GetSize(); - } - DWORD uLeftToWrite = uSize - uWritten; - DWORD uToCopy = uLeftToWrite < uFreeInBuffer ? uLeftToWrite : uFreeInBuffer; - memcpy(m_pWriteBuffer + m_uBytesInWriteBuffer, pBuf + uWritten, uToCopy); - uWritten += uToCopy; - m_uBytesInWriteBuffer += uToCopy; - } -} - -DWORD CZipStorage::VolumeLeft() -{ - // for pkzip span m_uCurrentVolSize is updated after each flush() - return m_uCurrentVolSize - m_uBytesInWriteBuffer - ((m_iSpanMode == pkzipSpan) ? 0 : m_iBytesWritten); -} - -void CZipStorage::Flush() -{ - m_iBytesWritten += m_uBytesInWriteBuffer; - if (m_uBytesInWriteBuffer) - { - m_pFile->Write(m_pWriteBuffer, m_uBytesInWriteBuffer); - m_uBytesInWriteBuffer = 0; - } - if (m_iSpanMode == pkzipSpan) - // after writing it is difficult to predict the free space due to - // not completly written clusters, write operation may start from - // the new cluster - m_uCurrentVolSize = GetFreeVolumeSpace(); -} - -DWORD CZipStorage::GetPosition() -{ - return m_pFile->GetPosition() + m_uBytesInWriteBuffer; -} - - -DWORD CZipStorage::GetFreeInBuffer() -{ - return m_pWriteBuffer.GetSize() - m_uBytesInWriteBuffer; -} diff --git a/harbour/contrib/hbzlib/zipstorage.h b/harbour/contrib/hbzlib/zipstorage.h deleted file mode 100644 index 5af509c8f3..0000000000 --- a/harbour/contrib/hbzlib/zipstorage.h +++ /dev/null @@ -1,375 +0,0 @@ -/** -* \file ZipStorage.h -* Interface for the CZipStorage class. -* -* \author Tadeusz Dracz -*/ -// Part of the ZipArchive library -// -// Copyright (C) 2000 - 2001 Tadeusz Dracz. -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// For the licensing details see the file License.txt -//////////////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_ZIPSTORAGE_H__941824FE_3320_4794_BDE3_BE334ED8984B__INCLUDED_) -#define AFX_ZIPSTORAGE_H__941824FE_3320_4794_BDE3_BE334ED8984B__INCLUDED_ - -#include "zipfile.h" -#include "zipautobuffer.h" -#include "zipstring.h" -#include "zipmemfile.h" - - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - -typedef bool (*ZIPCALLBACKFUN )(DWORD, int , void* ); - -/** - Class that represents a physical storage of the archive -*/ -ZEXPORT class CZipStorage -{ - friend class CZipCentralDir; -public: - - /** - The type of the disk spanning archive. - \see CZipArchive::GetSpanMode - */ - enum ZipSpanMode { - noSpan, ///< no disk spanning - pkzipSpan, ///< \ref PKSpan "disk spanning compatible with PKZIP" - tdSpan, ///< \ref TDSpan "TD mode disk spanning archive" - /** - Detect the type automatically. - If the archive is on the removable device assume PKZIP compatible, - otherwise TD mode compatible. - */ - suggestedAuto, - /** - If the disk spanning archive is on the removable device - assume it is TD mode compatible - */ - suggestedTd - }; - - CZipStorage(); - virtual ~CZipStorage(); - -/** - Open the archive in memory (new or existing). - The parameters are the same as CZipArchive::ZipOpenMode. - \param mf - \param iMode - \note Throws exceptions. - \see CZipArchive::Open(CZipMemFile& , int); -*/ - void Open(CZipMemFile& mf, int iMode); - -/** - Open or create an archive. - The parameters are the same as CZipArchive::Open. - \param szPathName - \param iMode - \param iVolumeSize - \note Throws exceptions. - \see CZipArchive::Open -*/ - void Open(LPCTSTR szPathName, int iMode, int iVolumeSize); - -/** - Called only by CZipCentralDir::Read() when opening an existing archive. - \param uLastDisk - the disk number the central directory is on - \note Throws exceptions. - -*/ - void UpdateSpanMode(WORD uLastDisk); - - -/** - Write chunk of data to the archive. - \param pBuf - buffer with data - \param iSize - bytes to write - \param bAtOnce - if \c true, the whole data must fit in the current volume, - otherwise the disk change is performed - \note Throws exceptions. -*/ - void Write(const void *pBuf, DWORD iSize, bool bAtOnce); - -/** - Read chunk of data from the archive. - \param pBuf - buffer to receive data - \param iSize - bytes to read - \param bAtOnce - if \c true, the specified count of bytes must be read from the same - volume (no disk change allowed) - \note Throws exceptions. -*/ - DWORD Read(void* pBuf, DWORD iSize, bool bAtOnce); - - /** - Return the position in the file, taking into account the bytes in the write buffer. - \note Throws exceptions. - */ - DWORD GetPosition(); - - - /** - Flush the data from the read buffer to the disk. - \note Throws exceptions. - */ - void Flush(); - -/** - A method used to change disks during writing to the disk spanning archive. - \param iNeeded - no of bytes needed on the disk - \param lpszFileName - the archive filename - \note Throws exceptions. -*/ - void NextDisk(int iNeeded, LPCTSTR lpszFileName = NULL); - - -/** - \return a zero-based number of the current disk -*/ - int GetCurrentDisk(); - - -/** - Change the disk during extract operations. - \param iNumber - a zero-based disk number requested - \return -*/ - void ChangeDisk(int iNumber); - -/** - Detect the span mode. - \return - - -1 - existing disk spanning archive opened - - 0 - no disk spanning archive - - 1 - disk spanning archive in creation - -*/ - int IsSpanMode(); - -/** - - \param bAfterException - set to \c true after the library has throw an exception. - The simplified mode is used then. - In this case it'll be possible to reuse the object to operate on another - archive, but the current archive file will not be valid anyway. - \note Throws exceptions. -*/ - void Close(bool bAfterException); - - - /** - The size of the write buffer. - Set before opening the archive. - It is usually set with CZipArchive::SetAdvanced - (specify this value as the first argument). - \see CZipArchive::SetAdvanced - */ - int m_iWriteBufferSize; - - /** - The User data to be passed to the callback function as the third parameter. - \see \ref callDes "CZipArchive::SetSpanCallback" - */ - void* m_pCallbackData; - - /** - The physical archive file (on a storage device). - Not used when opening archive in memory - with Open(CZipMemFile& , int). - */ - CZipFile m_internalfile; - - /** - The buffer representing the archive. - It is a physical file or a memory buffer depending on what - method was used to open the archive. In the first case it is - a pointer to #m_internalfile. - \see Open(LPCTSTR, int, int); - \see Open(CZipMemFile& mf, int iMode) - - */ - CZipAbstractFile* m_pFile; - - /** - Takes one of the values of #ZipSpanMode. - */ - int m_iSpanMode; - - /** - A callback function called when there is a need for a disk change - while operating on a #pkzipSpan archive. - \see \ref callDes "CZipArchive::SetSpanCallback" - */ - ZIPCALLBACKFUN m_pChangeDiskFunc; - - /** - The signature of the extended header - */ - static char m_gszExtHeaderSignat[]; -protected: -/** - Open a physical file. - \param lpszName - the name of the file to open - \param uFlags - file open flags - \param bThrow - if \c true then throw an exception in case of failure - \return \c true if successful -*/ - bool OpenFile(LPCTSTR lpszName, UINT uFlags, bool bThrow = true); -/** - Throw an exception with the given code. - \param err - \see CZipException::Throw -*/ - void ThrowError(int err); - -/** - Return the number of bytes left on the current volume. -*/ - DWORD VolumeLeft(); - - -/** - Write data to the internal buffer. - \param *pBuf - the buffer to copy data from - \param uSize - bytes to write - \note Throws exceptions. -*/ - void WriteInternalBuffer(const char *pBuf, DWORD uSize); - -/** - \return the number of free bytes on the current removable disk -*/ - DWORD GetFreeVolumeSpace(); - -/** - Call the callback function. - Throw an exception if the callback function returns \c false. - \param iCode - a code to be passed to the callback function - \param szTemp - a string to be used as a filename (the second argument - of CZipException::Throw) when the exception must be thrown - \note Throws exceptions. - \see \ref callDes "CZipArchive::SetSpanCallback" - \see CZipException::Throw -*/ - void CallCallback(int iCode, CZipString szTemp); - - -/** - Construct the name of the volume in #tdSpan mode. - \param bLast - must be \c true if constructing the last volume name (an extension "zip" is given) - \param lpszZipName - the name of the archive - \return - the new volume name -*/ - CZipString GetTdVolumeName(bool bLast, LPCTSTR lpszZipName = NULL); - - /** - Change the disk in #tdSpan mode - */ - CZipString ChangeTdRead(); - - /** - Change the disk in #pkzipSpan mode - */ - CZipString ChangePkzipRead(); - - - /** - Used only in \ref TDSpan "TD span mode" . The value it holds depends on the open mode. - - Opened existing disk spanning archive - store the number of the last - disk ( the one with "zip" extension). - - Disk spanning archive in creation - the size of the volume. - - \see CZipArchive::Open - \see CZipArchive::GetSpanMode - - */ - int m_iTdSpanData; - - /** - \return the count bytes left free in the write buffer - */ - DWORD GetFreeInBuffer(); - - /** - Number of bytes available in the write buffer. - */ - DWORD m_uBytesInWriteBuffer; - -/** - The value it holds depends on the open mode: - \par - - #tdSpan : the total size of the current volume - - #pkzipSpan: a free space on the current volume -*/ - DWORD m_uCurrentVolSize; - - - /** - number of bytes left free in the write buffer - */ - DWORD m_uVolumeFreeInBuffer; - - /** - Write buffer caching data. - */ - CZipAutoBuffer m_pWriteBuffer; - - - /** - Used only during disk spanning archive creation. - Tells how many bytes have been written physically to the current volume. - */ - DWORD m_iBytesWritten; - - /** - \c True, if the current archive is a new disk spanning archive. - */ - bool m_bNewSpan; - - /** - The current disk in a disk spanning archive. - Disk no 0 is the first disk. - */ - int m_iCurrentDisk; - - /** - It is set to \e true when an archive is created in memory; \e false otherwise. - */ - bool m_bInMemory; - -}; - -#endif // !defined(AFX_ZIPSTORAGE_H__941824FE_3320_4794_BDE3_BE334ED8984B__INCLUDED_) diff --git a/harbour/contrib/hbzlib/zlib.h b/harbour/contrib/hbzlib/zlib.h deleted file mode 100644 index 49f56b43bc..0000000000 --- a/harbour/contrib/hbzlib/zlib.h +++ /dev/null @@ -1,893 +0,0 @@ -/* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.1.3, July 9th, 1998 - - Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu - - - The data format used by the zlib library is described by RFCs (Request for - Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt - (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). -*/ - -#ifndef _ZLIB_H -#define _ZLIB_H - -#include "zconf.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define ZLIB_VERSION "1.1.3" - -/* - The 'zlib' compression library provides in-memory compression and - decompression functions, including integrity checks of the uncompressed - data. This version of the library supports only one compression method - (deflation) but other algorithms will be added later and will have the same - stream interface. - - Compression can be done in a single step if the buffers are large - enough (for example if an input file is mmap'ed), or can be done by - repeated calls of the compression function. In the latter case, the - application must provide more input and/or consume the output - (providing more output space) before each call. - - The library also supports reading and writing files in gzip (.gz) format - with an interface similar to that of stdio. - - The library does not install any signal handler. The decoder checks - the consistency of the compressed data, so the library should never - crash even in case of corrupted input. -*/ - -typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); -typedef void (*free_func) OF((voidpf opaque, voidpf address)); - -struct internal_state; - -typedef struct z_stream_s { - Bytef *next_in; /* next input byte */ - uInt avail_in; /* number of bytes available at next_in */ - uLong total_in; /* total nb of input bytes read so far */ - - Bytef *next_out; /* next output byte should be put there */ - uInt avail_out; /* remaining free space at next_out */ - uLong total_out; /* total nb of bytes output so far */ - - char *msg; /* last error message, NULL if no error */ - struct internal_state FAR *state; /* not visible by applications */ - - alloc_func zalloc; /* used to allocate the internal state */ - free_func zfree; /* used to free the internal state */ - voidpf opaque; /* private data object passed to zalloc and zfree */ - - int data_type; /* best guess about the data type: ascii or binary */ - uLong adler; /* adler32 value of the uncompressed data */ - uLong reserved; /* reserved for future use */ -} z_stream; - -typedef z_stream FAR *z_streamp; - -/* - The application must update next_in and avail_in when avail_in has - dropped to zero. It must update next_out and avail_out when avail_out - has dropped to zero. The application must initialize zalloc, zfree and - opaque before calling the init function. All other fields are set by the - compression library and must not be updated by the application. - - The opaque value provided by the application will be passed as the first - parameter for calls of zalloc and zfree. This can be useful for custom - memory management. The compression library attaches no meaning to the - opaque value. - - zalloc must return Z_NULL if there is not enough memory for the object. - If zlib is used in a multi-threaded application, zalloc and zfree must be - thread safe. - - On 16-bit systems, the functions zalloc and zfree must be able to allocate - exactly 65536 bytes, but will not be required to allocate more than this - if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, - pointers returned by zalloc for objects of exactly 65536 bytes *must* - have their offset normalized to zero. The default allocation function - provided by this library ensures this (see zutil.c). To reduce memory - requirements and avoid any allocation of 64K objects, at the expense of - compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). - - The fields total_in and total_out can be used for statistics or - progress reports. After compression, total_in holds the total size of - the uncompressed data and may be saved for use in the decompressor - (particularly if the decompressor wants to decompress everything in - a single step). -*/ - - /* constants */ - -#define Z_NO_FLUSH 0 -#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */ -#define Z_SYNC_FLUSH 2 -#define Z_FULL_FLUSH 3 -#define Z_FINISH 4 -/* Allowed flush values; see deflate() below for details */ - -#define Z_OK 0 -#define Z_STREAM_END 1 -#define Z_NEED_DICT 2 -#define Z_ERRNO (-1) -#define Z_STREAM_ERROR (-2) -#define Z_DATA_ERROR (-3) -#define Z_MEM_ERROR (-4) -#define Z_BUF_ERROR (-5) -#define Z_VERSION_ERROR (-6) -/* Return codes for the compression/decompression functions. Negative - * values are errors, positive values are used for special but normal events. - */ - -#define Z_NO_COMPRESSION 0 -#define Z_BEST_SPEED 1 -#define Z_BEST_COMPRESSION 9 -#define Z_DEFAULT_COMPRESSION (-1) -/* compression levels */ - -#define Z_FILTERED 1 -#define Z_HUFFMAN_ONLY 2 -#define Z_DEFAULT_STRATEGY 0 -/* compression strategy; see deflateInit2() below for details */ - -#define Z_BINARY 0 -#define Z_ASCII 1 -#define Z_UNKNOWN 2 -/* Possible values of the data_type field */ - -#define Z_DEFLATED 8 -/* The deflate compression method (the only one supported in this version) */ - -#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ - -#define zlib_version zlibVersion() -/* for compatibility with versions < 1.0.2 */ - - /* basic functions */ - -ZEXTERN const char * ZEXPORT zlibVersion OF((void)); -/* The application can compare zlibVersion and ZLIB_VERSION for consistency. - If the first character differs, the library code actually used is - not compatible with the zlib.h header file used by the application. - This check is automatically made by deflateInit and inflateInit. - */ - -/* -ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); - - Initializes the internal stream state for compression. The fields - zalloc, zfree and opaque must be initialized before by the caller. - If zalloc and zfree are set to Z_NULL, deflateInit updates them to - use default allocation functions. - - The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: - 1 gives best speed, 9 gives best compression, 0 gives no compression at - all (the input data is simply copied a block at a time). - Z_DEFAULT_COMPRESSION requests a default compromise between speed and - compression (currently equivalent to level 6). - - deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if level is not a valid compression level, - Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible - with the version assumed by the caller (ZLIB_VERSION). - msg is set to null if there is no error message. deflateInit does not - perform any compression: this will be done by deflate(). -*/ - - -ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); -/* - deflate compresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce some - output latency (reading input without producing any output) except when - forced to flush. - - The detailed semantics are as follows. deflate performs one or both of the - following actions: - - - Compress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in and avail_in are updated and - processing will resume at this point for the next call of deflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. This action is forced if the parameter flush is non zero. - Forcing flush frequently degrades the compression ratio, so this parameter - should be set only when necessary (in interactive applications). - Some output may be provided even if flush is not set. - - Before the call of deflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming - more output, and updating avail_in or avail_out accordingly; avail_out - should never be zero before the call. The application can consume the - compressed output when it wants, for example when the output buffer is full - (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK - and with zero avail_out, it must be called again after making room in the - output buffer because there might be more output pending. - - If the parameter flush is set to Z_SYNC_FLUSH, all pending output is - flushed to the output buffer and the output is aligned on a byte boundary, so - that the decompressor can get all input data available so far. (In particular - avail_in is zero after the call if enough output space has been provided - before the call.) Flushing may degrade compression for some compression - algorithms and so it should be used only when necessary. - - If flush is set to Z_FULL_FLUSH, all output is flushed as with - Z_SYNC_FLUSH, and the compression state is reset so that decompression can - restart from this point if previous compressed data has been damaged or if - random access is desired. Using Z_FULL_FLUSH too often can seriously degrade - the compression. - - If deflate returns with avail_out == 0, this function must be called again - with the same value of the flush parameter and more output space (updated - avail_out), until the flush is complete (deflate returns with non-zero - avail_out). - - If the parameter flush is set to Z_FINISH, pending input is processed, - pending output is flushed and deflate returns with Z_STREAM_END if there - was enough output space; if deflate returns with Z_OK, this function must be - called again with Z_FINISH and more output space (updated avail_out) but no - more input data, until it returns with Z_STREAM_END or an error. After - deflate has returned Z_STREAM_END, the only possible operations on the - stream are deflateReset or deflateEnd. - - Z_FINISH can be used immediately after deflateInit if all the compression - is to be done in a single step. In this case, avail_out must be at least - 0.1% larger than avail_in plus 12 bytes. If deflate does not return - Z_STREAM_END, then it must be called again as described above. - - deflate() sets strm->adler to the adler32 checksum of all input read - so far (that is, total_in bytes). - - deflate() may update data_type if it can make a good guess about - the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered - binary. This field is only for information purposes and does not affect - the compression algorithm in any manner. - - deflate() returns Z_OK if some progress has been made (more input - processed or more output produced), Z_STREAM_END if all input has been - consumed and all output has been produced (only when flush is set to - Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example - if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible - (for example avail_in or avail_out was zero). -*/ - - -ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any - pending output. - - deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the - stream state was inconsistent, Z_DATA_ERROR if the stream was freed - prematurely (some input or output was discarded). In the error case, - msg may be set but then points to a static string (which must not be - deallocated). -*/ - - -/* -ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); - - Initializes the internal stream state for decompression. The fields - next_in, avail_in, zalloc, zfree and opaque must be initialized before by - the caller. If next_in is not Z_NULL and avail_in is large enough (the exact - value depends on the compression method), inflateInit determines the - compression method from the zlib header and allocates all data structures - accordingly; otherwise the allocation will be deferred to the first call of - inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to - use default allocation functions. - - inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_VERSION_ERROR if the zlib library version is incompatible with the - version assumed by the caller. msg is set to null if there is no error - message. inflateInit does not perform any decompression apart from reading - the zlib header if present: this will be done by inflate(). (So next_in and - avail_in may be modified, but next_out and avail_out are unchanged.) -*/ - - -ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); -/* - inflate decompresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may some - introduce some output latency (reading input without producing any output) - except when forced to flush. - - The detailed semantics are as follows. inflate performs one or both of the - following actions: - - - Decompress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in is updated and processing - will resume at this point for the next call of inflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. inflate() provides as much output as possible, until there - is no more input data or no more space in the output buffer (see below - about the flush parameter). - - Before the call of inflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming - more output, and updating the next_* and avail_* values accordingly. - The application can consume the uncompressed output when it wants, for - example when the output buffer is full (avail_out == 0), or after each - call of inflate(). If inflate returns Z_OK and with zero avail_out, it - must be called again after making room in the output buffer because there - might be more output pending. - - If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much - output as possible to the output buffer. The flushing behavior of inflate is - not specified for values of the flush parameter other than Z_SYNC_FLUSH - and Z_FINISH, but the current implementation actually flushes as much output - as possible anyway. - - inflate() should normally be called until it returns Z_STREAM_END or an - error. However if all decompression is to be performed in a single step - (a single call of inflate), the parameter flush should be set to - Z_FINISH. In this case all pending input is processed and all pending - output is flushed; avail_out must be large enough to hold all the - uncompressed data. (The size of the uncompressed data may have been saved - by the compressor for this purpose.) The next operation on this stream must - be inflateEnd to deallocate the decompression state. The use of Z_FINISH - is never required, but can be used to inform inflate that a faster routine - may be used for the single inflate() call. - - If a preset dictionary is needed at this point (see inflateSetDictionary - below), inflate sets strm-adler to the adler32 checksum of the - dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise - it sets strm->adler to the adler32 checksum of all output produced - so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or - an error code as described below. At the end of the stream, inflate() - checks that its computed adler32 checksum is equal to that saved by the - compressor and returns Z_STREAM_END only if the checksum is correct. - - inflate() returns Z_OK if some progress has been made (more input processed - or more output produced), Z_STREAM_END if the end of the compressed data has - been reached and all uncompressed output has been produced, Z_NEED_DICT if a - preset dictionary is needed at this point, Z_DATA_ERROR if the input data was - corrupted (input stream not conforming to the zlib format or incorrect - adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent - (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if no progress is possible or if there was not - enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR - case, the application may then call inflateSync to look for a good - compression block. -*/ - - -ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any - pending output. - - inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state - was inconsistent. In the error case, msg may be set but then points to a - static string (which must not be deallocated). -*/ - - /* Advanced functions */ - -/* - The following functions are needed only in some special applications. -*/ - -/* -ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, - int level, - int method, - int windowBits, - int memLevel, - int strategy)); - - This is another version of deflateInit with more compression options. The - fields next_in, zalloc, zfree and opaque must be initialized before by - the caller. - - The method parameter is the compression method. It must be Z_DEFLATED in - this version of the library. - - The windowBits parameter is the base two logarithm of the window size - (the size of the history buffer). It should be in the range 8..15 for this - version of the library. Larger values of this parameter result in better - compression at the expense of memory usage. The default value is 15 if - deflateInit is used instead. - - The memLevel parameter specifies how much memory should be allocated - for the internal compression state. memLevel=1 uses minimum memory but - is slow and reduces compression ratio; memLevel=9 uses maximum memory - for optimal speed. The default value is 8. See zconf.h for total memory - usage as a function of windowBits and memLevel. - - The strategy parameter is used to tune the compression algorithm. Use the - value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a - filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no - string match). Filtered data consists mostly of small values with a - somewhat random distribution. In this case, the compression algorithm is - tuned to compress them better. The effect of Z_FILTERED is to force more - Huffman coding and less string matching; it is somewhat intermediate - between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects - the compression ratio but not the correctness of the compressed output even - if it is not set appropriately. - - deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid - method). msg is set to null if there is no error message. deflateInit2 does - not perform any compression: this will be done by deflate(). -*/ - -ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the compression dictionary from the given byte sequence - without producing any compressed output. This function must be called - immediately after deflateInit, deflateInit2 or deflateReset, before any - call of deflate. The compressor and decompressor must use exactly the same - dictionary (see inflateSetDictionary). - - The dictionary should consist of strings (byte sequences) that are likely - to be encountered later in the data to be compressed, with the most commonly - used strings preferably put towards the end of the dictionary. Using a - dictionary is most useful when the data to be compressed is short and can be - predicted with good accuracy; the data can then be compressed better than - with the default empty dictionary. - - Depending on the size of the compression data structures selected by - deflateInit or deflateInit2, a part of the dictionary may in effect be - discarded, for example if the dictionary is larger than the window size in - deflate or deflate2. Thus the strings most likely to be useful should be - put at the end of the dictionary, not at the front. - - Upon return of this function, strm->adler is set to the Adler32 value - of the dictionary; the decompressor may later use this value to determine - which dictionary has been used by the compressor. (The Adler32 value - applies to the whole dictionary even if only a subset of the dictionary is - actually used by the compressor.) - - deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a - parameter is invalid (such as NULL dictionary) or the stream state is - inconsistent (for example if deflate has already been called for this stream - or if the compression method is bsort). deflateSetDictionary does not - perform any compression: this will be done by deflate(). -*/ - -ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, - z_streamp source)); -/* - Sets the destination stream as a complete copy of the source stream. - - This function can be useful when several compression strategies will be - tried, for example when there are several ways of pre-processing the input - data with a filter. The streams that will be discarded should then be freed - by calling deflateEnd. Note that deflateCopy duplicates the internal - compression state which can be quite large, so this strategy is slow and - can consume lots of memory. - - deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being NULL). msg is left unchanged in both source and - destination. -*/ - -ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); -/* - This function is equivalent to deflateEnd followed by deflateInit, - but does not free and reallocate all the internal compression state. - The stream will keep the same compression level and any other attributes - that may have been set by deflateInit2. - - deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being NULL). -*/ - -ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, - int level, - int strategy)); -/* - Dynamically update the compression level and compression strategy. The - interpretation of level and strategy is as in deflateInit2. This can be - used to switch between compression and straight copy of the input data, or - to switch to a different kind of input data requiring a different - strategy. If the compression level is changed, the input available so far - is compressed with the old level (and may be flushed); the new level will - take effect only at the next call of deflate(). - - Before the call of deflateParams, the stream state must be set as for - a call of deflate(), since the currently available input may have to - be compressed and flushed. In particular, strm->avail_out must be non-zero. - - deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source - stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR - if strm->avail_out was zero. -*/ - -/* -ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, - int windowBits)); - - This is another version of inflateInit with an extra parameter. The - fields next_in, avail_in, zalloc, zfree and opaque must be initialized - before by the caller. - - The windowBits parameter is the base two logarithm of the maximum window - size (the size of the history buffer). It should be in the range 8..15 for - this version of the library. The default value is 15 if inflateInit is used - instead. If a compressed stream with a larger window size is given as - input, inflate() will return with the error code Z_DATA_ERROR instead of - trying to allocate a larger window. - - inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative - memLevel). msg is set to null if there is no error message. inflateInit2 - does not perform any decompression apart from reading the zlib header if - present: this will be done by inflate(). (So next_in and avail_in may be - modified, but next_out and avail_out are unchanged.) -*/ - -ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the decompression dictionary from the given uncompressed byte - sequence. This function must be called immediately after a call of inflate - if this call returned Z_NEED_DICT. The dictionary chosen by the compressor - can be determined from the Adler32 value returned by this call of - inflate. The compressor and decompressor must use exactly the same - dictionary (see deflateSetDictionary). - - inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a - parameter is invalid (such as NULL dictionary) or the stream state is - inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the - expected one (incorrect Adler32 value). inflateSetDictionary does not - perform any decompression: this will be done by subsequent calls of - inflate(). -*/ - -ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); -/* - Skips invalid compressed data until a full flush point (see above the - description of deflate with Z_FULL_FLUSH) can be found, or until all - available input is skipped. No output is provided. - - inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR - if no more input was provided, Z_DATA_ERROR if no flush point has been found, - or Z_STREAM_ERROR if the stream structure was inconsistent. In the success - case, the application may save the current current value of total_in which - indicates where valid compressed data was found. In the error case, the - application may repeatedly call inflateSync, providing more input each time, - until success or end of the input data. -*/ - -ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); -/* - This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate all the internal decompression state. - The stream will keep attributes that may have been set by inflateInit2. - - inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being NULL). -*/ - - - /* utility functions */ - -/* - The following utility functions are implemented on top of the - basic stream-oriented functions. To simplify the interface, some - default options are assumed (compression level and memory usage, - standard memory allocation functions). The source code of these - utility functions can easily be modified if you need special options. -*/ - -ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be at least 0.1% larger than - sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the - compressed buffer. - This function can be used to compress a whole file at once if the - input file is mmap'ed. - compress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer. -*/ - -ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen, - int level)); -/* - Compresses the source buffer into the destination buffer. The level - parameter has the same meaning as in deflateInit. sourceLen is the byte - length of the source buffer. Upon entry, destLen is the total size of the - destination buffer, which must be at least 0.1% larger than sourceLen plus - 12 bytes. Upon exit, destLen is the actual size of the compressed buffer. - - compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_BUF_ERROR if there was not enough room in the output buffer, - Z_STREAM_ERROR if the level parameter is invalid. -*/ - -ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be large enough to hold the - entire uncompressed data. (The size of the uncompressed data must have - been saved previously by the compressor and transmitted to the decompressor - by some mechanism outside the scope of this compression library.) - Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to decompress a whole file at once if the - input file is mmap'ed. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted. -*/ - - -typedef voidp gzFile; - -ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); -/* - Opens a gzip (.gz) file for reading or writing. The mode parameter - is as in fopen ("rb" or "wb") but can also include a compression level - ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for - Huffman only compression as in "wb1h". (See the description - of deflateInit2 for more information about the strategy parameter.) - - gzopen can be used to read a file which is not in gzip format; in this - case gzread will directly read from the file without decompression. - - gzopen returns NULL if the file could not be opened or if there was - insufficient memory to allocate the (de)compression state; errno - can be checked to distinguish the two cases (if errno is zero, the - zlib error is Z_MEM_ERROR). */ - -ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); -/* - gzdopen() associates a gzFile with the file descriptor fd. File - descriptors are obtained from calls like open, dup, creat, pipe or - fileno (in the file has been previously opened with fopen). - The mode parameter is as in gzopen. - The next call of gzclose on the returned gzFile will also close the - file descriptor fd, just like fclose(fdopen(fd), mode) closes the file - descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). - gzdopen returns NULL if there was insufficient memory to allocate - the (de)compression state. -*/ - -ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); -/* - Dynamically update the compression level or strategy. See the description - of deflateInit2 for the meaning of these parameters. - gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not - opened for writing. -*/ - -ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); -/* - Reads the given number of uncompressed bytes from the compressed file. - If the input file was not in gzip format, gzread copies the given number - of bytes into the buffer. - gzread returns the number of uncompressed bytes actually read (0 for - end of file, -1 for error). */ - -ZEXTERN int ZEXPORT gzwrite OF((gzFile file, - const voidp buf, unsigned len)); -/* - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of uncompressed bytes actually written - (0 in case of error). -*/ - -ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); -/* - Converts, formats, and writes the args to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written (0 in case of error). -*/ - -ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); -/* - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. -*/ - -ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); -/* - Reads bytes from the compressed file until len-1 characters are read, or - a newline character is read and transferred to buf, or an end-of-file - condition is encountered. The string is then terminated with a null - character. - gzgets returns buf, or Z_NULL in case of error. -*/ - -ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); -/* - Writes c, converted to an unsigned char, into the compressed file. - gzputc returns the value that was written, or -1 in case of error. -*/ - -ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); -/* - Reads one byte from the compressed file. gzgetc returns this byte - or -1 in case of end of file or error. -*/ - -ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); -/* - Flushes all pending output into the compressed file. The parameter - flush is as in the deflate() function. The return value is the zlib - error number (see function gzerror below). gzflush returns Z_OK if - the flush parameter is Z_FINISH and all output could be flushed. - gzflush should be called only when strictly necessary because it can - degrade compression. -*/ - -ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, - z_off_t offset, int whence)); -/* - Sets the starting position for the next gzread or gzwrite on the - given compressed file. The offset represents a number of bytes in the - uncompressed data stream. The whence parameter is defined as in lseek(2); - the value SEEK_END is not supported. - If the file is opened for reading, this function is emulated but can be - extremely slow. If the file is opened for writing, only forward seeks are - supported; gzseek then compresses a sequence of zeroes up to the new - starting position. - - gzseek returns the resulting offset location as measured in bytes from - the beginning of the uncompressed stream, or -1 in case of error, in - particular if the file is opened for writing and the new starting position - would be before the current position. -*/ - -ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); -/* - Rewinds the given file. This function is supported only for reading. - - gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) -*/ - -ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); -/* - Returns the starting position for the next gzread or gzwrite on the - given compressed file. This position represents a number of bytes in the - uncompressed data stream. - - gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) -*/ - -ZEXTERN int ZEXPORT gzeof OF((gzFile file)); -/* - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. -*/ - -ZEXTERN int ZEXPORT gzclose OF((gzFile file)); -/* - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. The return value is the zlib - error number (see function gzerror below). -*/ - -ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); -/* - Returns the error message for the last error which occurred on the - given compressed file. errnum is set to zlib error number. If an - error occurred in the file system and not in the compression library, - errnum is set to Z_ERRNO and the application may consult errno - to get the exact error code. -*/ - - /* checksum functions */ - -/* - These functions are not related to compression but are exported - anyway because they might be useful in applications using the - compression library. -*/ - -ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); - -/* - Update a running Adler-32 checksum with the bytes buf[0..len-1] and - return the updated checksum. If buf is NULL, this function returns - the required initial value for the checksum. - An Adler-32 checksum is almost as reliable as a CRC32 but can be computed - much faster. Usage example: - - uLong adler = adler32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - adler = adler32(adler, buffer, length); - } - if (adler != original_adler) error(); -*/ - -ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -/* - Update a running crc with the bytes buf[0..len-1] and return the updated - crc. If buf is NULL, this function returns the required initial value - for the crc. Pre- and post-conditioning (one's complement) is performed - within this function so it shouldn't be done by the application. - Usage example: - - uLong crc = crc32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - crc = crc32(crc, buffer, length); - } - if (crc != original_crc) error(); -*/ - - - /* various hacks, don't look :) */ - -/* deflateInit and inflateInit are macros to allow checking the zlib version - * and the compiler's view of z_stream: - */ -ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, - int windowBits, int memLevel, - int strategy, const char *version, - int stream_size)); -ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, - const char *version, int stream_size)); -#define deflateInit(strm, level) \ - deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) -#define inflateInit(strm) \ - inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) -#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ - deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ - (strategy), ZLIB_VERSION, sizeof(z_stream)) -#define inflateInit2(strm, windowBits) \ - inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) - - -#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; /* hack for buggy compilers */ -#endif - -ZEXTERN const char * ZEXPORT zError OF((int err)); -ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); -ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); - -#ifdef __cplusplus -} -#endif - -#endif /* _ZLIB_H */ diff --git a/harbour/contrib/hbzlib/zlibapi1.c b/harbour/contrib/hbzlib/zlibapi1.c deleted file mode 100644 index f00214c44d..0000000000 --- a/harbour/contrib/hbzlib/zlibapi1.c +++ /dev/null @@ -1,397 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * Low level zip functions for Zlib dll Call - * - * Copyright 2000 Luiz Rafael Culik - * www - http://www.harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - - -#include "hbsetup.h" - -#include -#include -#include -#include -#include -#include - -#if defined(HB_OS_UNIX) || defined(HARBOUR_GCC_OS2) || defined(__DJGPP__) -# include -# include -# include -# include -#else -# include -# include -#endif - -#include "hbzip.h" -#include "zip.h" - -#define WRITEBUFFERSIZE (16384) -#define MAXFILENAME (256) - -int iZipOk; -int Opt_OverWrite = 1; -int opt_compress_level = Z_DEFAULT_COMPRESSION; -int err = 0; -int Size_Buf = 0; -int errclose; -void *cBuffer = NULL; -zipFile szZipFile; - -#if defined(HB_OS_WIN_32) -uLong hb___filetime(char *f, tm_zip *tmzip, uLong *dt) -{ - int iRet = 0; - HB_SYMBOL_UNUSED(tmzip); - { - FILETIME ftLocal; - HANDLE hFind; - WIN32_FIND_DATA ff32; - - hFind = FindFirstFile(f,&ff32); - if (hFind != INVALID_HANDLE_VALUE) - { - FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal); - FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0); - FindClose(hFind); - iRet = 1; - } - } - return iRet; -} -#elif defined(HB_OS_UNIX) || defined(HARBOUR_GCC_OS2) || defined(__DJGPP__) -uLong hb___filetime(char *f, tm_zip *tmzip, uLong *dt) -{ - int ret=0; - struct stat s; /* results of stat() */ - struct tm* filedate; - time_t tm_t=0; - - if (strcmp(f,"-")!=0) - { - char name[MAXFILENAME]; - int len = strlen(f); - strcpy(name, f); - if (name[len - 1] == '/') - name[len - 1] = '\0'; - /* not all systems allow stat'ing a file with / appended */ - if (stat(name,&s)==0) - { - tm_t = s.st_mtime; - ret = 1; - } - } - filedate = localtime(&tm_t); - - tmzip->tm_sec = filedate->tm_sec; - tmzip->tm_min = filedate->tm_min; - tmzip->tm_hour = filedate->tm_hour; - tmzip->tm_mday = filedate->tm_mday; - tmzip->tm_mon = filedate->tm_mon ; - tmzip->tm_year = filedate->tm_year; - - return ret; -} -#else -uLong hb___filetime(char *f, tm_zip *tmzip, uLong *dt) -{ - return 0; -} -#endif - -char *hb___CheckFile( char * szFile) -{ - int uiCount,uiLen; - int uiDot_Found = 0; - iZipOk = 1; - uiLen = strlen(szFile); - - for (uiCount=0;uiCount0) - { - err = zipWriteInFileInZip (szZipFile,cBuffer,size_read); - if (err<0) - { -/* printf("error in writing %s in the zipfile\n", - filenameinzip);*/ - } - - } - } while ((err == ZIP_OK) && (size_read>0)); - - hb_fsClose(nFileHandle); - if (err<0) - err=ZIP_ERRNO; - else - { - err = zipCloseFileInZip(szZipFile); - if (err!=ZIP_OK) - return err; - } - - errclose = zipClose(szZipFile,NULL); - if (errclose != ZIP_OK) - return errclose; - - } - } - - hb_xfree( (void *) cBuffer ) ; - - return 1; /* to avoid warning */ -} - -int hb___CompressMultipleFile(char *szFile,PHB_ITEM pArray,int iCompLevel,PHB_ITEM pBlock,BOOL bOverWrite) -{ - uLong uiCount; - char szNewFile[MAXFILENAME]; - strcpy(szNewFile,szFile); - - Size_Buf = WRITEBUFFERSIZE; - if (iCompLevel != NULL) - { - opt_compress_level=iCompLevel; - } - - cBuffer = (void*) hb_xalloc(Size_Buf); - if (cBuffer == NULL) - { - return ZIP_INTERNALERROR; - } - - if (iZipOk == 1) - { -/* zipFile szZipFile;*/ - err = 0; -/* ULONG nSize=hb_arrayLen(pArray) ;*/ - szZipFile = zipOpen(szNewFile,0); - if (szZipFile == NULL) - { - err = ZIP_ERRNO; - } - - for (uiCount=1;(uiCount<= hb_arrayLen(pArray)) && (err==ZIP_OK);uiCount++) - { - - FHANDLE nFileHandle = NULL; - int size_read; - zip_fileinfo szZipFileInfo; - - char *szDummy = hb_arrayGetCPtr(pArray,uiCount) ; - const char *filenameinzip =szDummy; -/* hb_itemFreeC(szDummy);*/ - szZipFileInfo.tmz_date.tm_sec = szZipFileInfo.tmz_date.tm_min = szZipFileInfo.tmz_date.tm_hour = 0; - szZipFileInfo.tmz_date.tm_mday = szZipFileInfo.tmz_date.tm_min = szZipFileInfo.tmz_date.tm_year = 0; - szZipFileInfo.dosDate = 0; - szZipFileInfo.internal_fa = 0; - szZipFileInfo.external_fa = 0; - hb___filetime((char *)filenameinzip,&szZipFileInfo.tmz_date,&szZipFileInfo.dosDate); - if (pBlock !=NULL) - { - PHB_ITEM pFileName=hb_itemPutC(NULL,hb_arrayGetCPtr(pArray,uiCount)); - PHB_ITEM pFilePos=hb_itemPutNI(NULL,uiCount); - hb_vmEvalBlockV( pBlock, 2, pFileName, pFilePos ); - hb_itemRelease(pFileName); - hb_itemRelease(pFilePos); - } - err = zipOpenNewFileInZip(szZipFile,filenameinzip,&szZipFileInfo, - NULL,0,NULL,0,NULL /* comment*/, - (opt_compress_level != 0) ? Z_DEFLATED : 0, - opt_compress_level); - - if (err == ZIP_OK) - { - - nFileHandle = (FHANDLE)hb_fsOpen((BYTE*) filenameinzip,FO_READ+FO_COMPAT); - - if (nFileHandle==NULL) - { - err=ZIP_ERRNO; - } - - hb_fsSetDevMode(nFileHandle, FD_RAW); - - } - - if (err == ZIP_OK) - do - { - err = ZIP_OK; - - size_read = hb_fsRead(nFileHandle,(BYTE*) cBuffer,Size_Buf); - if (size_read < Size_Buf) - if (hb_fsEof(nFileHandle)==0) - { - err = ZIP_ERRNO; - } - - if (size_read>0) - { - err = zipWriteInFileInZip (szZipFile,cBuffer,size_read); - if (err<0) - { - } - - } - } while ((err == ZIP_OK) && (size_read>0)); - - hb_fsClose(nFileHandle); - if (err<0) - { - err=ZIP_ERRNO; - } - else - { - err = zipCloseFileInZip(szZipFile); - if (err!=ZIP_OK) - { -/* printf("error in closing %s in the zipfile\n", - filenameinzip);*/ - return -1; - - } - } - - } - errclose = zipClose(szZipFile,NULL); - } - - hb_xfree( (void *) cBuffer ) ; - - return 1; /* to avoid warning */ - -} - diff --git a/harbour/contrib/hbzlib/zutil.c b/harbour/contrib/hbzlib/zutil.c deleted file mode 100644 index b3de4e8837..0000000000 --- a/harbour/contrib/hbzlib/zutil.c +++ /dev/null @@ -1,225 +0,0 @@ -/* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-1998 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zutil.h" - -struct internal_state {int dummy;}; /* for buggy compilers */ - -#ifndef STDC -extern void exit OF((int)); -#endif - -const char *z_errmsg[10] = { -"need dictionary", /* Z_NEED_DICT 2 */ -"stream end", /* Z_STREAM_END 1 */ -"", /* Z_OK 0 */ -"file error", /* Z_ERRNO (-1) */ -"stream error", /* Z_STREAM_ERROR (-2) */ -"data error", /* Z_DATA_ERROR (-3) */ -"insufficient memory", /* Z_MEM_ERROR (-4) */ -"buffer error", /* Z_BUF_ERROR (-5) */ -"incompatible version",/* Z_VERSION_ERROR (-6) */ -""}; - - -const char * ZEXPORT zlibVersion() -{ - return ZLIB_VERSION; -} - -#ifdef DEBUG - -# ifndef verbose -# define verbose 0 -# endif -int z_verbose = verbose; - -void z_error (m) - char *m; -{ - fprintf(stderr, "%s\n", m); - exit(1); -} -#endif - -/* exported to allow conversion of error code to string for compress() and - * uncompress() - */ -const char * ZEXPORT zError(err) - int err; -{ - return ERR_MSG(err); -} - - -#ifndef HAVE_MEMCPY - -void zmemcpy(dest, source, len) - Bytef* dest; - const Bytef* source; - uInt len; -{ - if (len == 0) return; - do { - *dest++ = *source++; /* ??? to be unrolled */ - } while (--len != 0); -} - -int zmemcmp(s1, s2, len) - const Bytef* s1; - const Bytef* s2; - uInt len; -{ - uInt j; - - for (j = 0; j < len; j++) { - if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; - } - return 0; -} - -void zmemzero(dest, len) - Bytef* dest; - uInt len; -{ - if (len == 0) return; - do { - *dest++ = 0; /* ??? to be unrolled */ - } while (--len != 0); -} -#endif - -#ifdef __TURBOC__ -#if (defined( __BORLANDC__) || !defined(SMALL_MEDIUM)) && !defined(__32BIT__) -/* Small and medium model in Turbo C are for now limited to near allocation - * with reduced MAX_WBITS and MAX_MEM_LEVEL - */ -# define MY_ZCALLOC - -/* Turbo C malloc() does not allow dynamic allocation of 64K bytes - * and farmalloc(64K) returns a pointer with an offset of 8, so we - * must fix the pointer. Warning: the pointer must be put back to its - * original form in order to free it, use zcfree(). - */ - -#define MAX_PTR 10 -/* 10*64K = 640K */ - -local int next_ptr = 0; - -typedef struct ptr_table_s { - voidpf org_ptr; - voidpf new_ptr; -} ptr_table; - -local ptr_table table[MAX_PTR]; -/* This table is used to remember the original form of pointers - * to large buffers (64K). Such pointers are normalized with a zero offset. - * Since MSDOS is not a preemptive multitasking OS, this table is not - * protected from concurrent access. This hack doesn't work anyway on - * a protected system like OS/2. Use Microsoft C instead. - */ - -voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) -{ - voidpf buf = opaque; /* just to make some compilers happy */ - ulg bsize = (ulg)items*size; - - /* If we allocate less than 65520 bytes, we assume that farmalloc - * will return a usable pointer which doesn't have to be normalized. - */ - if (bsize < 65520L) { - buf = farmalloc(bsize); - if (*(ush*)&buf != 0) return buf; - } else { - buf = farmalloc(bsize + 16L); - } - if (buf == NULL || next_ptr >= MAX_PTR) return NULL; - table[next_ptr].org_ptr = buf; - - /* Normalize the pointer to seg:0 */ - *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4; - *(ush*)&buf = 0; - table[next_ptr++].new_ptr = buf; - return buf; -} - -void zcfree (voidpf opaque, voidpf ptr) -{ - int n; - if (*(ush*)&ptr != 0) { /* object < 64K */ - farfree(ptr); - return; - } - /* Find the original pointer */ - for (n = 0; n < next_ptr; n++) { - if (ptr != table[n].new_ptr) continue; - - farfree(table[n].org_ptr); - while (++n < next_ptr) { - table[n-1] = table[n]; - } - next_ptr--; - return; - } - ptr = opaque; /* just to make some compilers happy */ - Assert(0, "zcfree: ptr not found"); -} -#endif -#endif /* __TURBOC__ */ - - -#if defined(M_I86) && !defined(__32BIT__) -/* Microsoft C in 16-bit mode */ - -# define MY_ZCALLOC - -#if (!defined(_MSC_VER) || (_MSC_VER <= 600)) -# define _halloc halloc -# define _hfree hfree -#endif - -voidpf zcalloc (voidpf opaque, unsigned items, unsigned size) -{ - if (opaque) opaque = 0; /* to make compiler happy */ - return _halloc((long)items, size); -} - -void zcfree (voidpf opaque, voidpf ptr) -{ - if (opaque) opaque = 0; /* to make compiler happy */ - _hfree(ptr); -} - -#endif /* MSC */ - - -#ifndef MY_ZCALLOC /* Any system without a special alloc function */ - -#ifndef STDC -extern voidp calloc OF((uInt items, uInt size)); -extern void free OF((voidpf ptr)); -#endif - -voidpf zcalloc (opaque, items, size) - voidpf opaque; - unsigned items; - unsigned size; -{ - if (opaque) items += size - size; /* make compiler happy */ - return (voidpf)calloc(items, size); -} - -void zcfree (opaque, ptr) - voidpf opaque; - voidpf ptr; -{ - free(ptr); - if (opaque) return; /* make compiler happy */ -} - -#endif /* MY_ZCALLOC */