From c9bb6ec3d60e58496699827aa1c3eaf2bdac3695 Mon Sep 17 00:00:00 2001 From: fysx Date: Sun, 2 Feb 2014 01:28:41 +0100 Subject: [PATCH] updated physfs to inofficial 2.1 version --- jni/love/Android.mk | 2 +- jni/physfs-2.0.3/.hg_archival.txt | 5 - jni/physfs-2.0.3/CMakeLists.txt | 407 --- jni/physfs-2.0.3/TODO.txt | 45 - jni/physfs-2.0.3/archivers/dir.c | 283 -- jni/physfs-2.0.3/archivers/grp.c | 475 --- jni/physfs-2.0.3/archivers/hog.c | 514 --- jni/physfs-2.0.3/archivers/mvl.c | 471 --- jni/physfs-2.0.3/archivers/qpak.c | 633 ---- jni/physfs-2.0.3/archivers/wad.c | 531 --- jni/physfs-2.0.3/archivers/zip.c | 1472 -------- jni/physfs-2.0.3/extras/globbing.c | 159 - jni/physfs-2.0.3/extras/globbing.h | 89 - .../extras/physfs_rb/installer.rb | 103 - .../extras/physfs_rb/physfs/extconf.rb | 9 - .../extras/physfs_rb/physfs/install.rb | 7 - .../physfs_rb/physfs/make_install_test.sh | 9 - .../extras/physfs_rb/physfs/physfs.rb | 121 - .../extras/physfs_rb/physfs/physfsrwops.c | 192 -- .../extras/physfs_rb/physfs/physfsrwops.h | 87 - .../extras/physfs_rb/physfs/rb_physfs.c | 462 --- .../extras/physfs_rb/physfs/rb_physfs.h | 13 - .../extras/physfs_rb/physfs/rb_physfs_file.c | 226 -- .../extras/physfs_rb/physfs/rb_physfs_file.h | 24 - .../extras/physfs_rb/physfs/rb_sdl_rwops.c | 162 - .../extras/physfs_rb/physfs/rb_sdl_rwops.h | 16 - .../physfs_rb/physfs/test/test_physfs.rb | 358 -- jni/physfs-2.0.3/makeos2.cmd | 181 - jni/physfs-2.0.3/physfs.c | 2222 ------------ jni/physfs-2.0.3/physfs_byteorder.c | 312 -- jni/physfs-2.0.3/physfs_internal.h | 1496 --------- jni/physfs-2.0.3/physfs_platforms.h | 49 - jni/physfs-2.0.3/platform/os2.c | 702 ---- jni/physfs-2.0.3/platform/pocketpc.c | 612 ---- jni/physfs-2.0.3/platform/posix.c | 424 --- jni/physfs-2.0.3/platform/windows.c | 1408 -------- jni/physfs-2.0.3/test/wxtest_physfs.cpp | 486 --- jni/physfs-2.0.3/zlib123/README | 125 - jni/physfs-2.0.3/zlib123/adler32.c | 149 - jni/physfs-2.0.3/zlib123/compress.c | 79 - jni/physfs-2.0.3/zlib123/crc32.c | 423 --- jni/physfs-2.0.3/zlib123/crc32.h | 441 --- jni/physfs-2.0.3/zlib123/deflate.c | 1736 ---------- jni/physfs-2.0.3/zlib123/deflate.h | 331 -- jni/physfs-2.0.3/zlib123/gzio.c | 1026 ------ jni/physfs-2.0.3/zlib123/infback.c | 623 ---- jni/physfs-2.0.3/zlib123/inffast.c | 318 -- jni/physfs-2.0.3/zlib123/inffast.h | 11 - jni/physfs-2.0.3/zlib123/inffixed.h | 94 - jni/physfs-2.0.3/zlib123/inflate.c | 1368 -------- jni/physfs-2.0.3/zlib123/inflate.h | 115 - jni/physfs-2.0.3/zlib123/inftrees.c | 329 -- jni/physfs-2.0.3/zlib123/inftrees.h | 55 - jni/physfs-2.0.3/zlib123/trees.c | 1219 ------- jni/physfs-2.0.3/zlib123/trees.h | 128 - jni/physfs-2.0.3/zlib123/uncompr.c | 61 - jni/physfs-2.0.3/zlib123/zconf.h | 332 -- jni/physfs-2.0.3/zlib123/zlib.h | 1357 -------- jni/physfs-2.0.3/zlib123/zutil.c | 318 -- jni/physfs-2.0.3/zlib123/zutil.h | 269 -- jni/physfs-2.1.0/.hg_archival.txt | 5 + jni/{physfs-2.0.3 => physfs-2.1.0}/.hgignore | 0 jni/{physfs-2.0.3 => physfs-2.1.0}/.hgtags | 3 - jni/{physfs-2.0.3 => physfs-2.1.0}/Android.mk | 17 +- jni/physfs-2.1.0/CMakeLists.txt | 400 +++ .../LICENSE.txt | 6 +- jni/physfs-2.1.0/README.txt | 7 + .../docs}/CHANGELOG.txt | 0 .../docs}/CREDITS.txt | 37 +- .../docs}/Doxyfile | 6 +- .../docs}/INSTALL.txt | 15 +- jni/physfs-2.1.0/docs/TODO.txt | 81 + .../extras/PhysFS.NET/AssemblyInfo.cs | 0 .../extras/PhysFS.NET/PhysFS.NET.csproj | 0 .../extras/PhysFS.NET/PhysFS.NET.sln | 0 .../extras/PhysFS.NET/PhysFS.cs | 0 .../extras/PhysFS.NET/PhysFSFileStream.cs | 0 .../extras/PhysFS.NET/PhysFS_DLL.cs | 0 .../extras/PhysFS.NET/README.txt | 0 .../extras/PhysFS.NET/TestApp/App.ico | Bin .../extras/PhysFS.NET/TestApp/AssemblyInfo.cs | 0 .../extras/PhysFS.NET/TestApp/TestApp.csproj | 0 .../extras/PhysFS.NET/TestApp/TestApp.sln | 0 .../extras/PhysFS.NET/TestApp/TestAppForm.cs | 0 .../PhysFS.NET/TestApp/TestAppForm.resx | 0 .../extras/abs-file.h | 0 .../extras/casefolding.txt | 0 jni/physfs-2.1.0/extras/globbing.c | 239 ++ jni/physfs-2.1.0/extras/globbing.h | 165 + .../extras/ignorecase.c | 32 +- .../extras/ignorecase.h | 0 .../extras/makecasefoldhashtable.pl | 0 jni/physfs-2.1.0/extras/physfs-swig.i | 98 + jni/physfs-2.1.0/extras/physfs.pc.in | 11 + .../extras/physfshttpd.c | 14 +- .../extras/physfsrwops.c | 112 +- .../extras/physfsrwops.h | 8 +- .../extras/physfsunpack.c | 0 .../extras/selfextract.c | 6 +- jni/physfs-2.1.0/extras/uninstall.sh | 10 + jni/physfs-2.1.0/src/archiver_dir.c | 191 ++ jni/physfs-2.1.0/src/archiver_grp.c | 112 + jni/physfs-2.1.0/src/archiver_hog.c | 118 + jni/physfs-2.1.0/src/archiver_iso9660.c | 961 ++++++ .../src/archiver_lzma.c} | 399 +-- jni/physfs-2.1.0/src/archiver_mvl.c | 105 + jni/physfs-2.1.0/src/archiver_qpak.c | 121 + jni/physfs-2.1.0/src/archiver_slb.c | 126 + jni/physfs-2.1.0/src/archiver_unpacked.c | 464 +++ jni/physfs-2.1.0/src/archiver_wad.c | 129 + jni/physfs-2.1.0/src/archiver_zip.c | 1712 ++++++++++ .../src}/lzma/7zC.txt | 0 .../src}/lzma/7zFormat.txt | 0 .../src}/lzma/C/7zCrc.c | 0 .../src}/lzma/C/7zCrc.h | 0 .../src}/lzma/C/7zCrcT8.c | 0 .../src}/lzma/C/Alloc.c | 0 .../src}/lzma/C/Alloc.h | 0 .../src}/lzma/C/Archive/7z/7zAlloc.c | 0 .../src}/lzma/C/Archive/7z/7zAlloc.h | 0 .../src}/lzma/C/Archive/7z/7zBuffer.c | 0 .../src}/lzma/C/Archive/7z/7zBuffer.h | 0 .../src}/lzma/C/Archive/7z/7zDecode.c | 0 .../src}/lzma/C/Archive/7z/7zDecode.h | 0 .../src}/lzma/C/Archive/7z/7zExtract.c | 0 .../src}/lzma/C/Archive/7z/7zExtract.h | 0 .../src}/lzma/C/Archive/7z/7zHeader.c | 0 .../src}/lzma/C/Archive/7z/7zHeader.h | 0 .../src}/lzma/C/Archive/7z/7zIn.c | 0 .../src}/lzma/C/Archive/7z/7zIn.h | 0 .../src}/lzma/C/Archive/7z/7zItem.c | 0 .../src}/lzma/C/Archive/7z/7zItem.h | 0 .../src}/lzma/C/Archive/7z/7zMain.c | 0 .../src}/lzma/C/Archive/7z/7zMethodID.c | 0 .../src}/lzma/C/Archive/7z/7zMethodID.h | 0 .../src}/lzma/C/Archive/7z/7z_C.dsp | 0 .../src}/lzma/C/Archive/7z/7z_C.dsw | 0 .../src}/lzma/C/Archive/7z/makefile | 0 .../src}/lzma/C/Archive/7z/makefile.gcc | 0 .../src}/lzma/C/Compress/Branch/BranchARM.c | 0 .../src}/lzma/C/Compress/Branch/BranchARM.h | 0 .../lzma/C/Compress/Branch/BranchARMThumb.c | 0 .../lzma/C/Compress/Branch/BranchARMThumb.h | 0 .../src}/lzma/C/Compress/Branch/BranchIA64.c | 0 .../src}/lzma/C/Compress/Branch/BranchIA64.h | 0 .../src}/lzma/C/Compress/Branch/BranchPPC.c | 0 .../src}/lzma/C/Compress/Branch/BranchPPC.h | 0 .../src}/lzma/C/Compress/Branch/BranchSPARC.c | 0 .../src}/lzma/C/Compress/Branch/BranchSPARC.h | 0 .../src}/lzma/C/Compress/Branch/BranchTypes.h | 0 .../src}/lzma/C/Compress/Branch/BranchX86.c | 0 .../src}/lzma/C/Compress/Branch/BranchX86.h | 0 .../src}/lzma/C/Compress/Branch/BranchX86_2.c | 0 .../src}/lzma/C/Compress/Branch/BranchX86_2.h | 0 .../lzma/C/Compress/Huffman/HuffmanEncode.c | 0 .../lzma/C/Compress/Huffman/HuffmanEncode.h | 0 .../src}/lzma/C/Compress/Lz/LzHash.h | 0 .../src}/lzma/C/Compress/Lz/MatchFinder.c | 0 .../src}/lzma/C/Compress/Lz/MatchFinder.h | 0 .../src}/lzma/C/Compress/Lz/MatchFinderMt.c | 0 .../src}/lzma/C/Compress/Lz/MatchFinderMt.h | 0 .../src}/lzma/C/Compress/Lzma/LzmaDecode.c | 0 .../src}/lzma/C/Compress/Lzma/LzmaDecode.h | 0 .../lzma/C/Compress/Lzma/LzmaDecodeSize.c | 0 .../lzma/C/Compress/Lzma/LzmaStateDecode.c | 0 .../lzma/C/Compress/Lzma/LzmaStateDecode.h | 0 .../src}/lzma/C/Compress/Lzma/LzmaStateTest.c | 0 .../src}/lzma/C/Compress/Lzma/LzmaTest.c | 0 .../src}/lzma/C/Compress/Lzma/LzmaTypes.h | 0 .../src}/lzma/C/CpuArch.h | 0 .../src}/lzma/C/IStream.h | 0 .../src}/lzma/C/Sort.c | 0 .../src}/lzma/C/Sort.h | 0 .../src}/lzma/C/Threads.c | 0 .../src}/lzma/C/Threads.h | 0 .../src}/lzma/C/Types.h | 0 .../src}/lzma/CPP/7zip/Archive/7z/7z.ico | Bin .../CPP/7zip/Archive/7z/7zCompressionMode.cpp | 0 .../CPP/7zip/Archive/7z/7zCompressionMode.h | 0 .../lzma/CPP/7zip/Archive/7z/7zDecode.cpp | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zDecode.h | 0 .../lzma/CPP/7zip/Archive/7z/7zEncode.cpp | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zEncode.h | 0 .../lzma/CPP/7zip/Archive/7z/7zExtract.cpp | 0 .../CPP/7zip/Archive/7z/7zFolderInStream.cpp | 0 .../CPP/7zip/Archive/7z/7zFolderInStream.h | 0 .../CPP/7zip/Archive/7z/7zFolderOutStream.cpp | 0 .../CPP/7zip/Archive/7z/7zFolderOutStream.h | 0 .../lzma/CPP/7zip/Archive/7z/7zHandler.cpp | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zHandler.h | 0 .../lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp | 0 .../lzma/CPP/7zip/Archive/7z/7zHeader.cpp | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zHeader.h | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zIn.cpp | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zIn.h | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zItem.h | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zOut.cpp | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zOut.h | 0 .../lzma/CPP/7zip/Archive/7z/7zProperties.cpp | 0 .../lzma/CPP/7zip/Archive/7z/7zProperties.h | 0 .../lzma/CPP/7zip/Archive/7z/7zRegister.cpp | 0 .../lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp | 0 .../lzma/CPP/7zip/Archive/7z/7zSpecStream.h | 0 .../lzma/CPP/7zip/Archive/7z/7zUpdate.cpp | 0 .../src}/lzma/CPP/7zip/Archive/7z/7zUpdate.h | 0 .../src}/lzma/CPP/7zip/Archive/7z/StdAfx.cpp | 0 .../src}/lzma/CPP/7zip/Archive/7z/StdAfx.h | 0 .../src}/lzma/CPP/7zip/Archive/Archive.def | 0 .../src}/lzma/CPP/7zip/Archive/Archive2.def | 0 .../lzma/CPP/7zip/Archive/ArchiveExports.cpp | 0 .../CPP/7zip/Archive/Common/CoderMixer2.cpp | 0 .../CPP/7zip/Archive/Common/CoderMixer2.h | 0 .../CPP/7zip/Archive/Common/CoderMixer2MT.cpp | 0 .../CPP/7zip/Archive/Common/CoderMixer2MT.h | 0 .../Archive/Common/CrossThreadProgress.cpp | 0 .../7zip/Archive/Common/CrossThreadProgress.h | 0 .../7zip/Archive/Common/DummyOutStream.cpp | 0 .../CPP/7zip/Archive/Common/DummyOutStream.h | 0 .../CPP/7zip/Archive/Common/HandlerOut.cpp | 0 .../lzma/CPP/7zip/Archive/Common/HandlerOut.h | 0 .../7zip/Archive/Common/InStreamWithCRC.cpp | 0 .../CPP/7zip/Archive/Common/InStreamWithCRC.h | 0 .../CPP/7zip/Archive/Common/ItemNameUtils.cpp | 0 .../CPP/7zip/Archive/Common/ItemNameUtils.h | 0 .../CPP/7zip/Archive/Common/MultiStream.cpp | 0 .../CPP/7zip/Archive/Common/MultiStream.h | 0 .../7zip/Archive/Common/OutStreamWithCRC.cpp | 0 .../7zip/Archive/Common/OutStreamWithCRC.h | 0 .../7zip/Archive/Common/ParseProperties.cpp | 0 .../CPP/7zip/Archive/Common/ParseProperties.h | 0 .../lzma/CPP/7zip/Archive/DllExports2.cpp | 0 .../src}/lzma/CPP/7zip/Archive/IArchive.h | 0 .../lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp | 0 .../lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw | 0 .../lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp | 0 .../lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h | 0 .../lzma/CPP/7zip/Bundles/Alone7z/makefile | 0 .../lzma/CPP/7zip/Bundles/Alone7z/resource.rc | 0 .../7zip/Bundles/Format7zExtractR/StdAfx.cpp | 0 .../7zip/Bundles/Format7zExtractR/StdAfx.h | 0 .../7zip/Bundles/Format7zExtractR/makefile | 0 .../7zip/Bundles/Format7zExtractR/resource.rc | 0 .../CPP/7zip/Bundles/Format7zR/StdAfx.cpp | 0 .../lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h | 0 .../lzma/CPP/7zip/Bundles/Format7zR/makefile | 0 .../CPP/7zip/Bundles/Format7zR/resource.rc | 0 .../src}/lzma/CPP/7zip/Common/CreateCoder.cpp | 0 .../src}/lzma/CPP/7zip/Common/CreateCoder.h | 0 .../CPP/7zip/Common/FilePathAutoRename.cpp | 0 .../lzma/CPP/7zip/Common/FilePathAutoRename.h | 0 .../src}/lzma/CPP/7zip/Common/FileStreams.cpp | 0 .../src}/lzma/CPP/7zip/Common/FileStreams.h | 0 .../src}/lzma/CPP/7zip/Common/FilterCoder.cpp | 0 .../src}/lzma/CPP/7zip/Common/FilterCoder.h | 0 .../src}/lzma/CPP/7zip/Common/InBuffer.cpp | 0 .../src}/lzma/CPP/7zip/Common/InBuffer.h | 0 .../lzma/CPP/7zip/Common/InOutTempBuffer.cpp | 0 .../lzma/CPP/7zip/Common/InOutTempBuffer.h | 0 .../lzma/CPP/7zip/Common/LimitedStreams.cpp | 0 .../lzma/CPP/7zip/Common/LimitedStreams.h | 0 .../lzma/CPP/7zip/Common/LockedStream.cpp | 0 .../src}/lzma/CPP/7zip/Common/LockedStream.h | 0 .../src}/lzma/CPP/7zip/Common/MethodId.cpp | 0 .../src}/lzma/CPP/7zip/Common/MethodId.h | 0 .../src}/lzma/CPP/7zip/Common/MethodProps.cpp | 0 .../src}/lzma/CPP/7zip/Common/MethodProps.h | 0 .../lzma/CPP/7zip/Common/OffsetStream.cpp | 0 .../src}/lzma/CPP/7zip/Common/OffsetStream.h | 0 .../src}/lzma/CPP/7zip/Common/OutBuffer.cpp | 0 .../src}/lzma/CPP/7zip/Common/OutBuffer.h | 0 .../lzma/CPP/7zip/Common/ProgressUtils.cpp | 0 .../src}/lzma/CPP/7zip/Common/ProgressUtils.h | 0 .../src}/lzma/CPP/7zip/Common/RegisterArc.h | 0 .../src}/lzma/CPP/7zip/Common/RegisterCodec.h | 0 .../src}/lzma/CPP/7zip/Common/StdAfx.h | 0 .../lzma/CPP/7zip/Common/StreamBinder.cpp | 0 .../src}/lzma/CPP/7zip/Common/StreamBinder.h | 0 .../lzma/CPP/7zip/Common/StreamObjects.cpp | 0 .../src}/lzma/CPP/7zip/Common/StreamObjects.h | 0 .../src}/lzma/CPP/7zip/Common/StreamUtils.cpp | 0 .../src}/lzma/CPP/7zip/Common/StreamUtils.h | 0 .../src}/lzma/CPP/7zip/Common/VirtThread.cpp | 0 .../src}/lzma/CPP/7zip/Common/VirtThread.h | 0 .../lzma/CPP/7zip/Compress/Branch/ARM.cpp | 0 .../src}/lzma/CPP/7zip/Compress/Branch/ARM.h | 0 .../CPP/7zip/Compress/Branch/ARMThumb.cpp | 0 .../lzma/CPP/7zip/Compress/Branch/ARMThumb.h | 0 .../CPP/7zip/Compress/Branch/BCJ2Register.cpp | 0 .../CPP/7zip/Compress/Branch/BCJRegister.cpp | 0 .../CPP/7zip/Compress/Branch/BranchCoder.cpp | 0 .../CPP/7zip/Compress/Branch/BranchCoder.h | 0 .../7zip/Compress/Branch/BranchRegister.cpp | 0 .../lzma/CPP/7zip/Compress/Branch/IA64.cpp | 0 .../src}/lzma/CPP/7zip/Compress/Branch/IA64.h | 0 .../lzma/CPP/7zip/Compress/Branch/PPC.cpp | 0 .../src}/lzma/CPP/7zip/Compress/Branch/PPC.h | 0 .../lzma/CPP/7zip/Compress/Branch/SPARC.cpp | 0 .../lzma/CPP/7zip/Compress/Branch/SPARC.h | 0 .../lzma/CPP/7zip/Compress/Branch/StdAfx.cpp | 0 .../lzma/CPP/7zip/Compress/Branch/StdAfx.h | 0 .../lzma/CPP/7zip/Compress/Branch/x86.cpp | 0 .../src}/lzma/CPP/7zip/Compress/Branch/x86.h | 0 .../lzma/CPP/7zip/Compress/Branch/x86_2.cpp | 0 .../lzma/CPP/7zip/Compress/Branch/x86_2.h | 0 .../CPP/7zip/Compress/ByteSwap/ByteSwap.cpp | 0 .../CPP/7zip/Compress/ByteSwap/ByteSwap.h | 0 .../Compress/ByteSwap/ByteSwapRegister.cpp | 0 .../CPP/7zip/Compress/ByteSwap/StdAfx.cpp | 0 .../lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h | 0 .../lzma/CPP/7zip/Compress/CodecExports.cpp | 0 .../lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp | 0 .../lzma/CPP/7zip/Compress/Copy/CopyCoder.h | 0 .../CPP/7zip/Compress/Copy/CopyRegister.cpp | 0 .../lzma/CPP/7zip/Compress/Copy/StdAfx.cpp | 0 .../src}/lzma/CPP/7zip/Compress/Copy/StdAfx.h | 0 .../lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp | 0 .../lzma/CPP/7zip/Compress/LZ/LZOutWindow.h | 0 .../src}/lzma/CPP/7zip/Compress/LZ/StdAfx.h | 0 .../src}/lzma/CPP/7zip/Compress/LZMA/LZMA.h | 0 .../CPP/7zip/Compress/LZMA/LZMADecoder.cpp | 0 .../lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h | 0 .../CPP/7zip/Compress/LZMA/LZMAEncoder.cpp | 0 .../lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h | 0 .../CPP/7zip/Compress/LZMA/LZMARegister.cpp | 0 .../lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp | 0 .../src}/lzma/CPP/7zip/Compress/LZMA/StdAfx.h | 0 .../7zip/Compress/LZMA_Alone/AloneLZMA.dsp | 0 .../7zip/Compress/LZMA_Alone/AloneLZMA.dsw | 0 .../7zip/Compress/LZMA_Alone/LzmaAlone.cpp | 0 .../7zip/Compress/LZMA_Alone/LzmaBench.cpp | 0 .../CPP/7zip/Compress/LZMA_Alone/LzmaBench.h | 0 .../7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp | 0 .../7zip/Compress/LZMA_Alone/LzmaBenchCon.h | 0 .../CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp | 0 .../CPP/7zip/Compress/LZMA_Alone/LzmaRam.h | 0 .../7zip/Compress/LZMA_Alone/LzmaRamDecode.c | 0 .../7zip/Compress/LZMA_Alone/LzmaRamDecode.h | 0 .../CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp | 0 .../CPP/7zip/Compress/LZMA_Alone/StdAfx.h | 0 .../CPP/7zip/Compress/LZMA_Alone/makefile | 0 .../CPP/7zip/Compress/LZMA_Alone/makefile.gcc | 0 .../CPP/7zip/Compress/RangeCoder/RangeCoder.h | 0 .../Compress/RangeCoder/RangeCoderBit.cpp | 0 .../7zip/Compress/RangeCoder/RangeCoderBit.h | 0 .../Compress/RangeCoder/RangeCoderBitTree.h | 0 .../7zip/Compress/RangeCoder/RangeCoderOpt.h | 0 .../CPP/7zip/Compress/RangeCoder/StdAfx.h | 0 .../src}/lzma/CPP/7zip/ICoder.h | 0 .../src}/lzma/CPP/7zip/IDecl.h | 0 .../src}/lzma/CPP/7zip/IPassword.h | 0 .../src}/lzma/CPP/7zip/IProgress.h | 0 .../src}/lzma/CPP/7zip/IStream.h | 0 .../src}/lzma/CPP/7zip/MyVersion.h | 0 .../src}/lzma/CPP/7zip/MyVersionInfo.rc | 0 .../src}/lzma/CPP/7zip/PropID.h | 0 .../lzma/CPP/7zip/UI/Client7z/Client7z.cpp | 0 .../lzma/CPP/7zip/UI/Client7z/Client7z.dsp | 0 .../lzma/CPP/7zip/UI/Client7z/Client7z.dsw | 0 .../src}/lzma/CPP/7zip/UI/Client7z/StdAfx.cpp | 0 .../src}/lzma/CPP/7zip/UI/Client7z/StdAfx.h | 0 .../src}/lzma/CPP/7zip/UI/Client7z/makefile | 0 .../CPP/7zip/UI/Common/ArchiveCommandLine.cpp | 0 .../CPP/7zip/UI/Common/ArchiveCommandLine.h | 0 .../7zip/UI/Common/ArchiveExtractCallback.cpp | 0 .../7zip/UI/Common/ArchiveExtractCallback.h | 0 .../lzma/CPP/7zip/UI/Common/ArchiveName.cpp | 0 .../lzma/CPP/7zip/UI/Common/ArchiveName.h | 0 .../7zip/UI/Common/ArchiveOpenCallback.cpp | 0 .../CPP/7zip/UI/Common/ArchiveOpenCallback.h | 0 .../lzma/CPP/7zip/UI/Common/DefaultName.cpp | 0 .../lzma/CPP/7zip/UI/Common/DefaultName.h | 0 .../src}/lzma/CPP/7zip/UI/Common/DirItem.h | 0 .../lzma/CPP/7zip/UI/Common/EnumDirItems.cpp | 0 .../lzma/CPP/7zip/UI/Common/EnumDirItems.h | 0 .../src}/lzma/CPP/7zip/UI/Common/ExitCode.h | 0 .../src}/lzma/CPP/7zip/UI/Common/Extract.cpp | 0 .../src}/lzma/CPP/7zip/UI/Common/Extract.h | 0 .../lzma/CPP/7zip/UI/Common/ExtractMode.h | 0 .../CPP/7zip/UI/Common/ExtractingFilePath.cpp | 0 .../CPP/7zip/UI/Common/ExtractingFilePath.h | 0 .../CPP/7zip/UI/Common/IFileExtractCallback.h | 0 .../lzma/CPP/7zip/UI/Common/LoadCodecs.cpp | 0 .../src}/lzma/CPP/7zip/UI/Common/LoadCodecs.h | 0 .../lzma/CPP/7zip/UI/Common/OpenArchive.cpp | 0 .../lzma/CPP/7zip/UI/Common/OpenArchive.h | 0 .../lzma/CPP/7zip/UI/Common/PropIDUtils.cpp | 0 .../lzma/CPP/7zip/UI/Common/PropIDUtils.h | 0 .../src}/lzma/CPP/7zip/UI/Common/Property.h | 0 .../lzma/CPP/7zip/UI/Common/SetProperties.cpp | 0 .../lzma/CPP/7zip/UI/Common/SetProperties.h | 0 .../lzma/CPP/7zip/UI/Common/SortUtils.cpp | 0 .../src}/lzma/CPP/7zip/UI/Common/SortUtils.h | 0 .../lzma/CPP/7zip/UI/Common/TempFiles.cpp | 0 .../src}/lzma/CPP/7zip/UI/Common/TempFiles.h | 0 .../src}/lzma/CPP/7zip/UI/Common/Update.cpp | 0 .../src}/lzma/CPP/7zip/UI/Common/Update.h | 0 .../lzma/CPP/7zip/UI/Common/UpdateAction.cpp | 0 .../lzma/CPP/7zip/UI/Common/UpdateAction.h | 0 .../CPP/7zip/UI/Common/UpdateCallback.cpp | 0 .../lzma/CPP/7zip/UI/Common/UpdateCallback.h | 0 .../lzma/CPP/7zip/UI/Common/UpdatePair.cpp | 0 .../src}/lzma/CPP/7zip/UI/Common/UpdatePair.h | 0 .../lzma/CPP/7zip/UI/Common/UpdateProduce.cpp | 0 .../lzma/CPP/7zip/UI/Common/UpdateProduce.h | 0 .../src}/lzma/CPP/7zip/UI/Common/WorkDir.cpp | 0 .../src}/lzma/CPP/7zip/UI/Common/WorkDir.h | 0 .../lzma/CPP/7zip/UI/Common/ZipRegistry.h | 0 .../lzma/CPP/7zip/UI/Console/ConsoleClose.cpp | 0 .../lzma/CPP/7zip/UI/Console/ConsoleClose.h | 0 .../UI/Console/ExtractCallbackConsole.cpp | 0 .../7zip/UI/Console/ExtractCallbackConsole.h | 0 .../src}/lzma/CPP/7zip/UI/Console/List.cpp | 0 .../src}/lzma/CPP/7zip/UI/Console/List.h | 0 .../src}/lzma/CPP/7zip/UI/Console/Main.cpp | 0 .../src}/lzma/CPP/7zip/UI/Console/MainAr.cpp | 0 .../7zip/UI/Console/OpenCallbackConsole.cpp | 0 .../CPP/7zip/UI/Console/OpenCallbackConsole.h | 0 .../CPP/7zip/UI/Console/PercentPrinter.cpp | 0 .../lzma/CPP/7zip/UI/Console/PercentPrinter.h | 0 .../src}/lzma/CPP/7zip/UI/Console/StdAfx.cpp | 0 .../src}/lzma/CPP/7zip/UI/Console/StdAfx.h | 0 .../7zip/UI/Console/UpdateCallbackConsole.cpp | 0 .../7zip/UI/Console/UpdateCallbackConsole.h | 0 .../CPP/7zip/UI/Console/UserInputUtils.cpp | 0 .../lzma/CPP/7zip/UI/Console/UserInputUtils.h | 0 .../src}/lzma/CPP/7zip/UI/Console/afxres.h | 0 .../src}/lzma/CPP/Build.mak | 0 .../src}/lzma/CPP/Common/AutoPtr.h | 0 .../src}/lzma/CPP/Common/Buffer.h | 0 .../src}/lzma/CPP/Common/CRC.cpp | 0 .../src}/lzma/CPP/Common/C_FileIO.cpp | 0 .../src}/lzma/CPP/Common/C_FileIO.h | 0 .../src}/lzma/CPP/Common/ComTry.h | 0 .../lzma/CPP/Common/CommandLineParser.cpp | 0 .../src}/lzma/CPP/Common/CommandLineParser.h | 0 .../src}/lzma/CPP/Common/Defs.h | 0 .../src}/lzma/CPP/Common/DynamicBuffer.h | 0 .../src}/lzma/CPP/Common/IntToString.cpp | 0 .../src}/lzma/CPP/Common/IntToString.h | 0 .../src}/lzma/CPP/Common/ListFileUtils.cpp | 0 .../src}/lzma/CPP/Common/ListFileUtils.h | 0 .../src}/lzma/CPP/Common/MyCom.h | 0 .../src}/lzma/CPP/Common/MyException.h | 0 .../src}/lzma/CPP/Common/MyGuidDef.h | 0 .../src}/lzma/CPP/Common/MyInitGuid.h | 0 .../src}/lzma/CPP/Common/MyString.cpp | 0 .../src}/lzma/CPP/Common/MyString.h | 0 .../src}/lzma/CPP/Common/MyUnknown.h | 0 .../src}/lzma/CPP/Common/MyVector.cpp | 0 .../src}/lzma/CPP/Common/MyVector.h | 0 .../src}/lzma/CPP/Common/MyWindows.h | 0 .../src}/lzma/CPP/Common/NewHandler.cpp | 0 .../src}/lzma/CPP/Common/NewHandler.h | 0 .../src}/lzma/CPP/Common/StdAfx.h | 0 .../src}/lzma/CPP/Common/StdInStream.cpp | 0 .../src}/lzma/CPP/Common/StdInStream.h | 0 .../src}/lzma/CPP/Common/StdOutStream.cpp | 0 .../src}/lzma/CPP/Common/StdOutStream.h | 0 .../src}/lzma/CPP/Common/StringConvert.cpp | 0 .../src}/lzma/CPP/Common/StringConvert.h | 0 .../src}/lzma/CPP/Common/StringToInt.cpp | 0 .../src}/lzma/CPP/Common/StringToInt.h | 0 .../src}/lzma/CPP/Common/Types.h | 0 .../src}/lzma/CPP/Common/UTFConvert.cpp | 0 .../src}/lzma/CPP/Common/UTFConvert.h | 0 .../src}/lzma/CPP/Common/Wildcard.cpp | 0 .../src}/lzma/CPP/Common/Wildcard.h | 0 .../src}/lzma/CPP/Windows/DLL.cpp | 0 .../src}/lzma/CPP/Windows/DLL.h | 0 .../src}/lzma/CPP/Windows/Defs.h | 0 .../src}/lzma/CPP/Windows/Error.cpp | 0 .../src}/lzma/CPP/Windows/Error.h | 0 .../src}/lzma/CPP/Windows/FileDir.cpp | 0 .../src}/lzma/CPP/Windows/FileDir.h | 0 .../src}/lzma/CPP/Windows/FileFind.cpp | 0 .../src}/lzma/CPP/Windows/FileFind.h | 0 .../src}/lzma/CPP/Windows/FileIO.cpp | 0 .../src}/lzma/CPP/Windows/FileIO.h | 0 .../src}/lzma/CPP/Windows/FileMapping.cpp | 0 .../src}/lzma/CPP/Windows/FileMapping.h | 0 .../src}/lzma/CPP/Windows/FileName.cpp | 0 .../src}/lzma/CPP/Windows/FileName.h | 0 .../src}/lzma/CPP/Windows/Handle.h | 0 .../src}/lzma/CPP/Windows/MemoryLock.cpp | 0 .../src}/lzma/CPP/Windows/MemoryLock.h | 0 .../src}/lzma/CPP/Windows/PropVariant.cpp | 0 .../src}/lzma/CPP/Windows/PropVariant.h | 0 .../CPP/Windows/PropVariantConversions.cpp | 0 .../lzma/CPP/Windows/PropVariantConversions.h | 0 .../src}/lzma/CPP/Windows/StdAfx.h | 0 .../src}/lzma/CPP/Windows/Synchronization.cpp | 0 .../src}/lzma/CPP/Windows/Synchronization.h | 0 .../src}/lzma/CPP/Windows/System.cpp | 0 .../src}/lzma/CPP/Windows/System.h | 0 .../src}/lzma/CPP/Windows/Thread.h | 0 .../src}/lzma/CPP/Windows/Time.h | 0 .../src}/lzma/CS/7zip/Common/CRC.cs | 0 .../lzma/CS/7zip/Common/CommandLineParser.cs | 0 .../src}/lzma/CS/7zip/Common/InBuffer.cs | 0 .../src}/lzma/CS/7zip/Common/OutBuffer.cs | 0 .../lzma/CS/7zip/Compress/LZ/IMatchFinder.cs | 0 .../lzma/CS/7zip/Compress/LZ/LzBinTree.cs | 0 .../lzma/CS/7zip/Compress/LZ/LzInWindow.cs | 0 .../lzma/CS/7zip/Compress/LZ/LzOutWindow.cs | 0 .../lzma/CS/7zip/Compress/LZMA/LzmaBase.cs | 0 .../lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs | 0 .../lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs | 0 .../CS/7zip/Compress/LzmaAlone/LzmaAlone.cs | 0 .../7zip/Compress/LzmaAlone/LzmaAlone.csproj | 0 .../CS/7zip/Compress/LzmaAlone/LzmaAlone.sln | 0 .../CS/7zip/Compress/LzmaAlone/LzmaBench.cs | 0 .../LzmaAlone/Properties/AssemblyInfo.cs | 0 .../LzmaAlone/Properties/Resources.cs | 0 .../Compress/LzmaAlone/Properties/Settings.cs | 0 .../CS/7zip/Compress/RangeCoder/RangeCoder.cs | 0 .../7zip/Compress/RangeCoder/RangeCoderBit.cs | 0 .../Compress/RangeCoder/RangeCoderBitTree.cs | 0 .../src}/lzma/CS/7zip/ICoder.cs | 0 .../src}/lzma/Java/SevenZip/CRC.java | 0 .../Java/SevenZip/Compression/LZ/BinTree.java | 0 .../SevenZip/Compression/LZ/InWindow.java | 0 .../SevenZip/Compression/LZ/OutWindow.java | 0 .../Java/SevenZip/Compression/LZMA/Base.java | 0 .../SevenZip/Compression/LZMA/Decoder.java | 0 .../SevenZip/Compression/LZMA/Encoder.java | 0 .../RangeCoder/BitTreeDecoder.java | 0 .../RangeCoder/BitTreeEncoder.java | 0 .../Compression/RangeCoder/Decoder.java | 0 .../Compression/RangeCoder/Encoder.java | 0 .../lzma/Java/SevenZip/ICodeProgress.java | 0 .../src}/lzma/Java/SevenZip/LzmaAlone.java | 0 .../src}/lzma/Java/SevenZip/LzmaBench.java | 0 .../src}/lzma/LGPL.txt | 0 .../src}/lzma/Methods.txt | 0 .../src}/lzma/history.txt | 0 .../src}/lzma/lzma.exe | Bin .../src}/lzma/lzma.txt | 0 jni/physfs-2.1.0/src/physfs.c | 2966 +++++++++++++++++ .../src}/physfs.h | 1542 +++++++-- jni/physfs-2.1.0/src/physfs_byteorder.c | 137 + .../src}/physfs_casefolding.h | 0 jni/physfs-2.1.0/src/physfs_internal.h | 646 ++++ jni/physfs-2.1.0/src/physfs_miniz.h | 698 ++++ jni/physfs-2.1.0/src/physfs_platforms.h | 68 + .../src}/physfs_unicode.c | 131 +- .../src/platform_beos.cpp} | 135 +- .../src/platform_macosx.c} | 201 +- jni/physfs-2.1.0/src/platform_posix.c | 436 +++ .../src/platform_unix.c} | 326 +- jni/physfs-2.1.0/src/platform_windows.c | 934 ++++++ .../test/test_physfs.c | 399 ++- jni/physfs-2.1.0/test/test_physfs.pl | 21 + jni/physfs-2.1.0/test/test_physfs.rb | 19 + 553 files changed, 13324 insertions(+), 26719 deletions(-) delete mode 100644 jni/physfs-2.0.3/.hg_archival.txt delete mode 100644 jni/physfs-2.0.3/CMakeLists.txt delete mode 100644 jni/physfs-2.0.3/TODO.txt delete mode 100644 jni/physfs-2.0.3/archivers/dir.c delete mode 100644 jni/physfs-2.0.3/archivers/grp.c delete mode 100644 jni/physfs-2.0.3/archivers/hog.c delete mode 100644 jni/physfs-2.0.3/archivers/mvl.c delete mode 100644 jni/physfs-2.0.3/archivers/qpak.c delete mode 100644 jni/physfs-2.0.3/archivers/wad.c delete mode 100644 jni/physfs-2.0.3/archivers/zip.c delete mode 100644 jni/physfs-2.0.3/extras/globbing.c delete mode 100644 jni/physfs-2.0.3/extras/globbing.h delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/installer.rb delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/extconf.rb delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/install.rb delete mode 100755 jni/physfs-2.0.3/extras/physfs_rb/physfs/make_install_test.sh delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/physfs.rb delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/physfsrwops.c delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/physfsrwops.h delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs.c delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs.h delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs_file.c delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs_file.h delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_sdl_rwops.c delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_sdl_rwops.h delete mode 100644 jni/physfs-2.0.3/extras/physfs_rb/physfs/test/test_physfs.rb delete mode 100644 jni/physfs-2.0.3/makeos2.cmd delete mode 100644 jni/physfs-2.0.3/physfs.c delete mode 100644 jni/physfs-2.0.3/physfs_byteorder.c delete mode 100644 jni/physfs-2.0.3/physfs_internal.h delete mode 100644 jni/physfs-2.0.3/physfs_platforms.h delete mode 100644 jni/physfs-2.0.3/platform/os2.c delete mode 100644 jni/physfs-2.0.3/platform/pocketpc.c delete mode 100644 jni/physfs-2.0.3/platform/posix.c delete mode 100644 jni/physfs-2.0.3/platform/windows.c delete mode 100644 jni/physfs-2.0.3/test/wxtest_physfs.cpp delete mode 100644 jni/physfs-2.0.3/zlib123/README delete mode 100644 jni/physfs-2.0.3/zlib123/adler32.c delete mode 100644 jni/physfs-2.0.3/zlib123/compress.c delete mode 100644 jni/physfs-2.0.3/zlib123/crc32.c delete mode 100644 jni/physfs-2.0.3/zlib123/crc32.h delete mode 100644 jni/physfs-2.0.3/zlib123/deflate.c delete mode 100644 jni/physfs-2.0.3/zlib123/deflate.h delete mode 100644 jni/physfs-2.0.3/zlib123/gzio.c delete mode 100644 jni/physfs-2.0.3/zlib123/infback.c delete mode 100644 jni/physfs-2.0.3/zlib123/inffast.c delete mode 100644 jni/physfs-2.0.3/zlib123/inffast.h delete mode 100644 jni/physfs-2.0.3/zlib123/inffixed.h delete mode 100644 jni/physfs-2.0.3/zlib123/inflate.c delete mode 100644 jni/physfs-2.0.3/zlib123/inflate.h delete mode 100644 jni/physfs-2.0.3/zlib123/inftrees.c delete mode 100644 jni/physfs-2.0.3/zlib123/inftrees.h delete mode 100644 jni/physfs-2.0.3/zlib123/trees.c delete mode 100644 jni/physfs-2.0.3/zlib123/trees.h delete mode 100644 jni/physfs-2.0.3/zlib123/uncompr.c delete mode 100644 jni/physfs-2.0.3/zlib123/zconf.h delete mode 100644 jni/physfs-2.0.3/zlib123/zlib.h delete mode 100644 jni/physfs-2.0.3/zlib123/zutil.c delete mode 100644 jni/physfs-2.0.3/zlib123/zutil.h create mode 100644 jni/physfs-2.1.0/.hg_archival.txt rename jni/{physfs-2.0.3 => physfs-2.1.0}/.hgignore (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/.hgtags (82%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/Android.mk (60%) create mode 100644 jni/physfs-2.1.0/CMakeLists.txt rename jni/{physfs-2.0.3 => physfs-2.1.0}/LICENSE.txt (87%) create mode 100644 jni/physfs-2.1.0/README.txt rename jni/{physfs-2.0.3 => physfs-2.1.0/docs}/CHANGELOG.txt (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/docs}/CREDITS.txt (80%) rename jni/{physfs-2.0.3 => physfs-2.1.0/docs}/Doxyfile (99%) rename jni/{physfs-2.0.3 => physfs-2.1.0/docs}/INSTALL.txt (92%) create mode 100644 jni/physfs-2.1.0/docs/TODO.txt rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/AssemblyInfo.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/PhysFS.NET.csproj (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/PhysFS.NET.sln (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/PhysFS.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/PhysFSFileStream.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/PhysFS_DLL.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/README.txt (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/TestApp/App.ico (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/TestApp/AssemblyInfo.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/TestApp/TestApp.csproj (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/TestApp/TestApp.sln (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/TestApp/TestAppForm.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/PhysFS.NET/TestApp/TestAppForm.resx (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/abs-file.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/casefolding.txt (100%) create mode 100644 jni/physfs-2.1.0/extras/globbing.c create mode 100644 jni/physfs-2.1.0/extras/globbing.h rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/ignorecase.c (91%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/ignorecase.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/makecasefoldhashtable.pl (100%) create mode 100644 jni/physfs-2.1.0/extras/physfs-swig.i create mode 100644 jni/physfs-2.1.0/extras/physfs.pc.in rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/physfshttpd.c (98%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/physfsrwops.c (65%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/physfsrwops.h (92%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/physfsunpack.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0}/extras/selfextract.c (97%) create mode 100755 jni/physfs-2.1.0/extras/uninstall.sh create mode 100644 jni/physfs-2.1.0/src/archiver_dir.c create mode 100644 jni/physfs-2.1.0/src/archiver_grp.c create mode 100644 jni/physfs-2.1.0/src/archiver_hog.c create mode 100644 jni/physfs-2.1.0/src/archiver_iso9660.c rename jni/{physfs-2.0.3/archivers/lzma.c => physfs-2.1.0/src/archiver_lzma.c} (60%) create mode 100644 jni/physfs-2.1.0/src/archiver_mvl.c create mode 100644 jni/physfs-2.1.0/src/archiver_qpak.c create mode 100644 jni/physfs-2.1.0/src/archiver_slb.c create mode 100644 jni/physfs-2.1.0/src/archiver_unpacked.c create mode 100644 jni/physfs-2.1.0/src/archiver_wad.c create mode 100644 jni/physfs-2.1.0/src/archiver_zip.c rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/7zC.txt (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/7zFormat.txt (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/7zCrc.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/7zCrc.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/7zCrcT8.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Alloc.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Alloc.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zAlloc.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zAlloc.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zBuffer.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zBuffer.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zDecode.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zDecode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zExtract.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zExtract.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zHeader.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zHeader.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zIn.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zIn.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zItem.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zItem.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zMain.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zMethodID.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7zMethodID.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7z_C.dsp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/7z_C.dsw (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/makefile (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Archive/7z/makefile.gcc (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchARM.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchARM.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchARMThumb.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchARMThumb.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchIA64.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchIA64.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchPPC.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchPPC.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchSPARC.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchSPARC.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchTypes.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchX86.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchX86.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchX86_2.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Branch/BranchX86_2.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Huffman/HuffmanEncode.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Huffman/HuffmanEncode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lz/LzHash.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lz/MatchFinder.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lz/MatchFinder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lz/MatchFinderMt.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lz/MatchFinderMt.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lzma/LzmaDecode.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lzma/LzmaDecode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lzma/LzmaDecodeSize.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lzma/LzmaStateDecode.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lzma/LzmaStateDecode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lzma/LzmaStateTest.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lzma/LzmaTest.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Compress/Lzma/LzmaTypes.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/CpuArch.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/IStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Sort.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Sort.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Threads.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Threads.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/C/Types.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7z.ico (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zCompressionMode.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zCompressionMode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zDecode.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zDecode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zEncode.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zEncode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zExtract.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zFolderInStream.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zFolderInStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zHandler.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zHandler.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zHeader.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zHeader.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zIn.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zIn.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zItem.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zOut.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zOut.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zProperties.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zProperties.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zRegister.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zSpecStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zUpdate.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/7zUpdate.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/7z/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Archive.def (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Archive2.def (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/ArchiveExports.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/CoderMixer2.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/CoderMixer2.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/DummyOutStream.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/DummyOutStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/HandlerOut.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/HandlerOut.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/ItemNameUtils.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/ItemNameUtils.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/MultiStream.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/MultiStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/ParseProperties.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/Common/ParseProperties.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/DllExports2.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Archive/IArchive.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Alone7z/makefile (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Alone7z/resource.rc (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Format7zExtractR/makefile (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Format7zExtractR/resource.rc (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Format7zR/makefile (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Bundles/Format7zR/resource.rc (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/CreateCoder.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/CreateCoder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/FilePathAutoRename.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/FilePathAutoRename.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/FileStreams.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/FileStreams.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/FilterCoder.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/FilterCoder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/InBuffer.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/InBuffer.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/InOutTempBuffer.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/InOutTempBuffer.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/LimitedStreams.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/LimitedStreams.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/LockedStream.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/LockedStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/MethodId.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/MethodId.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/MethodProps.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/MethodProps.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/OffsetStream.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/OffsetStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/OutBuffer.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/OutBuffer.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/ProgressUtils.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/ProgressUtils.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/RegisterArc.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/RegisterCodec.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/StreamBinder.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/StreamBinder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/StreamObjects.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/StreamObjects.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/StreamUtils.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/StreamUtils.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/VirtThread.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Common/VirtThread.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/ARM.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/ARM.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/ARMThumb.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/ARMThumb.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/BCJ2Register.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/BCJRegister.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/BranchCoder.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/BranchCoder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/BranchRegister.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/IA64.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/IA64.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/PPC.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/PPC.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/SPARC.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/SPARC.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/x86.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/x86.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/x86_2.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Branch/x86_2.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/ByteSwap/ByteSwapRegister.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/CodecExports.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Copy/CopyCoder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Copy/CopyRegister.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Copy/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/Copy/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZ/LZOutWindow.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZ/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA/LZMA.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA/LZMARegister.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsw (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.c (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/makefile (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/LZMA_Alone/makefile.gcc (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/RangeCoder/RangeCoder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBitTree.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderOpt.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/Compress/RangeCoder/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/ICoder.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/IDecl.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/IPassword.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/IProgress.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/IStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/MyVersion.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/MyVersionInfo.rc (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/PropID.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Client7z/Client7z.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Client7z/Client7z.dsp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Client7z/Client7z.dsw (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Client7z/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Client7z/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Client7z/makefile (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ArchiveName.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ArchiveName.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/DefaultName.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/DefaultName.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/DirItem.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/EnumDirItems.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/EnumDirItems.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ExitCode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/Extract.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/Extract.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ExtractMode.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ExtractingFilePath.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/IFileExtractCallback.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/LoadCodecs.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/LoadCodecs.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/OpenArchive.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/OpenArchive.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/PropIDUtils.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/PropIDUtils.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/Property.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/SetProperties.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/SetProperties.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/SortUtils.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/SortUtils.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/TempFiles.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/TempFiles.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/Update.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/Update.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/UpdateAction.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/UpdateAction.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/UpdateCallback.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/UpdateCallback.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/UpdatePair.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/UpdatePair.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/UpdateProduce.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/UpdateProduce.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/WorkDir.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/WorkDir.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Common/ZipRegistry.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/ConsoleClose.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/ConsoleClose.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/List.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/List.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/Main.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/MainAr.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/PercentPrinter.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/PercentPrinter.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/StdAfx.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/UserInputUtils.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/UserInputUtils.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/7zip/UI/Console/afxres.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Build.mak (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/AutoPtr.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/Buffer.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/CRC.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/C_FileIO.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/C_FileIO.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/ComTry.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/CommandLineParser.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/CommandLineParser.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/Defs.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/DynamicBuffer.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/IntToString.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/IntToString.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/ListFileUtils.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/ListFileUtils.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyCom.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyException.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyGuidDef.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyInitGuid.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyString.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyString.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyUnknown.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyVector.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyVector.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/MyWindows.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/NewHandler.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/NewHandler.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/StdInStream.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/StdInStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/StdOutStream.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/StdOutStream.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/StringConvert.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/StringConvert.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/StringToInt.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/StringToInt.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/Types.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/UTFConvert.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/UTFConvert.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/Wildcard.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Common/Wildcard.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/DLL.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/DLL.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/Defs.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/Error.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/Error.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileDir.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileDir.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileFind.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileFind.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileIO.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileIO.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileMapping.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileMapping.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileName.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/FileName.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/Handle.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/MemoryLock.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/MemoryLock.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/PropVariant.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/PropVariant.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/PropVariantConversions.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/PropVariantConversions.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/StdAfx.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/Synchronization.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/Synchronization.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/System.cpp (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/System.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/Thread.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CPP/Windows/Time.h (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Common/CRC.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Common/CommandLineParser.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Common/InBuffer.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Common/OutBuffer.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LZ/IMatchFinder.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LZ/LzBinTree.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LZ/LzInWindow.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LZ/LzOutWindow.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LZMA/LzmaBase.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.sln (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LzmaAlone/LzmaBench.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LzmaAlone/Properties/AssemblyInfo.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LzmaAlone/Properties/Resources.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/LzmaAlone/Properties/Settings.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/RangeCoder/RangeCoder.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBit.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/CS/7zip/ICoder.cs (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/CRC.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/LZ/BinTree.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/LZ/InWindow.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/LZ/OutWindow.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/LZMA/Base.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/LZMA/Decoder.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/LZMA/Encoder.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeDecoder.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeEncoder.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/RangeCoder/Decoder.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/Compression/RangeCoder/Encoder.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/ICodeProgress.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/LzmaAlone.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Java/SevenZip/LzmaBench.java (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/LGPL.txt (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/Methods.txt (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/history.txt (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/lzma.exe (100%) rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/lzma/lzma.txt (100%) create mode 100644 jni/physfs-2.1.0/src/physfs.c rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/physfs.h (57%) create mode 100644 jni/physfs-2.1.0/src/physfs_byteorder.c rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/physfs_casefolding.h (100%) create mode 100644 jni/physfs-2.1.0/src/physfs_internal.h create mode 100644 jni/physfs-2.1.0/src/physfs_miniz.h create mode 100644 jni/physfs-2.1.0/src/physfs_platforms.h rename jni/{physfs-2.0.3 => physfs-2.1.0/src}/physfs_unicode.c (80%) rename jni/{physfs-2.0.3/platform/beos.cpp => physfs-2.1.0/src/platform_beos.cpp} (57%) rename jni/{physfs-2.0.3/platform/macosx.c => physfs-2.1.0/src/platform_macosx.c} (59%) create mode 100644 jni/physfs-2.1.0/src/platform_posix.c rename jni/{physfs-2.0.3/platform/unix.c => physfs-2.1.0/src/platform_unix.c} (50%) create mode 100644 jni/physfs-2.1.0/src/platform_windows.c rename jni/{physfs-2.0.3 => physfs-2.1.0}/test/test_physfs.c (76%) create mode 100755 jni/physfs-2.1.0/test/test_physfs.pl create mode 100755 jni/physfs-2.1.0/test/test_physfs.rb diff --git a/jni/love/Android.mk b/jni/love/Android.mk index a31a8df9..0a94a08f 100644 --- a/jni/love/Android.mk +++ b/jni/love/Android.mk @@ -29,7 +29,7 @@ LOCAL_C_INCLUDES := \ ${LOCAL_PATH}/../openal-soft-android/OpenAL32/Include \ ${LOCAL_PATH}/../freetype2-android/include \ ${LOCAL_PATH}/../freetype2-android/src \ - ${LOCAL_PATH}/../physfs-2.0.3 \ + ${LOCAL_PATH}/../physfs-2.1.0/src \ ${LOCAL_PATH}/../mpg123-1.17.0/src/libmpg123 \ ${LOCAL_PATH}/../libmodplug-0.8.8.4/src \ ${LOCAL_PATH}/../libvorbis-1.3.4/include \ diff --git a/jni/physfs-2.0.3/.hg_archival.txt b/jni/physfs-2.0.3/.hg_archival.txt deleted file mode 100644 index 20d9eb5f..00000000 --- a/jni/physfs-2.0.3/.hg_archival.txt +++ /dev/null @@ -1,5 +0,0 @@ -repo: 7672c9962ce627edaaa67ff54fe4ad8f9a46dc2b -node: f94eec5e90540889a42c34a27931b8266f4af52c -branch: stable-2.0 -latesttag: release-2.0.3 -latesttagdistance: 1 diff --git a/jni/physfs-2.0.3/CMakeLists.txt b/jni/physfs-2.0.3/CMakeLists.txt deleted file mode 100644 index 0dc67322..00000000 --- a/jni/physfs-2.0.3/CMakeLists.txt +++ /dev/null @@ -1,407 +0,0 @@ -# PhysicsFS; a portable, flexible file i/o abstraction. -# Copyright (C) 2007 Ryan C. Gordon. -# -# Please see the file LICENSE.txt in the source's root directory. - -CMAKE_MINIMUM_REQUIRED(VERSION 2.4) - -PROJECT(PhysicsFS) -SET(PHYSFS_VERSION 2.0.3) - -# Increment this if/when we break backwards compatibility. -SET(PHYSFS_SOVERSION 1) - -# I hate that they define "WIN32" ... we're about to move to Win64...I hope! -IF(WIN32 AND NOT WINDOWS) - SET(WINDOWS TRUE) -ENDIF(WIN32 AND NOT WINDOWS) - -# Bleh, let's do it for "APPLE" too. -IF(APPLE AND NOT MACOSX) - SET(MACOSX TRUE) -ENDIF(APPLE AND NOT MACOSX) - -# For now, Haiku and BeOS are the same, as far as the build system cares. -IF(HAIKU AND NOT BEOS) - SET(BEOS TRUE) -ENDIF(HAIKU AND NOT BEOS) - -INCLUDE(CheckIncludeFile) -INCLUDE(CheckLibraryExists) -INCLUDE(CheckCSourceCompiles) - -INCLUDE_DIRECTORIES(.) -#INCLUDE_DIRECTORIES(platform) -#INCLUDE_DIRECTORIES(archivers) - -IF(MACOSX) - # Fallback to older OS X on PowerPC to support wider range of systems... - IF(CMAKE_OSX_ARCHITECTURES MATCHES ppc) - ADD_DEFINITIONS(-DMAC_OS_X_VERSION_MIN_REQUIRED=1020) - SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} " -mmacosx-version-min=10.2") - ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES ppc) - - # Need these everywhere... - ADD_DEFINITIONS(-fno-common) - SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} " -framework Carbon -framework IOKit") -ENDIF(MACOSX) - -# Add some gcc-specific command lines. -IF(CMAKE_COMPILER_IS_GNUCC) - # Always build with debug symbols...you can strip it later. - ADD_DEFINITIONS(-g -pipe -Werror -fsigned-char) - - # Stupid BeOS generates warnings in the system headers. - IF(NOT BEOS) - ADD_DEFINITIONS(-Wall) - ENDIF(NOT BEOS) - - CHECK_C_SOURCE_COMPILES(" - #if ((defined(__GNUC__)) && (__GNUC__ >= 4)) - int main(int argc, char **argv) { int is_gcc4 = 1; return 0; } - #else - #error This is not gcc4. - #endif - " PHYSFS_IS_GCC4) - - IF(PHYSFS_IS_GCC4) - # Not supported on several operating systems at this time. - IF(NOT OS2 AND NOT SOLARIS AND NOT WINDOWS) - ADD_DEFINITIONS(-fvisibility=hidden) - ENDIF(NOT OS2 AND NOT SOLARIS AND NOT WINDOWS) - ENDIF(PHYSFS_IS_GCC4) -ENDIF(CMAKE_COMPILER_IS_GNUCC) - -IF(MSVC) - # VS.NET 8.0 got really really anal about strcpy, etc, which even if we - # cleaned up our code, zlib, etc still use...so disable the warning. - ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS=1) -ENDIF(MSVC) - -# Basic chunks of source code ... - -SET(ZLIB_SRCS - zlib123/adler32.c - zlib123/compress.c - zlib123/crc32.c - zlib123/deflate.c - zlib123/gzio.c - zlib123/infback.c - zlib123/inffast.c - zlib123/inflate.c - zlib123/inftrees.c - zlib123/trees.c - zlib123/uncompr.c - zlib123/zutil.c -) - -SET(LZMA_SRCS - lzma/C/7zCrc.c - lzma/C/Archive/7z/7zBuffer.c - lzma/C/Archive/7z/7zDecode.c - lzma/C/Archive/7z/7zExtract.c - lzma/C/Archive/7z/7zHeader.c - lzma/C/Archive/7z/7zIn.c - lzma/C/Archive/7z/7zItem.c - lzma/C/Archive/7z/7zMethodID.c - lzma/C/Compress/Branch/BranchX86.c - lzma/C/Compress/Branch/BranchX86_2.c - lzma/C/Compress/Lzma/LzmaDecode.c -) - -IF(BEOS) - # We add this explicitly, since we don't want CMake to think this - # is a C++ project unless we're on BeOS. - SET(PHYSFS_BEOS_SRCS platform/beos.cpp) - FIND_LIBRARY(BE_LIBRARY be) - FIND_LIBRARY(ROOT_LIBRARY root) - SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${BE_LIBRARY} ${ROOT_LIBRARY}) -ENDIF(BEOS) - -# Almost everything is "compiled" here, but things that don't apply to the -# build are #ifdef'd out. This is to make it easy to embed PhysicsFS into -# another project or bring up a new build system: just compile all the source -# code and #define the things you want. -SET(PHYSFS_SRCS - physfs.c - physfs_byteorder.c - physfs_unicode.c - platform/os2.c - platform/pocketpc.c - platform/posix.c - platform/unix.c - platform/macosx.c - platform/windows.c - archivers/dir.c - archivers/grp.c - archivers/hog.c - archivers/lzma.c - archivers/mvl.c - archivers/qpak.c - archivers/wad.c - archivers/zip.c - ${PHYSFS_BEOS_SRCS} -) - - -# platform layers ... - -IF(UNIX) - IF(BEOS) - SET(PHYSFS_HAVE_CDROM_SUPPORT TRUE) - SET(PHYSFS_HAVE_THREAD_SUPPORT TRUE) - SET(HAVE_PTHREAD_H TRUE) - ELSE(BEOS) - # !!! FIXME - # AC_DEFINE([PHYSFS_HAVE_LLSEEK], 1, [define if we have llseek]) - CHECK_INCLUDE_FILE(sys/ucred.h HAVE_UCRED_H) - IF(HAVE_UCRED_H) - ADD_DEFINITIONS(-DPHYSFS_HAVE_SYS_UCRED_H=1) - SET(PHYSFS_HAVE_CDROM_SUPPORT TRUE) - ENDIF(HAVE_UCRED_H) - - CHECK_INCLUDE_FILE(mntent.h HAVE_MNTENT_H) - IF(HAVE_MNTENT_H) - ADD_DEFINITIONS(-DPHYSFS_HAVE_MNTENT_H=1) - SET(PHYSFS_HAVE_CDROM_SUPPORT TRUE) - ENDIF(HAVE_MNTENT_H) - - CHECK_INCLUDE_FILE(pthread.h HAVE_PTHREAD_H) - IF(HAVE_PTHREAD_H) - SET(PHYSFS_HAVE_THREAD_SUPPORT TRUE) - ENDIF(HAVE_PTHREAD_H) - ENDIF(BEOS) -ENDIF(UNIX) - -IF(WINDOWS) - SET(PHYSFS_HAVE_CDROM_SUPPORT TRUE) - SET(PHYSFS_HAVE_THREAD_SUPPORT TRUE) -ENDIF(WINDOWS) - -IF(NOT PHYSFS_HAVE_CDROM_SUPPORT) - ADD_DEFINITIONS(-DPHYSFS_NO_CDROM_SUPPORT=1) - MESSAGE(WARNING " ***") - MESSAGE(WARNING " *** There is no CD-ROM support in this build!") - MESSAGE(WARNING " *** PhysicsFS will just pretend there are no discs.") - MESSAGE(WARNING " *** This may be fine, depending on how PhysicsFS is used,") - MESSAGE(WARNING " *** but is this what you REALLY wanted?") - MESSAGE(WARNING " *** (Maybe fix CMakeLists.txt, or write a platform driver?)") - MESSAGE(WARNING " ***") -ENDIF(NOT PHYSFS_HAVE_CDROM_SUPPORT) - -IF(PHYSFS_HAVE_THREAD_SUPPORT) - ADD_DEFINITIONS(-D_REENTRANT -D_THREAD_SAFE) -ELSE(PHYSFS_HAVE_THREAD_SUPPORT) - ADD_DEFINITIONS(-DPHYSFS_NO_THREAD_SUPPORT=1) - MESSAGE(WARNING " ***") - MESSAGE(WARNING " *** There is no thread support in this build!") - MESSAGE(WARNING " *** PhysicsFS will NOT be reentrant!") - MESSAGE(WARNING " *** This may be fine, depending on how PhysicsFS is used,") - MESSAGE(WARNING " *** but is this what you REALLY wanted?") - MESSAGE(WARNING " *** (Maybe fix CMakeLists.txt, or write a platform driver?)") - MESSAGE(WARNING " ***") -ENDIF(PHYSFS_HAVE_THREAD_SUPPORT) - -CHECK_INCLUDE_FILE(assert.h HAVE_ASSERT_H) -IF(HAVE_ASSERT_H) - ADD_DEFINITIONS(-DHAVE_ASSERT_H=1) -ENDIF(HAVE_ASSERT_H) - - - -# Archivers ... - -OPTION(PHYSFS_ARCHIVE_ZIP "Enable ZIP support" TRUE) -IF(PHYSFS_ARCHIVE_ZIP) - ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_ZIP=1) - SET(PHYSFS_NEED_ZLIB TRUE) -ENDIF(PHYSFS_ARCHIVE_ZIP) - -OPTION(PHYSFS_ARCHIVE_7Z "Enable 7zip support" TRUE) -IF(PHYSFS_ARCHIVE_7Z) - ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_7Z=1) - # !!! FIXME: rename to 7z.c? - SET(PHYSFS_SRCS ${PHYSFS_SRCS} ${LZMA_SRCS}) -ENDIF(PHYSFS_ARCHIVE_7Z) - -OPTION(PHYSFS_ARCHIVE_GRP "Enable Build Engine GRP support" TRUE) -IF(PHYSFS_ARCHIVE_GRP) - ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_GRP=1) -ENDIF(PHYSFS_ARCHIVE_GRP) - -OPTION(PHYSFS_ARCHIVE_WAD "Enable Doom WAD support" TRUE) -IF(PHYSFS_ARCHIVE_WAD) - ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_WAD=1) -ENDIF(PHYSFS_ARCHIVE_WAD) - -OPTION(PHYSFS_ARCHIVE_HOG "Enable Descent I/II HOG support" TRUE) -IF(PHYSFS_ARCHIVE_HOG) - ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_HOG=1) -ENDIF(PHYSFS_ARCHIVE_HOG) - -OPTION(PHYSFS_ARCHIVE_MVL "Enable Descent I/II MVL support" TRUE) -IF(PHYSFS_ARCHIVE_MVL) - ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_MVL=1) -ENDIF(PHYSFS_ARCHIVE_MVL) - -OPTION(PHYSFS_ARCHIVE_QPAK "Enable Quake I/II QPAK support" TRUE) -IF(PHYSFS_ARCHIVE_QPAK) - ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_QPAK=1) -ENDIF(PHYSFS_ARCHIVE_QPAK) - - -# See if some archiver required zlib, and see about using system version. - -IF(PHYSFS_NEED_ZLIB) - FIND_PACKAGE(ZLIB) - - IF(ZLIB_FOUND) - OPTION(PHYSFS_INTERNAL_ZLIB "Link own zlib instead of system library" FALSE) - ELSE(HAVE_SYSTEM_ZLIB) - SET(PHYSFS_INTERNAL_ZLIB TRUE) - ENDIF(ZLIB_FOUND) - - IF(PHYSFS_INTERNAL_ZLIB) - INCLUDE_DIRECTORIES(zlib123) - ADD_DEFINITIONS(-DZ_PREFIX=1) - SET(PHYSFS_SRCS ${PHYSFS_SRCS} ${ZLIB_SRCS}) - ELSE(PHYSFS_INTERNAL_ZLIB) - SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${ZLIB_LIBRARY}) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) - ENDIF(PHYSFS_INTERNAL_ZLIB) -ENDIF(PHYSFS_NEED_ZLIB) - -OPTION(PHYSFS_BUILD_STATIC "Build static library" TRUE) -IF(PHYSFS_BUILD_STATIC) - ADD_LIBRARY(physfs-static STATIC ${PHYSFS_SRCS}) - SET_TARGET_PROPERTIES(physfs-static PROPERTIES OUTPUT_NAME "physfs") - SET(PHYSFS_LIB_TARGET physfs-static) - SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs-static") -ENDIF(PHYSFS_BUILD_STATIC) - -OPTION(PHYSFS_BUILD_SHARED "Build shared library" TRUE) -IF(PHYSFS_BUILD_SHARED) - ADD_LIBRARY(physfs SHARED ${PHYSFS_SRCS}) - SET_TARGET_PROPERTIES(physfs PROPERTIES VERSION ${PHYSFS_VERSION}) - SET_TARGET_PROPERTIES(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION}) - TARGET_LINK_LIBRARIES(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS}) - SET(PHYSFS_LIB_TARGET physfs) - SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") -ENDIF(PHYSFS_BUILD_SHARED) - -IF(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC) - MESSAGE(FATAL "Both shared and static libraries are disabled!") -ENDIF(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC) - -# CMake FAQ says I need this... -IF(PHYSFS_BUILD_SHARED AND PHYSFS_BUILD_STATIC) - SET_TARGET_PROPERTIES(physfs PROPERTIES CLEAN_DIRECT_OUTPUT 1) - SET_TARGET_PROPERTIES(physfs-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) -ENDIF(PHYSFS_BUILD_SHARED AND PHYSFS_BUILD_STATIC) - -OPTION(PHYSFS_BUILD_TEST "Build stdio test program." TRUE) -MARK_AS_ADVANCED(PHYSFS_BUILD_TEST) -IF(PHYSFS_BUILD_TEST) - FIND_PATH(READLINE_H readline/readline.h) - FIND_PATH(HISTORY_H readline/history.h) - IF(READLINE_H AND HISTORY_H) - FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses) - SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY}) - FIND_LIBRARY(READLINE_LIBRARY readline) - IF(READLINE_LIBRARY) - SET(HAVE_SYSTEM_READLINE TRUE) - SET(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY} ${CURSES_LIBRARY}) - INCLUDE_DIRECTORIES(${READLINE_H} ${HISTORY_H}) - ADD_DEFINITIONS(-DPHYSFS_HAVE_READLINE=1) - ENDIF(READLINE_LIBRARY) - ENDIF(READLINE_H AND HISTORY_H) - ADD_EXECUTABLE(test_physfs test/test_physfs.c) - TARGET_LINK_LIBRARIES(test_physfs ${PHYSFS_LIB_TARGET} ${TEST_PHYSFS_LIBS} ${OTHER_LDFLAGS}) - SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";test_physfs") -ENDIF(PHYSFS_BUILD_TEST) - -OPTION(PHYSFS_BUILD_WX_TEST "Build wxWidgets test program." FALSE) -MARK_AS_ADVANCED(PHYSFS_BUILD_WX_TEST) -IF(PHYSFS_BUILD_WX_TEST) - SET(wxWidgets_USE_LIBS base core adv) - SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1) - FIND_PACKAGE(wxWidgets) - IF(wxWidgets_FOUND) - INCLUDE(${wxWidgets_USE_FILE}) - ADD_EXECUTABLE(wxtest_physfs test/wxtest_physfs.cpp) - SET_SOURCE_FILES_PROPERTIES(test/wxtest_physfs.cpp COMPILE_FLAGS ${wxWidgets_CXX_FLAGS}) - TARGET_LINK_LIBRARIES(wxtest_physfs ${PHYSFS_LIB_TARGET} ${wxWidgets_LIBRARIES} ${OTHER_LDFLAGS}) - SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";wxtest_physfs") - ELSE(wxWidgets_FOUND) - MESSAGE(STATUS "wxWidgets not found. Disabling wx test app.") - SET(PHYSFS_BUILD_WX_TEST FALSE) - ENDIF(wxWidgets_FOUND) -ENDIF(PHYSFS_BUILD_WX_TEST) - -INSTALL(TARGETS ${PHYSFS_INSTALL_TARGETS} - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) -INSTALL(FILES physfs.h DESTINATION include) - -FIND_PACKAGE(Doxygen) -IF(DOXYGEN_FOUND) - SET(PHYSFS_OUTPUT_DOXYFILE "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile") - CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile" - "${PHYSFS_OUTPUT_DOXYFILE}" - COPYONLY - ) - FILE(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "\n\n# Below auto-generated by cmake...\n\n") - FILE(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "PROJECT_NUMBER = ${PHYSFS_VERSION}\n") - FILE(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "OUTPUT_DIRECTORY = ${CMAKE_CURRENT_BINARY_DIR}/docs\n") - FILE(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "\n# End auto-generated section.\n\n") - - ADD_CUSTOM_TARGET( - docs - ${DOXYGEN_EXECUTABLE} "${PHYSFS_OUTPUT_DOXYFILE}" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - COMMENT "Building documentation in 'docs' directory..." - ) -ELSE(DOXYGEN_FOUND) - MESSAGE(STATUS "Doxygen not found. You won't be able to build documentation.") -ENDIF(DOXYGEN_FOUND) - -IF(UNIX) - SET(PHYSFS_TARBALL "${CMAKE_CURRENT_SOURCE_DIR}/../physfs-${PHYSFS_VERSION}.tar.bz2") - ADD_CUSTOM_TARGET( - dist - hg archive -t tbz2 "${PHYSFS_TARBALL}" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - COMMENT "Building source tarball '${PHYSFS_TARBALL}'..." - ) -ENDIF(UNIX) - -MACRO(MESSAGE_BOOL_OPTION _NAME _VALUE) - IF(${_VALUE}) - MESSAGE(STATUS " ${_NAME}: enabled") - ELSE(${_VALUE}) - MESSAGE(STATUS " ${_NAME}: disabled") - ENDIF(${_VALUE}) -ENDMACRO(MESSAGE_BOOL_OPTION) - -MESSAGE(STATUS "PhysicsFS will build with the following options:") -MESSAGE_BOOL_OPTION("ZIP support" PHYSFS_ARCHIVE_ZIP) -MESSAGE_BOOL_OPTION("7zip support" PHYSFS_ARCHIVE_7Z) -MESSAGE_BOOL_OPTION("GRP support" PHYSFS_ARCHIVE_GRP) -MESSAGE_BOOL_OPTION("WAD support" PHYSFS_ARCHIVE_WAD) -MESSAGE_BOOL_OPTION("HOG support" PHYSFS_ARCHIVE_HOG) -MESSAGE_BOOL_OPTION("MVL support" PHYSFS_ARCHIVE_MVL) -MESSAGE_BOOL_OPTION("QPAK support" PHYSFS_ARCHIVE_QPAK) -MESSAGE_BOOL_OPTION("CD-ROM drive support" PHYSFS_HAVE_CDROM_SUPPORT) -MESSAGE_BOOL_OPTION("Thread safety" PHYSFS_HAVE_THREAD_SUPPORT) -MESSAGE_BOOL_OPTION("Build own zlib" PHYSFS_INTERNAL_ZLIB) -MESSAGE_BOOL_OPTION("Build static library" PHYSFS_BUILD_STATIC) -MESSAGE_BOOL_OPTION("Build shared library" PHYSFS_BUILD_SHARED) -MESSAGE_BOOL_OPTION("Build wxWidgets test program" PHYSFS_BUILD_WX_TEST) -MESSAGE_BOOL_OPTION("Build stdio test program" PHYSFS_BUILD_TEST) -IF(PHYSFS_BUILD_TEST) - MESSAGE_BOOL_OPTION(" Use readline in test program" HAVE_SYSTEM_READLINE) -ENDIF(PHYSFS_BUILD_TEST) - -# end of CMakeLists.txt ... diff --git a/jni/physfs-2.0.3/TODO.txt b/jni/physfs-2.0.3/TODO.txt deleted file mode 100644 index 9425051b..00000000 --- a/jni/physfs-2.0.3/TODO.txt +++ /dev/null @@ -1,45 +0,0 @@ -Stuff that needs to be done and wishlist: - -These are in no particular order. -Some might be dupes, some might be done already. - -UNICODE: -- OS/2: Codepages. No full Unicode in the filesystem, but we can probably make - a conversion effort. - - -Stuff: -- Other archivers: perhaps tar(.gz|.bz2), RPM, ARJ, etc. These are less - important, since streaming archives aren't of much value to games (which - is why zipfiles are king: random access), but it could have uses for, say, - an installer/updater. -- Reduce malloc() pressure all over the place. We fragment memory like mad. -- profile string list interpolation. -- We have two different ways to find dir entries in zip.c. -- Do symlinks in zip archiver work when they point to dirs? -- Enable more warnings? -- Use __cdecl in physfs.h? -- Look for FIXMEs (many marked with "!!!" in comments). -- Find some way to relax or remove the security model for external tools. -- OSX shouldn't use ~/.app for userdir. -- fscanf and fprintf support in extras dir. -- Why do we call it openArchive and dirClose? -- Sanity check byte order at runtime. -- Memory locking? -- Find a better name than dvoid and fvoid. -- Can windows.c and pocketpc.c get merged? -- There's so much cut-and-paste between archivers...can this be reduced? -- General code audit. -- Multiple write dirs with mount points? -- Deprecate PHYSFS_setSaneConfig and move it to extras? -- Why is physfsrwops.c cut-and-pasted into the ruby bindings? -- Replace code from SDL... -- Should file enumeration return an error or set error state? -- Need "getmountpoint" command in test_physfs.c ... -- Look for calloc() calls that aren't going through the allocation hooks. -- Write up a simple HOWTO on embedding physicsfs in another project. -- Archivers need abstracted i/o to read from memory or files (archives in archives?) -- Probably other stuff. Requests and recommendations are welcome. - -// end of TODO.txt ... - diff --git a/jni/physfs-2.0.3/archivers/dir.c b/jni/physfs-2.0.3/archivers/dir.c deleted file mode 100644 index a5807434..00000000 --- a/jni/physfs-2.0.3/archivers/dir.c +++ /dev/null @@ -1,283 +0,0 @@ -/* - * Standard directory I/O support routines for PhysicsFS. - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#include -#include -#include -#include "physfs.h" - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_internal.h" - -static PHYSFS_sint64 DIR_read(fvoid *opaque, void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - PHYSFS_sint64 retval; - retval = __PHYSFS_platformRead(opaque, buffer, objSize, objCount); - return(retval); -} /* DIR_read */ - - -static PHYSFS_sint64 DIR_write(fvoid *opaque, const void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - PHYSFS_sint64 retval; - retval = __PHYSFS_platformWrite(opaque, buffer, objSize, objCount); - return(retval); -} /* DIR_write */ - - -static int DIR_eof(fvoid *opaque) -{ - return(__PHYSFS_platformEOF(opaque)); -} /* DIR_eof */ - - -static PHYSFS_sint64 DIR_tell(fvoid *opaque) -{ - return(__PHYSFS_platformTell(opaque)); -} /* DIR_tell */ - - -static int DIR_seek(fvoid *opaque, PHYSFS_uint64 offset) -{ - return(__PHYSFS_platformSeek(opaque, offset)); -} /* DIR_seek */ - - -static PHYSFS_sint64 DIR_fileLength(fvoid *opaque) -{ - return(__PHYSFS_platformFileLength(opaque)); -} /* DIR_fileLength */ - - -static int DIR_fileClose(fvoid *opaque) -{ - /* - * we manually flush the buffer, since that's the place a close will - * most likely fail, but that will leave the file handle in an undefined - * state if it fails. Flush failures we can recover from. - */ - BAIL_IF_MACRO(!__PHYSFS_platformFlush(opaque), NULL, 0); - BAIL_IF_MACRO(!__PHYSFS_platformClose(opaque), NULL, 0); - return(1); -} /* DIR_fileClose */ - - -static int DIR_isArchive(const char *filename, int forWriting) -{ - /* directories ARE archives in this driver... */ - return(__PHYSFS_platformIsDirectory(filename)); -} /* DIR_isArchive */ - - -static void *DIR_openArchive(const char *name, int forWriting) -{ - const char *dirsep = PHYSFS_getDirSeparator(); - char *retval = NULL; - size_t namelen = strlen(name); - size_t seplen = strlen(dirsep); - - /* !!! FIXME: when is this not called right before openArchive? */ - BAIL_IF_MACRO(!DIR_isArchive(name, forWriting), - ERR_UNSUPPORTED_ARCHIVE, 0); - - retval = allocator.Malloc(namelen + seplen + 1); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - - /* make sure there's a dir separator at the end of the string */ - strcpy(retval, name); - if (strcmp((name + namelen) - seplen, dirsep) != 0) - strcat(retval, dirsep); - - return(retval); -} /* DIR_openArchive */ - - -static void DIR_enumerateFiles(dvoid *opaque, const char *dname, - int omitSymLinks, PHYSFS_EnumFilesCallback cb, - const char *origdir, void *callbackdata) -{ - char *d = __PHYSFS_platformCvtToDependent((char *)opaque, dname, NULL); - if (d != NULL) - { - __PHYSFS_platformEnumerateFiles(d, omitSymLinks, cb, - origdir, callbackdata); - allocator.Free(d); - } /* if */ -} /* DIR_enumerateFiles */ - - -static int DIR_exists(dvoid *opaque, const char *name) -{ - char *f = __PHYSFS_platformCvtToDependent((char *) opaque, name, NULL); - int retval; - - BAIL_IF_MACRO(f == NULL, NULL, 0); - retval = __PHYSFS_platformExists(f); - allocator.Free(f); - return(retval); -} /* DIR_exists */ - - -static int DIR_isDirectory(dvoid *opaque, const char *name, int *fileExists) -{ - char *d = __PHYSFS_platformCvtToDependent((char *) opaque, name, NULL); - int retval = 0; - - BAIL_IF_MACRO(d == NULL, NULL, 0); - *fileExists = __PHYSFS_platformExists(d); - if (*fileExists) - retval = __PHYSFS_platformIsDirectory(d); - allocator.Free(d); - return(retval); -} /* DIR_isDirectory */ - - -static int DIR_isSymLink(dvoid *opaque, const char *name, int *fileExists) -{ - char *f = __PHYSFS_platformCvtToDependent((char *) opaque, name, NULL); - int retval = 0; - - BAIL_IF_MACRO(f == NULL, NULL, 0); - *fileExists = __PHYSFS_platformExists(f); - if (*fileExists) - retval = __PHYSFS_platformIsSymLink(f); - allocator.Free(f); - return(retval); -} /* DIR_isSymLink */ - - -static PHYSFS_sint64 DIR_getLastModTime(dvoid *opaque, - const char *name, - int *fileExists) -{ - char *d = __PHYSFS_platformCvtToDependent((char *) opaque, name, NULL); - PHYSFS_sint64 retval = -1; - - BAIL_IF_MACRO(d == NULL, NULL, 0); - *fileExists = __PHYSFS_platformExists(d); - if (*fileExists) - retval = __PHYSFS_platformGetLastModTime(d); - allocator.Free(d); - return(retval); -} /* DIR_getLastModTime */ - - -static fvoid *doOpen(dvoid *opaque, const char *name, - void *(*openFunc)(const char *filename), - int *fileExists) -{ - char *f = __PHYSFS_platformCvtToDependent((char *) opaque, name, NULL); - void *rc = NULL; - - BAIL_IF_MACRO(f == NULL, NULL, NULL); - - if (fileExists != NULL) - { - *fileExists = __PHYSFS_platformExists(f); - if (!(*fileExists)) - { - allocator.Free(f); - return(NULL); - } /* if */ - } /* if */ - - rc = openFunc(f); - allocator.Free(f); - - return((fvoid *) rc); -} /* doOpen */ - - -static fvoid *DIR_openRead(dvoid *opaque, const char *fnm, int *exist) -{ - return(doOpen(opaque, fnm, __PHYSFS_platformOpenRead, exist)); -} /* DIR_openRead */ - - -static fvoid *DIR_openWrite(dvoid *opaque, const char *filename) -{ - return(doOpen(opaque, filename, __PHYSFS_platformOpenWrite, NULL)); -} /* DIR_openWrite */ - - -static fvoid *DIR_openAppend(dvoid *opaque, const char *filename) -{ - return(doOpen(opaque, filename, __PHYSFS_platformOpenAppend, NULL)); -} /* DIR_openAppend */ - - -static int DIR_remove(dvoid *opaque, const char *name) -{ - char *f = __PHYSFS_platformCvtToDependent((char *) opaque, name, NULL); - int retval; - - BAIL_IF_MACRO(f == NULL, NULL, 0); - retval = __PHYSFS_platformDelete(f); - allocator.Free(f); - return(retval); -} /* DIR_remove */ - - -static int DIR_mkdir(dvoid *opaque, const char *name) -{ - char *f = __PHYSFS_platformCvtToDependent((char *) opaque, name, NULL); - int retval; - - BAIL_IF_MACRO(f == NULL, NULL, 0); - retval = __PHYSFS_platformMkDir(f); - allocator.Free(f); - return(retval); -} /* DIR_mkdir */ - - -static void DIR_dirClose(dvoid *opaque) -{ - allocator.Free(opaque); -} /* DIR_dirClose */ - - - -const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_DIR = -{ - "", - DIR_ARCHIVE_DESCRIPTION, - "Ryan C. Gordon ", - "http://icculus.org/physfs/", -}; - - - -const PHYSFS_Archiver __PHYSFS_Archiver_DIR = -{ - &__PHYSFS_ArchiveInfo_DIR, - DIR_isArchive, /* isArchive() method */ - DIR_openArchive, /* openArchive() method */ - DIR_enumerateFiles, /* enumerateFiles() method */ - DIR_exists, /* exists() method */ - DIR_isDirectory, /* isDirectory() method */ - DIR_isSymLink, /* isSymLink() method */ - DIR_getLastModTime, /* getLastModTime() method */ - DIR_openRead, /* openRead() method */ - DIR_openWrite, /* openWrite() method */ - DIR_openAppend, /* openAppend() method */ - DIR_remove, /* remove() method */ - DIR_mkdir, /* mkdir() method */ - DIR_dirClose, /* dirClose() method */ - DIR_read, /* read() method */ - DIR_write, /* write() method */ - DIR_eof, /* eof() method */ - DIR_tell, /* tell() method */ - DIR_seek, /* seek() method */ - DIR_fileLength, /* fileLength() method */ - DIR_fileClose /* fileClose() method */ -}; - -/* end of dir.c ... */ - diff --git a/jni/physfs-2.0.3/archivers/grp.c b/jni/physfs-2.0.3/archivers/grp.c deleted file mode 100644 index 8c63f1ed..00000000 --- a/jni/physfs-2.0.3/archivers/grp.c +++ /dev/null @@ -1,475 +0,0 @@ -/* - * GRP support routines for PhysicsFS. - * - * This driver handles BUILD engine archives ("groupfiles"). This format - * (but not this driver) was put together by Ken Silverman. - * - * The format is simple enough. In Ken's words: - * - * What's the .GRP file format? - * - * The ".grp" file format is just a collection of a lot of files stored - * into 1 big one. I tried to make the format as simple as possible: The - * first 12 bytes contains my name, "KenSilverman". The next 4 bytes is - * the number of files that were compacted into the group file. Then for - * each file, there is a 16 byte structure, where the first 12 bytes are - * the filename, and the last 4 bytes are the file's size. The rest of - * the group file is just the raw data packed one after the other in the - * same order as the list of files. - * - * (That info is from http://www.advsys.net/ken/build.htm ...) - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#if (defined PHYSFS_SUPPORTS_GRP) - -#include -#include -#include -#include "physfs.h" - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_internal.h" - -typedef struct -{ - char name[13]; - PHYSFS_uint32 startPos; - PHYSFS_uint32 size; -} GRPentry; - -typedef struct -{ - char *filename; - PHYSFS_sint64 last_mod_time; - PHYSFS_uint32 entryCount; - GRPentry *entries; -} GRPinfo; - -typedef struct -{ - void *handle; - GRPentry *entry; - PHYSFS_uint32 curPos; -} GRPfileinfo; - - -static void GRP_dirClose(dvoid *opaque) -{ - GRPinfo *info = ((GRPinfo *) opaque); - allocator.Free(info->filename); - allocator.Free(info->entries); - allocator.Free(info); -} /* GRP_dirClose */ - - -static PHYSFS_sint64 GRP_read(fvoid *opaque, void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - GRPfileinfo *finfo = (GRPfileinfo *) opaque; - GRPentry *entry = finfo->entry; - PHYSFS_uint32 bytesLeft = entry->size - finfo->curPos; - PHYSFS_uint32 objsLeft = (bytesLeft / objSize); - PHYSFS_sint64 rc; - - if (objsLeft < objCount) - objCount = objsLeft; - - rc = __PHYSFS_platformRead(finfo->handle, buffer, objSize, objCount); - if (rc > 0) - finfo->curPos += (PHYSFS_uint32) (rc * objSize); - - return(rc); -} /* GRP_read */ - - -static PHYSFS_sint64 GRP_write(fvoid *opaque, const void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, -1); -} /* GRP_write */ - - -static int GRP_eof(fvoid *opaque) -{ - GRPfileinfo *finfo = (GRPfileinfo *) opaque; - GRPentry *entry = finfo->entry; - return(finfo->curPos >= entry->size); -} /* GRP_eof */ - - -static PHYSFS_sint64 GRP_tell(fvoid *opaque) -{ - return(((GRPfileinfo *) opaque)->curPos); -} /* GRP_tell */ - - -static int GRP_seek(fvoid *opaque, PHYSFS_uint64 offset) -{ - GRPfileinfo *finfo = (GRPfileinfo *) opaque; - GRPentry *entry = finfo->entry; - int rc; - - BAIL_IF_MACRO(offset < 0, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(offset >= entry->size, ERR_PAST_EOF, 0); - rc = __PHYSFS_platformSeek(finfo->handle, entry->startPos + offset); - if (rc) - finfo->curPos = (PHYSFS_uint32) offset; - - return(rc); -} /* GRP_seek */ - - -static PHYSFS_sint64 GRP_fileLength(fvoid *opaque) -{ - GRPfileinfo *finfo = (GRPfileinfo *) opaque; - return((PHYSFS_sint64) finfo->entry->size); -} /* GRP_fileLength */ - - -static int GRP_fileClose(fvoid *opaque) -{ - GRPfileinfo *finfo = (GRPfileinfo *) opaque; - BAIL_IF_MACRO(!__PHYSFS_platformClose(finfo->handle), NULL, 0); - allocator.Free(finfo); - return(1); -} /* GRP_fileClose */ - - -static int grp_open(const char *filename, int forWriting, - void **fh, PHYSFS_uint32 *count) -{ - PHYSFS_uint8 buf[12]; - - *fh = NULL; - BAIL_IF_MACRO(forWriting, ERR_ARC_IS_READ_ONLY, 0); - - *fh = __PHYSFS_platformOpenRead(filename); - BAIL_IF_MACRO(*fh == NULL, NULL, 0); - - if (__PHYSFS_platformRead(*fh, buf, 12, 1) != 1) - goto openGrp_failed; - - if (memcmp(buf, "KenSilverman", 12) != 0) - { - __PHYSFS_setError(ERR_UNSUPPORTED_ARCHIVE); - goto openGrp_failed; - } /* if */ - - if (__PHYSFS_platformRead(*fh, count, sizeof (PHYSFS_uint32), 1) != 1) - goto openGrp_failed; - - *count = PHYSFS_swapULE32(*count); - - return(1); - -openGrp_failed: - if (*fh != NULL) - __PHYSFS_platformClose(*fh); - - *count = -1; - *fh = NULL; - return(0); -} /* grp_open */ - - -static int GRP_isArchive(const char *filename, int forWriting) -{ - void *fh; - PHYSFS_uint32 fileCount; - int retval = grp_open(filename, forWriting, &fh, &fileCount); - - if (fh != NULL) - __PHYSFS_platformClose(fh); - - return(retval); -} /* GRP_isArchive */ - - -static int grp_entry_cmp(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - const GRPentry *a = (const GRPentry *) _a; - return(strcmp(a[one].name, a[two].name)); - } /* if */ - - return 0; -} /* grp_entry_cmp */ - - -static void grp_entry_swap(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - GRPentry tmp; - GRPentry *first = &(((GRPentry *) _a)[one]); - GRPentry *second = &(((GRPentry *) _a)[two]); - memcpy(&tmp, first, sizeof (GRPentry)); - memcpy(first, second, sizeof (GRPentry)); - memcpy(second, &tmp, sizeof (GRPentry)); - } /* if */ -} /* grp_entry_swap */ - - -static int grp_load_entries(const char *name, int forWriting, GRPinfo *info) -{ - void *fh = NULL; - PHYSFS_uint32 fileCount; - PHYSFS_uint32 location = 16; /* sizeof sig. */ - GRPentry *entry; - char *ptr; - - BAIL_IF_MACRO(!grp_open(name, forWriting, &fh, &fileCount), NULL, 0); - info->entryCount = fileCount; - info->entries = (GRPentry *) allocator.Malloc(sizeof(GRPentry)*fileCount); - if (info->entries == NULL) - { - __PHYSFS_platformClose(fh); - BAIL_MACRO(ERR_OUT_OF_MEMORY, 0); - } /* if */ - - location += (16 * fileCount); - - for (entry = info->entries; fileCount > 0; fileCount--, entry++) - { - if (__PHYSFS_platformRead(fh, &entry->name, 12, 1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - entry->name[12] = '\0'; /* name isn't null-terminated in file. */ - if ((ptr = strchr(entry->name, ' ')) != NULL) - *ptr = '\0'; /* trim extra spaces. */ - - if (__PHYSFS_platformRead(fh, &entry->size, 4, 1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - entry->size = PHYSFS_swapULE32(entry->size); - entry->startPos = location; - location += entry->size; - } /* for */ - - __PHYSFS_platformClose(fh); - - __PHYSFS_sort(info->entries, info->entryCount, - grp_entry_cmp, grp_entry_swap); - return(1); -} /* grp_load_entries */ - - -static void *GRP_openArchive(const char *name, int forWriting) -{ - PHYSFS_sint64 modtime = __PHYSFS_platformGetLastModTime(name); - GRPinfo *info = (GRPinfo *) allocator.Malloc(sizeof (GRPinfo)); - - BAIL_IF_MACRO(info == NULL, ERR_OUT_OF_MEMORY, 0); - - memset(info, '\0', sizeof (GRPinfo)); - info->filename = (char *) allocator.Malloc(strlen(name) + 1); - GOTO_IF_MACRO(!info->filename, ERR_OUT_OF_MEMORY, GRP_openArchive_failed); - - if (!grp_load_entries(name, forWriting, info)) - goto GRP_openArchive_failed; - - strcpy(info->filename, name); - info->last_mod_time = modtime; - - return(info); - -GRP_openArchive_failed: - if (info != NULL) - { - if (info->filename != NULL) - allocator.Free(info->filename); - if (info->entries != NULL) - allocator.Free(info->entries); - allocator.Free(info); - } /* if */ - - return(NULL); -} /* GRP_openArchive */ - - -static void GRP_enumerateFiles(dvoid *opaque, const char *dname, - int omitSymLinks, PHYSFS_EnumFilesCallback cb, - const char *origdir, void *callbackdata) -{ - /* no directories in GRP files. */ - if (*dname == '\0') - { - GRPinfo *info = (GRPinfo *) opaque; - GRPentry *entry = info->entries; - PHYSFS_uint32 max = info->entryCount; - PHYSFS_uint32 i; - - for (i = 0; i < max; i++, entry++) - cb(callbackdata, origdir, entry->name); - } /* if */ -} /* GRP_enumerateFiles */ - - -static GRPentry *grp_find_entry(GRPinfo *info, const char *name) -{ - char *ptr = strchr(name, '.'); - GRPentry *a = info->entries; - PHYSFS_sint32 lo = 0; - PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); - PHYSFS_sint32 middle; - int rc; - - /* - * Rule out filenames to avoid unneeded processing...no dirs, - * big filenames, or extensions > 3 chars. - */ - BAIL_IF_MACRO((ptr) && (strlen(ptr) > 4), ERR_NO_SUCH_FILE, NULL); - BAIL_IF_MACRO(strlen(name) > 12, ERR_NO_SUCH_FILE, NULL); - BAIL_IF_MACRO(strchr(name, '/') != NULL, ERR_NO_SUCH_FILE, NULL); - - while (lo <= hi) - { - middle = lo + ((hi - lo) / 2); - rc = strcmp(name, a[middle].name); - if (rc == 0) /* found it! */ - return(&a[middle]); - else if (rc > 0) - lo = middle + 1; - else - hi = middle - 1; - } /* while */ - - BAIL_MACRO(ERR_NO_SUCH_FILE, NULL); -} /* grp_find_entry */ - - -static int GRP_exists(dvoid *opaque, const char *name) -{ - return(grp_find_entry((GRPinfo *) opaque, name) != NULL); -} /* GRP_exists */ - - -static int GRP_isDirectory(dvoid *opaque, const char *name, int *fileExists) -{ - *fileExists = GRP_exists(opaque, name); - return(0); /* never directories in a groupfile. */ -} /* GRP_isDirectory */ - - -static int GRP_isSymLink(dvoid *opaque, const char *name, int *fileExists) -{ - *fileExists = GRP_exists(opaque, name); - return(0); /* never symlinks in a groupfile. */ -} /* GRP_isSymLink */ - - -static PHYSFS_sint64 GRP_getLastModTime(dvoid *opaque, - const char *name, - int *fileExists) -{ - GRPinfo *info = (GRPinfo *) opaque; - PHYSFS_sint64 retval = -1; - - *fileExists = (grp_find_entry(info, name) != NULL); - if (*fileExists) /* use time of GRP itself in the physical filesystem. */ - retval = info->last_mod_time; - - return(retval); -} /* GRP_getLastModTime */ - - -static fvoid *GRP_openRead(dvoid *opaque, const char *fnm, int *fileExists) -{ - GRPinfo *info = (GRPinfo *) opaque; - GRPfileinfo *finfo; - GRPentry *entry; - - entry = grp_find_entry(info, fnm); - *fileExists = (entry != NULL); - BAIL_IF_MACRO(entry == NULL, NULL, NULL); - - finfo = (GRPfileinfo *) allocator.Malloc(sizeof (GRPfileinfo)); - BAIL_IF_MACRO(finfo == NULL, ERR_OUT_OF_MEMORY, NULL); - - finfo->handle = __PHYSFS_platformOpenRead(info->filename); - if ( (finfo->handle == NULL) || - (!__PHYSFS_platformSeek(finfo->handle, entry->startPos)) ) - { - allocator.Free(finfo); - return(NULL); - } /* if */ - - finfo->curPos = 0; - finfo->entry = entry; - return(finfo); -} /* GRP_openRead */ - - -static fvoid *GRP_openWrite(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* GRP_openWrite */ - - -static fvoid *GRP_openAppend(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* GRP_openAppend */ - - -static int GRP_remove(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* GRP_remove */ - - -static int GRP_mkdir(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* GRP_mkdir */ - - -const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_GRP = -{ - "GRP", - GRP_ARCHIVE_DESCRIPTION, - "Ryan C. Gordon ", - "http://icculus.org/physfs/", -}; - - -const PHYSFS_Archiver __PHYSFS_Archiver_GRP = -{ - &__PHYSFS_ArchiveInfo_GRP, - GRP_isArchive, /* isArchive() method */ - GRP_openArchive, /* openArchive() method */ - GRP_enumerateFiles, /* enumerateFiles() method */ - GRP_exists, /* exists() method */ - GRP_isDirectory, /* isDirectory() method */ - GRP_isSymLink, /* isSymLink() method */ - GRP_getLastModTime, /* getLastModTime() method */ - GRP_openRead, /* openRead() method */ - GRP_openWrite, /* openWrite() method */ - GRP_openAppend, /* openAppend() method */ - GRP_remove, /* remove() method */ - GRP_mkdir, /* mkdir() method */ - GRP_dirClose, /* dirClose() method */ - GRP_read, /* read() method */ - GRP_write, /* write() method */ - GRP_eof, /* eof() method */ - GRP_tell, /* tell() method */ - GRP_seek, /* seek() method */ - GRP_fileLength, /* fileLength() method */ - GRP_fileClose /* fileClose() method */ -}; - -#endif /* defined PHYSFS_SUPPORTS_GRP */ - -/* end of grp.c ... */ - diff --git a/jni/physfs-2.0.3/archivers/hog.c b/jni/physfs-2.0.3/archivers/hog.c deleted file mode 100644 index 43620f6f..00000000 --- a/jni/physfs-2.0.3/archivers/hog.c +++ /dev/null @@ -1,514 +0,0 @@ -/* - * HOG support routines for PhysicsFS. - * - * This driver handles Descent I/II HOG archives. - * - * The format is very simple: - * - * The file always starts with the 3-byte signature "DHF" (Descent - * HOG file). After that the files of a HOG are just attached after - * another, divided by a 17 bytes header, which specifies the name - * and length (in bytes) of the forthcoming file! So you just read - * the header with its information of how big the following file is, - * and then skip exact that number of bytes to get to the next file - * in that HOG. - * - * char sig[3] = {'D', 'H', 'F'}; // "DHF"=Descent HOG File - * - * struct { - * char file_name[13]; // Filename, padded to 13 bytes with 0s - * int file_size; // filesize in bytes - * char data[file_size]; // The file data - * } FILE_STRUCT; // Repeated until the end of the file. - * - * (That info is from http://www.descent2.com/ddn/specs/hog/) - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Bradley Bell. - * Based on grp.c by Ryan C. Gordon. - */ - -#if (defined PHYSFS_SUPPORTS_HOG) - -#include -#include -#include -#include "physfs.h" - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_internal.h" - -/* - * One HOGentry is kept for each file in an open HOG archive. - */ -typedef struct -{ - char name[13]; - PHYSFS_uint32 startPos; - PHYSFS_uint32 size; -} HOGentry; - -/* - * One HOGinfo is kept for each open HOG archive. - */ -typedef struct -{ - char *filename; - PHYSFS_sint64 last_mod_time; - PHYSFS_uint32 entryCount; - HOGentry *entries; -} HOGinfo; - -/* - * One HOGfileinfo is kept for each open file in a HOG archive. - */ -typedef struct -{ - void *handle; - HOGentry *entry; - PHYSFS_uint32 curPos; -} HOGfileinfo; - - -static void HOG_dirClose(dvoid *opaque) -{ - HOGinfo *info = ((HOGinfo *) opaque); - allocator.Free(info->filename); - allocator.Free(info->entries); - allocator.Free(info); -} /* HOG_dirClose */ - - -static PHYSFS_sint64 HOG_read(fvoid *opaque, void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - HOGfileinfo *finfo = (HOGfileinfo *) opaque; - HOGentry *entry = finfo->entry; - PHYSFS_uint32 bytesLeft = entry->size - finfo->curPos; - PHYSFS_uint32 objsLeft = (bytesLeft / objSize); - PHYSFS_sint64 rc; - - if (objsLeft < objCount) - objCount = objsLeft; - - rc = __PHYSFS_platformRead(finfo->handle, buffer, objSize, objCount); - if (rc > 0) - finfo->curPos += (PHYSFS_uint32) (rc * objSize); - - return(rc); -} /* HOG_read */ - - -static PHYSFS_sint64 HOG_write(fvoid *opaque, const void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, -1); -} /* HOG_write */ - - -static int HOG_eof(fvoid *opaque) -{ - HOGfileinfo *finfo = (HOGfileinfo *) opaque; - HOGentry *entry = finfo->entry; - return(finfo->curPos >= entry->size); -} /* HOG_eof */ - - -static PHYSFS_sint64 HOG_tell(fvoid *opaque) -{ - return(((HOGfileinfo *) opaque)->curPos); -} /* HOG_tell */ - - -static int HOG_seek(fvoid *opaque, PHYSFS_uint64 offset) -{ - HOGfileinfo *finfo = (HOGfileinfo *) opaque; - HOGentry *entry = finfo->entry; - int rc; - - BAIL_IF_MACRO(offset < 0, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(offset >= entry->size, ERR_PAST_EOF, 0); - rc = __PHYSFS_platformSeek(finfo->handle, entry->startPos + offset); - if (rc) - finfo->curPos = (PHYSFS_uint32) offset; - - return(rc); -} /* HOG_seek */ - - -static PHYSFS_sint64 HOG_fileLength(fvoid *opaque) -{ - HOGfileinfo *finfo = (HOGfileinfo *) opaque; - return((PHYSFS_sint64) finfo->entry->size); -} /* HOG_fileLength */ - - -static int HOG_fileClose(fvoid *opaque) -{ - HOGfileinfo *finfo = (HOGfileinfo *) opaque; - BAIL_IF_MACRO(!__PHYSFS_platformClose(finfo->handle), NULL, 0); - allocator.Free(finfo); - return(1); -} /* HOG_fileClose */ - - -static int hog_open(const char *filename, int forWriting, - void **fh, PHYSFS_uint32 *count) -{ - PHYSFS_uint8 buf[13]; - PHYSFS_uint32 size; - PHYSFS_sint64 pos; - - *count = 0; - - *fh = NULL; - BAIL_IF_MACRO(forWriting, ERR_ARC_IS_READ_ONLY, 0); - - *fh = __PHYSFS_platformOpenRead(filename); - BAIL_IF_MACRO(*fh == NULL, NULL, 0); - - if (__PHYSFS_platformRead(*fh, buf, 3, 1) != 1) - goto openHog_failed; - - if (memcmp(buf, "DHF", 3) != 0) - { - __PHYSFS_setError(ERR_UNSUPPORTED_ARCHIVE); - goto openHog_failed; - } /* if */ - - while (1) - { - if (__PHYSFS_platformRead(*fh, buf, 13, 1) != 1) - break; /* eof here is ok */ - - if (__PHYSFS_platformRead(*fh, &size, 4, 1) != 1) - goto openHog_failed; - - size = PHYSFS_swapULE32(size); - - (*count)++; - - /* Skip over entry... */ - pos = __PHYSFS_platformTell(*fh); - if (pos == -1) - goto openHog_failed; - if (!__PHYSFS_platformSeek(*fh, pos + size)) - goto openHog_failed; - } /* while */ - - /* Rewind to start of entries... */ - if (!__PHYSFS_platformSeek(*fh, 3)) - goto openHog_failed; - - return(1); - -openHog_failed: - if (*fh != NULL) - __PHYSFS_platformClose(*fh); - - *count = -1; - *fh = NULL; - return(0); -} /* hog_open */ - - -static int HOG_isArchive(const char *filename, int forWriting) -{ - void *fh; - PHYSFS_uint32 fileCount; - int retval = hog_open(filename, forWriting, &fh, &fileCount); - - if (fh != NULL) - __PHYSFS_platformClose(fh); - - return(retval); -} /* HOG_isArchive */ - - -static int hog_entry_cmp(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - const HOGentry *a = (const HOGentry *) _a; - return(__PHYSFS_stricmpASCII(a[one].name, a[two].name)); - } /* if */ - - return 0; -} /* hog_entry_cmp */ - - -static void hog_entry_swap(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - HOGentry tmp; - HOGentry *first = &(((HOGentry *) _a)[one]); - HOGentry *second = &(((HOGentry *) _a)[two]); - memcpy(&tmp, first, sizeof (HOGentry)); - memcpy(first, second, sizeof (HOGentry)); - memcpy(second, &tmp, sizeof (HOGentry)); - } /* if */ -} /* hog_entry_swap */ - - -static int hog_load_entries(const char *name, int forWriting, HOGinfo *info) -{ - void *fh = NULL; - PHYSFS_uint32 fileCount; - HOGentry *entry; - - BAIL_IF_MACRO(!hog_open(name, forWriting, &fh, &fileCount), NULL, 0); - info->entryCount = fileCount; - info->entries = (HOGentry *) allocator.Malloc(sizeof(HOGentry)*fileCount); - if (info->entries == NULL) - { - __PHYSFS_platformClose(fh); - BAIL_MACRO(ERR_OUT_OF_MEMORY, 0); - } /* if */ - - for (entry = info->entries; fileCount > 0; fileCount--, entry++) - { - if (__PHYSFS_platformRead(fh, &entry->name, 13, 1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - if (__PHYSFS_platformRead(fh, &entry->size, 4, 1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - entry->size = PHYSFS_swapULE32(entry->size); - entry->startPos = (unsigned int) __PHYSFS_platformTell(fh); - if (entry->startPos == -1) - { - __PHYSFS_platformClose(fh); - return(0); - } - - /* Skip over entry */ - if (!__PHYSFS_platformSeek(fh, entry->startPos + entry->size)) - { - __PHYSFS_platformClose(fh); - return(0); - } - } /* for */ - - __PHYSFS_platformClose(fh); - - __PHYSFS_sort(info->entries, info->entryCount, - hog_entry_cmp, hog_entry_swap); - return(1); -} /* hog_load_entries */ - - -static void *HOG_openArchive(const char *name, int forWriting) -{ - PHYSFS_sint64 modtime = __PHYSFS_platformGetLastModTime(name); - HOGinfo *info = (HOGinfo *) allocator.Malloc(sizeof (HOGinfo)); - - BAIL_IF_MACRO(info == NULL, ERR_OUT_OF_MEMORY, 0); - memset(info, '\0', sizeof (HOGinfo)); - info->filename = (char *) allocator.Malloc(strlen(name) + 1); - GOTO_IF_MACRO(!info->filename, ERR_OUT_OF_MEMORY, HOG_openArchive_failed); - - if (!hog_load_entries(name, forWriting, info)) - goto HOG_openArchive_failed; - - strcpy(info->filename, name); - info->last_mod_time = modtime; - - return(info); - -HOG_openArchive_failed: - if (info != NULL) - { - if (info->filename != NULL) - allocator.Free(info->filename); - if (info->entries != NULL) - allocator.Free(info->entries); - allocator.Free(info); - } /* if */ - - return(NULL); -} /* HOG_openArchive */ - - -static void HOG_enumerateFiles(dvoid *opaque, const char *dname, - int omitSymLinks, PHYSFS_EnumFilesCallback cb, - const char *origdir, void *callbackdata) -{ - /* no directories in HOG files. */ - if (*dname == '\0') - { - HOGinfo *info = (HOGinfo *) opaque; - HOGentry *entry = info->entries; - PHYSFS_uint32 max = info->entryCount; - PHYSFS_uint32 i; - - for (i = 0; i < max; i++, entry++) - cb(callbackdata, origdir, entry->name); - } /* if */ -} /* HOG_enumerateFiles */ - - -static HOGentry *hog_find_entry(HOGinfo *info, const char *name) -{ - char *ptr = strchr(name, '.'); - HOGentry *a = info->entries; - PHYSFS_sint32 lo = 0; - PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); - PHYSFS_sint32 middle; - int rc; - - /* - * Rule out filenames to avoid unneeded processing...no dirs, - * big filenames, or extensions > 3 chars. - */ - BAIL_IF_MACRO((ptr) && (strlen(ptr) > 4), ERR_NO_SUCH_FILE, NULL); - BAIL_IF_MACRO(strlen(name) > 12, ERR_NO_SUCH_FILE, NULL); - BAIL_IF_MACRO(strchr(name, '/') != NULL, ERR_NO_SUCH_FILE, NULL); - - while (lo <= hi) - { - middle = lo + ((hi - lo) / 2); - rc = __PHYSFS_stricmpASCII(name, a[middle].name); - if (rc == 0) /* found it! */ - return(&a[middle]); - else if (rc > 0) - lo = middle + 1; - else - hi = middle - 1; - } /* while */ - - BAIL_MACRO(ERR_NO_SUCH_FILE, NULL); -} /* hog_find_entry */ - - -static int HOG_exists(dvoid *opaque, const char *name) -{ - return(hog_find_entry(((HOGinfo *) opaque), name) != NULL); -} /* HOG_exists */ - - -static int HOG_isDirectory(dvoid *opaque, const char *name, int *fileExists) -{ - *fileExists = HOG_exists(opaque, name); - return(0); /* never directories in a groupfile. */ -} /* HOG_isDirectory */ - - -static int HOG_isSymLink(dvoid *opaque, const char *name, int *fileExists) -{ - *fileExists = HOG_exists(opaque, name); - return(0); /* never symlinks in a groupfile. */ -} /* HOG_isSymLink */ - - -static PHYSFS_sint64 HOG_getLastModTime(dvoid *opaque, - const char *name, - int *fileExists) -{ - HOGinfo *info = ((HOGinfo *) opaque); - PHYSFS_sint64 retval = -1; - - *fileExists = (hog_find_entry(info, name) != NULL); - if (*fileExists) /* use time of HOG itself in the physical filesystem. */ - retval = info->last_mod_time; - - return(retval); -} /* HOG_getLastModTime */ - - -static fvoid *HOG_openRead(dvoid *opaque, const char *fnm, int *fileExists) -{ - HOGinfo *info = ((HOGinfo *) opaque); - HOGfileinfo *finfo; - HOGentry *entry; - - entry = hog_find_entry(info, fnm); - *fileExists = (entry != NULL); - BAIL_IF_MACRO(entry == NULL, NULL, NULL); - - finfo = (HOGfileinfo *) allocator.Malloc(sizeof (HOGfileinfo)); - BAIL_IF_MACRO(finfo == NULL, ERR_OUT_OF_MEMORY, NULL); - - finfo->handle = __PHYSFS_platformOpenRead(info->filename); - if ( (finfo->handle == NULL) || - (!__PHYSFS_platformSeek(finfo->handle, entry->startPos)) ) - { - allocator.Free(finfo); - return(NULL); - } /* if */ - - finfo->curPos = 0; - finfo->entry = entry; - return(finfo); -} /* HOG_openRead */ - - -static fvoid *HOG_openWrite(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* HOG_openWrite */ - - -static fvoid *HOG_openAppend(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* HOG_openAppend */ - - -static int HOG_remove(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* HOG_remove */ - - -static int HOG_mkdir(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* HOG_mkdir */ - - -const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_HOG = -{ - "HOG", - HOG_ARCHIVE_DESCRIPTION, - "Bradley Bell ", - "http://icculus.org/physfs/", -}; - - -const PHYSFS_Archiver __PHYSFS_Archiver_HOG = -{ - &__PHYSFS_ArchiveInfo_HOG, - HOG_isArchive, /* isArchive() method */ - HOG_openArchive, /* openArchive() method */ - HOG_enumerateFiles, /* enumerateFiles() method */ - HOG_exists, /* exists() method */ - HOG_isDirectory, /* isDirectory() method */ - HOG_isSymLink, /* isSymLink() method */ - HOG_getLastModTime, /* getLastModTime() method */ - HOG_openRead, /* openRead() method */ - HOG_openWrite, /* openWrite() method */ - HOG_openAppend, /* openAppend() method */ - HOG_remove, /* remove() method */ - HOG_mkdir, /* mkdir() method */ - HOG_dirClose, /* dirClose() method */ - HOG_read, /* read() method */ - HOG_write, /* write() method */ - HOG_eof, /* eof() method */ - HOG_tell, /* tell() method */ - HOG_seek, /* seek() method */ - HOG_fileLength, /* fileLength() method */ - HOG_fileClose /* fileClose() method */ -}; - -#endif /* defined PHYSFS_SUPPORTS_HOG */ - -/* end of hog.c ... */ - diff --git a/jni/physfs-2.0.3/archivers/mvl.c b/jni/physfs-2.0.3/archivers/mvl.c deleted file mode 100644 index 8fbda239..00000000 --- a/jni/physfs-2.0.3/archivers/mvl.c +++ /dev/null @@ -1,471 +0,0 @@ -/* - * MVL support routines for PhysicsFS. - * - * This driver handles Descent II Movielib archives. - * - * The file format of MVL is quite easy... - * - * //MVL File format - Written by Heiko Herrmann - * char sig[4] = {'D','M', 'V', 'L'}; // "DMVL"=Descent MoVie Library - * - * int num_files; // the number of files in this MVL - * - * struct { - * char file_name[13]; // Filename, padded to 13 bytes with 0s - * int file_size; // filesize in bytes - * }DIR_STRUCT[num_files]; - * - * struct { - * char data[file_size]; // The file data - * }FILE_STRUCT[num_files]; - * - * (That info is from http://www.descent2.com/ddn/specs/mvl/) - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Bradley Bell. - * Based on grp.c by Ryan C. Gordon. - */ - -#if (defined PHYSFS_SUPPORTS_MVL) - -#include -#include -#include -#include "physfs.h" - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_internal.h" - -typedef struct -{ - char name[13]; - PHYSFS_uint32 startPos; - PHYSFS_uint32 size; -} MVLentry; - -typedef struct -{ - char *filename; - PHYSFS_sint64 last_mod_time; - PHYSFS_uint32 entryCount; - MVLentry *entries; -} MVLinfo; - -typedef struct -{ - void *handle; - MVLentry *entry; - PHYSFS_uint32 curPos; -} MVLfileinfo; - - -static void MVL_dirClose(dvoid *opaque) -{ - MVLinfo *info = ((MVLinfo *) opaque); - allocator.Free(info->filename); - allocator.Free(info->entries); - allocator.Free(info); -} /* MVL_dirClose */ - - -static PHYSFS_sint64 MVL_read(fvoid *opaque, void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - MVLfileinfo *finfo = (MVLfileinfo *) opaque; - MVLentry *entry = finfo->entry; - PHYSFS_uint32 bytesLeft = entry->size - finfo->curPos; - PHYSFS_uint32 objsLeft = (bytesLeft / objSize); - PHYSFS_sint64 rc; - - if (objsLeft < objCount) - objCount = objsLeft; - - rc = __PHYSFS_platformRead(finfo->handle, buffer, objSize, objCount); - if (rc > 0) - finfo->curPos += (PHYSFS_uint32) (rc * objSize); - - return(rc); -} /* MVL_read */ - - -static PHYSFS_sint64 MVL_write(fvoid *opaque, const void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, -1); -} /* MVL_write */ - - -static int MVL_eof(fvoid *opaque) -{ - MVLfileinfo *finfo = (MVLfileinfo *) opaque; - MVLentry *entry = finfo->entry; - return(finfo->curPos >= entry->size); -} /* MVL_eof */ - - -static PHYSFS_sint64 MVL_tell(fvoid *opaque) -{ - return(((MVLfileinfo *) opaque)->curPos); -} /* MVL_tell */ - - -static int MVL_seek(fvoid *opaque, PHYSFS_uint64 offset) -{ - MVLfileinfo *finfo = (MVLfileinfo *) opaque; - MVLentry *entry = finfo->entry; - int rc; - - BAIL_IF_MACRO(offset < 0, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(offset >= entry->size, ERR_PAST_EOF, 0); - rc = __PHYSFS_platformSeek(finfo->handle, entry->startPos + offset); - if (rc) - finfo->curPos = (PHYSFS_uint32) offset; - - return(rc); -} /* MVL_seek */ - - -static PHYSFS_sint64 MVL_fileLength(fvoid *opaque) -{ - MVLfileinfo *finfo = (MVLfileinfo *) opaque; - return((PHYSFS_sint64) finfo->entry->size); -} /* MVL_fileLength */ - - -static int MVL_fileClose(fvoid *opaque) -{ - MVLfileinfo *finfo = (MVLfileinfo *) opaque; - BAIL_IF_MACRO(!__PHYSFS_platformClose(finfo->handle), NULL, 0); - allocator.Free(finfo); - return(1); -} /* MVL_fileClose */ - - -static int mvl_open(const char *filename, int forWriting, - void **fh, PHYSFS_uint32 *count) -{ - PHYSFS_uint8 buf[4]; - - *fh = NULL; - BAIL_IF_MACRO(forWriting, ERR_ARC_IS_READ_ONLY, 0); - - *fh = __PHYSFS_platformOpenRead(filename); - BAIL_IF_MACRO(*fh == NULL, NULL, 0); - - if (__PHYSFS_platformRead(*fh, buf, 4, 1) != 1) - goto openMvl_failed; - - if (memcmp(buf, "DMVL", 4) != 0) - { - __PHYSFS_setError(ERR_UNSUPPORTED_ARCHIVE); - goto openMvl_failed; - } /* if */ - - if (__PHYSFS_platformRead(*fh, count, sizeof (PHYSFS_uint32), 1) != 1) - goto openMvl_failed; - - *count = PHYSFS_swapULE32(*count); - - return(1); - -openMvl_failed: - if (*fh != NULL) - __PHYSFS_platformClose(*fh); - - *count = -1; - *fh = NULL; - return(0); -} /* mvl_open */ - - -static int MVL_isArchive(const char *filename, int forWriting) -{ - void *fh; - PHYSFS_uint32 fileCount; - int retval = mvl_open(filename, forWriting, &fh, &fileCount); - - if (fh != NULL) - __PHYSFS_platformClose(fh); - - return(retval); -} /* MVL_isArchive */ - - -static int mvl_entry_cmp(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - const MVLentry *a = (const MVLentry *) _a; - return(strcmp(a[one].name, a[two].name)); - } /* if */ - - return 0; -} /* mvl_entry_cmp */ - - -static void mvl_entry_swap(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - MVLentry tmp; - MVLentry *first = &(((MVLentry *) _a)[one]); - MVLentry *second = &(((MVLentry *) _a)[two]); - memcpy(&tmp, first, sizeof (MVLentry)); - memcpy(first, second, sizeof (MVLentry)); - memcpy(second, &tmp, sizeof (MVLentry)); - } /* if */ -} /* mvl_entry_swap */ - - -static int mvl_load_entries(const char *name, int forWriting, MVLinfo *info) -{ - void *fh = NULL; - PHYSFS_uint32 fileCount; - PHYSFS_uint32 location = 8; /* sizeof sig. */ - MVLentry *entry; - - BAIL_IF_MACRO(!mvl_open(name, forWriting, &fh, &fileCount), NULL, 0); - info->entryCount = fileCount; - info->entries = (MVLentry *) allocator.Malloc(sizeof(MVLentry)*fileCount); - if (info->entries == NULL) - { - __PHYSFS_platformClose(fh); - BAIL_MACRO(ERR_OUT_OF_MEMORY, 0); - } /* if */ - - location += (17 * fileCount); - - for (entry = info->entries; fileCount > 0; fileCount--, entry++) - { - if (__PHYSFS_platformRead(fh, &entry->name, 13, 1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - if (__PHYSFS_platformRead(fh, &entry->size, 4, 1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - entry->size = PHYSFS_swapULE32(entry->size); - entry->startPos = location; - location += entry->size; - } /* for */ - - __PHYSFS_platformClose(fh); - - __PHYSFS_sort(info->entries, info->entryCount, - mvl_entry_cmp, mvl_entry_swap); - return(1); -} /* mvl_load_entries */ - - -static void *MVL_openArchive(const char *name, int forWriting) -{ - PHYSFS_sint64 modtime = __PHYSFS_platformGetLastModTime(name); - MVLinfo *info = (MVLinfo *) allocator.Malloc(sizeof (MVLinfo)); - - BAIL_IF_MACRO(info == NULL, ERR_OUT_OF_MEMORY, NULL); - memset(info, '\0', sizeof (MVLinfo)); - - info->filename = (char *) allocator.Malloc(strlen(name) + 1); - GOTO_IF_MACRO(!info->filename, ERR_OUT_OF_MEMORY, MVL_openArchive_failed); - if (!mvl_load_entries(name, forWriting, info)) - goto MVL_openArchive_failed; - - strcpy(info->filename, name); - info->last_mod_time = modtime; - return(info); - -MVL_openArchive_failed: - if (info != NULL) - { - if (info->filename != NULL) - allocator.Free(info->filename); - if (info->entries != NULL) - allocator.Free(info->entries); - allocator.Free(info); - } /* if */ - - return(NULL); -} /* MVL_openArchive */ - - -static void MVL_enumerateFiles(dvoid *opaque, const char *dname, - int omitSymLinks, PHYSFS_EnumFilesCallback cb, - const char *origdir, void *callbackdata) -{ - /* no directories in MVL files. */ - if (*dname == '\0') - { - MVLinfo *info = ((MVLinfo *) opaque); - MVLentry *entry = info->entries; - PHYSFS_uint32 max = info->entryCount; - PHYSFS_uint32 i; - - for (i = 0; i < max; i++, entry++) - cb(callbackdata, origdir, entry->name); - } /* if */ -} /* MVL_enumerateFiles */ - - -static MVLentry *mvl_find_entry(MVLinfo *info, const char *name) -{ - char *ptr = strchr(name, '.'); - MVLentry *a = info->entries; - PHYSFS_sint32 lo = 0; - PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); - PHYSFS_sint32 middle; - int rc; - - /* - * Rule out filenames to avoid unneeded processing...no dirs, - * big filenames, or extensions > 3 chars. - */ - BAIL_IF_MACRO((ptr) && (strlen(ptr) > 4), ERR_NO_SUCH_FILE, NULL); - BAIL_IF_MACRO(strlen(name) > 12, ERR_NO_SUCH_FILE, NULL); - BAIL_IF_MACRO(strchr(name, '/') != NULL, ERR_NO_SUCH_FILE, NULL); - - while (lo <= hi) - { - middle = lo + ((hi - lo) / 2); - rc = __PHYSFS_stricmpASCII(name, a[middle].name); - if (rc == 0) /* found it! */ - return(&a[middle]); - else if (rc > 0) - lo = middle + 1; - else - hi = middle - 1; - } /* while */ - - BAIL_MACRO(ERR_NO_SUCH_FILE, NULL); -} /* mvl_find_entry */ - - -static int MVL_exists(dvoid *opaque, const char *name) -{ - return(mvl_find_entry(((MVLinfo *) opaque), name) != NULL); -} /* MVL_exists */ - - -static int MVL_isDirectory(dvoid *opaque, const char *name, int *fileExists) -{ - *fileExists = MVL_exists(opaque, name); - return(0); /* never directories in a groupfile. */ -} /* MVL_isDirectory */ - - -static int MVL_isSymLink(dvoid *opaque, const char *name, int *fileExists) -{ - *fileExists = MVL_exists(opaque, name); - return(0); /* never symlinks in a groupfile. */ -} /* MVL_isSymLink */ - - -static PHYSFS_sint64 MVL_getLastModTime(dvoid *opaque, - const char *name, - int *fileExists) -{ - MVLinfo *info = ((MVLinfo *) opaque); - PHYSFS_sint64 retval = -1; - - *fileExists = (mvl_find_entry(info, name) != NULL); - if (*fileExists) /* use time of MVL itself in the physical filesystem. */ - retval = info->last_mod_time; - - return(retval); -} /* MVL_getLastModTime */ - - -static fvoid *MVL_openRead(dvoid *opaque, const char *fnm, int *fileExists) -{ - MVLinfo *info = ((MVLinfo *) opaque); - MVLfileinfo *finfo; - MVLentry *entry; - - entry = mvl_find_entry(info, fnm); - *fileExists = (entry != NULL); - BAIL_IF_MACRO(entry == NULL, NULL, NULL); - - finfo = (MVLfileinfo *) allocator.Malloc(sizeof (MVLfileinfo)); - BAIL_IF_MACRO(finfo == NULL, ERR_OUT_OF_MEMORY, NULL); - - finfo->handle = __PHYSFS_platformOpenRead(info->filename); - if ( (finfo->handle == NULL) || - (!__PHYSFS_platformSeek(finfo->handle, entry->startPos)) ) - { - allocator.Free(finfo); - return(NULL); - } /* if */ - - finfo->curPos = 0; - finfo->entry = entry; - return(finfo); -} /* MVL_openRead */ - - -static fvoid *MVL_openWrite(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* MVL_openWrite */ - - -static fvoid *MVL_openAppend(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* MVL_openAppend */ - - -static int MVL_remove(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* MVL_remove */ - - -static int MVL_mkdir(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* MVL_mkdir */ - - -const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_MVL = -{ - "MVL", - MVL_ARCHIVE_DESCRIPTION, - "Bradley Bell ", - "http://icculus.org/physfs/", -}; - - -const PHYSFS_Archiver __PHYSFS_Archiver_MVL = -{ - &__PHYSFS_ArchiveInfo_MVL, - MVL_isArchive, /* isArchive() method */ - MVL_openArchive, /* openArchive() method */ - MVL_enumerateFiles, /* enumerateFiles() method */ - MVL_exists, /* exists() method */ - MVL_isDirectory, /* isDirectory() method */ - MVL_isSymLink, /* isSymLink() method */ - MVL_getLastModTime, /* getLastModTime() method */ - MVL_openRead, /* openRead() method */ - MVL_openWrite, /* openWrite() method */ - MVL_openAppend, /* openAppend() method */ - MVL_remove, /* remove() method */ - MVL_mkdir, /* mkdir() method */ - MVL_dirClose, /* dirClose() method */ - MVL_read, /* read() method */ - MVL_write, /* write() method */ - MVL_eof, /* eof() method */ - MVL_tell, /* tell() method */ - MVL_seek, /* seek() method */ - MVL_fileLength, /* fileLength() method */ - MVL_fileClose /* fileClose() method */ -}; - -#endif /* defined PHYSFS_SUPPORTS_MVL */ - -/* end of mvl.c ... */ - diff --git a/jni/physfs-2.0.3/archivers/qpak.c b/jni/physfs-2.0.3/archivers/qpak.c deleted file mode 100644 index 1aa7a32b..00000000 --- a/jni/physfs-2.0.3/archivers/qpak.c +++ /dev/null @@ -1,633 +0,0 @@ -/* - * QPAK support routines for PhysicsFS. - * - * This archiver handles the archive format utilized by Quake 1 and 2. - * Quake3-based games use the PkZip/Info-Zip format (which our zip.c - * archiver handles). - * - * ======================================================================== - * - * This format info (in more detail) comes from: - * http://debian.fmi.uni-sofia.bg/~sergei/cgsr/docs/pak.txt - * - * Quake PAK Format - * - * Header - * (4 bytes) signature = 'PACK' - * (4 bytes) directory offset - * (4 bytes) directory length - * - * Directory - * (56 bytes) file name - * (4 bytes) file position - * (4 bytes) file length - * - * ======================================================================== - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#if (defined PHYSFS_SUPPORTS_QPAK) - -#include -#include -#include -#include "physfs.h" - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_internal.h" - -#if 1 /* Make this case insensitive? */ -#define QPAK_strcmp(x, y) __PHYSFS_stricmpASCII(x, y) -#define QPAK_strncmp(x, y, z) __PHYSFS_strnicmpASCII(x, y, z) -#else -#define QPAK_strcmp(x, y) strcmp(x, y) -#define QPAK_strncmp(x, y, z) strncmp(x, y, z) -#endif - - -typedef struct -{ - char name[56]; - PHYSFS_uint32 startPos; - PHYSFS_uint32 size; -} QPAKentry; - -typedef struct -{ - char *filename; - PHYSFS_sint64 last_mod_time; - PHYSFS_uint32 entryCount; - QPAKentry *entries; -} QPAKinfo; - -typedef struct -{ - void *handle; - QPAKentry *entry; - PHYSFS_uint32 curPos; -} QPAKfileinfo; - -/* Magic numbers... */ -#define QPAK_SIG 0x4b434150 /* "PACK" in ASCII. */ - - -static void QPAK_dirClose(dvoid *opaque) -{ - QPAKinfo *info = ((QPAKinfo *) opaque); - allocator.Free(info->filename); - allocator.Free(info->entries); - allocator.Free(info); -} /* QPAK_dirClose */ - - -static PHYSFS_sint64 QPAK_read(fvoid *opaque, void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - QPAKfileinfo *finfo = (QPAKfileinfo *) opaque; - QPAKentry *entry = finfo->entry; - PHYSFS_uint32 bytesLeft = entry->size - finfo->curPos; - PHYSFS_uint32 objsLeft = (bytesLeft / objSize); - PHYSFS_sint64 rc; - - if (objsLeft < objCount) - objCount = objsLeft; - - rc = __PHYSFS_platformRead(finfo->handle, buffer, objSize, objCount); - if (rc > 0) - finfo->curPos += (PHYSFS_uint32) (rc * objSize); - - return(rc); -} /* QPAK_read */ - - -static PHYSFS_sint64 QPAK_write(fvoid *opaque, const void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, -1); -} /* QPAK_write */ - - -static int QPAK_eof(fvoid *opaque) -{ - QPAKfileinfo *finfo = (QPAKfileinfo *) opaque; - QPAKentry *entry = finfo->entry; - return(finfo->curPos >= entry->size); -} /* QPAK_eof */ - - -static PHYSFS_sint64 QPAK_tell(fvoid *opaque) -{ - return(((QPAKfileinfo *) opaque)->curPos); -} /* QPAK_tell */ - - -static int QPAK_seek(fvoid *opaque, PHYSFS_uint64 offset) -{ - QPAKfileinfo *finfo = (QPAKfileinfo *) opaque; - QPAKentry *entry = finfo->entry; - int rc; - - BAIL_IF_MACRO(offset < 0, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(offset >= entry->size, ERR_PAST_EOF, 0); - rc = __PHYSFS_platformSeek(finfo->handle, entry->startPos + offset); - if (rc) - finfo->curPos = (PHYSFS_uint32) offset; - - return(rc); -} /* QPAK_seek */ - - -static PHYSFS_sint64 QPAK_fileLength(fvoid *opaque) -{ - QPAKfileinfo *finfo = (QPAKfileinfo *) opaque; - return((PHYSFS_sint64) finfo->entry->size); -} /* QPAK_fileLength */ - - -static int QPAK_fileClose(fvoid *opaque) -{ - QPAKfileinfo *finfo = (QPAKfileinfo *) opaque; - BAIL_IF_MACRO(!__PHYSFS_platformClose(finfo->handle), NULL, 0); - allocator.Free(finfo); - return(1); -} /* QPAK_fileClose */ - - -static int qpak_open(const char *filename, int forWriting, - void **fh, PHYSFS_uint32 *count) -{ - PHYSFS_uint32 buf; - - *fh = NULL; - BAIL_IF_MACRO(forWriting, ERR_ARC_IS_READ_ONLY, 0); - - *fh = __PHYSFS_platformOpenRead(filename); - BAIL_IF_MACRO(*fh == NULL, NULL, 0); - - if (__PHYSFS_platformRead(*fh, &buf, sizeof (PHYSFS_uint32), 1) != 1) - goto openQpak_failed; - - buf = PHYSFS_swapULE32(buf); - GOTO_IF_MACRO(buf != QPAK_SIG, ERR_UNSUPPORTED_ARCHIVE, openQpak_failed); - - if (__PHYSFS_platformRead(*fh, &buf, sizeof (PHYSFS_uint32), 1) != 1) - goto openQpak_failed; - - buf = PHYSFS_swapULE32(buf); /* directory table offset. */ - - if (__PHYSFS_platformRead(*fh, count, sizeof (PHYSFS_uint32), 1) != 1) - goto openQpak_failed; - - *count = PHYSFS_swapULE32(*count); - - /* corrupted archive? */ - GOTO_IF_MACRO((*count % 64) != 0, ERR_CORRUPTED, openQpak_failed); - - if (!__PHYSFS_platformSeek(*fh, buf)) - goto openQpak_failed; - - *count /= 64; - return(1); - -openQpak_failed: - if (*fh != NULL) - __PHYSFS_platformClose(*fh); - - *count = -1; - *fh = NULL; - return(0); -} /* qpak_open */ - - -static int QPAK_isArchive(const char *filename, int forWriting) -{ - void *fh; - PHYSFS_uint32 fileCount; - int retval = qpak_open(filename, forWriting, &fh, &fileCount); - - if (fh != NULL) - __PHYSFS_platformClose(fh); - - return(retval); -} /* QPAK_isArchive */ - - -static int qpak_entry_cmp(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - const QPAKentry *a = (const QPAKentry *) _a; - return(QPAK_strcmp(a[one].name, a[two].name)); - } /* if */ - - return 0; -} /* qpak_entry_cmp */ - - -static void qpak_entry_swap(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - QPAKentry tmp; - QPAKentry *first = &(((QPAKentry *) _a)[one]); - QPAKentry *second = &(((QPAKentry *) _a)[two]); - memcpy(&tmp, first, sizeof (QPAKentry)); - memcpy(first, second, sizeof (QPAKentry)); - memcpy(second, &tmp, sizeof (QPAKentry)); - } /* if */ -} /* qpak_entry_swap */ - - -static int qpak_load_entries(const char *name, int forWriting, QPAKinfo *info) -{ - void *fh = NULL; - PHYSFS_uint32 fileCount; - QPAKentry *entry; - - BAIL_IF_MACRO(!qpak_open(name, forWriting, &fh, &fileCount), NULL, 0); - info->entryCount = fileCount; - info->entries = (QPAKentry*) allocator.Malloc(sizeof(QPAKentry)*fileCount); - if (info->entries == NULL) - { - __PHYSFS_platformClose(fh); - BAIL_MACRO(ERR_OUT_OF_MEMORY, 0); - } /* if */ - - for (entry = info->entries; fileCount > 0; fileCount--, entry++) - { - PHYSFS_uint32 loc; - - if (__PHYSFS_platformRead(fh,&entry->name,sizeof(entry->name),1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - if (__PHYSFS_platformRead(fh,&loc,sizeof(loc),1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - if (__PHYSFS_platformRead(fh,&entry->size,sizeof(entry->size),1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - entry->size = PHYSFS_swapULE32(entry->size); - entry->startPos = PHYSFS_swapULE32(loc); - } /* for */ - - __PHYSFS_platformClose(fh); - - __PHYSFS_sort(info->entries, info->entryCount, - qpak_entry_cmp, qpak_entry_swap); - return(1); -} /* qpak_load_entries */ - - -static void *QPAK_openArchive(const char *name, int forWriting) -{ - QPAKinfo *info = (QPAKinfo *) allocator.Malloc(sizeof (QPAKinfo)); - PHYSFS_sint64 modtime = __PHYSFS_platformGetLastModTime(name); - - BAIL_IF_MACRO(info == NULL, ERR_OUT_OF_MEMORY, NULL); - memset(info, '\0', sizeof (QPAKinfo)); - - info->filename = (char *) allocator.Malloc(strlen(name) + 1); - if (info->filename == NULL) - { - __PHYSFS_setError(ERR_OUT_OF_MEMORY); - goto QPAK_openArchive_failed; - } /* if */ - - if (!qpak_load_entries(name, forWriting, info)) - goto QPAK_openArchive_failed; - - strcpy(info->filename, name); - info->last_mod_time = modtime; - return(info); - -QPAK_openArchive_failed: - if (info != NULL) - { - if (info->filename != NULL) - allocator.Free(info->filename); - if (info->entries != NULL) - allocator.Free(info->entries); - allocator.Free(info); - } /* if */ - - return(NULL); -} /* QPAK_openArchive */ - - -static PHYSFS_sint32 qpak_find_start_of_dir(QPAKinfo *info, const char *path, - int stop_on_first_find) -{ - PHYSFS_sint32 lo = 0; - PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); - PHYSFS_sint32 middle; - PHYSFS_uint32 dlen = strlen(path); - PHYSFS_sint32 retval = -1; - const char *name; - int rc; - - if (*path == '\0') /* root dir? */ - return(0); - - if ((dlen > 0) && (path[dlen - 1] == '/')) /* ignore trailing slash. */ - dlen--; - - while (lo <= hi) - { - middle = lo + ((hi - lo) / 2); - name = info->entries[middle].name; - rc = QPAK_strncmp(path, name, dlen); - if (rc == 0) - { - char ch = name[dlen]; - if (ch < '/') /* make sure this isn't just a substr match. */ - rc = -1; - else if (ch > '/') - rc = 1; - else - { - if (stop_on_first_find) /* Just checking dir's existance? */ - return(middle); - - if (name[dlen + 1] == '\0') /* Skip initial dir entry. */ - return(middle + 1); - - /* there might be more entries earlier in the list. */ - retval = middle; - hi = middle - 1; - } /* else */ - } /* if */ - - if (rc > 0) - lo = middle + 1; - else - hi = middle - 1; - } /* while */ - - return(retval); -} /* qpak_find_start_of_dir */ - - -/* - * Moved to seperate function so we can use alloca then immediately throw - * away the allocated stack space... - */ -static void doEnumCallback(PHYSFS_EnumFilesCallback cb, void *callbackdata, - const char *odir, const char *str, PHYSFS_sint32 ln) -{ - char *newstr = __PHYSFS_smallAlloc(ln + 1); - if (newstr == NULL) - return; - - memcpy(newstr, str, ln); - newstr[ln] = '\0'; - cb(callbackdata, odir, newstr); - __PHYSFS_smallFree(newstr); -} /* doEnumCallback */ - - -static void QPAK_enumerateFiles(dvoid *opaque, const char *dname, - int omitSymLinks, PHYSFS_EnumFilesCallback cb, - const char *origdir, void *callbackdata) -{ - QPAKinfo *info = ((QPAKinfo *) opaque); - PHYSFS_sint32 dlen, dlen_inc, max, i; - - i = qpak_find_start_of_dir(info, dname, 0); - if (i == -1) /* no such directory. */ - return; - - dlen = strlen(dname); - if ((dlen > 0) && (dname[dlen - 1] == '/')) /* ignore trailing slash. */ - dlen--; - - dlen_inc = ((dlen > 0) ? 1 : 0) + dlen; - max = (PHYSFS_sint32) info->entryCount; - while (i < max) - { - char *add; - char *ptr; - PHYSFS_sint32 ln; - char *e = info->entries[i].name; - if ((dlen) && ((QPAK_strncmp(e, dname, dlen)) || (e[dlen] != '/'))) - break; /* past end of this dir; we're done. */ - - add = e + dlen_inc; - ptr = strchr(add, '/'); - ln = (PHYSFS_sint32) ((ptr) ? ptr-add : strlen(add)); - doEnumCallback(cb, callbackdata, origdir, add, ln); - ln += dlen_inc; /* point past entry to children... */ - - /* increment counter and skip children of subdirs... */ - while ((++i < max) && (ptr != NULL)) - { - char *e_new = info->entries[i].name; - if ((QPAK_strncmp(e, e_new, ln) != 0) || (e_new[ln] != '/')) - break; - } /* while */ - } /* while */ -} /* QPAK_enumerateFiles */ - - -/* - * This will find the QPAKentry associated with a path in platform-independent - * notation. Directories don't have QPAKentries associated with them, but - * (*isDir) will be set to non-zero if a dir was hit. - */ -static QPAKentry *qpak_find_entry(QPAKinfo *info, const char *path, int *isDir) -{ - QPAKentry *a = info->entries; - PHYSFS_sint32 pathlen = strlen(path); - PHYSFS_sint32 lo = 0; - PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); - PHYSFS_sint32 middle; - const char *thispath = NULL; - int rc; - - while (lo <= hi) - { - middle = lo + ((hi - lo) / 2); - thispath = a[middle].name; - rc = QPAK_strncmp(path, thispath, pathlen); - - if (rc > 0) - lo = middle + 1; - - else if (rc < 0) - hi = middle - 1; - - else /* substring match...might be dir or entry or nothing. */ - { - if (isDir != NULL) - { - *isDir = (thispath[pathlen] == '/'); - if (*isDir) - return(NULL); - } /* if */ - - if (thispath[pathlen] == '\0') /* found entry? */ - return(&a[middle]); - /* adjust search params, try again. */ - else if (thispath[pathlen] > '/') - hi = middle - 1; - else - lo = middle + 1; - } /* if */ - } /* while */ - - if (isDir != NULL) - *isDir = 0; - - BAIL_MACRO(ERR_NO_SUCH_FILE, NULL); -} /* qpak_find_entry */ - - -static int QPAK_exists(dvoid *opaque, const char *name) -{ - int isDir; - QPAKinfo *info = (QPAKinfo *) opaque; - QPAKentry *entry = qpak_find_entry(info, name, &isDir); - return((entry != NULL) || (isDir)); -} /* QPAK_exists */ - - -static int QPAK_isDirectory(dvoid *opaque, const char *name, int *fileExists) -{ - QPAKinfo *info = (QPAKinfo *) opaque; - int isDir; - QPAKentry *entry = qpak_find_entry(info, name, &isDir); - - *fileExists = ((isDir) || (entry != NULL)); - if (isDir) - return(1); /* definitely a dir. */ - - BAIL_MACRO(ERR_NO_SUCH_FILE, 0); -} /* QPAK_isDirectory */ - - -static int QPAK_isSymLink(dvoid *opaque, const char *name, int *fileExists) -{ - *fileExists = QPAK_exists(opaque, name); - return(0); /* never symlinks in a quake pak. */ -} /* QPAK_isSymLink */ - - -static PHYSFS_sint64 QPAK_getLastModTime(dvoid *opaque, - const char *name, - int *fileExists) -{ - int isDir; - QPAKinfo *info = ((QPAKinfo *) opaque); - PHYSFS_sint64 retval = -1; - QPAKentry *entry = qpak_find_entry(info, name, &isDir); - - *fileExists = ((isDir) || (entry != NULL)); - if (*fileExists) /* use time of QPAK itself in the physical filesystem. */ - retval = info->last_mod_time; - - return(retval); -} /* QPAK_getLastModTime */ - - -static fvoid *QPAK_openRead(dvoid *opaque, const char *fnm, int *fileExists) -{ - QPAKinfo *info = ((QPAKinfo *) opaque); - QPAKfileinfo *finfo; - QPAKentry *entry; - int isDir; - - entry = qpak_find_entry(info, fnm, &isDir); - *fileExists = ((entry != NULL) || (isDir)); - BAIL_IF_MACRO(isDir, ERR_NOT_A_FILE, NULL); - BAIL_IF_MACRO(entry == NULL, ERR_NO_SUCH_FILE, NULL); - - finfo = (QPAKfileinfo *) allocator.Malloc(sizeof (QPAKfileinfo)); - BAIL_IF_MACRO(finfo == NULL, ERR_OUT_OF_MEMORY, NULL); - - finfo->handle = __PHYSFS_platformOpenRead(info->filename); - if ( (finfo->handle == NULL) || - (!__PHYSFS_platformSeek(finfo->handle, entry->startPos)) ) - { - allocator.Free(finfo); - return(NULL); - } /* if */ - - finfo->curPos = 0; - finfo->entry = entry; - return(finfo); -} /* QPAK_openRead */ - - -static fvoid *QPAK_openWrite(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* QPAK_openWrite */ - - -static fvoid *QPAK_openAppend(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* QPAK_openAppend */ - - -static int QPAK_remove(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* QPAK_remove */ - - -static int QPAK_mkdir(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* QPAK_mkdir */ - - -const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_QPAK = -{ - "PAK", - QPAK_ARCHIVE_DESCRIPTION, - "Ryan C. Gordon ", - "http://icculus.org/physfs/", -}; - - -const PHYSFS_Archiver __PHYSFS_Archiver_QPAK = -{ - &__PHYSFS_ArchiveInfo_QPAK, - QPAK_isArchive, /* isArchive() method */ - QPAK_openArchive, /* openArchive() method */ - QPAK_enumerateFiles, /* enumerateFiles() method */ - QPAK_exists, /* exists() method */ - QPAK_isDirectory, /* isDirectory() method */ - QPAK_isSymLink, /* isSymLink() method */ - QPAK_getLastModTime, /* getLastModTime() method */ - QPAK_openRead, /* openRead() method */ - QPAK_openWrite, /* openWrite() method */ - QPAK_openAppend, /* openAppend() method */ - QPAK_remove, /* remove() method */ - QPAK_mkdir, /* mkdir() method */ - QPAK_dirClose, /* dirClose() method */ - QPAK_read, /* read() method */ - QPAK_write, /* write() method */ - QPAK_eof, /* eof() method */ - QPAK_tell, /* tell() method */ - QPAK_seek, /* seek() method */ - QPAK_fileLength, /* fileLength() method */ - QPAK_fileClose /* fileClose() method */ -}; - -#endif /* defined PHYSFS_SUPPORTS_QPAK */ - -/* end of qpak.c ... */ - diff --git a/jni/physfs-2.0.3/archivers/wad.c b/jni/physfs-2.0.3/archivers/wad.c deleted file mode 100644 index 052792c9..00000000 --- a/jni/physfs-2.0.3/archivers/wad.c +++ /dev/null @@ -1,531 +0,0 @@ -/* - * WAD support routines for PhysicsFS. - * - * This driver handles DOOM engine archives ("wads"). - * This format (but not this driver) was designed by id Software for use - * with the DOOM engine. - * The specs of the format are from the unofficial doom specs v1.666 - * found here: http://www.gamers.org/dhs/helpdocs/dmsp1666.html - * The format of the archive: (from the specs) - * - * A WAD file has three parts: - * (1) a twelve-byte header - * (2) one or more "lumps" - * (3) a directory or "info table" that contains the names, offsets, and - * sizes of all the lumps in the WAD - * - * The header consists of three four-byte parts: - * (a) an ASCII string which must be either "IWAD" or "PWAD" - * (b) a 4-byte (long) integer which is the number of lumps in the wad - * (c) a long integer which is the file offset to the start of - * the directory - * - * The directory has one 16-byte entry for every lump. Each entry consists - * of three parts: - * - * (a) a long integer, the file offset to the start of the lump - * (b) a long integer, the size of the lump in bytes - * (c) an 8-byte ASCII string, the name of the lump, padded with zeros. - * For example, the "DEMO1" entry in hexadecimal would be - * (44 45 4D 4F 31 00 00 00) - * - * Note that there is no way to tell if an opened WAD archive is a - * IWAD or PWAD with this archiver. - * I couldn't think of a way to provide that information, without being too - * hacky. - * I don't think it's really that important though. - * - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Travis Wells, based on the GRP archiver by - * Ryan C. Gordon. - */ - -#if (defined PHYSFS_SUPPORTS_WAD) - -#include -#include -#include -#include "physfs.h" - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_internal.h" - -typedef struct -{ - char name[18]; - PHYSFS_uint32 startPos; - PHYSFS_uint32 size; -} WADentry; - -typedef struct -{ - char *filename; - PHYSFS_sint64 last_mod_time; - PHYSFS_uint32 entryCount; - PHYSFS_uint32 entryOffset; - WADentry *entries; -} WADinfo; - -typedef struct -{ - void *handle; - WADentry *entry; - PHYSFS_uint32 curPos; -} WADfileinfo; - - -static void WAD_dirClose(dvoid *opaque) -{ - WADinfo *info = ((WADinfo *) opaque); - allocator.Free(info->filename); - allocator.Free(info->entries); - allocator.Free(info); -} /* WAD_dirClose */ - - -static PHYSFS_sint64 WAD_read(fvoid *opaque, void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - WADfileinfo *finfo = (WADfileinfo *) opaque; - WADentry *entry = finfo->entry; - PHYSFS_uint32 bytesLeft = entry->size - finfo->curPos; - PHYSFS_uint32 objsLeft = (bytesLeft / objSize); - PHYSFS_sint64 rc; - - if (objsLeft < objCount) - objCount = objsLeft; - - rc = __PHYSFS_platformRead(finfo->handle, buffer, objSize, objCount); - if (rc > 0) - finfo->curPos += (PHYSFS_uint32) (rc * objSize); - - return(rc); -} /* WAD_read */ - - -static PHYSFS_sint64 WAD_write(fvoid *opaque, const void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, -1); -} /* WAD_write */ - - -static int WAD_eof(fvoid *opaque) -{ - WADfileinfo *finfo = (WADfileinfo *) opaque; - WADentry *entry = finfo->entry; - return(finfo->curPos >= entry->size); -} /* WAD_eof */ - - -static PHYSFS_sint64 WAD_tell(fvoid *opaque) -{ - return(((WADfileinfo *) opaque)->curPos); -} /* WAD_tell */ - - -static int WAD_seek(fvoid *opaque, PHYSFS_uint64 offset) -{ - WADfileinfo *finfo = (WADfileinfo *) opaque; - WADentry *entry = finfo->entry; - int rc; - - BAIL_IF_MACRO(offset < 0, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(offset >= entry->size, ERR_PAST_EOF, 0); - rc = __PHYSFS_platformSeek(finfo->handle, entry->startPos + offset); - if (rc) - finfo->curPos = (PHYSFS_uint32) offset; - - return(rc); -} /* WAD_seek */ - - -static PHYSFS_sint64 WAD_fileLength(fvoid *opaque) -{ - WADfileinfo *finfo = (WADfileinfo *) opaque; - return((PHYSFS_sint64) finfo->entry->size); -} /* WAD_fileLength */ - - -static int WAD_fileClose(fvoid *opaque) -{ - WADfileinfo *finfo = (WADfileinfo *) opaque; - BAIL_IF_MACRO(!__PHYSFS_platformClose(finfo->handle), NULL, 0); - allocator.Free(finfo); - return(1); -} /* WAD_fileClose */ - - -static int wad_open(const char *filename, int forWriting, - void **fh, PHYSFS_uint32 *count,PHYSFS_uint32 *offset) -{ - PHYSFS_uint8 buf[4]; - - *fh = NULL; - BAIL_IF_MACRO(forWriting, ERR_ARC_IS_READ_ONLY, 0); - - *fh = __PHYSFS_platformOpenRead(filename); - BAIL_IF_MACRO(*fh == NULL, NULL, 0); - - if (__PHYSFS_platformRead(*fh, buf, 4, 1) != 1) - goto openWad_failed; - - if (memcmp(buf, "IWAD", 4) != 0 && memcmp(buf, "PWAD", 4) != 0) - { - __PHYSFS_setError(ERR_UNSUPPORTED_ARCHIVE); - goto openWad_failed; - } /* if */ - - if (__PHYSFS_platformRead(*fh, count, sizeof (PHYSFS_uint32), 1) != 1) - goto openWad_failed; - - *count = PHYSFS_swapULE32(*count); - - if (__PHYSFS_platformRead(*fh, offset, sizeof (PHYSFS_uint32), 1) != 1) - goto openWad_failed; - - *offset = PHYSFS_swapULE32(*offset); - - return(1); - -openWad_failed: - if (*fh != NULL) - __PHYSFS_platformClose(*fh); - - *count = -1; - *fh = NULL; - return(0); -} /* wad_open */ - - -static int WAD_isArchive(const char *filename, int forWriting) -{ - void *fh; - PHYSFS_uint32 fileCount,offset; - int retval = wad_open(filename, forWriting, &fh, &fileCount,&offset); - - if (fh != NULL) - __PHYSFS_platformClose(fh); - - return(retval); -} /* WAD_isArchive */ - - -static int wad_entry_cmp(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - const WADentry *a = (const WADentry *) _a; - return(strcmp(a[one].name, a[two].name)); - } /* if */ - - return 0; -} /* wad_entry_cmp */ - - -static void wad_entry_swap(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - WADentry tmp; - WADentry *first = &(((WADentry *) _a)[one]); - WADentry *second = &(((WADentry *) _a)[two]); - memcpy(&tmp, first, sizeof (WADentry)); - memcpy(first, second, sizeof (WADentry)); - memcpy(second, &tmp, sizeof (WADentry)); - } /* if */ -} /* wad_entry_swap */ - - -static int wad_load_entries(const char *name, int forWriting, WADinfo *info) -{ - void *fh = NULL; - PHYSFS_uint32 fileCount; - PHYSFS_uint32 directoryOffset; - WADentry *entry; - - BAIL_IF_MACRO(!wad_open(name, forWriting, &fh, &fileCount,&directoryOffset), NULL, 0); - info->entryCount = fileCount; - info->entries = (WADentry *) allocator.Malloc(sizeof(WADentry)*fileCount); - if (info->entries == NULL) - { - __PHYSFS_platformClose(fh); - BAIL_MACRO(ERR_OUT_OF_MEMORY, 0); - } /* if */ - - __PHYSFS_platformSeek(fh,directoryOffset); - - for (entry = info->entries; fileCount > 0; fileCount--, entry++) - { - if (__PHYSFS_platformRead(fh, &entry->startPos, 4, 1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - if (__PHYSFS_platformRead(fh, &entry->size, 4, 1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - if (__PHYSFS_platformRead(fh, &entry->name, 8, 1) != 1) - { - __PHYSFS_platformClose(fh); - return(0); - } /* if */ - - entry->name[8] = '\0'; /* name might not be null-terminated in file. */ - entry->size = PHYSFS_swapULE32(entry->size); - entry->startPos = PHYSFS_swapULE32(entry->startPos); - } /* for */ - - __PHYSFS_platformClose(fh); - - __PHYSFS_sort(info->entries, info->entryCount, - wad_entry_cmp, wad_entry_swap); - return(1); -} /* wad_load_entries */ - - -static void *WAD_openArchive(const char *name, int forWriting) -{ - PHYSFS_sint64 modtime = __PHYSFS_platformGetLastModTime(name); - WADinfo *info = (WADinfo *) allocator.Malloc(sizeof (WADinfo)); - - BAIL_IF_MACRO(info == NULL, ERR_OUT_OF_MEMORY, NULL); - memset(info, '\0', sizeof (WADinfo)); - - info->filename = (char *) allocator.Malloc(strlen(name) + 1); - GOTO_IF_MACRO(!info->filename, ERR_OUT_OF_MEMORY, WAD_openArchive_failed); - - if (!wad_load_entries(name, forWriting, info)) - goto WAD_openArchive_failed; - - strcpy(info->filename, name); - info->last_mod_time = modtime; - return(info); - -WAD_openArchive_failed: - if (info != NULL) - { - if (info->filename != NULL) - allocator.Free(info->filename); - if (info->entries != NULL) - allocator.Free(info->entries); - allocator.Free(info); - } /* if */ - - return(NULL); -} /* WAD_openArchive */ - - -static void WAD_enumerateFiles(dvoid *opaque, const char *dname, - int omitSymLinks, PHYSFS_EnumFilesCallback cb, - const char *origdir, void *callbackdata) -{ - WADinfo *info = ((WADinfo *) opaque); - WADentry *entry = info->entries; - PHYSFS_uint32 max = info->entryCount; - PHYSFS_uint32 i; - const char *name; - char *sep; - - if (*dname == '\0') /* root directory enumeration? */ - { - for (i = 0; i < max; i++, entry++) - { - name = entry->name; - if (strchr(name, '/') == NULL) - cb(callbackdata, origdir, name); - } /* for */ - } /* if */ - else - { - for (i = 0; i < max; i++, entry++) - { - name = entry->name; - sep = strchr(name, '/'); - if (sep != NULL) - { - if (strncmp(dname, name, (sep - name)) == 0) - cb(callbackdata, origdir, sep + 1); - } /* if */ - } /* for */ - } /* else */ -} /* WAD_enumerateFiles */ - - -static WADentry *wad_find_entry(WADinfo *info, const char *name) -{ - WADentry *a = info->entries; - PHYSFS_sint32 lo = 0; - PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); - PHYSFS_sint32 middle; - int rc; - - while (lo <= hi) - { - middle = lo + ((hi - lo) / 2); - rc = strcmp(name, a[middle].name); - if (rc == 0) /* found it! */ - return(&a[middle]); - else if (rc > 0) - lo = middle + 1; - else - hi = middle - 1; - } /* while */ - - BAIL_MACRO(ERR_NO_SUCH_FILE, NULL); -} /* wad_find_entry */ - - -static int WAD_exists(dvoid *opaque, const char *name) -{ - return(wad_find_entry(((WADinfo *) opaque), name) != NULL); -} /* WAD_exists */ - - -static int WAD_isDirectory(dvoid *opaque, const char *name, int *fileExists) -{ - WADentry *entry = wad_find_entry(((WADinfo *) opaque), name); - if (entry != NULL) - { - char *n; - - *fileExists = 1; - - /* Can't be a directory if it's a subdirectory. */ - if (strchr(entry->name, '/') != NULL) - return(0); - - /* Check if it matches "MAP??" or "E?M?" ... */ - n = entry->name; - if ((n[0] == 'E' && n[2] == 'M') || - (n[0] == 'M' && n[1] == 'A' && n[2] == 'P' && n[6] == 0)) - { - return(1); - } /* if */ - return(0); - } /* if */ - else - { - *fileExists = 0; - return(0); - } /* else */ -} /* WAD_isDirectory */ - - -static int WAD_isSymLink(dvoid *opaque, const char *name, int *fileExists) -{ - *fileExists = WAD_exists(opaque, name); - return(0); /* never symlinks in a wad. */ -} /* WAD_isSymLink */ - - -static PHYSFS_sint64 WAD_getLastModTime(dvoid *opaque, - const char *name, - int *fileExists) -{ - WADinfo *info = ((WADinfo *) opaque); - PHYSFS_sint64 retval = -1; - - *fileExists = (wad_find_entry(info, name) != NULL); - if (*fileExists) /* use time of WAD itself in the physical filesystem. */ - retval = info->last_mod_time; - - return(retval); -} /* WAD_getLastModTime */ - - -static fvoid *WAD_openRead(dvoid *opaque, const char *fnm, int *fileExists) -{ - WADinfo *info = ((WADinfo *) opaque); - WADfileinfo *finfo; - WADentry *entry; - - entry = wad_find_entry(info, fnm); - *fileExists = (entry != NULL); - BAIL_IF_MACRO(entry == NULL, NULL, NULL); - - finfo = (WADfileinfo *) allocator.Malloc(sizeof (WADfileinfo)); - BAIL_IF_MACRO(finfo == NULL, ERR_OUT_OF_MEMORY, NULL); - - finfo->handle = __PHYSFS_platformOpenRead(info->filename); - if ( (finfo->handle == NULL) || - (!__PHYSFS_platformSeek(finfo->handle, entry->startPos)) ) - { - allocator.Free(finfo); - return(NULL); - } /* if */ - - finfo->curPos = 0; - finfo->entry = entry; - return(finfo); -} /* WAD_openRead */ - - -static fvoid *WAD_openWrite(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* WAD_openWrite */ - - -static fvoid *WAD_openAppend(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* WAD_openAppend */ - - -static int WAD_remove(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* WAD_remove */ - - -static int WAD_mkdir(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* WAD_mkdir */ - - -const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_WAD = -{ - "WAD", - WAD_ARCHIVE_DESCRIPTION, - "Travis Wells ", - "http://www.3dmm2.com/doom/", -}; - - -const PHYSFS_Archiver __PHYSFS_Archiver_WAD = -{ - &__PHYSFS_ArchiveInfo_WAD, - WAD_isArchive, /* isArchive() method */ - WAD_openArchive, /* openArchive() method */ - WAD_enumerateFiles, /* enumerateFiles() method */ - WAD_exists, /* exists() method */ - WAD_isDirectory, /* isDirectory() method */ - WAD_isSymLink, /* isSymLink() method */ - WAD_getLastModTime, /* getLastModTime() method */ - WAD_openRead, /* openRead() method */ - WAD_openWrite, /* openWrite() method */ - WAD_openAppend, /* openAppend() method */ - WAD_remove, /* remove() method */ - WAD_mkdir, /* mkdir() method */ - WAD_dirClose, /* dirClose() method */ - WAD_read, /* read() method */ - WAD_write, /* write() method */ - WAD_eof, /* eof() method */ - WAD_tell, /* tell() method */ - WAD_seek, /* seek() method */ - WAD_fileLength, /* fileLength() method */ - WAD_fileClose /* fileClose() method */ -}; - -#endif /* defined PHYSFS_SUPPORTS_WAD */ - -/* end of wad.c ... */ - diff --git a/jni/physfs-2.0.3/archivers/zip.c b/jni/physfs-2.0.3/archivers/zip.c deleted file mode 100644 index 0e65453a..00000000 --- a/jni/physfs-2.0.3/archivers/zip.c +++ /dev/null @@ -1,1472 +0,0 @@ -/* - * ZIP support routines for PhysicsFS. - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon, with some peeking at "unzip.c" - * by Gilles Vollant. - */ - -#if (defined PHYSFS_SUPPORTS_ZIP) - -#include -#include -#include -#ifndef _WIN32_WCE -#include -#include -#endif -#include "physfs.h" -#include "zlib.h" - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_internal.h" - -/* - * A buffer of ZIP_READBUFSIZE is allocated for each compressed file opened, - * and is freed when you close the file; compressed data is read into - * this buffer, and then is decompressed into the buffer passed to - * PHYSFS_read(). - * - * Uncompressed entries in a zipfile do not allocate this buffer; they just - * read data directly into the buffer passed to PHYSFS_read(). - * - * Depending on your speed and memory requirements, you should tweak this - * value. - */ -#define ZIP_READBUFSIZE (16 * 1024) - - -/* - * Entries are "unresolved" until they are first opened. At that time, - * local file headers parsed/validated, data offsets will be updated to look - * at the actual file data instead of the header, and symlinks will be - * followed and optimized. This means that we don't seek and read around the - * archive until forced to do so, and after the first time, we had to do - * less reading and parsing, which is very CD-ROM friendly. - */ -typedef enum -{ - ZIP_UNRESOLVED_FILE, - ZIP_UNRESOLVED_SYMLINK, - ZIP_RESOLVING, - ZIP_RESOLVED, - ZIP_BROKEN_FILE, - ZIP_BROKEN_SYMLINK -} ZipResolveType; - - -/* - * One ZIPentry is kept for each file in an open ZIP archive. - */ -typedef struct _ZIPentry -{ - char *name; /* Name of file in archive */ - struct _ZIPentry *symlink; /* NULL or file we symlink to */ - ZipResolveType resolved; /* Have we resolved file/symlink? */ - PHYSFS_uint32 offset; /* offset of data in archive */ - PHYSFS_uint16 version; /* version made by */ - PHYSFS_uint16 version_needed; /* version needed to extract */ - PHYSFS_uint16 compression_method; /* compression method */ - PHYSFS_uint32 crc; /* crc-32 */ - PHYSFS_uint32 compressed_size; /* compressed size */ - PHYSFS_uint32 uncompressed_size; /* uncompressed size */ - PHYSFS_sint64 last_mod_time; /* last file mod time */ -} ZIPentry; - -/* - * One ZIPinfo is kept for each open ZIP archive. - */ -typedef struct -{ - char *archiveName; /* path to ZIP in platform-dependent notation. */ - PHYSFS_uint16 entryCount; /* Number of files in ZIP. */ - ZIPentry *entries; /* info on all files in ZIP. */ -} ZIPinfo; - -/* - * One ZIPfileinfo is kept for each open file in a ZIP archive. - */ -typedef struct -{ - ZIPentry *entry; /* Info on file. */ - void *handle; /* physical file handle. */ - PHYSFS_uint32 compressed_position; /* offset in compressed data. */ - PHYSFS_uint32 uncompressed_position; /* tell() position. */ - PHYSFS_uint8 *buffer; /* decompression buffer. */ - z_stream stream; /* zlib stream state. */ -} ZIPfileinfo; - - -/* Magic numbers... */ -#define ZIP_LOCAL_FILE_SIG 0x04034b50 -#define ZIP_CENTRAL_DIR_SIG 0x02014b50 -#define ZIP_END_OF_CENTRAL_DIR_SIG 0x06054b50 - -/* compression methods... */ -#define COMPMETH_NONE 0 -/* ...and others... */ - - -#define UNIX_FILETYPE_MASK 0170000 -#define UNIX_FILETYPE_SYMLINK 0120000 - - -/* - * Bridge physfs allocation functions to zlib's format... - */ -static voidpf zlibPhysfsAlloc(voidpf opaque, uInt items, uInt size) -{ - return(((PHYSFS_Allocator *) opaque)->Malloc(items * size)); -} /* zlibPhysfsAlloc */ - -/* - * Bridge physfs allocation functions to zlib's format... - */ -static void zlibPhysfsFree(voidpf opaque, voidpf address) -{ - ((PHYSFS_Allocator *) opaque)->Free(address); -} /* zlibPhysfsFree */ - - -/* - * Construct a new z_stream to a sane state. - */ -static void initializeZStream(z_stream *pstr) -{ - memset(pstr, '\0', sizeof (z_stream)); - pstr->zalloc = zlibPhysfsAlloc; - pstr->zfree = zlibPhysfsFree; - pstr->opaque = &allocator; -} /* initializeZStream */ - - -static const char *zlib_error_string(int rc) -{ - switch (rc) - { - case Z_OK: return(NULL); /* not an error. */ - case Z_STREAM_END: return(NULL); /* not an error. */ -#ifndef _WIN32_WCE - case Z_ERRNO: return(strerror(errno)); -#endif - case Z_NEED_DICT: return(ERR_NEED_DICT); - case Z_DATA_ERROR: return(ERR_DATA_ERROR); - case Z_MEM_ERROR: return(ERR_MEMORY_ERROR); - case Z_BUF_ERROR: return(ERR_BUFFER_ERROR); - case Z_VERSION_ERROR: return(ERR_VERSION_ERROR); - default: return(ERR_UNKNOWN_ERROR); - } /* switch */ - - return(NULL); -} /* zlib_error_string */ - - -/* - * Wrap all zlib calls in this, so the physfs error state is set appropriately. - */ -static int zlib_err(int rc) -{ - const char *str = zlib_error_string(rc); - if (str != NULL) - __PHYSFS_setError(str); - return(rc); -} /* zlib_err */ - - -/* - * Read an unsigned 32-bit int and swap to native byte order. - */ -static int readui32(void *in, PHYSFS_uint32 *val) -{ - PHYSFS_uint32 v; - BAIL_IF_MACRO(__PHYSFS_platformRead(in, &v, sizeof (v), 1) != 1, NULL, 0); - *val = PHYSFS_swapULE32(v); - return(1); -} /* readui32 */ - - -/* - * Read an unsigned 16-bit int and swap to native byte order. - */ -static int readui16(void *in, PHYSFS_uint16 *val) -{ - PHYSFS_uint16 v; - BAIL_IF_MACRO(__PHYSFS_platformRead(in, &v, sizeof (v), 1) != 1, NULL, 0); - *val = PHYSFS_swapULE16(v); - return(1); -} /* readui16 */ - - -static PHYSFS_sint64 ZIP_read(fvoid *opaque, void *buf, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - ZIPfileinfo *finfo = (ZIPfileinfo *) opaque; - ZIPentry *entry = finfo->entry; - PHYSFS_sint64 retval = 0; - PHYSFS_sint64 maxread = ((PHYSFS_sint64) objSize) * objCount; - PHYSFS_sint64 avail = entry->uncompressed_size - - finfo->uncompressed_position; - - BAIL_IF_MACRO(maxread == 0, NULL, 0); /* quick rejection. */ - - if (avail < maxread) - { - maxread = avail - (avail % objSize); - objCount = (PHYSFS_uint32) (maxread / objSize); - BAIL_IF_MACRO(objCount == 0, ERR_PAST_EOF, 0); /* quick rejection. */ - __PHYSFS_setError(ERR_PAST_EOF); /* this is always true here. */ - } /* if */ - - if (entry->compression_method == COMPMETH_NONE) - { - retval = __PHYSFS_platformRead(finfo->handle, buf, objSize, objCount); - } /* if */ - - else - { - finfo->stream.next_out = buf; - finfo->stream.avail_out = objSize * objCount; - - while (retval < maxread) - { - PHYSFS_uint32 before = finfo->stream.total_out; - int rc; - - if (finfo->stream.avail_in == 0) - { - PHYSFS_sint64 br; - - br = entry->compressed_size - finfo->compressed_position; - if (br > 0) - { - if (br > ZIP_READBUFSIZE) - br = ZIP_READBUFSIZE; - - br = __PHYSFS_platformRead(finfo->handle, - finfo->buffer, - 1, (PHYSFS_uint32) br); - if (br <= 0) - break; - - finfo->compressed_position += (PHYSFS_uint32) br; - finfo->stream.next_in = finfo->buffer; - finfo->stream.avail_in = (PHYSFS_uint32) br; - } /* if */ - } /* if */ - - rc = zlib_err(inflate(&finfo->stream, Z_SYNC_FLUSH)); - retval += (finfo->stream.total_out - before); - - if (rc != Z_OK) - break; - } /* while */ - - retval /= objSize; - } /* else */ - - if (retval > 0) - finfo->uncompressed_position += (PHYSFS_uint32) (retval * objSize); - - return(retval); -} /* ZIP_read */ - - -static PHYSFS_sint64 ZIP_write(fvoid *opaque, const void *buf, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, -1); -} /* ZIP_write */ - - -static int ZIP_eof(fvoid *opaque) -{ - ZIPfileinfo *finfo = (ZIPfileinfo *) opaque; - return(finfo->uncompressed_position >= finfo->entry->uncompressed_size); -} /* ZIP_eof */ - - -static PHYSFS_sint64 ZIP_tell(fvoid *opaque) -{ - return(((ZIPfileinfo *) opaque)->uncompressed_position); -} /* ZIP_tell */ - - -static int ZIP_seek(fvoid *opaque, PHYSFS_uint64 offset) -{ - ZIPfileinfo *finfo = (ZIPfileinfo *) opaque; - ZIPentry *entry = finfo->entry; - void *in = finfo->handle; - - BAIL_IF_MACRO(offset > entry->uncompressed_size, ERR_PAST_EOF, 0); - - if (entry->compression_method == COMPMETH_NONE) - { - PHYSFS_sint64 newpos = offset + entry->offset; - BAIL_IF_MACRO(!__PHYSFS_platformSeek(in, newpos), NULL, 0); - finfo->uncompressed_position = (PHYSFS_uint32) offset; - } /* if */ - - else - { - /* - * If seeking backwards, we need to redecode the file - * from the start and throw away the compressed bits until we hit - * the offset we need. If seeking forward, we still need to - * decode, but we don't rewind first. - */ - if (offset < finfo->uncompressed_position) - { - /* we do a copy so state is sane if inflateInit2() fails. */ - z_stream str; - initializeZStream(&str); - if (zlib_err(inflateInit2(&str, -MAX_WBITS)) != Z_OK) - return(0); - - if (!__PHYSFS_platformSeek(in, entry->offset)) - return(0); - - inflateEnd(&finfo->stream); - memcpy(&finfo->stream, &str, sizeof (z_stream)); - finfo->uncompressed_position = finfo->compressed_position = 0; - } /* if */ - - while (finfo->uncompressed_position != offset) - { - PHYSFS_uint8 buf[512]; - PHYSFS_uint32 maxread; - - maxread = (PHYSFS_uint32) (offset - finfo->uncompressed_position); - if (maxread > sizeof (buf)) - maxread = sizeof (buf); - - if (ZIP_read(finfo, buf, maxread, 1) != 1) - return(0); - } /* while */ - } /* else */ - - return(1); -} /* ZIP_seek */ - - -static PHYSFS_sint64 ZIP_fileLength(fvoid *opaque) -{ - ZIPfileinfo *finfo = (ZIPfileinfo *) opaque; - return(finfo->entry->uncompressed_size); -} /* ZIP_fileLength */ - - -static int ZIP_fileClose(fvoid *opaque) -{ - ZIPfileinfo *finfo = (ZIPfileinfo *) opaque; - BAIL_IF_MACRO(!__PHYSFS_platformClose(finfo->handle), NULL, 0); - - if (finfo->entry->compression_method != COMPMETH_NONE) - inflateEnd(&finfo->stream); - - if (finfo->buffer != NULL) - allocator.Free(finfo->buffer); - - allocator.Free(finfo); - return(1); -} /* ZIP_fileClose */ - - -static PHYSFS_sint64 zip_find_end_of_central_dir(void *in, PHYSFS_sint64 *len) -{ - PHYSFS_uint8 buf[256]; - PHYSFS_uint8 extra[4] = { 0, 0, 0, 0 }; - PHYSFS_sint32 i = 0; - PHYSFS_sint64 filelen; - PHYSFS_sint64 filepos; - PHYSFS_sint32 maxread; - PHYSFS_sint32 totalread = 0; - int found = 0; - - filelen = __PHYSFS_platformFileLength(in); - BAIL_IF_MACRO(filelen == -1, NULL, 0); /* !!! FIXME: unlocalized string */ - BAIL_IF_MACRO(filelen > 0xFFFFFFFF, "ZIP bigger than 2 gigs?!", 0); - - /* - * Jump to the end of the file and start reading backwards. - * The last thing in the file is the zipfile comment, which is variable - * length, and the field that specifies its size is before it in the - * file (argh!)...this means that we need to scan backwards until we - * hit the end-of-central-dir signature. We can then sanity check that - * the comment was as big as it should be to make sure we're in the - * right place. The comment length field is 16 bits, so we can stop - * searching for that signature after a little more than 64k at most, - * and call it a corrupted zipfile. - */ - - if (sizeof (buf) < filelen) - { - filepos = filelen - sizeof (buf); - maxread = sizeof (buf); - } /* if */ - else - { - filepos = 0; - maxread = (PHYSFS_uint32) filelen; - } /* else */ - - while ((totalread < filelen) && (totalread < 65557)) - { - BAIL_IF_MACRO(!__PHYSFS_platformSeek(in, filepos), NULL, -1); - - /* make sure we catch a signature between buffers. */ - if (totalread != 0) - { - if (__PHYSFS_platformRead(in, buf, maxread - 4, 1) != 1) - return(-1); - memcpy(&buf[maxread - 4], &extra, sizeof (extra)); - totalread += maxread - 4; - } /* if */ - else - { - if (__PHYSFS_platformRead(in, buf, maxread, 1) != 1) - return(-1); - totalread += maxread; - } /* else */ - - memcpy(&extra, buf, sizeof (extra)); - - for (i = maxread - 4; i > 0; i--) - { - if ((buf[i + 0] == 0x50) && - (buf[i + 1] == 0x4B) && - (buf[i + 2] == 0x05) && - (buf[i + 3] == 0x06) ) - { - found = 1; /* that's the signature! */ - break; - } /* if */ - } /* for */ - - if (found) - break; - - filepos -= (maxread - 4); - if (filepos < 0) - filepos = 0; - } /* while */ - - BAIL_IF_MACRO(!found, ERR_NOT_AN_ARCHIVE, -1); - - if (len != NULL) - *len = filelen; - - return(filepos + i); -} /* zip_find_end_of_central_dir */ - - -static int ZIP_isArchive(const char *filename, int forWriting) -{ - PHYSFS_uint32 sig; - int retval = 0; - void *in; - - in = __PHYSFS_platformOpenRead(filename); - BAIL_IF_MACRO(in == NULL, NULL, 0); - - /* - * The first thing in a zip file might be the signature of the - * first local file record, so it makes for a quick determination. - */ - if (readui32(in, &sig)) - { - retval = (sig == ZIP_LOCAL_FILE_SIG); - if (!retval) - { - /* - * No sig...might be a ZIP with data at the start - * (a self-extracting executable, etc), so we'll have to do - * it the hard way... - */ - retval = (zip_find_end_of_central_dir(in, NULL) != -1); - } /* if */ - } /* if */ - - __PHYSFS_platformClose(in); - return(retval); -} /* ZIP_isArchive */ - - -static void zip_free_entries(ZIPentry *entries, PHYSFS_uint32 max) -{ - PHYSFS_uint32 i; - for (i = 0; i < max; i++) - { - ZIPentry *entry = &entries[i]; - if (entry->name != NULL) - allocator.Free(entry->name); - } /* for */ - - allocator.Free(entries); -} /* zip_free_entries */ - - -/* - * This will find the ZIPentry associated with a path in platform-independent - * notation. Directories don't have ZIPentries associated with them, but - * (*isDir) will be set to non-zero if a dir was hit. - */ -static ZIPentry *zip_find_entry(ZIPinfo *info, const char *path, int *isDir) -{ - ZIPentry *a = info->entries; - PHYSFS_sint32 pathlen = strlen(path); - PHYSFS_sint32 lo = 0; - PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); - PHYSFS_sint32 middle; - const char *thispath = NULL; - int rc; - - while (lo <= hi) - { - middle = lo + ((hi - lo) / 2); - thispath = a[middle].name; - rc = strncmp(path, thispath, pathlen); - - if (rc > 0) - lo = middle + 1; - - else if (rc < 0) - hi = middle - 1; - - else /* substring match...might be dir or entry or nothing. */ - { - int i; - - if (isDir != NULL) - { - *isDir = (thispath[pathlen] == '/'); - if (*isDir) - return(NULL); - } /* if */ - - if (thispath[pathlen] == '\0') /* found entry? */ - return(&a[middle]); - - /* substring match; search remaining space to find it... */ - for (i = lo; i < hi; i++) - { - thispath = a[i].name; - if (strncmp(path, thispath, pathlen) == 0) - { - if (isDir != NULL) - { - *isDir = (thispath[pathlen] == '/'); - if (*isDir) - return(NULL); - } /* if */ - - if (thispath[pathlen] == '\0') /* found entry? */ - return(&a[i]); - } /* if */ - } /* for */ - break; - - } /* else */ - } /* while */ - - if (isDir != NULL) - *isDir = 0; - - BAIL_MACRO(ERR_NO_SUCH_FILE, NULL); -} /* zip_find_entry */ - - -/* Convert paths from old, buggy DOS zippers... */ -static void zip_convert_dos_path(ZIPentry *entry, char *path) -{ - PHYSFS_uint8 hosttype = (PHYSFS_uint8) ((entry->version >> 8) & 0xFF); - if (hosttype == 0) /* FS_FAT_ */ - { - while (*path) - { - if (*path == '\\') - *path = '/'; - path++; - } /* while */ - } /* if */ -} /* zip_convert_dos_path */ - - -static void zip_expand_symlink_path(char *path) -{ - char *ptr = path; - char *prevptr = path; - - while (1) - { - ptr = strchr(ptr, '/'); - if (ptr == NULL) - break; - - if (*(ptr + 1) == '.') - { - if (*(ptr + 2) == '/') - { - /* current dir in middle of string: ditch it. */ - memmove(ptr, ptr + 2, strlen(ptr + 2) + 1); - } /* else if */ - - else if (*(ptr + 2) == '\0') - { - /* current dir at end of string: ditch it. */ - *ptr = '\0'; - } /* else if */ - - else if (*(ptr + 2) == '.') - { - if (*(ptr + 3) == '/') - { - /* parent dir in middle: move back one, if possible. */ - memmove(prevptr, ptr + 4, strlen(ptr + 4) + 1); - ptr = prevptr; - while (prevptr != path) - { - prevptr--; - if (*prevptr == '/') - { - prevptr++; - break; - } /* if */ - } /* while */ - } /* if */ - - if (*(ptr + 3) == '\0') - { - /* parent dir at end: move back one, if possible. */ - *prevptr = '\0'; - } /* if */ - } /* if */ - } /* if */ - else - { - prevptr = ptr; - ptr++; - } /* else */ - } /* while */ -} /* zip_expand_symlink_path */ - -/* (forward reference: zip_follow_symlink and zip_resolve call each other.) */ -static int zip_resolve(void *in, ZIPinfo *info, ZIPentry *entry); - -/* - * Look for the entry named by (path). If it exists, resolve it, and return - * a pointer to that entry. If it's another symlink, keep resolving until you - * hit a real file and then return a pointer to the final non-symlink entry. - * If there's a problem, return NULL. (path) is always free()'d by this - * function. - */ -static ZIPentry *zip_follow_symlink(void *in, ZIPinfo *info, char *path) -{ - ZIPentry *entry; - - zip_expand_symlink_path(path); - entry = zip_find_entry(info, path, NULL); - if (entry != NULL) - { - if (!zip_resolve(in, info, entry)) /* recursive! */ - entry = NULL; - else - { - if (entry->symlink != NULL) - entry = entry->symlink; - } /* else */ - } /* if */ - - allocator.Free(path); - return(entry); -} /* zip_follow_symlink */ - - -static int zip_resolve_symlink(void *in, ZIPinfo *info, ZIPentry *entry) -{ - char *path; - PHYSFS_uint32 size = entry->uncompressed_size; - int rc = 0; - - /* - * We've already parsed the local file header of the symlink at this - * point. Now we need to read the actual link from the file data and - * follow it. - */ - - BAIL_IF_MACRO(!__PHYSFS_platformSeek(in, entry->offset), NULL, 0); - - path = (char *) allocator.Malloc(size + 1); - BAIL_IF_MACRO(path == NULL, ERR_OUT_OF_MEMORY, 0); - - if (entry->compression_method == COMPMETH_NONE) - rc = (__PHYSFS_platformRead(in, path, size, 1) == 1); - - else /* symlink target path is compressed... */ - { - z_stream stream; - PHYSFS_uint32 complen = entry->compressed_size; - PHYSFS_uint8 *compressed = (PHYSFS_uint8*) __PHYSFS_smallAlloc(complen); - if (compressed != NULL) - { - if (__PHYSFS_platformRead(in, compressed, complen, 1) == 1) - { - initializeZStream(&stream); - stream.next_in = compressed; - stream.avail_in = complen; - stream.next_out = (unsigned char *) path; - stream.avail_out = size; - if (zlib_err(inflateInit2(&stream, -MAX_WBITS)) == Z_OK) - { - rc = zlib_err(inflate(&stream, Z_FINISH)); - inflateEnd(&stream); - - /* both are acceptable outcomes... */ - rc = ((rc == Z_OK) || (rc == Z_STREAM_END)); - } /* if */ - } /* if */ - __PHYSFS_smallFree(compressed); - } /* if */ - } /* else */ - - if (!rc) - allocator.Free(path); - else - { - path[entry->uncompressed_size] = '\0'; /* null-terminate it. */ - zip_convert_dos_path(entry, path); - entry->symlink = zip_follow_symlink(in, info, path); - } /* else */ - - return(entry->symlink != NULL); -} /* zip_resolve_symlink */ - - -/* - * Parse the local file header of an entry, and update entry->offset. - */ -static int zip_parse_local(void *in, ZIPentry *entry) -{ - PHYSFS_uint32 ui32; - PHYSFS_uint16 ui16; - PHYSFS_uint16 fnamelen; - PHYSFS_uint16 extralen; - - /* - * crc and (un)compressed_size are always zero if this is a "JAR" - * archive created with Sun's Java tools, apparently. We only - * consider this archive corrupted if those entries don't match and - * aren't zero. That seems to work well. - */ - - BAIL_IF_MACRO(!__PHYSFS_platformSeek(in, entry->offset), NULL, 0); - BAIL_IF_MACRO(!readui32(in, &ui32), NULL, 0); - BAIL_IF_MACRO(ui32 != ZIP_LOCAL_FILE_SIG, ERR_CORRUPTED, 0); - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); - BAIL_IF_MACRO(ui16 != entry->version_needed, ERR_CORRUPTED, 0); - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); /* general bits. */ - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); - BAIL_IF_MACRO(ui16 != entry->compression_method, ERR_CORRUPTED, 0); - BAIL_IF_MACRO(!readui32(in, &ui32), NULL, 0); /* date/time */ - BAIL_IF_MACRO(!readui32(in, &ui32), NULL, 0); - BAIL_IF_MACRO(ui32 && (ui32 != entry->crc), ERR_CORRUPTED, 0); - BAIL_IF_MACRO(!readui32(in, &ui32), NULL, 0); - BAIL_IF_MACRO(ui32 && (ui32 != entry->compressed_size), ERR_CORRUPTED, 0); - BAIL_IF_MACRO(!readui32(in, &ui32), NULL, 0); - BAIL_IF_MACRO(ui32 && (ui32 != entry->uncompressed_size),ERR_CORRUPTED,0); - BAIL_IF_MACRO(!readui16(in, &fnamelen), NULL, 0); - BAIL_IF_MACRO(!readui16(in, &extralen), NULL, 0); - - entry->offset += fnamelen + extralen + 30; - return(1); -} /* zip_parse_local */ - - -static int zip_resolve(void *in, ZIPinfo *info, ZIPentry *entry) -{ - int retval = 1; - ZipResolveType resolve_type = entry->resolved; - - /* Don't bother if we've failed to resolve this entry before. */ - BAIL_IF_MACRO(resolve_type == ZIP_BROKEN_FILE, ERR_CORRUPTED, 0); - BAIL_IF_MACRO(resolve_type == ZIP_BROKEN_SYMLINK, ERR_CORRUPTED, 0); - - /* uhoh...infinite symlink loop! */ - BAIL_IF_MACRO(resolve_type == ZIP_RESOLVING, ERR_SYMLINK_LOOP, 0); - - /* - * We fix up the offset to point to the actual data on the - * first open, since we don't want to seek across the whole file on - * archive open (can be SLOW on large, CD-stored files), but we - * need to check the local file header...not just for corruption, - * but since it stores offset info the central directory does not. - */ - if (resolve_type != ZIP_RESOLVED) - { - entry->resolved = ZIP_RESOLVING; - - retval = zip_parse_local(in, entry); - if (retval) - { - /* - * If it's a symlink, find the original file. This will cause - * resolution of other entries (other symlinks and, eventually, - * the real file) if all goes well. - */ - if (resolve_type == ZIP_UNRESOLVED_SYMLINK) - retval = zip_resolve_symlink(in, info, entry); - } /* if */ - - if (resolve_type == ZIP_UNRESOLVED_SYMLINK) - entry->resolved = ((retval) ? ZIP_RESOLVED : ZIP_BROKEN_SYMLINK); - else if (resolve_type == ZIP_UNRESOLVED_FILE) - entry->resolved = ((retval) ? ZIP_RESOLVED : ZIP_BROKEN_FILE); - } /* if */ - - return(retval); -} /* zip_resolve */ - - -static int zip_version_does_symlinks(PHYSFS_uint32 version) -{ - int retval = 0; - PHYSFS_uint8 hosttype = (PHYSFS_uint8) ((version >> 8) & 0xFF); - - switch (hosttype) - { - /* - * These are the platforms that can NOT build an archive with - * symlinks, according to the Info-ZIP project. - */ - case 0: /* FS_FAT_ */ - case 1: /* AMIGA_ */ - case 2: /* VMS_ */ - case 4: /* VM_CSM_ */ - case 6: /* FS_HPFS_ */ - case 11: /* FS_NTFS_ */ - case 14: /* FS_VFAT_ */ - case 13: /* ACORN_ */ - case 15: /* MVS_ */ - case 18: /* THEOS_ */ - break; /* do nothing. */ - - default: /* assume the rest to be unix-like. */ - retval = 1; - break; - } /* switch */ - - return(retval); -} /* zip_version_does_symlinks */ - - -static int zip_entry_is_symlink(const ZIPentry *entry) -{ - return((entry->resolved == ZIP_UNRESOLVED_SYMLINK) || - (entry->resolved == ZIP_BROKEN_SYMLINK) || - (entry->symlink)); -} /* zip_entry_is_symlink */ - - -static int zip_has_symlink_attr(ZIPentry *entry, PHYSFS_uint32 extern_attr) -{ - PHYSFS_uint16 xattr = ((extern_attr >> 16) & 0xFFFF); - - return ( - (zip_version_does_symlinks(entry->version)) && - (entry->uncompressed_size > 0) && - ((xattr & UNIX_FILETYPE_MASK) == UNIX_FILETYPE_SYMLINK) - ); -} /* zip_has_symlink_attr */ - - -static PHYSFS_sint64 zip_dos_time_to_physfs_time(PHYSFS_uint32 dostime) -{ -#ifdef _WIN32_WCE - /* We have no struct tm and no mktime right now. - FIXME: This should probably be fixed at some point. - */ - return -1; -#else - PHYSFS_uint32 dosdate; - struct tm unixtime; - memset(&unixtime, '\0', sizeof (unixtime)); - - dosdate = (PHYSFS_uint32) ((dostime >> 16) & 0xFFFF); - dostime &= 0xFFFF; - - /* dissect date */ - unixtime.tm_year = ((dosdate >> 9) & 0x7F) + 80; - unixtime.tm_mon = ((dosdate >> 5) & 0x0F) - 1; - unixtime.tm_mday = ((dosdate ) & 0x1F); - - /* dissect time */ - unixtime.tm_hour = ((dostime >> 11) & 0x1F); - unixtime.tm_min = ((dostime >> 5) & 0x3F); - unixtime.tm_sec = ((dostime << 1) & 0x3E); - - /* let mktime calculate daylight savings time. */ - unixtime.tm_isdst = -1; - - return((PHYSFS_sint64) mktime(&unixtime)); -#endif -} /* zip_dos_time_to_physfs_time */ - - -static int zip_load_entry(void *in, ZIPentry *entry, PHYSFS_uint32 ofs_fixup) -{ - PHYSFS_uint16 fnamelen, extralen, commentlen; - PHYSFS_uint32 external_attr; - PHYSFS_uint16 ui16; - PHYSFS_uint32 ui32; - PHYSFS_sint64 si64; - - /* sanity check with central directory signature... */ - BAIL_IF_MACRO(!readui32(in, &ui32), NULL, 0); - BAIL_IF_MACRO(ui32 != ZIP_CENTRAL_DIR_SIG, ERR_CORRUPTED, 0); - - /* Get the pertinent parts of the record... */ - BAIL_IF_MACRO(!readui16(in, &entry->version), NULL, 0); - BAIL_IF_MACRO(!readui16(in, &entry->version_needed), NULL, 0); - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); /* general bits */ - BAIL_IF_MACRO(!readui16(in, &entry->compression_method), NULL, 0); - BAIL_IF_MACRO(!readui32(in, &ui32), NULL, 0); - entry->last_mod_time = zip_dos_time_to_physfs_time(ui32); - BAIL_IF_MACRO(!readui32(in, &entry->crc), NULL, 0); - BAIL_IF_MACRO(!readui32(in, &entry->compressed_size), NULL, 0); - BAIL_IF_MACRO(!readui32(in, &entry->uncompressed_size), NULL, 0); - BAIL_IF_MACRO(!readui16(in, &fnamelen), NULL, 0); - BAIL_IF_MACRO(!readui16(in, &extralen), NULL, 0); - BAIL_IF_MACRO(!readui16(in, &commentlen), NULL, 0); - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); /* disk number start */ - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); /* internal file attribs */ - BAIL_IF_MACRO(!readui32(in, &external_attr), NULL, 0); - BAIL_IF_MACRO(!readui32(in, &entry->offset), NULL, 0); - entry->offset += ofs_fixup; - - entry->symlink = NULL; /* will be resolved later, if necessary. */ - entry->resolved = (zip_has_symlink_attr(entry, external_attr)) ? - ZIP_UNRESOLVED_SYMLINK : ZIP_UNRESOLVED_FILE; - - entry->name = (char *) allocator.Malloc(fnamelen + 1); - BAIL_IF_MACRO(entry->name == NULL, ERR_OUT_OF_MEMORY, 0); - if (__PHYSFS_platformRead(in, entry->name, fnamelen, 1) != 1) - goto zip_load_entry_puked; - - entry->name[fnamelen] = '\0'; /* null-terminate the filename. */ - zip_convert_dos_path(entry, entry->name); - - si64 = __PHYSFS_platformTell(in); - if (si64 == -1) - goto zip_load_entry_puked; - - /* seek to the start of the next entry in the central directory... */ - if (!__PHYSFS_platformSeek(in, si64 + extralen + commentlen)) - goto zip_load_entry_puked; - - return(1); /* success. */ - -zip_load_entry_puked: - allocator.Free(entry->name); - return(0); /* failure. */ -} /* zip_load_entry */ - - -static int zip_entry_cmp(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - const ZIPentry *a = (const ZIPentry *) _a; - return(strcmp(a[one].name, a[two].name)); - } /* if */ - - return 0; -} /* zip_entry_cmp */ - - -static void zip_entry_swap(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) -{ - if (one != two) - { - ZIPentry tmp; - ZIPentry *first = &(((ZIPentry *) _a)[one]); - ZIPentry *second = &(((ZIPentry *) _a)[two]); - memcpy(&tmp, first, sizeof (ZIPentry)); - memcpy(first, second, sizeof (ZIPentry)); - memcpy(second, &tmp, sizeof (ZIPentry)); - } /* if */ -} /* zip_entry_swap */ - - -static int zip_load_entries(void *in, ZIPinfo *info, - PHYSFS_uint32 data_ofs, PHYSFS_uint32 central_ofs) -{ - PHYSFS_uint32 max = info->entryCount; - PHYSFS_uint32 i; - - BAIL_IF_MACRO(!__PHYSFS_platformSeek(in, central_ofs), NULL, 0); - - info->entries = (ZIPentry *) allocator.Malloc(sizeof (ZIPentry) * max); - BAIL_IF_MACRO(info->entries == NULL, ERR_OUT_OF_MEMORY, 0); - - for (i = 0; i < max; i++) - { - if (!zip_load_entry(in, &info->entries[i], data_ofs)) - { - zip_free_entries(info->entries, i); - return(0); - } /* if */ - } /* for */ - - __PHYSFS_sort(info->entries, max, zip_entry_cmp, zip_entry_swap); - return(1); -} /* zip_load_entries */ - - -static int zip_parse_end_of_central_dir(void *in, ZIPinfo *info, - PHYSFS_uint32 *data_start, - PHYSFS_uint32 *central_dir_ofs) -{ - PHYSFS_uint32 ui32; - PHYSFS_uint16 ui16; - PHYSFS_sint64 len; - PHYSFS_sint64 pos; - - /* find the end-of-central-dir record, and seek to it. */ - pos = zip_find_end_of_central_dir(in, &len); - BAIL_IF_MACRO(pos == -1, NULL, 0); - BAIL_IF_MACRO(!__PHYSFS_platformSeek(in, pos), NULL, 0); - - /* check signature again, just in case. */ - BAIL_IF_MACRO(!readui32(in, &ui32), NULL, 0); - BAIL_IF_MACRO(ui32 != ZIP_END_OF_CENTRAL_DIR_SIG, ERR_NOT_AN_ARCHIVE, 0); - - /* number of this disk */ - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); - BAIL_IF_MACRO(ui16 != 0, ERR_UNSUPPORTED_ARCHIVE, 0); - - /* number of the disk with the start of the central directory */ - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); - BAIL_IF_MACRO(ui16 != 0, ERR_UNSUPPORTED_ARCHIVE, 0); - - /* total number of entries in the central dir on this disk */ - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); - - /* total number of entries in the central dir */ - BAIL_IF_MACRO(!readui16(in, &info->entryCount), NULL, 0); - BAIL_IF_MACRO(ui16 != info->entryCount, ERR_UNSUPPORTED_ARCHIVE, 0); - - /* size of the central directory */ - BAIL_IF_MACRO(!readui32(in, &ui32), NULL, 0); - - /* offset of central directory */ - BAIL_IF_MACRO(!readui32(in, central_dir_ofs), NULL, 0); - BAIL_IF_MACRO(pos < *central_dir_ofs + ui32, ERR_UNSUPPORTED_ARCHIVE, 0); - - /* - * For self-extracting archives, etc, there's crapola in the file - * before the zipfile records; we calculate how much data there is - * prepended by determining how far the central directory offset is - * from where it is supposed to be (start of end-of-central-dir minus - * sizeof central dir)...the difference in bytes is how much arbitrary - * data is at the start of the physical file. - */ - *data_start = (PHYSFS_uint32) (pos - (*central_dir_ofs + ui32)); - - /* Now that we know the difference, fix up the central dir offset... */ - *central_dir_ofs += *data_start; - - /* zipfile comment length */ - BAIL_IF_MACRO(!readui16(in, &ui16), NULL, 0); - - /* - * Make sure that the comment length matches to the end of file... - * If it doesn't, we're either in the wrong part of the file, or the - * file is corrupted, but we give up either way. - */ - BAIL_IF_MACRO((pos + 22 + ui16) != len, ERR_UNSUPPORTED_ARCHIVE, 0); - - return(1); /* made it. */ -} /* zip_parse_end_of_central_dir */ - - -static ZIPinfo *zip_create_zipinfo(const char *name) -{ - char *ptr; - ZIPinfo *info = (ZIPinfo *) allocator.Malloc(sizeof (ZIPinfo)); - BAIL_IF_MACRO(info == NULL, ERR_OUT_OF_MEMORY, 0); - memset(info, '\0', sizeof (ZIPinfo)); - - ptr = (char *) allocator.Malloc(strlen(name) + 1); - if (ptr == NULL) - { - allocator.Free(info); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); - } /* if */ - - info->archiveName = ptr; - strcpy(info->archiveName, name); - return(info); -} /* zip_create_zipinfo */ - - -static void *ZIP_openArchive(const char *name, int forWriting) -{ - void *in = NULL; - ZIPinfo *info = NULL; - PHYSFS_uint32 data_start; - PHYSFS_uint32 cent_dir_ofs; - - BAIL_IF_MACRO(forWriting, ERR_ARC_IS_READ_ONLY, NULL); - - if ((in = __PHYSFS_platformOpenRead(name)) == NULL) - goto zip_openarchive_failed; - - if ((info = zip_create_zipinfo(name)) == NULL) - goto zip_openarchive_failed; - - if (!zip_parse_end_of_central_dir(in, info, &data_start, ¢_dir_ofs)) - goto zip_openarchive_failed; - - if (!zip_load_entries(in, info, data_start, cent_dir_ofs)) - goto zip_openarchive_failed; - - __PHYSFS_platformClose(in); - return(info); - -zip_openarchive_failed: - if (info != NULL) - { - if (info->archiveName != NULL) - allocator.Free(info->archiveName); - allocator.Free(info); - } /* if */ - - if (in != NULL) - __PHYSFS_platformClose(in); - - return(NULL); -} /* ZIP_openArchive */ - - -static PHYSFS_sint32 zip_find_start_of_dir(ZIPinfo *info, const char *path, - int stop_on_first_find) -{ - PHYSFS_sint32 lo = 0; - PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); - PHYSFS_sint32 middle; - PHYSFS_uint32 dlen = strlen(path); - PHYSFS_sint32 retval = -1; - const char *name; - int rc; - - if (*path == '\0') /* root dir? */ - return(0); - - if ((dlen > 0) && (path[dlen - 1] == '/')) /* ignore trailing slash. */ - dlen--; - - while (lo <= hi) - { - middle = lo + ((hi - lo) / 2); - name = info->entries[middle].name; - rc = strncmp(path, name, dlen); - if (rc == 0) - { - char ch = name[dlen]; - if ('/' < ch) /* make sure this isn't just a substr match. */ - rc = -1; - else if ('/' > ch) - rc = 1; - else - { - if (stop_on_first_find) /* Just checking dir's existance? */ - return(middle); - - if (name[dlen + 1] == '\0') /* Skip initial dir entry. */ - return(middle + 1); - - /* there might be more entries earlier in the list. */ - retval = middle; - hi = middle - 1; - } /* else */ - } /* if */ - - if (rc > 0) - lo = middle + 1; - else - hi = middle - 1; - } /* while */ - - return(retval); -} /* zip_find_start_of_dir */ - - -/* - * Moved to seperate function so we can use alloca then immediately throw - * away the allocated stack space... - */ -static void doEnumCallback(PHYSFS_EnumFilesCallback cb, void *callbackdata, - const char *odir, const char *str, PHYSFS_sint32 ln) -{ - char *newstr = __PHYSFS_smallAlloc(ln + 1); - if (newstr == NULL) - return; - - memcpy(newstr, str, ln); - newstr[ln] = '\0'; - cb(callbackdata, odir, newstr); - __PHYSFS_smallFree(newstr); -} /* doEnumCallback */ - - -static void ZIP_enumerateFiles(dvoid *opaque, const char *dname, - int omitSymLinks, PHYSFS_EnumFilesCallback cb, - const char *origdir, void *callbackdata) -{ - ZIPinfo *info = ((ZIPinfo *) opaque); - PHYSFS_sint32 dlen, dlen_inc, max, i; - - i = zip_find_start_of_dir(info, dname, 0); - if (i == -1) /* no such directory. */ - return; - - dlen = strlen(dname); - if ((dlen > 0) && (dname[dlen - 1] == '/')) /* ignore trailing slash. */ - dlen--; - - dlen_inc = ((dlen > 0) ? 1 : 0) + dlen; - max = (PHYSFS_sint32) info->entryCount; - while (i < max) - { - char *e = info->entries[i].name; - if ((dlen) && ((strncmp(e, dname, dlen) != 0) || (e[dlen] != '/'))) - break; /* past end of this dir; we're done. */ - - if ((omitSymLinks) && (zip_entry_is_symlink(&info->entries[i]))) - i++; - else - { - char *add = e + dlen_inc; - char *ptr = strchr(add, '/'); - PHYSFS_sint32 ln = (PHYSFS_sint32) ((ptr) ? ptr-add : strlen(add)); - doEnumCallback(cb, callbackdata, origdir, add, ln); - ln += dlen_inc; /* point past entry to children... */ - - /* increment counter and skip children of subdirs... */ - while ((++i < max) && (ptr != NULL)) - { - char *e_new = info->entries[i].name; - if ((strncmp(e, e_new, ln) != 0) || (e_new[ln] != '/')) - break; - } /* while */ - } /* else */ - } /* while */ -} /* ZIP_enumerateFiles */ - - -static int ZIP_exists(dvoid *opaque, const char *name) -{ - int isDir; - ZIPinfo *info = (ZIPinfo *) opaque; - ZIPentry *entry = zip_find_entry(info, name, &isDir); - return((entry != NULL) || (isDir)); -} /* ZIP_exists */ - - -static PHYSFS_sint64 ZIP_getLastModTime(dvoid *opaque, - const char *name, - int *fileExists) -{ - int isDir; - ZIPinfo *info = (ZIPinfo *) opaque; - ZIPentry *entry = zip_find_entry(info, name, &isDir); - - *fileExists = ((isDir) || (entry != NULL)); - if (isDir) - return(1); /* Best I can do for a dir... */ - - BAIL_IF_MACRO(entry == NULL, NULL, -1); - return(entry->last_mod_time); -} /* ZIP_getLastModTime */ - - -static int ZIP_isDirectory(dvoid *opaque, const char *name, int *fileExists) -{ - ZIPinfo *info = (ZIPinfo *) opaque; - int isDir; - ZIPentry *entry = zip_find_entry(info, name, &isDir); - - *fileExists = ((isDir) || (entry != NULL)); - if (isDir) - return(1); /* definitely a dir. */ - - /* Follow symlinks. This means we might need to resolve entries. */ - BAIL_IF_MACRO(entry == NULL, ERR_NO_SUCH_FILE, 0); - - if (entry->resolved == ZIP_UNRESOLVED_SYMLINK) /* gotta resolve it. */ - { - int rc; - void *in = __PHYSFS_platformOpenRead(info->archiveName); - BAIL_IF_MACRO(in == NULL, NULL, 0); - rc = zip_resolve(in, info, entry); - __PHYSFS_platformClose(in); - if (!rc) - return(0); - } /* if */ - - BAIL_IF_MACRO(entry->resolved == ZIP_BROKEN_SYMLINK, NULL, 0); - BAIL_IF_MACRO(entry->symlink == NULL, ERR_NOT_A_DIR, 0); - - return(zip_find_start_of_dir(info, entry->symlink->name, 1) >= 0); -} /* ZIP_isDirectory */ - - -static int ZIP_isSymLink(dvoid *opaque, const char *name, int *fileExists) -{ - int isDir; - const ZIPentry *entry = zip_find_entry((ZIPinfo *) opaque, name, &isDir); - *fileExists = ((isDir) || (entry != NULL)); - BAIL_IF_MACRO(entry == NULL, NULL, 0); - return(zip_entry_is_symlink(entry)); -} /* ZIP_isSymLink */ - - -static void *zip_get_file_handle(const char *fn, ZIPinfo *inf, ZIPentry *entry) -{ - int success; - void *retval = __PHYSFS_platformOpenRead(fn); - BAIL_IF_MACRO(retval == NULL, NULL, NULL); - - success = zip_resolve(retval, inf, entry); - if (success) - { - PHYSFS_sint64 offset; - offset = ((entry->symlink) ? entry->symlink->offset : entry->offset); - success = __PHYSFS_platformSeek(retval, offset); - } /* if */ - - if (!success) - { - __PHYSFS_platformClose(retval); - retval = NULL; - } /* if */ - - return(retval); -} /* zip_get_file_handle */ - - -static fvoid *ZIP_openRead(dvoid *opaque, const char *fnm, int *fileExists) -{ - ZIPinfo *info = (ZIPinfo *) opaque; - ZIPentry *entry = zip_find_entry(info, fnm, NULL); - ZIPfileinfo *finfo = NULL; - void *in; - - *fileExists = (entry != NULL); - BAIL_IF_MACRO(entry == NULL, NULL, NULL); - - in = zip_get_file_handle(info->archiveName, info, entry); - BAIL_IF_MACRO(in == NULL, NULL, NULL); - - finfo = (ZIPfileinfo *) allocator.Malloc(sizeof (ZIPfileinfo)); - if (finfo == NULL) - { - __PHYSFS_platformClose(in); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); - } /* if */ - - memset(finfo, '\0', sizeof (ZIPfileinfo)); - finfo->handle = in; - finfo->entry = ((entry->symlink != NULL) ? entry->symlink : entry); - initializeZStream(&finfo->stream); - if (finfo->entry->compression_method != COMPMETH_NONE) - { - if (zlib_err(inflateInit2(&finfo->stream, -MAX_WBITS)) != Z_OK) - { - ZIP_fileClose(finfo); - return(NULL); - } /* if */ - - finfo->buffer = (PHYSFS_uint8 *) allocator.Malloc(ZIP_READBUFSIZE); - if (finfo->buffer == NULL) - { - ZIP_fileClose(finfo); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); - } /* if */ - } /* if */ - - return(finfo); -} /* ZIP_openRead */ - - -static fvoid *ZIP_openWrite(dvoid *opaque, const char *filename) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* ZIP_openWrite */ - - -static fvoid *ZIP_openAppend(dvoid *opaque, const char *filename) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); -} /* ZIP_openAppend */ - - -static void ZIP_dirClose(dvoid *opaque) -{ - ZIPinfo *zi = (ZIPinfo *) (opaque); - zip_free_entries(zi->entries, zi->entryCount); - allocator.Free(zi->archiveName); - allocator.Free(zi); -} /* ZIP_dirClose */ - - -static int ZIP_remove(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* ZIP_remove */ - - -static int ZIP_mkdir(dvoid *opaque, const char *name) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* ZIP_mkdir */ - - -const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_ZIP = -{ - "ZIP", - ZIP_ARCHIVE_DESCRIPTION, - "Ryan C. Gordon ", - "http://icculus.org/physfs/", -}; - - -const PHYSFS_Archiver __PHYSFS_Archiver_ZIP = -{ - &__PHYSFS_ArchiveInfo_ZIP, - ZIP_isArchive, /* isArchive() method */ - ZIP_openArchive, /* openArchive() method */ - ZIP_enumerateFiles, /* enumerateFiles() method */ - ZIP_exists, /* exists() method */ - ZIP_isDirectory, /* isDirectory() method */ - ZIP_isSymLink, /* isSymLink() method */ - ZIP_getLastModTime, /* getLastModTime() method */ - ZIP_openRead, /* openRead() method */ - ZIP_openWrite, /* openWrite() method */ - ZIP_openAppend, /* openAppend() method */ - ZIP_remove, /* remove() method */ - ZIP_mkdir, /* mkdir() method */ - ZIP_dirClose, /* dirClose() method */ - ZIP_read, /* read() method */ - ZIP_write, /* write() method */ - ZIP_eof, /* eof() method */ - ZIP_tell, /* tell() method */ - ZIP_seek, /* seek() method */ - ZIP_fileLength, /* fileLength() method */ - ZIP_fileClose /* fileClose() method */ -}; - -#endif /* defined PHYSFS_SUPPORTS_ZIP */ - -/* end of zip.c ... */ - diff --git a/jni/physfs-2.0.3/extras/globbing.c b/jni/physfs-2.0.3/extras/globbing.c deleted file mode 100644 index bb83d6a2..00000000 --- a/jni/physfs-2.0.3/extras/globbing.c +++ /dev/null @@ -1,159 +0,0 @@ -/** \file globbing.c */ - -#include -#include -#include -#include - -#include "physfs.h" -#include "globbing.h" - -/** - * Please see globbing.h for details. - * - * License: this code is public domain. I make no warranty that it is useful, - * correct, harmless, or environmentally safe. - * - * This particular file may be used however you like, including copying it - * verbatim into a closed-source project, exploiting it commercially, and - * removing any trace of my name from the source (although I hope you won't - * do that). I welcome enhancements and corrections to this file, but I do - * not require you to send me patches if you make changes. This code has - * NO WARRANTY. - * - * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. - * Please see LICENSE.txt in the root of the source tree. - * - * \author Ryan C. Gordon. - */ - - -static int matchesPattern(const char *fname, const char *wildcard, - int caseSensitive) -{ - char x, y; - const char *fnameptr = fname; - const char *wildptr = wildcard; - - while ((*wildptr) && (*fnameptr)) - { - y = *wildptr; - if (y == '*') - { - do - { - wildptr++; /* skip multiple '*' in a row... */ - } while (*wildptr == '*'); - - y = (caseSensitive) ? *wildptr : (char) tolower(*wildptr); - - while (1) - { - x = (caseSensitive) ? *fnameptr : (char) tolower(*fnameptr); - if ((!x) || (x == y)) - break; - else - fnameptr++; - } /* while */ - } /* if */ - - else if (y == '?') - { - wildptr++; - fnameptr++; - } /* else if */ - - else - { - if (caseSensitive) - x = *fnameptr; - else - { - x = tolower(*fnameptr); - y = tolower(y); - } /* if */ - - wildptr++; - fnameptr++; - - if (x != y) - return(0); - } /* else */ - } /* while */ - - while (*wildptr == '*') - wildptr++; - - return(*fnameptr == *wildptr); -} /* matchesPattern */ - - -char **PHYSFSEXT_enumerateFilesWildcard(const char *dir, const char *wildcard, - int caseSensitive) -{ - char **rc = PHYSFS_enumerateFiles(dir); - char **i = rc; - char **j; - - while (*i != NULL) - { - if (matchesPattern(*i, wildcard, caseSensitive)) - i++; - else - { - /* FIXME: This counts on physfs's allocation method not changing! */ - free(*i); - for (j = i; *j != NULL; j++) - j[0] = j[1]; - } /* else */ - } /* for */ - - return(rc); -} /* PHYSFSEXT_enumerateFilesWildcard */ - - -#ifdef TEST_PHYSFSEXT_ENUMERATEFILESWILDCARD -int main(int argc, char **argv) -{ - int rc; - char **flist; - char **i; - - if (argc != 3) - { - printf("USAGE: %s \n" - " where is 1 or 0.\n", argv[0]); - return(1); - } /* if */ - - if (!PHYSFS_init(argv[0])) - { - fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getLastError()); - return(1); - } /* if */ - - if (!PHYSFS_addToSearchPath(".", 1)) - { - fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError()); - PHYSFS_deinit(); - return(1); - } /* if */ - - flist = PHYSFSEXT_enumerateFilesWildcard("/", argv[1], atoi(argv[2])); - rc = 0; - for (i = flist; *i; i++) - { - printf("%s\n", *i); - rc++; - } /* for */ - printf("\n total %d files.\n\n", rc); - - PHYSFS_freeList(flist); - PHYSFS_deinit(); - - return(0); -} /* main */ -#endif - -/* end of globbing.c ... */ - diff --git a/jni/physfs-2.0.3/extras/globbing.h b/jni/physfs-2.0.3/extras/globbing.h deleted file mode 100644 index f1c1aa77..00000000 --- a/jni/physfs-2.0.3/extras/globbing.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef INCL_PHYSFSEXT_GLOBBING_H -#define INCL_PHYSFSEXT_GLOBBING_H - -/** \file globbing.h */ - -/** - * \mainpage PhysicsFS globbing - * - * This is an extension to PhysicsFS to let you search for files with basic - * wildcard matching, regardless of what sort of filesystem or archive they - * reside in. It does this by enumerating directories as needed and manually - * locating matching entries. - * - * Usage: Set up PhysicsFS as you normally would, then use - * PHYSFSEXT_enumerateFilesPattern() when enumerating files. This is just - * like PHYSFS_enumerateFiles(), but it returns a subset that matches your - * wildcard pattern. You must call PHYSFS_freeList() on the results, just - * like you would with PHYSFS_enumerateFiles(). - * - * License: this code is public domain. I make no warranty that it is useful, - * correct, harmless, or environmentally safe. - * - * This particular file may be used however you like, including copying it - * verbatim into a closed-source project, exploiting it commercially, and - * removing any trace of my name from the source (although I hope you won't - * do that). I welcome enhancements and corrections to this file, but I do - * not require you to send me patches if you make changes. This code has - * NO WARRANTY. - * - * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. - * Please see LICENSE.txt in the root of the source tree. - * - * \author Ryan C. Gordon. - */ - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \fn char **PHYSFS_enumerateFilesWildcard(const char *dir, const char *wildcard, int caseSensitive) - * \brief Get a file listing of a search path's directory. - * - * Matching directories are interpolated. That is, if "C:\mydir" is in the - * search path and contains a directory "savegames" that contains "x.sav", - * "y.Sav", and "z.txt", and there is also a "C:\userdir" in the search path - * that has a "savegames" subdirectory with "w.sav", then the following code: - * - * \code - * char **rc = PHYSFS_enumerateFilesWildcard("savegames", "*.sav", 0); - * char **i; - * - * for (i = rc; *i != NULL; i++) - * printf(" * We've got [%s].\n", *i); - * - * PHYSFS_freeList(rc); - * \endcode - * - * ...will print: - * - * \verbatim - * We've got [x.sav]. - * We've got [y.Sav]. - * We've got [w.sav].\endverbatim - * - * Feel free to sort the list however you like. We only promise there will - * be no duplicates, but not what order the final list will come back in. - * - * Wildcard strings can use the '*' and '?' characters, currently. - * Matches can be case-insensitive if you pass a zero for argument 3. - * - * Don't forget to call PHYSFS_freeList() with the return value from this - * function when you are done with it. - * - * \param dir directory in platform-independent notation to enumerate. - * \return Null-terminated array of null-terminated strings. - */ -__EXPORT__ char **PHYSFSEXT_enumerateFilesWildcard(const char *dir, - const char *wildcard, - int caseSensitive); - -#ifdef __cplusplus -} -#endif - -#endif /* include-once blocker. */ - -/* end of globbing.h ... */ - diff --git a/jni/physfs-2.0.3/extras/physfs_rb/installer.rb b/jni/physfs-2.0.3/extras/physfs_rb/installer.rb deleted file mode 100644 index a62bd288..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/installer.rb +++ /dev/null @@ -1,103 +0,0 @@ -# $Id: installer.rb,v 1.3 2003/07/21 03:46:50 icculus Exp $ - -require 'rbconfig' -require 'find' -require 'ftools' - -include Config - -module Slimb - class Installer - def initialize target_dir = "", &user_skip - @user_skip = user_skip or proc {|f| false} - - @version = CONFIG["MAJOR"] + "." + CONFIG["MINOR"] - @libdir = File.join(CONFIG["libdir"], "ruby", @version) - @sitedir = CONFIG["sitedir"] || File.join(@libdir, "site_ruby") - @dest = File.join @sitedir, target_dir - - File::makedirs @dest - File::chmod 0755, @dest, true - end - - def skip? file - @user_skip[file] or - file[0] == ?. or file[-1] == ?~ or file[-1] == ?# - end - - def install_dir dir - File::makedirs(File.join(@dest, dir)) - File::chmod(0755, File.join(@dest, dir), true) - Dir.foreach(dir) {|file| - next if skip? file - - if File.ftype(File.join(dir, file)) == "directory" - install_dir File.join(dir, file) - else - install_file File.join(dir, file) - end - } - end - - def install_file file - if file =~ /\.so$/ - install_so file - else - File::install file, File.join(@dest, file), 0644, true - end - end - - def install_so file - File::install file, File.join(CONFIG["sitearchdir"], file), 0644, true - end - - def uninstall_so file - file = File.join(CONFIG["sitearchdir"], file) - File::safe_unlink file - end - - def install something - case something - when Array - something.each {|x| - install x if x.is_a? String - } - when String - if File.ftype(something) == "directory" - install_dir something - else - install_file something - end - end - end - - def uninstall what = "*" - case what - when Array - files = what.map {|x| File.join(@dest, x)} - when String - files = Dir[File.join(@dest, what)] - end - - files.each {|x| - # FIXME: recursive uninstall is a must - next if FileTest.directory? x - File::safe_unlink x - } - end - - def run files, argv - if !argv.grep(/--uninstall/).empty? - uninstall files - else - install files - end - end - end -end - -# self-installation -if $0 == __FILE__ - $stderr.puts "Installing slimb installer..." - Slimb::Installer.new("slimb").install File.basename(__FILE__) -end diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/extconf.rb b/jni/physfs-2.0.3/extras/physfs_rb/physfs/extconf.rb deleted file mode 100644 index f344059c..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/extconf.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'mkmf' - -$CFLAGS += `sdl-config --cflags`.chomp -$LDFLAGS += `sdl-config --libs`.chomp - -have_library "physfs", "PHYSFS_init" -have_library "SDL", "SDL_AllocRW" - -create_makefile "physfs_so" diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/install.rb b/jni/physfs-2.0.3/extras/physfs_rb/physfs/install.rb deleted file mode 100644 index 29bd4548..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/install.rb +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/local/bin/ruby - -if __FILE__ == $0 - require 'slimb/installer' - files = ["physfs.rb", "physfs_so.so"] - installer = Slimb::Installer.new.run files, ARGV -end diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/make_install_test.sh b/jni/physfs-2.0.3/extras/physfs_rb/physfs/make_install_test.sh deleted file mode 100755 index ac616c84..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/make_install_test.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -ruby extconf.rb -make -cd .. -ruby installer.rb -cd physfs -ruby install.rb -cd test -ruby test_physfs.rb \ No newline at end of file diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/physfs.rb b/jni/physfs-2.0.3/extras/physfs_rb/physfs/physfs.rb deleted file mode 100644 index 88da331b..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/physfs.rb +++ /dev/null @@ -1,121 +0,0 @@ -# -# PhysicsFS - ruby interface -# -# Author: Ed Sinjiashvili (slimb@vlinkmail.com) -# License: LGPL -# - -require 'physfs_so' - -module PhysicsFS - - class Version - def initialize major, minor, patch - @major = major - @minor = minor - @patch = patch - end - - attr_reader :major, :minor, :patch - - def to_s - "#@major.#@minor.#@patch" - end - end - - class ArchiveInfo - def initialize ext, desc, author, url - @extension = ext - @description = desc - @author = author - @url = url - end - - attr_reader :extension, :description - attr_reader :author, :url - - def to_s - " * #@extension: #@description\n Written by #@author.\n #@url\n" - end - end - - # - # convenience methods - # - class << self - - def init argv0 = $0 - init_internal argv0 - end - - def append_search_path str - add_to_search_path str, 1 - self - end - - def prepend_search_path str - add_to_search_path str, 0 - self - end - - alias_method :<<, :append_search_path - alias_method :push, :append_search_path - alias_method :unshift, :prepend_search_path - - def ls path = "" - enumerate path - end - end - - # - # File - PhysicsFS abstract file - can be drawn from various sources - # - class File - def write_str str - write str, 1, str.length - end - - def cat - prev_pos = tell - seek 0 - r = read length, 1 - seek prev_pos - r - end - - alias_method :size, :length - end - - # - # RWops - general stdio like operations on file-like creatures - # - class RWops - SEEK_SET = 0 - SEEK_CUR = 1 - SEEK_END = 2 - - # tell current position of RWopted entity - def tell - seek 0, SEEK_CUR - end - - # length of RWops abstracted entity - def length - cur = tell - r = seek 0, SEEK_END - seek cur, SEEK_SET - r - end - - alias_method :size, :length - - # - # create rwops from PhysicsFS file object - # - def self.from_physfs file - file.to_rwops - end - end -end - -# physfs.rb ends here # diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/physfsrwops.c b/jni/physfs-2.0.3/extras/physfs_rb/physfs/physfsrwops.c deleted file mode 100644 index 8dd23bff..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/physfsrwops.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * This code provides a glue layer between PhysicsFS and Simple Directmedia - * Layer's (SDL) RWops i/o abstraction. - * - * License: this code is public domain. I make no warranty that it is useful, - * correct, harmless, or environmentally safe. - * - * This particular file may be used however you like, including copying it - * verbatim into a closed-source project, exploiting it commercially, and - * removing any trace of my name from the source (although I hope you won't - * do that). I welcome enhancements and corrections to this file, but I do - * not require you to send me patches if you make changes. - * - * Unless otherwise stated, the rest of PhysicsFS falls under the GNU Lesser - * General Public License: http://www.gnu.org/licenses/lgpl.txt - * - * SDL falls under the LGPL, too. You can get SDL at http://www.libsdl.org/ - * - * This file was written by Ryan C. Gordon. (icculus@icculus.org). - */ - -#include /* used for SEEK_SET, SEEK_CUR, SEEK_END ... */ -#include "physfsrwops.h" - -static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) -{ - PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - int pos = 0; - - if (whence == SEEK_SET) - { - pos = offset; - } /* if */ - - else if (whence == SEEK_CUR) - { - PHYSFS_sint64 current = PHYSFS_tell(handle); - if (current == -1) - { - SDL_SetError("Can't find position in file: %s", - PHYSFS_getLastError()); - return(-1); - } /* if */ - - pos = (int) current; - if ( ((PHYSFS_sint64) pos) != current ) - { - SDL_SetError("Can't fit current file position in an int!"); - return(-1); - } /* if */ - - if (offset == 0) /* this is a "tell" call. We're done. */ - return(pos); - - pos += offset; - } /* else if */ - - else if (whence == SEEK_END) - { - PHYSFS_sint64 len = PHYSFS_fileLength(handle); - if (len == -1) - { - SDL_SetError("Can't find end of file: %s", PHYSFS_getLastError()); - return(-1); - } /* if */ - - pos = (int) len; - if ( ((PHYSFS_sint64) pos) != len ) - { - SDL_SetError("Can't fit end-of-file position in an int!"); - return(-1); - } /* if */ - - pos += offset; - } /* else if */ - - else - { - SDL_SetError("Invalid 'whence' parameter."); - return(-1); - } /* else */ - - if ( pos < 0 ) - { - SDL_SetError("Attempt to seek past start of file."); - return(-1); - } /* if */ - - if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos)) - { - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - return(-1); - } /* if */ - - return(pos); -} /* physfsrwops_seek */ - - -static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum) -{ - PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - PHYSFS_sint64 rc = PHYSFS_read(handle, ptr, size, maxnum); - if (rc != maxnum) - { - if (!PHYSFS_eof(handle)) /* not EOF? Must be an error. */ - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - } /* if */ - - return((int) rc); -} /* physfsrwops_read */ - - -static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num) -{ - PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - PHYSFS_sint64 rc = PHYSFS_write(handle, ptr, size, num); - if (rc != num) - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - - return((int) rc); -} /* physfsrwops_write */ - - -static int physfsrwops_close(SDL_RWops *rw) -{ - PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - if (!PHYSFS_close(handle)) - { - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - return(-1); - } /* if */ - - SDL_FreeRW(rw); - return(0); -} /* physfsrwops_close */ - - -static SDL_RWops *create_rwops(PHYSFS_File *handle) -{ - SDL_RWops *retval = NULL; - - if (handle == NULL) - SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - else - { - retval = SDL_AllocRW(); - if (retval != NULL) - { - retval->seek = physfsrwops_seek; - retval->read = physfsrwops_read; - retval->write = physfsrwops_write; - retval->close = physfsrwops_close; - retval->hidden.unknown.data1 = handle; - } /* if */ - } /* else */ - - return(retval); -} /* create_rwops */ - - -SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_File *handle) -{ - SDL_RWops *retval = NULL; - if (handle == NULL) - SDL_SetError("NULL pointer passed to PHYSFSRWOPS_makeRWops()."); - else - retval = create_rwops(handle); - - return(retval); -} /* PHYSFSRWOPS_makeRWops */ - - -SDL_RWops *PHYSFSRWOPS_openRead(const char *fname) -{ - return(create_rwops(PHYSFS_openRead(fname))); -} /* PHYSFSRWOPS_openRead */ - - -SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname) -{ - return(create_rwops(PHYSFS_openWrite(fname))); -} /* PHYSFSRWOPS_openWrite */ - - -SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname) -{ - return(create_rwops(PHYSFS_openAppend(fname))); -} /* PHYSFSRWOPS_openAppend */ - - -/* end of physfsrwops.c ... */ - diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/physfsrwops.h b/jni/physfs-2.0.3/extras/physfs_rb/physfs/physfsrwops.h deleted file mode 100644 index 5ff519a1..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/physfsrwops.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This code provides a glue layer between PhysicsFS and Simple Directmedia - * Layer's (SDL) RWops i/o abstraction. - * - * License: this code is public domain. I make no warranty that it is useful, - * correct, harmless, or environmentally safe. - * - * This particular file may be used however you like, including copying it - * verbatim into a closed-source project, exploiting it commercially, and - * removing any trace of my name from the source (although I hope you won't - * do that). I welcome enhancements and corrections to this file, but I do - * not require you to send me patches if you make changes. - * - * Unless otherwise stated, the rest of PhysicsFS falls under the GNU Lesser - * General Public License: http://www.gnu.org/licenses/lgpl.txt - * - * SDL falls under the LGPL, too. You can get SDL at http://www.libsdl.org/ - * - * This file was written by Ryan C. Gordon. (icculus@icculus.org). - */ - -#ifndef _INCLUDE_PHYSFSRWOPS_H_ -#define _INCLUDE_PHYSFSRWOPS_H_ - -#include "physfs.h" -#include "SDL.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Open a platform-independent filename for reading, and make it accessible - * via an SDL_RWops structure. The file will be closed in PhysicsFS when the - * RWops is closed. PhysicsFS should be configured to your liking before - * opening files through this method. - * - * @param filename File to open in platform-independent notation. - * @return A valid SDL_RWops structure on success, NULL on error. Specifics - * of the error can be gleaned from PHYSFS_getLastError(). - */ -__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); - -/** - * Open a platform-independent filename for writing, and make it accessible - * via an SDL_RWops structure. The file will be closed in PhysicsFS when the - * RWops is closed. PhysicsFS should be configured to your liking before - * opening files through this method. - * - * @param filename File to open in platform-independent notation. - * @return A valid SDL_RWops structure on success, NULL on error. Specifics - * of the error can be gleaned from PHYSFS_getLastError(). - */ -__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); - -/** - * Open a platform-independent filename for appending, and make it accessible - * via an SDL_RWops structure. The file will be closed in PhysicsFS when the - * RWops is closed. PhysicsFS should be configured to your liking before - * opening files through this method. - * - * @param filename File to open in platform-independent notation. - * @return A valid SDL_RWops structure on success, NULL on error. Specifics - * of the error can be gleaned from PHYSFS_getLastError(). - */ -__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); - -/** - * Make a SDL_RWops from an existing PhysicsFS file handle. You should - * dispose of any references to the handle after successful creation of - * the RWops. The actual PhysicsFS handle will be destroyed when the - * RWops is closed. - * - * @param handle a valid PhysicsFS file handle. - * @return A valid SDL_RWops structure on success, NULL on error. Specifics - * of the error can be gleaned from PHYSFS_getLastError(). - */ -__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle); - -#ifdef __cplusplus -} -#endif - -#endif /* include-once blocker */ - -/* end of physfsrwops.h ... */ - diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs.c b/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs.c deleted file mode 100644 index 043d9117..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs.c +++ /dev/null @@ -1,462 +0,0 @@ -/* - * PhysicsFS - ruby interface - * - * Author:: Ed Sinjiashvili (slimb@vlinkmail.com) - * License:: LGPL - */ - -#include "physfs.h" -#include "ruby.h" - -#include "rb_physfs.h" -#include "rb_physfs_file.h" - -VALUE modulePhysfs; - -/* - * PhysicsFS::init str - * - * initialize PhysicsFS - */ -VALUE physfs_init (VALUE self, VALUE str) -{ - int result = PHYSFS_init (STR2CSTR(str)); - - if (result) - return Qtrue; - - return Qfalse; -} - -/* - * PhysicsFS::deinit - */ -VALUE physfs_deinit (VALUE self) -{ - if (PHYSFS_deinit ()) - return Qtrue; - - return Qfalse; -} - -/* - * PhysicsFS::version - * - * return PhysicsFS::Version object - */ -VALUE physfs_version (VALUE self) -{ - char evalStr[200]; - PHYSFS_Version ver; - - PHYSFS_getLinkedVersion (&ver); - - sprintf (evalStr, "PhysicsFS::Version.new %d, %d, %d", - ver.major, ver.minor, ver.patch); - return rb_eval_string (evalStr); -} - -/* - * PhysicsFS::supported_archives - * - * return Array of PhysicsFS::ArchiveInfo objects - */ -VALUE physfs_supported_archives (VALUE self) -{ - const PHYSFS_ArchiveInfo **info = PHYSFS_supportedArchiveTypes(); - VALUE klass = rb_const_get (modulePhysfs, rb_intern ("ArchiveInfo")); - VALUE ary = rb_ary_new (); - VALUE params[4]; - - while ( *info != 0 ) - { - params[0] = rb_str_new2 ((*info)->extension); - params[1] = rb_str_new2 ((*info)->description); - params[2] = rb_str_new2 ((*info)->author); - params[3] = rb_str_new2 ((*info)->url); - - rb_ary_push (ary, rb_class_new_instance (4, params, klass)); - info++; - } - - return ary; -} - -/* - * PhysicsFS::last_error - * - * return string representation of last PhysicsFS error - */ -VALUE physfs_last_error (VALUE self) -{ - const char *last_error = PHYSFS_getLastError (); - - if (last_error == 0) - last_error = ""; - - return rb_str_new2 (last_error); -} - -/* - * PhysicsFS::dir_separator - * - * return platform directory separator - */ -VALUE physfs_dir_separator (VALUE self) -{ - return rb_str_new2 (PHYSFS_getDirSeparator ()); -} - -/* - * PhysicsFS::permit_symlinks boolValue - * - * turn symlinks support on/off - */ -VALUE physfs_permit_symlinks (VALUE self, VALUE allow) -{ - int p = 1; - - if (allow == Qfalse || allow == Qnil) - p = 0; - - PHYSFS_permitSymbolicLinks (p); - return Qtrue; -} - -/* - * PhysicsFS::cdrom_dirs - * - * return Array of strings containing available CDs - */ -VALUE physfs_cdrom_dirs (VALUE self) -{ - char **cds = PHYSFS_getCdRomDirs(); - char **i; - VALUE ary = rb_ary_new (); - - for (i = cds; *i != 0; i++) - rb_ary_push (ary, rb_str_new2 (*i)); - - PHYSFS_freeList (cds); - return ary; -} - -/* - * PhysicsFS::base_dir - * - * return base directory - */ -VALUE physfs_base_dir (VALUE self) -{ - const char *base_dir = PHYSFS_getBaseDir (); - if (base_dir == 0) - base_dir = ""; - - return rb_str_new2 (base_dir); -} - -/* - * PhysicsFS::user_dir - * - * return user directory - */ -VALUE physfs_user_dir (VALUE self) -{ - const char *user_dir = PHYSFS_getBaseDir (); - if (user_dir == 0) - user_dir = ""; - - return rb_str_new2 (user_dir); -} - -/* - * PhysicsFS::write_dir - * - * return write directory - */ -VALUE physfs_write_dir (VALUE self) -{ - const char *write_dir = PHYSFS_getWriteDir (); - if (write_dir == 0) - return Qnil; - - return rb_str_new2 (write_dir); -} - -/* - * PhysicsFS::write_dir= str - * - * set write directory to *str* - */ -VALUE physfs_set_write_dir (VALUE self, VALUE str) -{ - int result = PHYSFS_setWriteDir (STR2CSTR(str)); - - if (result) - return Qtrue; - return Qfalse; -} - -/* - * PhysicsFS::add_to_search_path str, append - * - * if append > 0 - append str to search path, otherwise prepend it - */ -VALUE physfs_add_search_path (VALUE self, VALUE str, VALUE append) -{ - int result = PHYSFS_addToSearchPath (STR2CSTR(str), FIX2INT(append)); - if (result) - return Qtrue; - return Qfalse; -} - -/* - * PhysicsFS::remove_from_search_path str - * - * removes str from search path - */ -VALUE physfs_remove_search_path (VALUE self, VALUE str) -{ - int result = PHYSFS_removeFromSearchPath (STR2CSTR(str)); - if (result) - return Qtrue; - return Qfalse; -} - -/* - * PhysicsFS::search_path - * - * return current search_path - as array of strings - */ -VALUE physfs_search_path (VALUE self) -{ - char **path = PHYSFS_getSearchPath (); - char **i; - VALUE ary = rb_ary_new (); - - for (i = path ; *i != 0; i++) - rb_ary_push (ary, rb_str_new2 (*i)); - - PHYSFS_freeList (path); - return ary; -} - -// -VALUE physfs_setSaneConfig(VALUE self, VALUE org, VALUE app, VALUE ext, - VALUE includeCdroms, VALUE archivesFirst) -{ - int res = PHYSFS_setSaneConfig (STR2CSTR(org), STR2CSTR(app), STR2CSTR(ext), - RTEST(includeCdroms), RTEST(archivesFirst)); - if (res) - return Qtrue; - - return Qfalse; -} - -/* - * PhysicsFS::mkdir newdir - * - * create new directory - */ -VALUE physfs_mkdir (VALUE self, VALUE newdir) -{ - int result = PHYSFS_mkdir (STR2CSTR(newdir)); - if (result) - return Qtrue; - return Qfalse; -} - -/* - * PhysicsFS::delete name - * - * delete file with name - */ -VALUE physfs_delete (VALUE self, VALUE name) -{ - int result = PHYSFS_delete (STR2CSTR(name)); - if (result) - return Qtrue; - return Qfalse; -} - -/* - * PhysicsFS::real_dir name - * - * return real directory (in search path) of a name - */ -VALUE physfs_real_dir (VALUE self, VALUE name) -{ - const char *path = PHYSFS_getRealDir (STR2CSTR(name)); - if (path == 0) - return Qnil; - - return rb_str_new2 (path); -} - -/* - * PhysicsFS::enumerate dir - * - * list a dir from a search path - */ -VALUE physfs_enumerate (VALUE self, VALUE dir) -{ - char **files = PHYSFS_enumerateFiles (STR2CSTR(dir)); - char **i; - VALUE ary = rb_ary_new (); - - for (i = files; *i != 0; i++) - rb_ary_push (ary, rb_str_new2 (*i)); - - PHYSFS_freeList (files); - return ary; -} - -/* - * PhysicsFS::exists? name - * - * does a file with name exist? - */ -VALUE physfs_exists (VALUE self, VALUE name) -{ - int result = PHYSFS_exists (STR2CSTR(name)); - if (result) - return Qtrue; - return Qfalse; -} - -/* - * PhysicsFS::is_directory? name - * - * return true if name is directory - */ -VALUE physfs_is_directory (VALUE self, VALUE name) -{ - int result = PHYSFS_isDirectory (STR2CSTR(name)); - if (result) - return Qtrue; - return Qfalse; -} - -/* - * PhysicsFS::is_symlink? name - * - * return true if name is symlink - */ -VALUE physfs_is_symlink (VALUE self, VALUE name) -{ - int result = PHYSFS_isSymbolicLink (STR2CSTR(name)); - if (result) - return Qtrue; - return Qfalse; -} - -/* - * PhysicsFS::last_mod_time name - * - * return last modification time of a file - */ -VALUE physfs_last_mod_time (VALUE self, VALUE name) -{ - int result = PHYSFS_getLastModTime (STR2CSTR(name)); - - return INT2FIX(result); -} - -/* - * PhysicsFS::open_read name - * - * return +PhysicsFS::File+ ready for reading - */ -VALUE physfs_open_read (VALUE self, VALUE name) -{ - PHYSFS_File *file = PHYSFS_openRead (STR2CSTR(name)); - return physfs_file_new (file); -} - -/* - * PhysicsFS::open_write name - * - * return PhysicsFS::File ready for writing - */ -VALUE physfs_open_write (VALUE self, VALUE name) -{ - PHYSFS_File *file = PHYSFS_openWrite (STR2CSTR(name)); - return physfs_file_new (file); -} - -/* - * PhysicsFS::open_append name - * - * return PhysicsFS::File ready for appending - */ -VALUE physfs_open_append (VALUE self, VALUE name) -{ - PHYSFS_File *file = PHYSFS_openAppend (STR2CSTR(name)); - return physfs_file_new (file); -} - -void Init_physfs_so (void) -{ - modulePhysfs = rb_define_module ("PhysicsFS"); - - rb_define_singleton_method (modulePhysfs, "init_internal", physfs_init, 1); - rb_define_singleton_method (modulePhysfs, "deinit", physfs_deinit, 0); - rb_define_singleton_method (modulePhysfs, "version", physfs_version, 0); - rb_define_singleton_method (modulePhysfs, "supported_archives", - physfs_supported_archives, 0); - rb_define_singleton_method (modulePhysfs, "last_error", - physfs_last_error, 0); - rb_define_singleton_method (modulePhysfs, "dir_separator", - physfs_dir_separator, 0); - rb_define_singleton_method (modulePhysfs, "permit_symlinks", - physfs_permit_symlinks, 1); - rb_define_singleton_method (modulePhysfs, "cdrom_dirs", - physfs_cdrom_dirs, 0); - rb_define_singleton_method (modulePhysfs, "base_dir", physfs_base_dir, 0); - rb_define_singleton_method (modulePhysfs, "user_dir", physfs_user_dir, 0); - - rb_define_singleton_method (modulePhysfs, "write_dir", physfs_write_dir, 0); - rb_define_singleton_method (modulePhysfs, "write_dir=", - physfs_set_write_dir, 1); - - rb_define_singleton_method (modulePhysfs, "add_to_search_path", - physfs_add_search_path, 2); - rb_define_singleton_method (modulePhysfs, "remove_from_search_path", - physfs_remove_search_path, 1); - rb_define_singleton_method (modulePhysfs, "search_path", - physfs_search_path, 0); - - rb_define_singleton_method (modulePhysfs, "set_sane_config", - physfs_setSaneConfig, 5); - - rb_define_singleton_method (modulePhysfs, "mkdir", physfs_mkdir, 1); - rb_define_singleton_method (modulePhysfs, "delete", physfs_delete, 1); - rb_define_singleton_method (modulePhysfs, "real_dir", - physfs_real_dir, 1); - rb_define_singleton_method (modulePhysfs, "enumerate", physfs_enumerate, 1); - rb_define_singleton_method (modulePhysfs, "exists?", physfs_exists, 1); - rb_define_singleton_method (modulePhysfs, "is_directory?", - physfs_is_directory, 1); - rb_define_singleton_method (modulePhysfs, "is_symlink?", - physfs_is_symlink, 1); - rb_define_singleton_method (modulePhysfs, "last_mod_time", - physfs_last_mod_time, 1); - - rb_define_singleton_method (modulePhysfs, "open_read", - physfs_open_read, 1); - rb_define_singleton_method (modulePhysfs, "open_write", - physfs_open_write, 1); - rb_define_singleton_method (modulePhysfs, "open_append", - physfs_open_append, 1); - - init_physfs_file (); - init_sdl_rwops (); -} - -/* -// Local Variables: -// mode: C -// c-indentation-style: "stroustrup" -// indent-tabs-mode: nil -// End: -*/ diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs.h b/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs.h deleted file mode 100644 index ca820366..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * PhysicsFS - ruby interface - * - * Author:: Ed Sinjiashvili (slimb@vlinkmail.com) - * License:: LGPL - */ - -#ifndef __RB__PHYSFS__H__ -#define __RB__PHYSFS__H__ - -extern VALUE modulePhysfs; - -#endif diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs_file.c b/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs_file.c deleted file mode 100644 index 3e50880a..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs_file.c +++ /dev/null @@ -1,226 +0,0 @@ -/* - * PhysicsFS File abstraction - ruby interface - * - * Author:: Ed Sinjiashvili (slimb@vlinkmail.com) - * License:: LGPL - */ - -#include "physfs.h" -#include "ruby.h" - -#include "rb_physfs.h" -#include "rb_physfs_file.h" -#include "physfsrwops.h" - -VALUE classPhysfsFile; - -/* - * construct new PhysicsFS::File object - */ -VALUE physfs_file_new (PHYSFS_File *file) -{ - if (file == 0) - return Qnil; - - return Data_Wrap_Struct (classPhysfsFile, 0, 0, file); -} - -/* - * PhysicsFS::File#close - * - * Close the file. It's illegal to use the object after its closure. - */ -VALUE physfs_file_close (VALUE self) -{ - int result; - PHYSFS_File *file; - Data_Get_Struct (self, PHYSFS_File, file); - - if (file == 0) - return Qfalse; - - result = PHYSFS_close (file); - DATA_PTR(self) = 0; - - if (result) - return Qtrue; - return Qfalse; -} - -/* - * PhysicsFS::File#read obj_size, num_objects - * - * Read *objCount* objects which are *objSize* each. - * return String instance containing raw data or nil if failure. - * #length of string will reflect real number of objects read. - */ -VALUE physfs_file_read (VALUE self, VALUE objSize, VALUE objCount) -{ - int objRead; - void *buffer; - VALUE result; - PHYSFS_File *file; - - Data_Get_Struct (self, PHYSFS_File, file); - if (file == 0) - return Qnil; //wasted file - no read possible - - buffer = malloc (FIX2UINT(objSize) * FIX2UINT(objCount)); - if (buffer == 0) - return Qnil; - - objRead = PHYSFS_read (file, buffer, FIX2UINT(objSize), FIX2UINT(objCount)); - if (objRead == -1) - { - free (buffer); - return Qnil; - } - - result = rb_str_new (buffer, objRead * FIX2UINT(objSize)); - free (buffer); - return result; -} - -/* - * PhysicsFS::File#write buffer, obj_size, num_objects - * - * return nil on failure or number of objects written. - */ -VALUE physfs_file_write (VALUE self, VALUE buf, VALUE objSize, VALUE objCount) -{ - int result; - PHYSFS_File *file; - - Data_Get_Struct (self, PHYSFS_File, file); - if (file == 0) - return Qnil; - - result = PHYSFS_write (file, STR2CSTR(buf), - FIX2UINT(objSize), FIX2UINT(objCount)); - if (result == -1) - return Qnil; - - return INT2FIX(result); -} - -/* - * PhysicsFS::File#eof? - */ -VALUE physfs_file_eof (VALUE self) -{ - int result; - PHYSFS_File *file; - - Data_Get_Struct (self, PHYSFS_File, file); - if (file == 0) - return Qnil; - - result = PHYSFS_eof (file); - - if (result) - return Qtrue; - - return Qfalse; -} - -/* - * PhysicsFS::File#tell - * - * tells current position in file - */ -VALUE physfs_file_tell (VALUE self) -{ - int result; - PHYSFS_File *file; - - Data_Get_Struct (self, PHYSFS_File, file); - if (file == 0) - return Qnil; - - result = PHYSFS_tell (file); - - if (result == -1) - return Qnil; - - return INT2FIX(result); -} - -/* - * PhysicsFS::File#seek pos - * - * seek to pos in file - */ -VALUE physfs_file_seek (VALUE self, VALUE pos) -{ - int result; - PHYSFS_File *file; - - Data_Get_Struct (self, PHYSFS_File, file); - if (file == 0) - return Qnil; - - result = PHYSFS_seek (file, FIX2LONG(pos)); - - if (result) - return Qtrue; - - return Qfalse; -} - -/* - * PhysicsFS::File#length - */ -VALUE physfs_file_length (VALUE self) -{ - int result; - PHYSFS_File *file; - - Data_Get_Struct (self, PHYSFS_File, file); - if (file == 0) - return Qnil; - - result = PHYSFS_fileLength (file); - - if (result == -1) - return Qnil; - - return INT2FIX(result); -} - -/* - * PhysicsFS::File#to_rwops - * - * File object is converted to RWops object. - * File object becomes unusable after that - every operation - * should be done through new-born RWops object. - */ -VALUE physfs_file_to_rwops (VALUE self) -{ - PHYSFS_File *file; - SDL_RWops *rwops; - - Data_Get_Struct (self, PHYSFS_File, file); - if (file == 0) - return Qnil; - - rwops = PHYSFSRWOPS_makeRWops (file); - if (rwops == 0) - return Qnil; - - DATA_PTR(self) = 0; // oh, gosh, we've sacrificed ourselves! - return sdl_rwops_new (rwops); -} - -void init_physfs_file (void) -{ - classPhysfsFile = rb_define_class_under (modulePhysfs, "File", rb_cObject); - - rb_define_method (classPhysfsFile, "close", physfs_file_close, 0); - rb_define_method (classPhysfsFile, "eof?", physfs_file_eof, 0); - rb_define_method (classPhysfsFile, "tell", physfs_file_tell, 0); - rb_define_method (classPhysfsFile, "seek", physfs_file_seek, 1); - rb_define_method (classPhysfsFile, "length", physfs_file_length, 0); - rb_define_method (classPhysfsFile, "read", physfs_file_read, 2); - rb_define_method (classPhysfsFile, "write", physfs_file_write, 3); - rb_define_method (classPhysfsFile, "to_rwops", physfs_file_to_rwops, 0); -} diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs_file.h b/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs_file.h deleted file mode 100644 index 5cc1b218..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_physfs_file.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * PhysicsFS File abstraction - ruby interface - * - * Author:: Ed Sinjiashvili (slimb@vlinkmail.com) - * License:: LGPL - */ - -#ifndef __RB__PHYSFS__FILE__H__ -#define __RB__PHYSFS__FILE__H__ - -extern VALUE classPhysfsFile; - -VALUE physfs_file_new (PHYSFS_file *file); -VALUE physfs_file_close (VALUE self); -VALUE physfs_file_read (VALUE self, VALUE objSize, VALUE objCount); -VALUE physfs_file_write (VALUE self, VALUE buf, VALUE objSize, VALUE objCount); -VALUE physfs_file_eof (VALUE self); -VALUE physfs_file_tell (VALUE self); -VALUE physfs_file_seek (VALUE self, VALUE pos); -VALUE physfs_file_length (VALUE self); - -void init_physfs_file (void); - -#endif diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_sdl_rwops.c b/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_sdl_rwops.c deleted file mode 100644 index 6574906a..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_sdl_rwops.c +++ /dev/null @@ -1,162 +0,0 @@ -/* - * SDL_RWops - ruby interface - * - * Author:: Ed Sinjiashvili (slimb@vlinkmail.com) - * License:: LGPL - */ - -#include "SDL_rwops.h" -#include "ruby.h" - -#include "rb_physfs.h" -#include "rb_sdl_rwops.h" - -VALUE classRWops; - -/* - * RWops constructor - */ -VALUE sdl_rwops_new (SDL_RWops *ops) -{ - VALUE result; - - if (ops == 0) - return Qnil; - - result = Data_Wrap_Struct (classRWops, 0, SDL_FreeRW, ops); - return result; -} - -/* - * PhysicsFS::RWops::from_file name, mode - * - * create RWops object from file - */ -VALUE sdl_rwops_from_file (VALUE self, VALUE name, VALUE mode) -{ - SDL_RWops *ops = SDL_RWFromFile(STR2CSTR(name), STR2CSTR(mode)); - return sdl_rwops_new (ops); -} - -/* - * PhysicsFS::RWops::from_memory string - * - * create RWops object from memory - */ -VALUE sdl_rwops_from_mem (VALUE self, VALUE str) -{ - int len = RSTRING(str)->len; - void *mem = STR2CSTR(str); - SDL_RWops *ops = SDL_RWFromMem(mem, len); - - return sdl_rwops_new (ops); -} - -/* - * PhysicsFS::RWops#seek offset, whence - * - * position RWops object - */ -VALUE sdl_rwops_seek (VALUE self, VALUE offset, VALUE whence) -{ - int result; - SDL_RWops *ops; - - Data_Get_Struct (self, SDL_RWops, ops); - if (ops == 0) - return Qnil; - - result = SDL_RWseek(ops, FIX2INT(offset), FIX2INT(whence)); - return INT2FIX(result); -} - -/* - * PhysicsFS::RWops#close - * - * close RWops. No use of the object is possible after that. - */ -VALUE sdl_rwops_close (VALUE self) -{ - int result; - SDL_RWops *ops; - - Data_Get_Struct (self, SDL_RWops, ops); - if (ops == 0) - return Qnil; - - result = SDL_RWclose (ops); - DATA_PTR(self) = 0; - - return INT2FIX(result); -} - -/* - * PhysicsFS::RWops#read - * - * read from RWops object objCount objSize'd entities. - * return string containing raw data or nil - */ -VALUE sdl_rwops_read (VALUE self, VALUE objSize, VALUE objCount) -{ - int objRead; - void *buffer; - VALUE result; - SDL_RWops *ops; - - Data_Get_Struct (self, SDL_RWops, ops); - if (ops == 0) - return Qnil; - - buffer = malloc (FIX2UINT(objSize) * FIX2UINT(objCount)); - if (buffer == 0) - return Qnil; - - objRead = SDL_RWread (ops, buffer, FIX2UINT(objSize), FIX2UINT(objCount)); - if (objRead == -1) - { - free (buffer); - return Qnil; - } - - result = rb_str_new (buffer, objRead * FIX2UINT(objSize)); - free (buffer); - return result; -} - -/* - * PhysicsFS::RWops#write buffer, size, n - * - * write raw string containing n objects size length each. - * return number of objects written or nil - */ -VALUE sdl_rwops_write (VALUE self, VALUE buffer, VALUE size, VALUE n) -{ - int result; - SDL_RWops *ops; - - Data_Get_Struct (self, SDL_RWops, ops); - if (ops == 0) - return Qnil; - - result = SDL_RWwrite (ops, STR2CSTR(buffer), FIX2INT(size), FIX2INT(n)); - - if (result == -1) - return Qnil; - - return INT2FIX(result); -} - -void init_sdl_rwops (void) -{ - classRWops = rb_define_class_under (modulePhysfs, "RWops", rb_cObject); - - rb_define_method (classRWops, "seek", sdl_rwops_seek, 2); - rb_define_method (classRWops, "read", sdl_rwops_read, 2); - rb_define_method (classRWops, "write", sdl_rwops_write, 3); - rb_define_method (classRWops, "close", sdl_rwops_close, 0); - - rb_define_singleton_method (classRWops, "from_file", - sdl_rwops_from_file, 2); - rb_define_singleton_method (classRWops, "from_memory", - sdl_rwops_from_mem, 1); -} diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_sdl_rwops.h b/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_sdl_rwops.h deleted file mode 100644 index 05f51bcc..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/rb_sdl_rwops.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * SDL_RWops - ruby interface - * - * Author:: Ed Sinjiashvili (slimb@vlinkmail.com) - * License:: LGPL - */ - -#ifndef __RB__SDL__RWOPS__H__ -#define __RB__SDL__RWOPS__H__ - -extern VALUE classRWops; - -VALUE sdl_rwops_new (SDL_RWops *ops); -void init_sdl_rwops (void); - -#endif diff --git a/jni/physfs-2.0.3/extras/physfs_rb/physfs/test/test_physfs.rb b/jni/physfs-2.0.3/extras/physfs_rb/physfs/test/test_physfs.rb deleted file mode 100644 index 3f194c19..00000000 --- a/jni/physfs-2.0.3/extras/physfs_rb/physfs/test/test_physfs.rb +++ /dev/null @@ -1,358 +0,0 @@ -# -# PhysicsFS test program - mimics real physfs_test -# -require 'readline' -require 'physfs' - -def die msg - puts "#{msg} - reason: #{PhysicsFS.last_error}" -end - -# -# parse line to command and args -# -def parse line - return false if line.nil? - - if line.strip =~ /^(.*?) (?: (?:\s+(.*)) | $)/x - run $1, $2 - else - false - end -end - -# -# parse command args -# -def parse_args args - args.strip! - - dquoted = /^ " (.*?) "/x - squoted = /^ ' (.*?) '/x - unquoted = /^([^\s\'\"]+)/ - - regexps = [dquoted, squoted, unquoted] - - result = [] - while args != "" - regexps.each do |r| - if args =~ r - result << $1 - args.sub! r, "" - args.sub!(/\s+/, "") - break - end - end - end - result -end - -def usage cmd, prefix = "usage: " - print prefix - args = Commands::HELP[cmd] - if args - print cmd - args.scan(/\w+/).each {|x| - print " <#{x}>" - } - puts - else - puts %|#{cmd} (no arguments)| - end -end - -# commands go below -module Commands - HELP = { - "init" => "argv0", - "addarchive" => "archiveLocation append", - "removearchive" => "archiveLocation", - "enumerate" => "dirToEnumerate", - "ls" => "dirToEnumerate", - "setwritedir" => "newWriteDir", - "permitsymlinks" => "1or0", - "setsaneconfig" => "org appName arcExt includeCdRoms archivesFirst", - "mkdir" => "dirToMk", - "delete" => "dirToDelete", - "getrealdir" => "fileToFind", - "exists" => "fileToCheck", - "isdir" => "fileToCheck", - "issymlink" => "fileToCheck", - "cat" => "fileToCat", - "filelength" => "fileToCheck", - "append" => "fileToAppend", - "write" => "fileToCreateOrTrash", - "getlastmodtime" => "fileToExamine" - } - - def quit_cmd - exit - end - - alias q_cmd quit_cmd - - def help_cmd - commands = ::Commands.instance_methods.grep(/_cmd$/).sort - puts "Commands:" - commands.each do |c| - usage c.sub("_cmd", ""), " - " - end - - true - end - - def e val - if val - puts "Successful." - else - puts "Failure. reason: #{PhysicsFS.last_error}" - end - true - end - - def init_cmd arg - e PhysicsFS.init(arg) - end - - def deinit_cmd - e PhysicsFS.deinit - end - - def addarchive_cmd archive, append - e PhysicsFS.add_to_search_path(archive, append) - end - - def removearchive_cmd archive - e PhysicsFS.remove_from_search_path archive - end - - def enumerate_cmd path - entries = PhysicsFS.enumerate(path) - entries.each {|x| - puts x - } - true - end - - alias ls_cmd enumerate_cmd - - def getlasterror_cmd - puts "Last error is [#{PhysicsFS.last_error}]" - true - end - - def getdirsep_cmd - puts "Directory separator is [#{PhysicsFS.dir_separator}]" - true - end - - def getcdromdirs_cmd - dirs = PhysicsFS.cdrom_dirs - dirs.each {|x| - puts x - } - puts " total [#{dirs.length}] drives." - true - end - - def getsearchpath_cmd - spath = PhysicsFS.search_path - spath.each {|x| - puts x - } - puts "total [#{spath.length}] directories." - true - end - - def getbasedir_cmd - dir = PhysicsFS.base_dir - puts dir if dir - true - end - - def getuserdir_cmd - puts PhysicsFS.user_dir - true - end - - def getwritedir_cmd - dir = PhysicsFS.write_dir - if dir - puts "Write directory is [#{dir}]." - else - puts "No write directory defined." - end - true - end - - def setwritedir_cmd dir - e(PhysicsFS.write_dir = dir) - end - - def permitsymlinks_cmd val - if val.to_i == 1 - PhysicsFS.permit_symlinks true - puts "Symlinks are now permitted" - else - PhysicsFS.permit_symlinks false - puts "Symlinks are now forbidden" - end - true - end - - def setsaneconfig_cmd org, appname, ext, includeCdroms, archivesFirst - includeCdroms = includeCdroms.to_i == 1 - archiveFirst = archivesFirst == 1 - e PhysicsFS.set_sane_config(org, appname, ext, includeCdroms, archivesFirst) - end - - def mkdir_cmd dir - e PhysicsFS.mkdir(dir) - end - - def delete_cmd dir - e PhysicsFS.delete(dir) - end - - def getrealdir_cmd file - dir = PhysicsFS.real_dir file - if dir - puts "Found at [#{dir}]" - else - puts "Not found." - end - true - end - - def exists_cmd file - if PhysicsFS.exists? file - puts "File exists" - else - puts "File does not exist" - end - true - end - - def isdir_cmd file - if PhysicsFS.is_directory? file - puts "File is a directory" - else - puts "File is NOT a directory" - end - true - end - - def issymlink_cmd file - if PhysicsFS.is_symlink? file - puts "File is a symlink" - else - puts "File is NOT a symlink" - end - true - end - - def cat_cmd filename - file = PhysicsFS.open_read filename - if file.nil? - puts "failed to open. reason: #{PhysicsFS.last_error}" - return true - end - - puts file.cat - true - end - - def filelength_cmd filename - file = PhysicsFS.open_read filename - if file.nil? - puts "failed to open. reason: #{PhysicsFS.last_error}" - return true - end - - puts file.length - file.close - true - end - - WRITE_STR = "Rubyfied PhysicsFS works just fine.\n\n" - - def append_cmd filename - file = PhysicsFS.open_append filename - if file.nil? - puts "failed to open. reason: #{PhysicsFS.last_error}" - return true - end - - file.write WRITE_STR, 1, WRITE_STR.length - file.close - true - end - - def write_cmd filename - file = PhysicsFS.open_write filename - if file.nil? - puts "failed to open. reason: #{PhysicsFS.last_error}" - return true - end - - file.write_str WRITE_STR - file.close - true - end - - def getlastmodtime_cmd filename - t = PhysicsFS.last_mod_time filename - if t == -1 - puts "failed to determin. reason: #{PhysicsFS.last_error}" - else - puts "Last modified: #{Time.at(t)}" - end - true - end -end - -include Commands - -def run command, args - if args - args = parse_args args - else - args = [] - end - - begin - cmd = method "#{command}_cmd" - if args.length == cmd.arity - return cmd.call *args - else - usage command - true - end - rescue NameError - puts 'Unknown command. Enter "help" for instructions.' - true - end -end - -if __FILE__ == $0 - - PhysicsFS.init($0) or die "PhysicsFS init failed" - - puts "PhysicsFS version: #{PhysicsFS.version}" - puts - - puts "Supported archives: " - puts PhysicsFS.supported_archives - puts - - puts 'Enter commands. Enter "help" for instructions.' - - loop { - line = Readline::readline "physfs_rb> ", true - break unless parse line - } -end - - - - diff --git a/jni/physfs-2.0.3/makeos2.cmd b/jni/physfs-2.0.3/makeos2.cmd deleted file mode 100644 index b1fb4c07..00000000 --- a/jni/physfs-2.0.3/makeos2.cmd +++ /dev/null @@ -1,181 +0,0 @@ -@echo off -rem this is a simple batch file to build PhysicsFS on OS/2. You need to have -rem the Innotek libc and GCC (or "kLIBC") installed for this to work: -rem -rem http://svn.netlabs.org/libc -rem -rem This script (and, indeed, our OS/2 support) could use some tweaking. -rem Patches go to icculus@icculus.org ... - -set PHYSFSLANG=PHYSFS_LANG_ENGLISH -set DEBUGFLAGS=-D_NDEBUG -O2 -s -rem set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib123 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_7Z -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DPHYSFS_LANG=%PHYSFSLANG% -DHAVE_ASSERT_H -set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -I. -Iz -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_7Z -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DHAVE_ASSERT_H - -rem goto :dolinking - -@echo cleaning up any previous build... -@mkdir bin 2>NUL -@erase /N bin\*.* 2>NUL - -@echo Building export definitions... -@echo ;don't edit this directly! It is rewritten by makeos2.cmd! > bin\test_physfs.def -@echo NAME TESTPHYSFS WINDOWCOMPAT >> bin\test_physfs.def -@echo DESCRIPTION 'PhysicsFS: http://icculus.org/physfs/' >> bin\test_physfs.def -@echo STACKSIZE 0x10000 >> bin\test_physfs.def -@echo BASE=0x10000 >> bin\test_physfs.def -@echo PROTMODE >> bin\test_physfs.def - -@echo ;don't edit this directly! It is rewritten by makeos2.cmd! > bin\physfs.def -@echo LIBRARY 'physfs' INITINSTANCE TERMINSTANCE >> bin\physfs.def -@echo STACKSIZE 0x10000 >> bin\physfs.def -@echo CODE LOADONCALL >> bin\physfs.def -@echo DATA LOADONCALL NONSHARED MULTIPLE >> bin\physfs.def -@echo DESCRIPTION 'PhysicsFS: http://icculus.org/physfs/' >> bin\physfs.def -@echo EXPORTS >> bin\physfs.def -@echo "_PHYSFS_getLinkedVersion" >> bin\physfs.def -@echo "_PHYSFS_init" >> bin\physfs.def -@echo "_PHYSFS_deinit" >> bin\physfs.def -@echo "_PHYSFS_isInit" >> bin\physfs.def -@echo "_PHYSFS_supportedArchiveTypes" >> bin\physfs.def -@echo "_PHYSFS_freeList" >> bin\physfs.def -@echo "_PHYSFS_getLastError" >> bin\physfs.def -@echo "_PHYSFS_getDirSeparator" >> bin\physfs.def -@echo "_PHYSFS_permitSymbolicLinks" >> bin\physfs.def -@echo "_PHYSFS_symbolicLinksPermitted" >> bin\physfs.def -@echo "_PHYSFS_getCdRomDirs" >> bin\physfs.def -@echo "_PHYSFS_getBaseDir" >> bin\physfs.def -@echo "_PHYSFS_getUserDir" >> bin\physfs.def -@echo "_PHYSFS_getWriteDir" >> bin\physfs.def -@echo "_PHYSFS_setWriteDir" >> bin\physfs.def -@echo "_PHYSFS_addToSearchPath" >> bin\physfs.def -@echo "_PHYSFS_removeFromSearchPath" >> bin\physfs.def -@echo "_PHYSFS_getSearchPath" >> bin\physfs.def -@echo "_PHYSFS_setSaneConfig" >> bin\physfs.def -@echo "_PHYSFS_mkdir" >> bin\physfs.def -@echo "_PHYSFS_delete" >> bin\physfs.def -@echo "_PHYSFS_getRealDir" >> bin\physfs.def -@echo "_PHYSFS_enumerateFiles" >> bin\physfs.def -@echo "_PHYSFS_exists" >> bin\physfs.def -@echo "_PHYSFS_isDirectory" >> bin\physfs.def -@echo "_PHYSFS_isSymbolicLink" >> bin\physfs.def -@echo "_PHYSFS_openWrite" >> bin\physfs.def -@echo "_PHYSFS_openAppend" >> bin\physfs.def -@echo "_PHYSFS_openRead" >> bin\physfs.def -@echo "_PHYSFS_close" >> bin\physfs.def -@echo "_PHYSFS_read" >> bin\physfs.def -@echo "_PHYSFS_write" >> bin\physfs.def -@echo "_PHYSFS_eof" >> bin\physfs.def -@echo "_PHYSFS_tell" >> bin\physfs.def -@echo "_PHYSFS_seek" >> bin\physfs.def -@echo "_PHYSFS_fileLength" >> bin\physfs.def -@echo "_PHYSFS_swapSLE16" >> bin\physfs.def -@echo "_PHYSFS_swapULE16" >> bin\physfs.def -@echo "_PHYSFS_swapSLE32" >> bin\physfs.def -@echo "_PHYSFS_swapULE32" >> bin\physfs.def -@echo "_PHYSFS_swapSLE64" >> bin\physfs.def -@echo "_PHYSFS_swapULE64" >> bin\physfs.def -@echo "_PHYSFS_swapSBE16" >> bin\physfs.def -@echo "_PHYSFS_swapUBE16" >> bin\physfs.def -@echo "_PHYSFS_swapSBE32" >> bin\physfs.def -@echo "_PHYSFS_swapUBE32" >> bin\physfs.def -@echo "_PHYSFS_swapSBE64" >> bin\physfs.def -@echo "_PHYSFS_swapUBE64" >> bin\physfs.def -@echo "_PHYSFS_getLastModTime" >> bin\physfs.def -@echo "_PHYSFS_readSLE16" >> bin\physfs.def -@echo "_PHYSFS_readULE16" >> bin\physfs.def -@echo "_PHYSFS_readSLE32" >> bin\physfs.def -@echo "_PHYSFS_readULE32" >> bin\physfs.def -@echo "_PHYSFS_readSLE64" >> bin\physfs.def -@echo "_PHYSFS_readULE64" >> bin\physfs.def -@echo "_PHYSFS_readSBE16" >> bin\physfs.def -@echo "_PHYSFS_readUBE16" >> bin\physfs.def -@echo "_PHYSFS_readSBE32" >> bin\physfs.def -@echo "_PHYSFS_readUBE32" >> bin\physfs.def -@echo "_PHYSFS_readSBE64" >> bin\physfs.def -@echo "_PHYSFS_readUBE64" >> bin\physfs.def -@echo "_PHYSFS_writeSLE16" >> bin\physfs.def -@echo "_PHYSFS_writeULE16" >> bin\physfs.def -@echo "_PHYSFS_writeSLE32" >> bin\physfs.def -@echo "_PHYSFS_writeULE32" >> bin\physfs.def -@echo "_PHYSFS_writeSLE64" >> bin\physfs.def -@echo "_PHYSFS_writeULE64" >> bin\physfs.def -@echo "_PHYSFS_writeSBE16" >> bin\physfs.def -@echo "_PHYSFS_writeUBE16" >> bin\physfs.def -@echo "_PHYSFS_writeSBE32" >> bin\physfs.def -@echo "_PHYSFS_writeUBE32" >> bin\physfs.def -@echo "_PHYSFS_writeSBE64" >> bin\physfs.def -@echo "_PHYSFS_writeUBE64" >> bin\physfs.def -@echo "_PHYSFS_setBuffer" >> bin\physfs.def -@echo "_PHYSFS_flush" >> bin\physfs.def -@echo "_PHYSFS_mount" >> bin\physfs.def -@echo "_PHYSFS_getMountPoint" >> bin\physfs.def -@echo "_PHYSFS_setAllocator" >> bin\physfs.def -@echo "_PHYSFS_getCdRomDirsCallback" >> bin\physfs.def -@echo "_PHYSFS_getSearchPathCallback" >> bin\physfs.def -@echo "_PHYSFS_enumerateFilesCallback" >> bin\physfs.def -@echo "_PHYSFS_utf8ToUcs2" >> bin\physfs.def -@echo "_PHYSFS_utf8FromUcs2" >> bin\physfs.def -@echo "_PHYSFS_utf8ToUcs4" >> bin\physfs.def -@echo "_PHYSFS_utf8FromUcs4" >> bin\physfs.def -@echo "_PHYSFS_utf8FromLatin1" >> bin\physfs.def - -@echo Building export library... -emximp -o bin/physfs.lib bin/physfs.def -emximp -o bin/physfs.a bin/physfs.def - -@echo Compiling PhysicsFS library... -@echo on -gcc %CFLAGS% -o bin/physfs.obj physfs.c -gcc %CFLAGS% -o bin/physfs_byteorder.obj physfs_byteorder.c -gcc %CFLAGS% -o bin/physfs_unicode.obj physfs_unicode.c -gcc %CFLAGS% -o bin/os2.obj platform/os2.c -gcc %CFLAGS% -o bin/dir.obj archivers/dir.c -gcc %CFLAGS% -o bin/grp.obj archivers/grp.c -gcc %CFLAGS% -o bin/wad.obj archivers/wad.c -gcc %CFLAGS% -o bin/lzma.obj archivers/lzma.c -gcc %CFLAGS% -o bin/zip.obj archivers/zip.c -gcc %CFLAGS% -o bin/qpak.obj archivers/qpak.c -gcc %CFLAGS% -o bin/hog.obj archivers/hog.c -gcc %CFLAGS% -o bin/mvl.obj archivers/mvl.c -gcc %CFLAGS% -o bin/adler32.obj zlib123/adler32.c -gcc %CFLAGS% -o bin/compress.obj zlib123/compress.c -gcc %CFLAGS% -o bin/crc32.obj zlib123/crc32.c -gcc %CFLAGS% -o bin/deflate.obj zlib123/deflate.c -gcc %CFLAGS% -o bin/gzio.obj zlib123/gzio.c -gcc %CFLAGS% -o bin/infback.obj zlib123/infback.c -gcc %CFLAGS% -o bin/inffast.obj zlib123/inffast.c -gcc %CFLAGS% -o bin/inflate.obj zlib123/inflate.c -gcc %CFLAGS% -o bin/inftrees.obj zlib123/inftrees.c -gcc %CFLAGS% -o bin/trees.obj zlib123/trees.c -gcc %CFLAGS% -o bin/uncompr.obj zlib123/uncompr.c -gcc %CFLAGS% -o bin/zutil.obj zlib123/zutil.c -gcc %CFLAGS% -o bin/7zBuffer.obj lzma/7zBuffer.c -gcc %CFLAGS% -o bin/7zCrc.obj lzma/7zCrc.c -gcc %CFLAGS% -o bin/7zDecode.obj lzma/7zDecode.c -gcc %CFLAGS% -o bin/7zExtract.obj lzma/7zExtract.c -gcc %CFLAGS% -o bin/7zHeader.obj lzma/7zHeader.c -gcc %CFLAGS% -o bin/7zIn.obj lzma/7zIn.c -gcc %CFLAGS% -o bin/7zItem.obj lzma/7zItem.c -gcc %CFLAGS% -o bin/7zMethodID.obj lzma/7zMethodID.c -gcc %CFLAGS% -o bin/LzmaDecode.obj lzma/LzmaDecode.c -gcc %CFLAGS% -o bin/LzmaStateDecode.obj lzma/LzmaStateDecode.c -@echo off - -:dolinking -@echo Linking PhysicsFS library... -gcc %DEBUGFLAGS% -Zdll -Zcrtdll -Zomf -o bin/physfs.dll bin/*.obj bin/physfs.def - -rem goto :builddone - -@echo Compiling test program... -gcc %CFLAGS% -o bin/test_physfs.obj test/test_physfs.c -@echo Linking test program... -gcc %DEBUGFLAGS% -Zomf -Zcrtdll -o bin/test_physfs.exe bin/test_physfs.obj bin/physfs.lib bin/test_physfs.def - -:builddone - -@echo "All done!" - -rem end of makeos2.cmd ... - diff --git a/jni/physfs-2.0.3/physfs.c b/jni/physfs-2.0.3/physfs.c deleted file mode 100644 index 580b5a12..00000000 --- a/jni/physfs-2.0.3/physfs.c +++ /dev/null @@ -1,2222 +0,0 @@ -/** - * PhysicsFS; a portable, flexible file i/o abstraction. - * - * Documentation is in physfs.h. It's verbose, honest. :) - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#include -#include -#include -#include "physfs.h" - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_internal.h" - - -typedef struct __PHYSFS_DIRHANDLE__ -{ - void *opaque; /* Instance data unique to the archiver. */ - char *dirName; /* Path to archive in platform-dependent notation. */ - char *mountPoint; /* Mountpoint in virtual file tree. */ - const PHYSFS_Archiver *funcs; /* Ptr to archiver info for this handle. */ - struct __PHYSFS_DIRHANDLE__ *next; /* linked list stuff. */ -} DirHandle; - - -typedef struct __PHYSFS_FILEHANDLE__ -{ - void *opaque; /* Instance data unique to the archiver for this file. */ - PHYSFS_uint8 forReading; /* Non-zero if reading, zero if write/append */ - const DirHandle *dirHandle; /* Archiver instance that created this */ - const PHYSFS_Archiver *funcs; /* Ptr to archiver info for this handle. */ - PHYSFS_uint8 *buffer; /* Buffer, if set (NULL otherwise). Don't touch! */ - PHYSFS_uint32 bufsize; /* Bufsize, if set (0 otherwise). Don't touch! */ - PHYSFS_uint32 buffill; /* Buffer fill size. Don't touch! */ - PHYSFS_uint32 bufpos; /* Buffer position. Don't touch! */ - struct __PHYSFS_FILEHANDLE__ *next; /* linked list stuff. */ -} FileHandle; - - -typedef struct __PHYSFS_ERRMSGTYPE__ -{ - void *tid; - int errorAvailable; - char errorString[80]; - struct __PHYSFS_ERRMSGTYPE__ *next; -} ErrMsg; - - -/* The various i/o drivers...some of these may not be compiled in. */ -extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_ZIP; -extern const PHYSFS_Archiver __PHYSFS_Archiver_ZIP; -extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_LZMA; -extern const PHYSFS_Archiver __PHYSFS_Archiver_LZMA; -extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_GRP; -extern const PHYSFS_Archiver __PHYSFS_Archiver_GRP; -extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_QPAK; -extern const PHYSFS_Archiver __PHYSFS_Archiver_QPAK; -extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_HOG; -extern const PHYSFS_Archiver __PHYSFS_Archiver_HOG; -extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_MVL; -extern const PHYSFS_Archiver __PHYSFS_Archiver_MVL; -extern const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_WAD; -extern const PHYSFS_Archiver __PHYSFS_Archiver_WAD; -extern const PHYSFS_Archiver __PHYSFS_Archiver_DIR; - - -static const PHYSFS_ArchiveInfo *supported_types[] = -{ -#if (defined PHYSFS_SUPPORTS_ZIP) - &__PHYSFS_ArchiveInfo_ZIP, -#endif -#if (defined PHYSFS_SUPPORTS_7Z) - &__PHYSFS_ArchiveInfo_LZMA, -#endif -#if (defined PHYSFS_SUPPORTS_GRP) - &__PHYSFS_ArchiveInfo_GRP, -#endif -#if (defined PHYSFS_SUPPORTS_QPAK) - &__PHYSFS_ArchiveInfo_QPAK, -#endif -#if (defined PHYSFS_SUPPORTS_HOG) - &__PHYSFS_ArchiveInfo_HOG, -#endif -#if (defined PHYSFS_SUPPORTS_MVL) - &__PHYSFS_ArchiveInfo_MVL, -#endif -#if (defined PHYSFS_SUPPORTS_WAD) - &__PHYSFS_ArchiveInfo_WAD, -#endif - NULL -}; - -static const PHYSFS_Archiver * const archivers[] = -{ - &__PHYSFS_Archiver_DIR, -#if (defined PHYSFS_SUPPORTS_ZIP) - &__PHYSFS_Archiver_ZIP, -#endif -#if (defined PHYSFS_SUPPORTS_7Z) - &__PHYSFS_Archiver_LZMA, -#endif -#if (defined PHYSFS_SUPPORTS_GRP) - &__PHYSFS_Archiver_GRP, -#endif -#if (defined PHYSFS_SUPPORTS_QPAK) - &__PHYSFS_Archiver_QPAK, -#endif -#if (defined PHYSFS_SUPPORTS_HOG) - &__PHYSFS_Archiver_HOG, -#endif -#if (defined PHYSFS_SUPPORTS_MVL) - &__PHYSFS_Archiver_MVL, -#endif -#if (defined PHYSFS_SUPPORTS_WAD) - &__PHYSFS_Archiver_WAD, -#endif - NULL -}; - - - -/* General PhysicsFS state ... */ -static int initialized = 0; -static ErrMsg *errorMessages = NULL; -static DirHandle *searchPath = NULL; -static DirHandle *writeDir = NULL; -static FileHandle *openWriteList = NULL; -static FileHandle *openReadList = NULL; -static char *baseDir = NULL; -static char *userDir = NULL; -static int allowSymLinks = 0; - -/* mutexes ... */ -static void *errorLock = NULL; /* protects error message list. */ -static void *stateLock = NULL; /* protects other PhysFS static state. */ - -/* allocator ... */ -static int externalAllocator = 0; -PHYSFS_Allocator allocator; - - -/* functions ... */ - -typedef struct -{ - char **list; - PHYSFS_uint32 size; - const char *errorstr; -} EnumStringListCallbackData; - -static void enumStringListCallback(void *data, const char *str) -{ - void *ptr; - char *newstr; - EnumStringListCallbackData *pecd = (EnumStringListCallbackData *) data; - - if (pecd->errorstr) - return; - - ptr = allocator.Realloc(pecd->list, (pecd->size + 2) * sizeof (char *)); - newstr = (char *) allocator.Malloc(strlen(str) + 1); - if (ptr != NULL) - pecd->list = (char **) ptr; - - if ((ptr == NULL) || (newstr == NULL)) - { - pecd->errorstr = ERR_OUT_OF_MEMORY; - pecd->list[pecd->size] = NULL; - PHYSFS_freeList(pecd->list); - return; - } /* if */ - - strcpy(newstr, str); - pecd->list[pecd->size] = newstr; - pecd->size++; -} /* enumStringListCallback */ - - -static char **doEnumStringList(void (*func)(PHYSFS_StringCallback, void *)) -{ - EnumStringListCallbackData ecd; - memset(&ecd, '\0', sizeof (ecd)); - ecd.list = (char **) allocator.Malloc(sizeof (char *)); - BAIL_IF_MACRO(ecd.list == NULL, ERR_OUT_OF_MEMORY, NULL); - func(enumStringListCallback, &ecd); - BAIL_IF_MACRO(ecd.errorstr != NULL, ecd.errorstr, NULL); - ecd.list[ecd.size] = NULL; - return(ecd.list); -} /* doEnumStringList */ - - -static void __PHYSFS_bubble_sort(void *a, PHYSFS_uint32 lo, PHYSFS_uint32 hi, - int (*cmpfn)(void *, PHYSFS_uint32, PHYSFS_uint32), - void (*swapfn)(void *, PHYSFS_uint32, PHYSFS_uint32)) -{ - PHYSFS_uint32 i; - int sorted; - - do - { - sorted = 1; - for (i = lo; i < hi; i++) - { - if (cmpfn(a, i, i + 1) > 0) - { - swapfn(a, i, i + 1); - sorted = 0; - } /* if */ - } /* for */ - } while (!sorted); -} /* __PHYSFS_bubble_sort */ - - -static void __PHYSFS_quick_sort(void *a, PHYSFS_uint32 lo, PHYSFS_uint32 hi, - int (*cmpfn)(void *, PHYSFS_uint32, PHYSFS_uint32), - void (*swapfn)(void *, PHYSFS_uint32, PHYSFS_uint32)) -{ - PHYSFS_uint32 i; - PHYSFS_uint32 j; - PHYSFS_uint32 v; - - if ((hi - lo) <= PHYSFS_QUICKSORT_THRESHOLD) - __PHYSFS_bubble_sort(a, lo, hi, cmpfn, swapfn); - else - { - i = (hi + lo) / 2; - - if (cmpfn(a, lo, i) > 0) swapfn(a, lo, i); - if (cmpfn(a, lo, hi) > 0) swapfn(a, lo, hi); - if (cmpfn(a, i, hi) > 0) swapfn(a, i, hi); - - j = hi - 1; - swapfn(a, i, j); - i = lo; - v = j; - while (1) - { - while(cmpfn(a, ++i, v) < 0) { /* do nothing */ } - while(cmpfn(a, --j, v) > 0) { /* do nothing */ } - if (j < i) - break; - swapfn(a, i, j); - } /* while */ - if (i != (hi-1)) - swapfn(a, i, hi-1); - __PHYSFS_quick_sort(a, lo, j, cmpfn, swapfn); - __PHYSFS_quick_sort(a, i+1, hi, cmpfn, swapfn); - } /* else */ -} /* __PHYSFS_quick_sort */ - - -void __PHYSFS_sort(void *entries, PHYSFS_uint32 max, - int (*cmpfn)(void *, PHYSFS_uint32, PHYSFS_uint32), - void (*swapfn)(void *, PHYSFS_uint32, PHYSFS_uint32)) -{ - /* - * Quicksort w/ Bubblesort fallback algorithm inspired by code from here: - * http://www.cs.ubc.ca/spider/harrison/Java/sorting-demo.html - */ - if (max > 0) - __PHYSFS_quick_sort(entries, 0, max - 1, cmpfn, swapfn); -} /* __PHYSFS_sort */ - - -static ErrMsg *findErrorForCurrentThread(void) -{ - ErrMsg *i; - void *tid; - - if (errorLock != NULL) - __PHYSFS_platformGrabMutex(errorLock); - - if (errorMessages != NULL) - { - tid = __PHYSFS_platformGetThreadID(); - - for (i = errorMessages; i != NULL; i = i->next) - { - if (i->tid == tid) - { - if (errorLock != NULL) - __PHYSFS_platformReleaseMutex(errorLock); - return(i); - } /* if */ - } /* for */ - } /* if */ - - if (errorLock != NULL) - __PHYSFS_platformReleaseMutex(errorLock); - - return(NULL); /* no error available. */ -} /* findErrorForCurrentThread */ - - -void __PHYSFS_setError(const char *str) -{ - ErrMsg *err; - - if (str == NULL) - return; - - err = findErrorForCurrentThread(); - - if (err == NULL) - { - err = (ErrMsg *) allocator.Malloc(sizeof (ErrMsg)); - if (err == NULL) - return; /* uhh...? */ - - memset((void *) err, '\0', sizeof (ErrMsg)); - err->tid = __PHYSFS_platformGetThreadID(); - - if (errorLock != NULL) - __PHYSFS_platformGrabMutex(errorLock); - - err->next = errorMessages; - errorMessages = err; - - if (errorLock != NULL) - __PHYSFS_platformReleaseMutex(errorLock); - } /* if */ - - err->errorAvailable = 1; - strncpy(err->errorString, str, sizeof (err->errorString)); - err->errorString[sizeof (err->errorString) - 1] = '\0'; -} /* __PHYSFS_setError */ - - -const char *PHYSFS_getLastError(void) -{ - ErrMsg *err = findErrorForCurrentThread(); - - if ((err == NULL) || (!err->errorAvailable)) - return(NULL); - - err->errorAvailable = 0; - return(err->errorString); -} /* PHYSFS_getLastError */ - - -/* MAKE SURE that errorLock is held before calling this! */ -static void freeErrorMessages(void) -{ - ErrMsg *i; - ErrMsg *next; - - for (i = errorMessages; i != NULL; i = next) - { - next = i->next; - allocator.Free(i); - } /* for */ - - errorMessages = NULL; -} /* freeErrorMessages */ - - -void PHYSFS_getLinkedVersion(PHYSFS_Version *ver) -{ - if (ver != NULL) - { - ver->major = PHYSFS_VER_MAJOR; - ver->minor = PHYSFS_VER_MINOR; - ver->patch = PHYSFS_VER_PATCH; - } /* if */ -} /* PHYSFS_getLinkedVersion */ - - -static const char *find_filename_extension(const char *fname) -{ - const char *retval = strchr(fname, '.'); - const char *p = retval; - - while (p != NULL) - { - p = strchr(p + 1, '.'); - if (p != NULL) - retval = p; - } /* while */ - - if (retval != NULL) - retval++; /* skip '.' */ - - return(retval); -} /* find_filename_extension */ - - -static DirHandle *tryOpenDir(const PHYSFS_Archiver *funcs, - const char *d, int forWriting) -{ - DirHandle *retval = NULL; - if (funcs->isArchive(d, forWriting)) - { - void *opaque = funcs->openArchive(d, forWriting); - if (opaque != NULL) - { - retval = (DirHandle *) allocator.Malloc(sizeof (DirHandle)); - if (retval == NULL) - funcs->dirClose(opaque); - else - { - memset(retval, '\0', sizeof (DirHandle)); - retval->mountPoint = NULL; - retval->funcs = funcs; - retval->opaque = opaque; - } /* else */ - } /* if */ - } /* if */ - - return(retval); -} /* tryOpenDir */ - - -static DirHandle *openDirectory(const char *d, int forWriting) -{ - DirHandle *retval = NULL; - const PHYSFS_Archiver * const *i; - const char *ext; - - BAIL_IF_MACRO(!__PHYSFS_platformExists(d), ERR_NO_SUCH_FILE, NULL); - - ext = find_filename_extension(d); - if (ext != NULL) - { - /* Look for archivers with matching file extensions first... */ - for (i = archivers; (*i != NULL) && (retval == NULL); i++) - { - if (__PHYSFS_stricmpASCII(ext, (*i)->info->extension) == 0) - retval = tryOpenDir(*i, d, forWriting); - } /* for */ - - /* failing an exact file extension match, try all the others... */ - for (i = archivers; (*i != NULL) && (retval == NULL); i++) - { - if (__PHYSFS_stricmpASCII(ext, (*i)->info->extension) != 0) - retval = tryOpenDir(*i, d, forWriting); - } /* for */ - } /* if */ - - else /* no extension? Try them all. */ - { - for (i = archivers; (*i != NULL) && (retval == NULL); i++) - retval = tryOpenDir(*i, d, forWriting); - } /* else */ - - BAIL_IF_MACRO(retval == NULL, ERR_UNSUPPORTED_ARCHIVE, NULL); - return(retval); -} /* openDirectory */ - - -/* - * Make a platform-independent path string sane. Doesn't actually check the - * file hierarchy, it just cleans up the string. - * (dst) must be a buffer at least as big as (src), as this is where the - * cleaned up string is deposited. - * If there are illegal bits in the path (".." entries, etc) then we - * return zero and (dst) is undefined. Non-zero if the path was sanitized. - */ -static int sanitizePlatformIndependentPath(const char *src, char *dst) -{ - char *prev; - char ch; - - while (*src == '/') /* skip initial '/' chars... */ - src++; - - prev = dst; - do - { - ch = *(src++); - - if ((ch == ':') || (ch == '\\')) /* illegal chars in a physfs path. */ - BAIL_MACRO(ERR_INSECURE_FNAME, 0); - - if (ch == '/') /* path separator. */ - { - *dst = '\0'; /* "." and ".." are illegal pathnames. */ - if ((strcmp(prev, ".") == 0) || (strcmp(prev, "..") == 0)) - BAIL_MACRO(ERR_INSECURE_FNAME, 0); - - while (*src == '/') /* chop out doubles... */ - src++; - - if (*src == '\0') /* ends with a pathsep? */ - break; /* we're done, don't add final pathsep to dst. */ - - prev = dst + 1; - } /* if */ - - *(dst++) = ch; - } while (ch != '\0'); - - return(1); -} /* sanitizePlatformIndependentPath */ - - -/* - * Figure out if (fname) is part of (h)'s mountpoint. (fname) must be an - * output from sanitizePlatformIndependentPath(), so that it is in a known - * state. - * - * This only finds legitimate segments of a mountpoint. If the mountpoint is - * "/a/b/c" and (fname) is "/a/b/c", "/", or "/a/b/c/d", then the results are - * all zero. "/a/b" will succeed, though. - */ -static int partOfMountPoint(DirHandle *h, char *fname) -{ - /* !!! FIXME: This code feels gross. */ - int rc; - size_t len, mntpntlen; - - if (h->mountPoint == NULL) - return(0); - else if (*fname == '\0') - return(1); - - len = strlen(fname); - mntpntlen = strlen(h->mountPoint); - if (len > mntpntlen) /* can't be a subset of mountpoint. */ - return(0); - - /* if true, must be not a match or a complete match, but not a subset. */ - if ((len + 1) == mntpntlen) - return(0); - - rc = strncmp(fname, h->mountPoint, len); /* !!! FIXME: case insensitive? */ - if (rc != 0) - return(0); /* not a match. */ - - /* make sure /a/b matches /a/b/ and not /a/bc ... */ - return(h->mountPoint[len] == '/'); -} /* partOfMountPoint */ - - -static DirHandle *createDirHandle(const char *newDir, - const char *mountPoint, - int forWriting) -{ - DirHandle *dirHandle = NULL; - char *tmpmntpnt = NULL; - - GOTO_IF_MACRO(!newDir, ERR_INVALID_ARGUMENT, badDirHandle); - if (mountPoint != NULL) - { - const size_t len = strlen(mountPoint) + 1; - tmpmntpnt = (char *) __PHYSFS_smallAlloc(len); - GOTO_IF_MACRO(!tmpmntpnt, ERR_OUT_OF_MEMORY, badDirHandle); - if (!sanitizePlatformIndependentPath(mountPoint, tmpmntpnt)) - goto badDirHandle; - mountPoint = tmpmntpnt; /* sanitized version. */ - } /* if */ - - dirHandle = openDirectory(newDir, forWriting); - GOTO_IF_MACRO(!dirHandle, NULL, badDirHandle); - - dirHandle->dirName = (char *) allocator.Malloc(strlen(newDir) + 1); - GOTO_IF_MACRO(!dirHandle->dirName, ERR_OUT_OF_MEMORY, badDirHandle); - strcpy(dirHandle->dirName, newDir); - - if ((mountPoint != NULL) && (*mountPoint != '\0')) - { - dirHandle->mountPoint = (char *)allocator.Malloc(strlen(mountPoint)+2); - GOTO_IF_MACRO(!dirHandle->mountPoint, ERR_OUT_OF_MEMORY, badDirHandle); - strcpy(dirHandle->mountPoint, mountPoint); - strcat(dirHandle->mountPoint, "/"); - } /* if */ - - __PHYSFS_smallFree(tmpmntpnt); - return(dirHandle); - -badDirHandle: - if (dirHandle != NULL) - { - dirHandle->funcs->dirClose(dirHandle->opaque); - allocator.Free(dirHandle->dirName); - allocator.Free(dirHandle->mountPoint); - allocator.Free(dirHandle); - } /* if */ - - __PHYSFS_smallFree(tmpmntpnt); - return(NULL); -} /* createDirHandle */ - - -/* MAKE SURE you've got the stateLock held before calling this! */ -static int freeDirHandle(DirHandle *dh, FileHandle *openList) -{ - FileHandle *i; - - if (dh == NULL) - return(1); - - for (i = openList; i != NULL; i = i->next) - BAIL_IF_MACRO(i->dirHandle == dh, ERR_FILES_STILL_OPEN, 0); - - dh->funcs->dirClose(dh->opaque); - allocator.Free(dh->dirName); - allocator.Free(dh->mountPoint); - allocator.Free(dh); - return(1); -} /* freeDirHandle */ - - -static char *calculateUserDir(void) -{ - char *retval = __PHYSFS_platformGetUserDir(); - if (retval != NULL) - { - /* make sure it really exists and is normalized. */ - char *ptr = __PHYSFS_platformRealPath(retval); - allocator.Free(retval); - retval = ptr; - } /* if */ - - if (retval == NULL) - { - const char *dirsep = PHYSFS_getDirSeparator(); - const char *uname = __PHYSFS_platformGetUserName(); - const char *str = (uname != NULL) ? uname : "default"; - - retval = (char *) allocator.Malloc(strlen(baseDir) + strlen(str) + - strlen(dirsep) + 6); - - if (retval == NULL) - __PHYSFS_setError(ERR_OUT_OF_MEMORY); - else - sprintf(retval, "%susers%s%s", baseDir, dirsep, str); - - allocator.Free((void *) uname); - } /* else */ - - return(retval); -} /* calculateUserDir */ - - -static int appendDirSep(char **dir) -{ - const char *dirsep = PHYSFS_getDirSeparator(); - char *ptr; - - if (strcmp((*dir + strlen(*dir)) - strlen(dirsep), dirsep) == 0) - return(1); - - ptr = (char *) allocator.Realloc(*dir, strlen(*dir) + strlen(dirsep) + 1); - if (!ptr) - { - allocator.Free(*dir); - return(0); - } /* if */ - - strcat(ptr, dirsep); - *dir = ptr; - return(1); -} /* appendDirSep */ - - -static char *calculateBaseDir(const char *argv0) -{ - char *retval = NULL; - const char *dirsep = NULL; - char *ptr = NULL; - - /* Give the platform layer first shot at this. */ - retval = __PHYSFS_platformCalcBaseDir(argv0); - if (retval != NULL) - return(retval); - - /* We need argv0 to go on. */ - BAIL_IF_MACRO(argv0 == NULL, ERR_ARGV0_IS_NULL, NULL); - - dirsep = PHYSFS_getDirSeparator(); - if (strlen(dirsep) == 1) /* fast path. */ - ptr = strrchr(argv0, *dirsep); - else - { - ptr = strstr(argv0, dirsep); - if (ptr != NULL) - { - char *p = ptr; - while (p != NULL) - { - ptr = p; - p = strstr(p + 1, dirsep); - } /* while */ - } /* if */ - } /* else */ - - if (ptr != NULL) - { - size_t size = (size_t) (ptr - argv0); - retval = (char *) allocator.Malloc(size + 1); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - memcpy(retval, argv0, size); - retval[size] = '\0'; - return(retval); - } /* if */ - - /* argv0 wasn't helpful. */ - BAIL_MACRO(ERR_INVALID_ARGUMENT, NULL); - return(NULL); -} /* calculateBaseDir */ - - -static int initializeMutexes(void) -{ - errorLock = __PHYSFS_platformCreateMutex(); - if (errorLock == NULL) - goto initializeMutexes_failed; - - stateLock = __PHYSFS_platformCreateMutex(); - if (stateLock == NULL) - goto initializeMutexes_failed; - - return(1); /* success. */ - -initializeMutexes_failed: - if (errorLock != NULL) - __PHYSFS_platformDestroyMutex(errorLock); - - if (stateLock != NULL) - __PHYSFS_platformDestroyMutex(stateLock); - - errorLock = stateLock = NULL; - return(0); /* failed. */ -} /* initializeMutexes */ - - -static void setDefaultAllocator(void); - -int PHYSFS_init(const char *argv0) -{ - char *ptr; - - BAIL_IF_MACRO(initialized, ERR_IS_INITIALIZED, 0); - - if (!externalAllocator) - setDefaultAllocator(); - - if (allocator.Init != NULL) - BAIL_IF_MACRO(!allocator.Init(), NULL, 0); - - BAIL_IF_MACRO(!__PHYSFS_platformInit(), NULL, 0); - - BAIL_IF_MACRO(!initializeMutexes(), NULL, 0); - - baseDir = calculateBaseDir(argv0); - BAIL_IF_MACRO(baseDir == NULL, NULL, 0); - - /* !!! FIXME: only call this if we got this from argv0 (unreliable). */ - ptr = __PHYSFS_platformRealPath(baseDir); - allocator.Free(baseDir); - BAIL_IF_MACRO(ptr == NULL, NULL, 0); - baseDir = ptr; - - BAIL_IF_MACRO(!appendDirSep(&baseDir), NULL, 0); - - userDir = calculateUserDir(); - if ((userDir == NULL) || (!appendDirSep(&userDir))) - { - allocator.Free(baseDir); - baseDir = NULL; - return(0); - } /* if */ - - initialized = 1; - - /* This makes sure that the error subsystem is initialized. */ - __PHYSFS_setError(PHYSFS_getLastError()); - - return(1); -} /* PHYSFS_init */ - - -/* MAKE SURE you hold stateLock before calling this! */ -static int closeFileHandleList(FileHandle **list) -{ - FileHandle *i; - FileHandle *next = NULL; - - for (i = *list; i != NULL; i = next) - { - next = i->next; - if (!i->funcs->fileClose(i->opaque)) - { - *list = i; - return(0); - } /* if */ - - allocator.Free(i); - } /* for */ - - *list = NULL; - return(1); -} /* closeFileHandleList */ - - -/* MAKE SURE you hold the stateLock before calling this! */ -static void freeSearchPath(void) -{ - DirHandle *i; - DirHandle *next = NULL; - - closeFileHandleList(&openReadList); - - if (searchPath != NULL) - { - for (i = searchPath; i != NULL; i = next) - { - next = i->next; - freeDirHandle(i, openReadList); - } /* for */ - searchPath = NULL; - } /* if */ -} /* freeSearchPath */ - - -int PHYSFS_deinit(void) -{ - BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0); - BAIL_IF_MACRO(!__PHYSFS_platformDeinit(), NULL, 0); - - closeFileHandleList(&openWriteList); - BAIL_IF_MACRO(!PHYSFS_setWriteDir(NULL), ERR_FILES_STILL_OPEN, 0); - - freeSearchPath(); - freeErrorMessages(); - - if (baseDir != NULL) - { - allocator.Free(baseDir); - baseDir = NULL; - } /* if */ - - if (userDir != NULL) - { - allocator.Free(userDir); - userDir = NULL; - } /* if */ - - allowSymLinks = 0; - initialized = 0; - - __PHYSFS_platformDestroyMutex(errorLock); - __PHYSFS_platformDestroyMutex(stateLock); - - if (allocator.Deinit != NULL) - allocator.Deinit(); - - errorLock = stateLock = NULL; - return(1); -} /* PHYSFS_deinit */ - - -int PHYSFS_isInit(void) -{ - return(initialized); -} /* PHYSFS_isInit */ - - -const PHYSFS_ArchiveInfo **PHYSFS_supportedArchiveTypes(void) -{ - return(supported_types); -} /* PHYSFS_supportedArchiveTypes */ - - -void PHYSFS_freeList(void *list) -{ - void **i; - for (i = (void **) list; *i != NULL; i++) - allocator.Free(*i); - - allocator.Free(list); -} /* PHYSFS_freeList */ - - -const char *PHYSFS_getDirSeparator(void) -{ - return(__PHYSFS_platformDirSeparator); -} /* PHYSFS_getDirSeparator */ - - -char **PHYSFS_getCdRomDirs(void) -{ - return(doEnumStringList(__PHYSFS_platformDetectAvailableCDs)); -} /* PHYSFS_getCdRomDirs */ - - -void PHYSFS_getCdRomDirsCallback(PHYSFS_StringCallback callback, void *data) -{ - __PHYSFS_platformDetectAvailableCDs(callback, data); -} /* PHYSFS_getCdRomDirsCallback */ - - -const char *PHYSFS_getBaseDir(void) -{ - return(baseDir); /* this is calculated in PHYSFS_init()... */ -} /* PHYSFS_getBaseDir */ - - -const char *PHYSFS_getUserDir(void) -{ - return(userDir); /* this is calculated in PHYSFS_init()... */ -} /* PHYSFS_getUserDir */ - - -const char *PHYSFS_getWriteDir(void) -{ - const char *retval = NULL; - - __PHYSFS_platformGrabMutex(stateLock); - if (writeDir != NULL) - retval = writeDir->dirName; - __PHYSFS_platformReleaseMutex(stateLock); - - return(retval); -} /* PHYSFS_getWriteDir */ - - -int PHYSFS_setWriteDir(const char *newDir) -{ - int retval = 1; - - __PHYSFS_platformGrabMutex(stateLock); - - if (writeDir != NULL) - { - BAIL_IF_MACRO_MUTEX(!freeDirHandle(writeDir, openWriteList), NULL, - stateLock, 0); - writeDir = NULL; - } /* if */ - - if (newDir != NULL) - { - writeDir = createDirHandle(newDir, NULL, 1); - retval = (writeDir != NULL); - } /* if */ - - __PHYSFS_platformReleaseMutex(stateLock); - - return(retval); -} /* PHYSFS_setWriteDir */ - - -int PHYSFS_mount(const char *newDir, const char *mountPoint, int appendToPath) -{ - DirHandle *dh; - DirHandle *prev = NULL; - DirHandle *i; - - BAIL_IF_MACRO(newDir == NULL, ERR_INVALID_ARGUMENT, 0); - - if (mountPoint == NULL) - mountPoint = "/"; - - __PHYSFS_platformGrabMutex(stateLock); - - for (i = searchPath; i != NULL; i = i->next) - { - /* already in search path? */ - BAIL_IF_MACRO_MUTEX(strcmp(newDir, i->dirName)==0, NULL, stateLock, 1); - prev = i; - } /* for */ - - dh = createDirHandle(newDir, mountPoint, 0); - BAIL_IF_MACRO_MUTEX(dh == NULL, NULL, stateLock, 0); - - if (appendToPath) - { - if (prev == NULL) - searchPath = dh; - else - prev->next = dh; - } /* if */ - else - { - dh->next = searchPath; - searchPath = dh; - } /* else */ - - __PHYSFS_platformReleaseMutex(stateLock); - return(1); -} /* PHYSFS_mount */ - - -int PHYSFS_addToSearchPath(const char *newDir, int appendToPath) -{ - return(PHYSFS_mount(newDir, NULL, appendToPath)); -} /* PHYSFS_addToSearchPath */ - - -int PHYSFS_removeFromSearchPath(const char *oldDir) -{ - DirHandle *i; - DirHandle *prev = NULL; - DirHandle *next = NULL; - - BAIL_IF_MACRO(oldDir == NULL, ERR_INVALID_ARGUMENT, 0); - - __PHYSFS_platformGrabMutex(stateLock); - for (i = searchPath; i != NULL; i = i->next) - { - if (strcmp(i->dirName, oldDir) == 0) - { - next = i->next; - BAIL_IF_MACRO_MUTEX(!freeDirHandle(i, openReadList), NULL, - stateLock, 0); - - if (prev == NULL) - searchPath = next; - else - prev->next = next; - - BAIL_MACRO_MUTEX(NULL, stateLock, 1); - } /* if */ - prev = i; - } /* for */ - - BAIL_MACRO_MUTEX(ERR_NOT_IN_SEARCH_PATH, stateLock, 0); -} /* PHYSFS_removeFromSearchPath */ - - -char **PHYSFS_getSearchPath(void) -{ - return(doEnumStringList(PHYSFS_getSearchPathCallback)); -} /* PHYSFS_getSearchPath */ - - -const char *PHYSFS_getMountPoint(const char *dir) -{ - DirHandle *i; - __PHYSFS_platformGrabMutex(stateLock); - for (i = searchPath; i != NULL; i = i->next) - { - if (strcmp(i->dirName, dir) == 0) - { - const char *retval = ((i->mountPoint) ? i->mountPoint : "/"); - __PHYSFS_platformReleaseMutex(stateLock); - return(retval); - } /* if */ - } /* for */ - __PHYSFS_platformReleaseMutex(stateLock); - - BAIL_MACRO(ERR_NOT_IN_SEARCH_PATH, NULL); -} /* PHYSFS_getMountPoint */ - - -void PHYSFS_getSearchPathCallback(PHYSFS_StringCallback callback, void *data) -{ - DirHandle *i; - - __PHYSFS_platformGrabMutex(stateLock); - - for (i = searchPath; i != NULL; i = i->next) - callback(data, i->dirName); - - __PHYSFS_platformReleaseMutex(stateLock); -} /* PHYSFS_getSearchPathCallback */ - - -/* Split out to avoid stack allocation in a loop. */ -static void setSaneCfgAddPath(const char *i, const size_t l, const char *dirsep, - int archivesFirst) -{ - const char *d = PHYSFS_getRealDir(i); - const size_t allocsize = strlen(d) + strlen(dirsep) + l + 1; - char *str = (char *) __PHYSFS_smallAlloc(allocsize); - if (str != NULL) - { - sprintf(str, "%s%s%s", d, dirsep, i); - PHYSFS_addToSearchPath(str, archivesFirst == 0); - __PHYSFS_smallFree(str); - } /* if */ -} /* setSaneCfgAddPath */ - - -int PHYSFS_setSaneConfig(const char *organization, const char *appName, - const char *archiveExt, int includeCdRoms, - int archivesFirst) -{ - const char *basedir = PHYSFS_getBaseDir(); - const char *userdir = PHYSFS_getUserDir(); - const char *dirsep = PHYSFS_getDirSeparator(); - PHYSFS_uint64 len = 0; - char *str = NULL; - - BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0); - - /* set write dir... */ - len = (strlen(userdir) + (strlen(organization) * 2) + - (strlen(appName) * 2) + (strlen(dirsep) * 3) + 2); - - str = (char *) __PHYSFS_smallAlloc(len); - - BAIL_IF_MACRO(str == NULL, ERR_OUT_OF_MEMORY, 0); - sprintf(str, "%s.%s%s%s", userdir, organization, dirsep, appName); - - if (!PHYSFS_setWriteDir(str)) - { - int no_write = 0; - sprintf(str, ".%s/%s", organization, appName); - if ( (PHYSFS_setWriteDir(userdir)) && - (PHYSFS_mkdir(str)) ) - { - sprintf(str, "%s.%s%s%s", userdir, organization, dirsep, appName); - if (!PHYSFS_setWriteDir(str)) - no_write = 1; - } /* if */ - else - { - no_write = 1; - } /* else */ - - if (no_write) - { - PHYSFS_setWriteDir(NULL); /* just in case. */ - __PHYSFS_smallFree(str); - BAIL_MACRO(ERR_CANT_SET_WRITE_DIR, 0); - } /* if */ - } /* if */ - - /* Put write dir first in search path... */ - PHYSFS_addToSearchPath(str, 0); - __PHYSFS_smallFree(str); - - /* Put base path on search path... */ - PHYSFS_addToSearchPath(basedir, 1); - - /* handle CD-ROMs... */ - if (includeCdRoms) - { - char **cds = PHYSFS_getCdRomDirs(); - char **i; - for (i = cds; *i != NULL; i++) - PHYSFS_addToSearchPath(*i, 1); - - PHYSFS_freeList(cds); - } /* if */ - - /* Root out archives, and add them to search path... */ - if (archiveExt != NULL) - { - char **rc = PHYSFS_enumerateFiles("/"); - char **i; - size_t extlen = strlen(archiveExt); - char *ext; - - for (i = rc; *i != NULL; i++) - { - size_t l = strlen(*i); - if ((l > extlen) && ((*i)[l - extlen - 1] == '.')) - { - ext = (*i) + (l - extlen); - if (__PHYSFS_stricmpASCII(ext, archiveExt) == 0) - setSaneCfgAddPath(*i, l, dirsep, archivesFirst); - } /* if */ - } /* for */ - - PHYSFS_freeList(rc); - } /* if */ - - return(1); -} /* PHYSFS_setSaneConfig */ - - -void PHYSFS_permitSymbolicLinks(int allow) -{ - allowSymLinks = allow; -} /* PHYSFS_permitSymbolicLinks */ - - -int PHYSFS_symbolicLinksPermitted(void) -{ - return(allowSymLinks); -} /* PHYSFS_symbolicLinksPermitted */ - - -/* string manipulation in C makes my ass itch. */ -char *__PHYSFS_convertToDependent(const char *prepend, - const char *dirName, - const char *append) -{ - const char *dirsep = __PHYSFS_platformDirSeparator; - size_t sepsize = strlen(dirsep); - char *str; - char *i1; - char *i2; - size_t allocSize; - - while (*dirName == '/') /* !!! FIXME: pass through sanitize function. */ - dirName++; - - allocSize = strlen(dirName) + 1; - if (prepend != NULL) - allocSize += strlen(prepend) + sepsize; - if (append != NULL) - allocSize += strlen(append) + sepsize; - - /* make sure there's enough space if the dir separator is bigger. */ - if (sepsize > 1) - { - str = (char *) dirName; - do - { - str = strchr(str, '/'); - if (str != NULL) - { - allocSize += (sepsize - 1); - str++; - } /* if */ - } while (str != NULL); - } /* if */ - - str = (char *) allocator.Malloc(allocSize); - BAIL_IF_MACRO(str == NULL, ERR_OUT_OF_MEMORY, NULL); - - if (prepend == NULL) - *str = '\0'; - else - { - strcpy(str, prepend); - strcat(str, dirsep); - } /* else */ - - for (i1 = (char *) dirName, i2 = str + strlen(str); *i1; i1++, i2++) - { - if (*i1 == '/') - { - strcpy(i2, dirsep); - i2 += sepsize; - } /* if */ - else - { - *i2 = *i1; - } /* else */ - } /* for */ - *i2 = '\0'; - - if (append) - { - strcat(str, dirsep); - strcat(str, append); - } /* if */ - - return(str); -} /* __PHYSFS_convertToDependent */ - - -/* - * Verify that (fname) (in platform-independent notation), in relation - * to (h) is secure. That means that each element of fname is checked - * for symlinks (if they aren't permitted). This also allows for quick - * rejection of files that exist outside an archive's mountpoint. - * - * With some exceptions (like PHYSFS_mkdir(), which builds multiple subdirs - * at a time), you should always pass zero for "allowMissing" for efficiency. - * - * (fname) must point to an output from sanitizePlatformIndependentPath(), - * since it will make sure that path names are in the right format for - * passing certain checks. It will also do checks for "insecure" pathnames - * like ".." which should be done once instead of once per archive. This also - * gives us license to treat (fname) as scratch space in this function. - * - * Returns non-zero if string is safe, zero if there's a security issue. - * PHYSFS_getLastError() will specify what was wrong. (*fname) will be - * updated to point past any mount point elements so it is prepared to - * be used with the archiver directly. - */ -static int verifyPath(DirHandle *h, char **_fname, int allowMissing) -{ - char *fname = *_fname; - int retval = 1; - char *start; - char *end; - - if (*fname == '\0') /* quick rejection. */ - return(1); - - /* !!! FIXME: This codeblock sucks. */ - if (h->mountPoint != NULL) /* NULL mountpoint means "/". */ - { - size_t mntpntlen = strlen(h->mountPoint); - size_t len = strlen(fname); - assert(mntpntlen > 1); /* root mount points should be NULL. */ - /* not under the mountpoint, so skip this archive. */ - BAIL_IF_MACRO(len < mntpntlen-1, ERR_NO_SUCH_PATH, 0); - /* !!! FIXME: Case insensitive? */ - retval = strncmp(h->mountPoint, fname, mntpntlen-1); - BAIL_IF_MACRO(retval != 0, ERR_NO_SUCH_PATH, 0); - if (len > mntpntlen-1) /* corner case... */ - BAIL_IF_MACRO(fname[mntpntlen-1] != '/', ERR_NO_SUCH_PATH, 0); - fname += mntpntlen-1; /* move to start of actual archive path. */ - if (*fname == '/') - fname++; - *_fname = fname; /* skip mountpoint for later use. */ - retval = 1; /* may be reset, below. */ - } /* if */ - - start = fname; - if (!allowSymLinks) - { - while (1) - { - int rc = 0; - end = strchr(start, '/'); - - if (end != NULL) *end = '\0'; - rc = h->funcs->isSymLink(h->opaque, fname, &retval); - if (end != NULL) *end = '/'; - - BAIL_IF_MACRO(rc, ERR_SYMLINK_DISALLOWED, 0); /* insecure. */ - - /* break out early if path element is missing. */ - if (!retval) - { - /* - * We need to clear it if it's the last element of the path, - * since this might be a non-existant file we're opening - * for writing... - */ - if ((end == NULL) || (allowMissing)) - retval = 1; - break; - } /* if */ - - if (end == NULL) - break; - - start = end + 1; - } /* while */ - } /* if */ - - return(retval); -} /* verifyPath */ - - -static int doMkdir(const char *_dname, char *dname) -{ - DirHandle *h; - char *start; - char *end; - int retval = 0; - int exists = 1; /* force existance check on first path element. */ - - BAIL_IF_MACRO(!sanitizePlatformIndependentPath(_dname, dname), NULL, 0); - - __PHYSFS_platformGrabMutex(stateLock); - BAIL_IF_MACRO_MUTEX(writeDir == NULL, ERR_NO_WRITE_DIR, stateLock, 0); - h = writeDir; - BAIL_IF_MACRO_MUTEX(!verifyPath(h, &dname, 1), NULL, stateLock, 0); - - start = dname; - while (1) - { - end = strchr(start, '/'); - if (end != NULL) - *end = '\0'; - - /* only check for existance if all parent dirs existed, too... */ - if (exists) - retval = h->funcs->isDirectory(h->opaque, dname, &exists); - - if (!exists) - retval = h->funcs->mkdir(h->opaque, dname); - - if (!retval) - break; - - if (end == NULL) - break; - - *end = '/'; - start = end + 1; - } /* while */ - - __PHYSFS_platformReleaseMutex(stateLock); - return(retval); -} /* doMkdir */ - - -int PHYSFS_mkdir(const char *_dname) -{ - int retval = 0; - char *dname; - size_t len; - - BAIL_IF_MACRO(_dname == NULL, ERR_INVALID_ARGUMENT, 0); - len = strlen(_dname) + 1; - dname = (char *) __PHYSFS_smallAlloc(len); - BAIL_IF_MACRO(dname == NULL, ERR_OUT_OF_MEMORY, 0); - retval = doMkdir(_dname, dname); - __PHYSFS_smallFree(dname); - return(retval); -} /* PHYSFS_mkdir */ - - -static int doDelete(const char *_fname, char *fname) -{ - int retval; - DirHandle *h; - BAIL_IF_MACRO(!sanitizePlatformIndependentPath(_fname, fname), NULL, 0); - - __PHYSFS_platformGrabMutex(stateLock); - - BAIL_IF_MACRO_MUTEX(writeDir == NULL, ERR_NO_WRITE_DIR, stateLock, 0); - h = writeDir; - BAIL_IF_MACRO_MUTEX(!verifyPath(h, &fname, 0), NULL, stateLock, 0); - retval = h->funcs->remove(h->opaque, fname); - - __PHYSFS_platformReleaseMutex(stateLock); - return(retval); -} /* doDelete */ - - -int PHYSFS_delete(const char *_fname) -{ - int retval; - char *fname; - size_t len; - - BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, 0); - len = strlen(_fname) + 1; - fname = (char *) __PHYSFS_smallAlloc(len); - BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, 0); - retval = doDelete(_fname, fname); - __PHYSFS_smallFree(fname); - return(retval); -} /* PHYSFS_delete */ - - -const char *PHYSFS_getRealDir(const char *_fname) -{ - const char *retval = NULL; - char *fname = NULL; - size_t len; - - BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, NULL); - len = strlen(_fname) + 1; - fname = __PHYSFS_smallAlloc(len); - BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, NULL); - if (sanitizePlatformIndependentPath(_fname, fname)) - { - DirHandle *i; - __PHYSFS_platformGrabMutex(stateLock); - for (i = searchPath; ((i != NULL) && (retval == NULL)); i = i->next) - { - char *arcfname = fname; - if (partOfMountPoint(i, arcfname)) - retval = i->dirName; - else if (verifyPath(i, &arcfname, 0)) - { - if (i->funcs->exists(i->opaque, arcfname)) - retval = i->dirName; - } /* if */ - } /* for */ - __PHYSFS_platformReleaseMutex(stateLock); - } /* if */ - - __PHYSFS_smallFree(fname); - return(retval); -} /* PHYSFS_getRealDir */ - - -static int locateInStringList(const char *str, - char **list, - PHYSFS_uint32 *pos) -{ - PHYSFS_uint32 len = *pos; - PHYSFS_uint32 half_len; - PHYSFS_uint32 lo = 0; - PHYSFS_uint32 middle; - int cmp; - - while (len > 0) - { - half_len = len >> 1; - middle = lo + half_len; - cmp = strcmp(list[middle], str); - - if (cmp == 0) /* it's in the list already. */ - return(1); - else if (cmp > 0) - len = half_len; - else - { - lo = middle + 1; - len -= half_len + 1; - } /* else */ - } /* while */ - - *pos = lo; - return(0); -} /* locateInStringList */ - - -static void enumFilesCallback(void *data, const char *origdir, const char *str) -{ - PHYSFS_uint32 pos; - void *ptr; - char *newstr; - EnumStringListCallbackData *pecd = (EnumStringListCallbackData *) data; - - /* - * See if file is in the list already, and if not, insert it in there - * alphabetically... - */ - pos = pecd->size; - if (locateInStringList(str, pecd->list, &pos)) - return; /* already in the list. */ - - ptr = allocator.Realloc(pecd->list, (pecd->size + 2) * sizeof (char *)); - newstr = (char *) allocator.Malloc(strlen(str) + 1); - if (ptr != NULL) - pecd->list = (char **) ptr; - - if ((ptr == NULL) || (newstr == NULL)) - return; /* better luck next time. */ - - strcpy(newstr, str); - - if (pos != pecd->size) - { - memmove(&pecd->list[pos+1], &pecd->list[pos], - sizeof (char *) * ((pecd->size) - pos)); - } /* if */ - - pecd->list[pos] = newstr; - pecd->size++; -} /* enumFilesCallback */ - - -char **PHYSFS_enumerateFiles(const char *path) -{ - EnumStringListCallbackData ecd; - memset(&ecd, '\0', sizeof (ecd)); - ecd.list = (char **) allocator.Malloc(sizeof (char *)); - BAIL_IF_MACRO(ecd.list == NULL, ERR_OUT_OF_MEMORY, NULL); - PHYSFS_enumerateFilesCallback(path, enumFilesCallback, &ecd); - ecd.list[ecd.size] = NULL; - return(ecd.list); -} /* PHYSFS_enumerateFiles */ - - -/* - * Broke out to seperate function so we can use stack allocation gratuitously. - */ -static void enumerateFromMountPoint(DirHandle *i, const char *arcfname, - PHYSFS_EnumFilesCallback callback, - const char *_fname, void *data) -{ - const size_t len = strlen(arcfname); - char *ptr = NULL; - char *end = NULL; - const size_t slen = strlen(i->mountPoint) + 1; - char *mountPoint = (char *) __PHYSFS_smallAlloc(slen); - - if (mountPoint == NULL) - return; /* oh well. */ - - strcpy(mountPoint, i->mountPoint); - ptr = mountPoint + ((len) ? len + 1 : 0); - end = strchr(ptr, '/'); - assert(end); /* should always find a terminating '/'. */ - *end = '\0'; - callback(data, _fname, ptr); - __PHYSFS_smallFree(mountPoint); -} /* enumerateFromMountPoint */ - - -/* !!! FIXME: this should report error conditions. */ -void PHYSFS_enumerateFilesCallback(const char *_fname, - PHYSFS_EnumFilesCallback callback, - void *data) -{ - size_t len; - char *fname; - - BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, ) /*0*/; - BAIL_IF_MACRO(callback == NULL, ERR_INVALID_ARGUMENT, ) /*0*/; - - len = strlen(_fname) + 1; - fname = (char *) __PHYSFS_smallAlloc(len); - BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, ) /*0*/; - - if (sanitizePlatformIndependentPath(_fname, fname)) - { - DirHandle *i; - int noSyms; - - __PHYSFS_platformGrabMutex(stateLock); - noSyms = !allowSymLinks; - for (i = searchPath; i != NULL; i = i->next) - { - char *arcfname = fname; - if (partOfMountPoint(i, arcfname)) - enumerateFromMountPoint(i, arcfname, callback, _fname, data); - - else if (verifyPath(i, &arcfname, 0)) - { - i->funcs->enumerateFiles(i->opaque, arcfname, noSyms, - callback, _fname, data); - } /* else if */ - } /* for */ - __PHYSFS_platformReleaseMutex(stateLock); - } /* if */ - - __PHYSFS_smallFree(fname); -} /* PHYSFS_enumerateFilesCallback */ - - -int PHYSFS_exists(const char *fname) -{ - return(PHYSFS_getRealDir(fname) != NULL); -} /* PHYSFS_exists */ - - -PHYSFS_sint64 PHYSFS_getLastModTime(const char *_fname) -{ - PHYSFS_sint64 retval = -1; - char *fname; - size_t len; - - BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, -1); - len = strlen(_fname) + 1; - fname = (char *) __PHYSFS_smallAlloc(len); - BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, -1); - - if (sanitizePlatformIndependentPath(_fname, fname)) - { - if (*fname == '\0') /* eh...punt if it's the root dir. */ - retval = 1; /* !!! FIXME: Maybe this should be an error? */ - else - { - DirHandle *i; - int exists = 0; - __PHYSFS_platformGrabMutex(stateLock); - for (i = searchPath; ((i != NULL) && (!exists)); i = i->next) - { - char *arcfname = fname; - exists = partOfMountPoint(i, arcfname); - if (exists) - retval = 1; /* !!! FIXME: What's the right value? */ - else if (verifyPath(i, &arcfname, 0)) - { - retval = i->funcs->getLastModTime(i->opaque, arcfname, - &exists); - } /* else if */ - } /* for */ - __PHYSFS_platformReleaseMutex(stateLock); - } /* else */ - } /* if */ - - __PHYSFS_smallFree(fname); - return(retval); -} /* PHYSFS_getLastModTime */ - - -int PHYSFS_isDirectory(const char *_fname) -{ - int retval = 0; - size_t len; - char *fname; - - BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, 0); - len = strlen(_fname) + 1; - fname = (char *) __PHYSFS_smallAlloc(len); - BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, 0); - - if (!sanitizePlatformIndependentPath(_fname, fname)) - retval = 0; - - else if (*fname == '\0') - retval = 1; /* Root is always a dir. :) */ - - else - { - DirHandle *i; - int exists = 0; - - __PHYSFS_platformGrabMutex(stateLock); - for (i = searchPath; ((i != NULL) && (!exists)); i = i->next) - { - char *arcfname = fname; - if ((exists = partOfMountPoint(i, arcfname)) != 0) - retval = 1; - else if (verifyPath(i, &arcfname, 0)) - retval = i->funcs->isDirectory(i->opaque, arcfname, &exists); - } /* for */ - __PHYSFS_platformReleaseMutex(stateLock); - } /* else */ - - __PHYSFS_smallFree(fname); - return(retval); -} /* PHYSFS_isDirectory */ - - -int PHYSFS_isSymbolicLink(const char *_fname) -{ - int retval = 0; - size_t len; - char *fname; - - BAIL_IF_MACRO(!allowSymLinks, ERR_SYMLINK_DISALLOWED, 0); - - BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, 0); - len = strlen(_fname) + 1; - fname = (char *) __PHYSFS_smallAlloc(len); - BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, 0); - - if (!sanitizePlatformIndependentPath(_fname, fname)) - retval = 0; - - else if (*fname == '\0') - retval = 1; /* Root is never a symlink. */ - - else - { - DirHandle *i; - int fileExists = 0; - - __PHYSFS_platformGrabMutex(stateLock); - for (i = searchPath; ((i != NULL) && (!fileExists)); i = i->next) - { - char *arcfname = fname; - if ((fileExists = partOfMountPoint(i, arcfname)) != 0) - retval = 0; /* virtual dir...not a symlink. */ - else if (verifyPath(i, &arcfname, 0)) - retval = i->funcs->isSymLink(i->opaque, arcfname, &fileExists); - } /* for */ - __PHYSFS_platformReleaseMutex(stateLock); - } /* else */ - - __PHYSFS_smallFree(fname); - return(retval); -} /* PHYSFS_isSymbolicLink */ - - -static PHYSFS_File *doOpenWrite(const char *_fname, int appending) -{ - FileHandle *fh = NULL; - size_t len; - char *fname; - - BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, 0); - len = strlen(_fname) + 1; - fname = (char *) __PHYSFS_smallAlloc(len); - BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, 0); - - if (sanitizePlatformIndependentPath(_fname, fname)) - { - void *opaque = NULL; - DirHandle *h = NULL; - const PHYSFS_Archiver *f; - - __PHYSFS_platformGrabMutex(stateLock); - - GOTO_IF_MACRO(!writeDir, ERR_NO_WRITE_DIR, doOpenWriteEnd); - - h = writeDir; - GOTO_IF_MACRO(!verifyPath(h, &fname, 0), NULL, doOpenWriteEnd); - - f = h->funcs; - if (appending) - opaque = f->openAppend(h->opaque, fname); - else - opaque = f->openWrite(h->opaque, fname); - - GOTO_IF_MACRO(opaque == NULL, NULL, doOpenWriteEnd); - - fh = (FileHandle *) allocator.Malloc(sizeof (FileHandle)); - if (fh == NULL) - { - f->fileClose(opaque); - GOTO_MACRO(ERR_OUT_OF_MEMORY, doOpenWriteEnd); - } /* if */ - else - { - memset(fh, '\0', sizeof (FileHandle)); - fh->opaque = opaque; - fh->dirHandle = h; - fh->funcs = h->funcs; - fh->next = openWriteList; - openWriteList = fh; - } /* else */ - - doOpenWriteEnd: - __PHYSFS_platformReleaseMutex(stateLock); - } /* if */ - - __PHYSFS_smallFree(fname); - return((PHYSFS_File *) fh); -} /* doOpenWrite */ - - -PHYSFS_File *PHYSFS_openWrite(const char *filename) -{ - return(doOpenWrite(filename, 0)); -} /* PHYSFS_openWrite */ - - -PHYSFS_File *PHYSFS_openAppend(const char *filename) -{ - return(doOpenWrite(filename, 1)); -} /* PHYSFS_openAppend */ - - -PHYSFS_File *PHYSFS_openRead(const char *_fname) -{ - FileHandle *fh = NULL; - char *fname; - size_t len; - - BAIL_IF_MACRO(_fname == NULL, ERR_INVALID_ARGUMENT, 0); - len = strlen(_fname) + 1; - fname = (char *) __PHYSFS_smallAlloc(len); - BAIL_IF_MACRO(fname == NULL, ERR_OUT_OF_MEMORY, 0); - - if (sanitizePlatformIndependentPath(_fname, fname)) - { - int fileExists = 0; - DirHandle *i = NULL; - fvoid *opaque = NULL; - - __PHYSFS_platformGrabMutex(stateLock); - - GOTO_IF_MACRO(!searchPath, ERR_NO_SUCH_PATH, openReadEnd); - - /* !!! FIXME: Why aren't we using a for loop here? */ - i = searchPath; - - do - { - char *arcfname = fname; - if (verifyPath(i, &arcfname, 0)) - { - opaque = i->funcs->openRead(i->opaque, arcfname, &fileExists); - if (opaque) - break; - } /* if */ - i = i->next; - } while ((i != NULL) && (!fileExists)); - - /* !!! FIXME: may not set an error if openRead didn't fail. */ - GOTO_IF_MACRO(opaque == NULL, NULL, openReadEnd); - - fh = (FileHandle *) allocator.Malloc(sizeof (FileHandle)); - if (fh == NULL) - { - i->funcs->fileClose(opaque); - GOTO_MACRO(ERR_OUT_OF_MEMORY, openReadEnd); - } /* if */ - - memset(fh, '\0', sizeof (FileHandle)); - fh->opaque = opaque; - fh->forReading = 1; - fh->dirHandle = i; - fh->funcs = i->funcs; - fh->next = openReadList; - openReadList = fh; - - openReadEnd: - __PHYSFS_platformReleaseMutex(stateLock); - } /* if */ - - __PHYSFS_smallFree(fname); - return((PHYSFS_File *) fh); -} /* PHYSFS_openRead */ - - -static int closeHandleInOpenList(FileHandle **list, FileHandle *handle) -{ - FileHandle *prev = NULL; - FileHandle *i; - int rc = 1; - - for (i = *list; i != NULL; i = i->next) - { - if (i == handle) /* handle is in this list? */ - { - PHYSFS_uint8 *tmp = handle->buffer; - rc = PHYSFS_flush((PHYSFS_File *) handle); - if (rc) - rc = handle->funcs->fileClose(handle->opaque); - if (!rc) - return(-1); - - if (tmp != NULL) /* free any associated buffer. */ - allocator.Free(tmp); - - if (prev == NULL) - *list = handle->next; - else - prev->next = handle->next; - - allocator.Free(handle); - return(1); - } /* if */ - prev = i; - } /* for */ - - return(0); -} /* closeHandleInOpenList */ - - -int PHYSFS_close(PHYSFS_File *_handle) -{ - FileHandle *handle = (FileHandle *) _handle; - int rc; - - __PHYSFS_platformGrabMutex(stateLock); - - /* -1 == close failure. 0 == not found. 1 == success. */ - rc = closeHandleInOpenList(&openReadList, handle); - BAIL_IF_MACRO_MUTEX(rc == -1, NULL, stateLock, 0); - if (!rc) - { - rc = closeHandleInOpenList(&openWriteList, handle); - BAIL_IF_MACRO_MUTEX(rc == -1, NULL, stateLock, 0); - } /* if */ - - __PHYSFS_platformReleaseMutex(stateLock); - BAIL_IF_MACRO(!rc, ERR_NOT_A_HANDLE, 0); - return(1); -} /* PHYSFS_close */ - - -static PHYSFS_sint64 doBufferedRead(FileHandle *fh, void *buffer, - PHYSFS_uint32 objSize, - PHYSFS_uint32 objCount) -{ - PHYSFS_sint64 retval = 0; - PHYSFS_uint32 remainder = 0; - - while (objCount > 0) - { - PHYSFS_uint32 buffered = fh->buffill - fh->bufpos; - PHYSFS_uint64 mustread = (objSize * objCount) - remainder; - PHYSFS_uint32 copied; - - if (buffered == 0) /* need to refill buffer? */ - { - PHYSFS_sint64 rc = fh->funcs->read(fh->opaque, fh->buffer, - 1, fh->bufsize); - if (rc <= 0) - { - fh->bufpos -= remainder; - return(((rc == -1) && (retval == 0)) ? -1 : retval); - } /* if */ - - buffered = fh->buffill = (PHYSFS_uint32) rc; - fh->bufpos = 0; - } /* if */ - - if (buffered > mustread) - buffered = (PHYSFS_uint32) mustread; - - memcpy(buffer, fh->buffer + fh->bufpos, (size_t) buffered); - buffer = ((PHYSFS_uint8 *) buffer) + buffered; - fh->bufpos += buffered; - buffered += remainder; /* take remainder into account. */ - copied = (buffered / objSize); - remainder = (buffered % objSize); - retval += copied; - objCount -= copied; - } /* while */ - - return(retval); -} /* doBufferedRead */ - - -PHYSFS_sint64 PHYSFS_read(PHYSFS_File *handle, void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - FileHandle *fh = (FileHandle *) handle; - - BAIL_IF_MACRO(!fh->forReading, ERR_FILE_ALREADY_OPEN_W, -1); - BAIL_IF_MACRO(objSize == 0, NULL, 0); - BAIL_IF_MACRO(objCount == 0, NULL, 0); - if (fh->buffer != NULL) - return(doBufferedRead(fh, buffer, objSize, objCount)); - - return(fh->funcs->read(fh->opaque, buffer, objSize, objCount)); -} /* PHYSFS_read */ - - -static PHYSFS_sint64 doBufferedWrite(PHYSFS_File *handle, const void *buffer, - PHYSFS_uint32 objSize, - PHYSFS_uint32 objCount) -{ - FileHandle *fh = (FileHandle *) handle; - - /* whole thing fits in the buffer? */ - if (fh->buffill + (objSize * objCount) < fh->bufsize) - { - memcpy(fh->buffer + fh->buffill, buffer, objSize * objCount); - fh->buffill += (objSize * objCount); - return(objCount); - } /* if */ - - /* would overflow buffer. Flush and then write the new objects, too. */ - BAIL_IF_MACRO(!PHYSFS_flush(handle), NULL, -1); - return(fh->funcs->write(fh->opaque, buffer, objSize, objCount)); -} /* doBufferedWrite */ - - -PHYSFS_sint64 PHYSFS_write(PHYSFS_File *handle, const void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) -{ - FileHandle *fh = (FileHandle *) handle; - - BAIL_IF_MACRO(fh->forReading, ERR_FILE_ALREADY_OPEN_R, -1); - BAIL_IF_MACRO(objSize == 0, NULL, 0); - BAIL_IF_MACRO(objCount == 0, NULL, 0); - if (fh->buffer != NULL) - return(doBufferedWrite(handle, buffer, objSize, objCount)); - - return(fh->funcs->write(fh->opaque, buffer, objSize, objCount)); -} /* PHYSFS_write */ - - -int PHYSFS_eof(PHYSFS_File *handle) -{ - FileHandle *fh = (FileHandle *) handle; - - if (!fh->forReading) /* never EOF on files opened for write/append. */ - return(0); - - /* eof if buffer is empty and archiver says so. */ - return((fh->bufpos == fh->buffill) && (fh->funcs->eof(fh->opaque))); -} /* PHYSFS_eof */ - - -PHYSFS_sint64 PHYSFS_tell(PHYSFS_File *handle) -{ - FileHandle *fh = (FileHandle *) handle; - PHYSFS_sint64 pos = fh->funcs->tell(fh->opaque); - PHYSFS_sint64 retval = fh->forReading ? - (pos - fh->buffill) + fh->bufpos : - (pos + fh->buffill); - return(retval); -} /* PHYSFS_tell */ - - -int PHYSFS_seek(PHYSFS_File *handle, PHYSFS_uint64 pos) -{ - FileHandle *fh = (FileHandle *) handle; - BAIL_IF_MACRO(!PHYSFS_flush(handle), NULL, 0); - - if (fh->buffer && fh->forReading) - { - /* avoid throwing away our precious buffer if seeking within it. */ - PHYSFS_sint64 offset = pos - PHYSFS_tell(handle); - if ( /* seeking within the already-buffered range? */ - ((offset >= 0) && (offset <= fh->buffill - fh->bufpos)) /* fwd */ - || ((offset < 0) && (-offset <= fh->bufpos)) /* backward */ ) - { - fh->bufpos += (PHYSFS_uint32) offset; - return(1); /* successful seek */ - } /* if */ - } /* if */ - - /* we have to fall back to a 'raw' seek. */ - fh->buffill = fh->bufpos = 0; - return(fh->funcs->seek(fh->opaque, pos)); -} /* PHYSFS_seek */ - - -PHYSFS_sint64 PHYSFS_fileLength(PHYSFS_File *handle) -{ - FileHandle *fh = (FileHandle *) handle; - return(fh->funcs->fileLength(fh->opaque)); -} /* PHYSFS_filelength */ - - -int PHYSFS_setBuffer(PHYSFS_File *handle, PHYSFS_uint64 _bufsize) -{ - FileHandle *fh = (FileHandle *) handle; - PHYSFS_uint32 bufsize; - - /* !!! FIXME: Unlocalized string. */ - BAIL_IF_MACRO(_bufsize > 0xFFFFFFFF, "buffer must fit in 32-bits", 0); - bufsize = (PHYSFS_uint32) _bufsize; - - BAIL_IF_MACRO(!PHYSFS_flush(handle), NULL, 0); - - /* - * For reads, we need to move the file pointer to where it would be - * if we weren't buffering, so that the next read will get the - * right chunk of stuff from the file. PHYSFS_flush() handles writes. - */ - if ((fh->forReading) && (fh->buffill != fh->bufpos)) - { - PHYSFS_uint64 pos; - PHYSFS_sint64 curpos = fh->funcs->tell(fh->opaque); - BAIL_IF_MACRO(curpos == -1, NULL, 0); - pos = ((curpos - fh->buffill) + fh->bufpos); - BAIL_IF_MACRO(!fh->funcs->seek(fh->opaque, pos), NULL, 0); - } /* if */ - - if (bufsize == 0) /* delete existing buffer. */ - { - if (fh->buffer != NULL) - { - allocator.Free(fh->buffer); - fh->buffer = NULL; - } /* if */ - } /* if */ - - else - { - PHYSFS_uint8 *newbuf; - newbuf = (PHYSFS_uint8 *) allocator.Realloc(fh->buffer, bufsize); - BAIL_IF_MACRO(newbuf == NULL, ERR_OUT_OF_MEMORY, 0); - fh->buffer = newbuf; - } /* else */ - - fh->bufsize = bufsize; - fh->buffill = fh->bufpos = 0; - return(1); -} /* PHYSFS_setBuffer */ - - -int PHYSFS_flush(PHYSFS_File *handle) -{ - FileHandle *fh = (FileHandle *) handle; - PHYSFS_sint64 rc; - - if ((fh->forReading) || (fh->bufpos == fh->buffill)) - return(1); /* open for read or buffer empty are successful no-ops. */ - - /* dump buffer to disk. */ - rc = fh->funcs->write(fh->opaque, fh->buffer + fh->bufpos, - fh->buffill - fh->bufpos, 1); - BAIL_IF_MACRO(rc <= 0, NULL, 0); - fh->bufpos = fh->buffill = 0; - return(1); -} /* PHYSFS_flush */ - - -int PHYSFS_setAllocator(const PHYSFS_Allocator *a) -{ - BAIL_IF_MACRO(initialized, ERR_IS_INITIALIZED, 0); - externalAllocator = (a != NULL); - if (externalAllocator) - memcpy(&allocator, a, sizeof (PHYSFS_Allocator)); - - return(1); -} /* PHYSFS_setAllocator */ - - -static void *mallocAllocatorMalloc(PHYSFS_uint64 s) -{ - BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL); - #undef malloc - return(malloc((size_t) s)); -} /* mallocAllocatorMalloc */ - - -static void *mallocAllocatorRealloc(void *ptr, PHYSFS_uint64 s) -{ - BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL); - #undef realloc - return(realloc(ptr, (size_t) s)); -} /* mallocAllocatorRealloc */ - - -static void mallocAllocatorFree(void *ptr) -{ - #undef free - free(ptr); -} /* mallocAllocatorFree */ - - -static void setDefaultAllocator(void) -{ - assert(!externalAllocator); - if (!__PHYSFS_platformSetDefaultAllocator(&allocator)) - { - allocator.Init = NULL; - allocator.Deinit = NULL; - allocator.Malloc = mallocAllocatorMalloc; - allocator.Realloc = mallocAllocatorRealloc; - allocator.Free = mallocAllocatorFree; - } /* if */ -} /* setDefaultAllocator */ - - -void *__PHYSFS_initSmallAlloc(void *ptr, PHYSFS_uint64 len) -{ - const char useHeap = ((ptr == NULL) ? 1 : 0); - if (useHeap) /* too large for stack allocation or alloca() failed. */ - ptr = allocator.Malloc(len+1); - - if (ptr != NULL) - { - char *retval = (char *) ptr; - /*printf("%s alloc'd (%d) bytes at (%p).\n", - useHeap ? "heap" : "stack", (int) len, ptr);*/ - *retval = useHeap; - return(retval+1); - } /* if */ - - return(NULL); /* allocation failed. */ -} /* __PHYSFS_initSmallAlloc */ - - -void __PHYSFS_smallFree(void *ptr) -{ - if (ptr != NULL) - { - char *block = ((char *) ptr) - 1; - const char useHeap = *block; - if (useHeap) - allocator.Free(block); - /*printf("%s free'd (%p).\n", useHeap ? "heap" : "stack", block);*/ - } /* if */ -} /* __PHYSFS_smallFree */ - -/* end of physfs.c ... */ - diff --git a/jni/physfs-2.0.3/physfs_byteorder.c b/jni/physfs-2.0.3/physfs_byteorder.c deleted file mode 100644 index ee3688b3..00000000 --- a/jni/physfs-2.0.3/physfs_byteorder.c +++ /dev/null @@ -1,312 +0,0 @@ -/** - * PhysicsFS; a portable, flexible file i/o abstraction. - * - * Documentation is in physfs.h. It's verbose, honest. :) - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#include -#include - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_internal.h" - -#if (defined macintosh) && !(defined __MWERKS__) -#define __inline__ -#endif - -#if (defined _MSC_VER) -#define __inline__ __inline -#endif - -#ifndef PHYSFS_Swap16 -static __inline__ PHYSFS_uint16 PHYSFS_Swap16(PHYSFS_uint16 D) -{ - return((D<<8)|(D>>8)); -} -#endif -#ifndef PHYSFS_Swap32 -static __inline__ PHYSFS_uint32 PHYSFS_Swap32(PHYSFS_uint32 D) -{ - return((D<<24)|((D<<8)&0x00FF0000)|((D>>8)&0x0000FF00)|(D>>24)); -} -#endif -#ifndef PHYSFS_NO_64BIT_SUPPORT -#ifndef PHYSFS_Swap64 -static __inline__ PHYSFS_uint64 PHYSFS_Swap64(PHYSFS_uint64 val) { - PHYSFS_uint32 hi, lo; - - /* Separate into high and low 32-bit values and swap them */ - lo = (PHYSFS_uint32)(val&0xFFFFFFFF); - val >>= 32; - hi = (PHYSFS_uint32)(val&0xFFFFFFFF); - val = PHYSFS_Swap32(lo); - val <<= 32; - val |= PHYSFS_Swap32(hi); - return(val); -} -#endif -#else -#ifndef PHYSFS_Swap64 -/* This is mainly to keep compilers from complaining in PHYSFS code. - If there is no real 64-bit datatype, then compilers will complain about - the fake 64-bit datatype that PHYSFS provides when it compiles user code. -*/ -#define PHYSFS_Swap64(X) (X) -#endif -#endif /* PHYSFS_NO_64BIT_SUPPORT */ - - -/* Byteswap item from the specified endianness to the native endianness */ -#if PHYSFS_BYTEORDER == PHYSFS_LIL_ENDIAN -PHYSFS_uint16 PHYSFS_swapULE16(PHYSFS_uint16 x) { return(x); } -PHYSFS_sint16 PHYSFS_swapSLE16(PHYSFS_sint16 x) { return(x); } -PHYSFS_uint32 PHYSFS_swapULE32(PHYSFS_uint32 x) { return(x); } -PHYSFS_sint32 PHYSFS_swapSLE32(PHYSFS_sint32 x) { return(x); } -PHYSFS_uint64 PHYSFS_swapULE64(PHYSFS_uint64 x) { return(x); } -PHYSFS_sint64 PHYSFS_swapSLE64(PHYSFS_sint64 x) { return(x); } - -PHYSFS_uint16 PHYSFS_swapUBE16(PHYSFS_uint16 x) { return(PHYSFS_Swap16(x)); } -PHYSFS_sint16 PHYSFS_swapSBE16(PHYSFS_sint16 x) { return(PHYSFS_Swap16(x)); } -PHYSFS_uint32 PHYSFS_swapUBE32(PHYSFS_uint32 x) { return(PHYSFS_Swap32(x)); } -PHYSFS_sint32 PHYSFS_swapSBE32(PHYSFS_sint32 x) { return(PHYSFS_Swap32(x)); } -PHYSFS_uint64 PHYSFS_swapUBE64(PHYSFS_uint64 x) { return(PHYSFS_Swap64(x)); } -PHYSFS_sint64 PHYSFS_swapSBE64(PHYSFS_sint64 x) { return(PHYSFS_Swap64(x)); } -#else -PHYSFS_uint16 PHYSFS_swapULE16(PHYSFS_uint16 x) { return(PHYSFS_Swap16(x)); } -PHYSFS_sint16 PHYSFS_swapSLE16(PHYSFS_sint16 x) { return(PHYSFS_Swap16(x)); } -PHYSFS_uint32 PHYSFS_swapULE32(PHYSFS_uint32 x) { return(PHYSFS_Swap32(x)); } -PHYSFS_sint32 PHYSFS_swapSLE32(PHYSFS_sint32 x) { return(PHYSFS_Swap32(x)); } -PHYSFS_uint64 PHYSFS_swapULE64(PHYSFS_uint64 x) { return(PHYSFS_Swap64(x)); } -PHYSFS_sint64 PHYSFS_swapSLE64(PHYSFS_sint64 x) { return(PHYSFS_Swap64(x)); } - -PHYSFS_uint16 PHYSFS_swapUBE16(PHYSFS_uint16 x) { return(x); } -PHYSFS_sint16 PHYSFS_swapSBE16(PHYSFS_sint16 x) { return(x); } -PHYSFS_uint32 PHYSFS_swapUBE32(PHYSFS_uint32 x) { return(x); } -PHYSFS_sint32 PHYSFS_swapSBE32(PHYSFS_sint32 x) { return(x); } -PHYSFS_uint64 PHYSFS_swapUBE64(PHYSFS_uint64 x) { return(x); } -PHYSFS_sint64 PHYSFS_swapSBE64(PHYSFS_sint64 x) { return(x); } -#endif - - -int PHYSFS_readSLE16(PHYSFS_File *file, PHYSFS_sint16 *val) -{ - PHYSFS_sint16 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapSLE16(in); - return(1); -} /* PHYSFS_readSLE16 */ - - -int PHYSFS_readULE16(PHYSFS_File *file, PHYSFS_uint16 *val) -{ - PHYSFS_uint16 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapULE16(in); - return(1); -} /* PHYSFS_readULE16 */ - - -int PHYSFS_readSBE16(PHYSFS_File *file, PHYSFS_sint16 *val) -{ - PHYSFS_sint16 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapSBE16(in); - return(1); -} /* PHYSFS_readSBE16 */ - - -int PHYSFS_readUBE16(PHYSFS_File *file, PHYSFS_uint16 *val) -{ - PHYSFS_uint16 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapUBE16(in); - return(1); -} /* PHYSFS_readUBE16 */ - - -int PHYSFS_readSLE32(PHYSFS_File *file, PHYSFS_sint32 *val) -{ - PHYSFS_sint32 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapSLE32(in); - return(1); -} /* PHYSFS_readSLE32 */ - - -int PHYSFS_readULE32(PHYSFS_File *file, PHYSFS_uint32 *val) -{ - PHYSFS_uint32 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapULE32(in); - return(1); -} /* PHYSFS_readULE32 */ - - -int PHYSFS_readSBE32(PHYSFS_File *file, PHYSFS_sint32 *val) -{ - PHYSFS_sint32 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapSBE32(in); - return(1); -} /* PHYSFS_readSBE32 */ - - -int PHYSFS_readUBE32(PHYSFS_File *file, PHYSFS_uint32 *val) -{ - PHYSFS_uint32 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapUBE32(in); - return(1); -} /* PHYSFS_readUBE32 */ - - -int PHYSFS_readSLE64(PHYSFS_File *file, PHYSFS_sint64 *val) -{ - PHYSFS_sint64 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapSLE64(in); - return(1); -} /* PHYSFS_readSLE64 */ - - -int PHYSFS_readULE64(PHYSFS_File *file, PHYSFS_uint64 *val) -{ - PHYSFS_uint64 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapULE64(in); - return(1); -} /* PHYSFS_readULE64 */ - - -int PHYSFS_readSBE64(PHYSFS_File *file, PHYSFS_sint64 *val) -{ - PHYSFS_sint64 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapSBE64(in); - return(1); -} /* PHYSFS_readSBE64 */ - - -int PHYSFS_readUBE64(PHYSFS_File *file, PHYSFS_uint64 *val) -{ - PHYSFS_uint64 in; - BAIL_IF_MACRO(val == NULL, ERR_INVALID_ARGUMENT, 0); - BAIL_IF_MACRO(PHYSFS_read(file, &in, sizeof (in), 1) != 1, NULL, 0); - *val = PHYSFS_swapUBE64(in); - return(1); -} /* PHYSFS_readUBE64 */ - - - -int PHYSFS_writeSLE16(PHYSFS_File *file, PHYSFS_sint16 val) -{ - PHYSFS_sint16 out = PHYSFS_swapSLE16(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeSLE16 */ - - -int PHYSFS_writeULE16(PHYSFS_File *file, PHYSFS_uint16 val) -{ - PHYSFS_uint16 out = PHYSFS_swapULE16(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeULE16 */ - - -int PHYSFS_writeSBE16(PHYSFS_File *file, PHYSFS_sint16 val) -{ - PHYSFS_sint16 out = PHYSFS_swapSBE16(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeSBE16 */ - - -int PHYSFS_writeUBE16(PHYSFS_File *file, PHYSFS_uint16 val) -{ - PHYSFS_uint16 out = PHYSFS_swapUBE16(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeUBE16 */ - - -int PHYSFS_writeSLE32(PHYSFS_File *file, PHYSFS_sint32 val) -{ - PHYSFS_sint32 out = PHYSFS_swapSLE32(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeSLE32 */ - - -int PHYSFS_writeULE32(PHYSFS_File *file, PHYSFS_uint32 val) -{ - PHYSFS_uint32 out = PHYSFS_swapULE32(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeULE32 */ - - -int PHYSFS_writeSBE32(PHYSFS_File *file, PHYSFS_sint32 val) -{ - PHYSFS_sint32 out = PHYSFS_swapSBE32(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeSBE32 */ - - -int PHYSFS_writeUBE32(PHYSFS_File *file, PHYSFS_uint32 val) -{ - PHYSFS_uint32 out = PHYSFS_swapUBE32(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeUBE32 */ - - -int PHYSFS_writeSLE64(PHYSFS_File *file, PHYSFS_sint64 val) -{ - PHYSFS_sint64 out = PHYSFS_swapSLE64(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeSLE64 */ - - -int PHYSFS_writeULE64(PHYSFS_File *file, PHYSFS_uint64 val) -{ - PHYSFS_uint64 out = PHYSFS_swapULE64(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeULE64 */ - - -int PHYSFS_writeSBE64(PHYSFS_File *file, PHYSFS_sint64 val) -{ - PHYSFS_sint64 out = PHYSFS_swapSBE64(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeSBE64 */ - - -int PHYSFS_writeUBE64(PHYSFS_File *file, PHYSFS_uint64 val) -{ - PHYSFS_uint64 out = PHYSFS_swapUBE64(val); - BAIL_IF_MACRO(PHYSFS_write(file, &out, sizeof (out), 1) != 1, NULL, 0); - return(1); -} /* PHYSFS_writeUBE64 */ - -/* end of physfs_byteorder.c ... */ - diff --git a/jni/physfs-2.0.3/physfs_internal.h b/jni/physfs-2.0.3/physfs_internal.h deleted file mode 100644 index 9e83a7eb..00000000 --- a/jni/physfs-2.0.3/physfs_internal.h +++ /dev/null @@ -1,1496 +0,0 @@ -/* - * Internal function/structure declaration. Do NOT include in your - * application. - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#ifndef _INCLUDE_PHYSFS_INTERNAL_H_ -#define _INCLUDE_PHYSFS_INTERNAL_H_ - -#ifndef __PHYSICSFS_INTERNAL__ -#error Do not include this header from your applications. -#endif - -#include "physfs.h" - -#include /* make sure NULL is defined... */ - -#ifdef HAVE_ASSERT_H -#include -#elif (!defined assert) -#define assert(x) -#endif - -/* !!! FIXME: remove this when revamping stack allocation code... */ -#if defined(_MSC_VER) || defined(__MINGW32__) -#include -#endif - -#if defined(__sun) || defined(sun) -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __GNUC__ -#define PHYSFS_MINIMUM_GCC_VERSION(major, minor) \ - ( ((__GNUC__ << 16) + __GNUC_MINOR__) >= (((major) << 16) + (minor)) ) -#else -#define PHYSFS_MINIMUM_GCC_VERSION(major, minor) (0) -#endif - -/* - * Interface for small allocations. If you need a little scratch space for - * a throwaway buffer or string, use this. It will make small allocations - * on the stack if possible, and use allocator.Malloc() if they are too - * large. This helps reduce malloc pressure. - * There are some rules, though: - * NEVER return a pointer from this, as stack-allocated buffers go away - * when your function returns. - * NEVER allocate in a loop, as stack-allocated pointers will pile up. Call - * a function that uses smallAlloc from your loop, so the allocation can - * free each time. - * NEVER call smallAlloc with any complex expression (it's a macro that WILL - * have side effects...it references the argument multiple times). Use a - * variable or a literal. - * NEVER free a pointer from this with anything but smallFree. It will not - * be a valid pointer to the allocator, regardless of where the memory came - * from. - * NEVER realloc a pointer from this. - * NEVER forget to use smallFree: it may not be a pointer from the stack. - * NEVER forget to check for NULL...allocation can fail here, of course! - */ -#define __PHYSFS_SMALLALLOCTHRESHOLD 128 -void *__PHYSFS_initSmallAlloc(void *ptr, PHYSFS_uint64 len); - -#define __PHYSFS_smallAlloc(bytes) ( \ - __PHYSFS_initSmallAlloc((((bytes) < __PHYSFS_SMALLALLOCTHRESHOLD) ? \ - alloca((size_t)((bytes)+1)) : NULL), (bytes)) \ -) - -void __PHYSFS_smallFree(void *ptr); - - -/* Use the allocation hooks. */ -#define malloc(x) Do not use malloc() directly. -#define realloc(x, y) Do not use realloc() directly. -#define free(x) Do not use free() directly. -/* !!! FIXME: add alloca check here. */ - -/* The LANG section. */ -/* please send questions/translations to Ryan: icculus@icculus.org. */ - -#if (!defined PHYSFS_LANG) -# define PHYSFS_LANG PHYSFS_LANG_ENGLISH -#endif - -/* All language strings are UTF-8 encoded! */ -#define PHYSFS_LANG_ENGLISH 1 /* English by Ryan C. Gordon */ -#define PHYSFS_LANG_RUSSIAN 2 /* Russian by Ed Sinjiashvili */ -#define PHYSFS_LANG_SPANISH 3 /* Spanish by Pedro J. Pérez */ -#define PHYSFS_LANG_FRENCH 4 /* French by Stéphane Peter */ -#define PHYSFS_LANG_GERMAN 5 /* German by Michael Renner */ -#define PHYSFS_LANG_PORTUGUESE_BR 6 /* pt-br by Danny Angelo Carminati Grein */ - -#if (PHYSFS_LANG == PHYSFS_LANG_ENGLISH) - #define DIR_ARCHIVE_DESCRIPTION "Non-archive, direct filesystem I/O" - #define GRP_ARCHIVE_DESCRIPTION "Build engine Groupfile format" - #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format" - #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format" - #define QPAK_ARCHIVE_DESCRIPTION "Quake I/II format" - #define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip compatible" - #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" - #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" - - #define ERR_IS_INITIALIZED "Already initialized" - #define ERR_NOT_INITIALIZED "Not initialized" - #define ERR_INVALID_ARGUMENT "Invalid argument" - #define ERR_FILES_STILL_OPEN "Files still open" - #define ERR_NO_DIR_CREATE "Failed to create directories" - #define ERR_OUT_OF_MEMORY "Out of memory" - #define ERR_NOT_IN_SEARCH_PATH "No such entry in search path" - #define ERR_NOT_SUPPORTED "Operation not supported" - #define ERR_UNSUPPORTED_ARCHIVE "Archive type unsupported" - #define ERR_NOT_A_HANDLE "Not a file handle" - #define ERR_INSECURE_FNAME "Insecure filename" - #define ERR_SYMLINK_DISALLOWED "Symbolic links are disabled" - #define ERR_NO_WRITE_DIR "Write directory is not set" - #define ERR_NO_SUCH_FILE "File not found" - #define ERR_NO_SUCH_PATH "Path not found" - #define ERR_NO_SUCH_VOLUME "Volume not found" - #define ERR_PAST_EOF "Past end of file" - #define ERR_ARC_IS_READ_ONLY "Archive is read-only" - #define ERR_IO_ERROR "I/O error" - #define ERR_CANT_SET_WRITE_DIR "Can't set write directory" - #define ERR_SYMLINK_LOOP "Infinite symbolic link loop" - #define ERR_COMPRESSION "(De)compression error" - #define ERR_NOT_IMPLEMENTED "Not implemented" - #define ERR_OS_ERROR "Operating system reported error" - #define ERR_FILE_EXISTS "File already exists" - #define ERR_NOT_A_FILE "Not a file" - #define ERR_NOT_A_DIR "Not a directory" - #define ERR_NOT_AN_ARCHIVE "Not an archive" - #define ERR_CORRUPTED "Corrupted archive" - #define ERR_SEEK_OUT_OF_RANGE "Seek out of range" - #define ERR_BAD_FILENAME "Bad filename" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS made a bad system call" - #define ERR_ARGV0_IS_NULL "argv0 is NULL" - #define ERR_NEED_DICT "need dictionary" - #define ERR_DATA_ERROR "data error" - #define ERR_MEMORY_ERROR "memory error" - #define ERR_BUFFER_ERROR "buffer error" - #define ERR_VERSION_ERROR "version error" - #define ERR_UNKNOWN_ERROR "unknown error" - #define ERR_SEARCHPATH_TRUNC "Search path was truncated" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() was truncated" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() had no dir" - #define ERR_DISK_FULL "Disk is full" - #define ERR_DIRECTORY_FULL "Directory full" - #define ERR_MACOS_GENERIC "MacOS reported error (%d)" - #define ERR_OS2_GENERIC "OS/2 reported error (%d)" - #define ERR_VOL_LOCKED_HW "Volume is locked through hardware" - #define ERR_VOL_LOCKED_SW "Volume is locked through software" - #define ERR_FILE_LOCKED "File is locked" - #define ERR_FILE_OR_DIR_BUSY "File/directory is busy" - #define ERR_FILE_ALREADY_OPEN_W "File already open for writing" - #define ERR_FILE_ALREADY_OPEN_R "File already open for reading" - #define ERR_INVALID_REFNUM "Invalid reference number" - #define ERR_GETTING_FILE_POS "Error getting file position" - #define ERR_VOLUME_OFFLINE "Volume is offline" - #define ERR_PERMISSION_DENIED "Permission denied" - #define ERR_VOL_ALREADY_ONLINE "Volume already online" - #define ERR_NO_SUCH_DRIVE "No such drive" - #define ERR_NOT_MAC_DISK "Not a Macintosh disk" - #define ERR_VOL_EXTERNAL_FS "Volume belongs to an external filesystem" - #define ERR_PROBLEM_RENAME "Problem during rename" - #define ERR_BAD_MASTER_BLOCK "Bad master directory block" - #define ERR_CANT_MOVE_FORBIDDEN "Attempt to move forbidden" - #define ERR_WRONG_VOL_TYPE "Wrong volume type" - #define ERR_SERVER_VOL_LOST "Server volume has been disconnected" - #define ERR_FILE_ID_NOT_FOUND "File ID not found" - #define ERR_FILE_ID_EXISTS "File ID already exists" - #define ERR_SERVER_NO_RESPOND "Server not responding" - #define ERR_USER_AUTH_FAILED "User authentication failed" - #define ERR_PWORD_EXPIRED "Password has expired on server" - #define ERR_ACCESS_DENIED "Access denied" - #define ERR_NOT_A_DOS_DISK "Not a DOS disk" - #define ERR_SHARING_VIOLATION "Sharing violation" - #define ERR_CANNOT_MAKE "Cannot make" - #define ERR_DEV_IN_USE "Device already in use" - #define ERR_OPEN_FAILED "Open failed" - #define ERR_PIPE_BUSY "Pipe is busy" - #define ERR_SHARING_BUF_EXCEEDED "Sharing buffer exceeded" - #define ERR_TOO_MANY_HANDLES "Too many open handles" - #define ERR_SEEK_ERROR "Seek error" - #define ERR_DEL_CWD "Trying to delete current working directory" - #define ERR_WRITE_PROTECT_ERROR "Write protect error" - #define ERR_WRITE_FAULT "Write fault" - #define ERR_LOCK_VIOLATION "Lock violation" - #define ERR_GEN_FAILURE "General failure" - #define ERR_UNCERTAIN_MEDIA "Uncertain media" - #define ERR_PROT_VIOLATION "Protection violation" - #define ERR_BROKEN_PIPE "Broken pipe" - -#elif (PHYSFS_LANG == PHYSFS_LANG_GERMAN) - #define DIR_ARCHIVE_DESCRIPTION "Kein Archiv, direkte Ein/Ausgabe in das Dateisystem" - #define GRP_ARCHIVE_DESCRIPTION "Build engine Groupfile format" - #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format" - #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format" - #define QPAK_ARCHIVE_DESCRIPTION "Quake I/II format" - #define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip kompatibel" - #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" /* !!! FIXME: translate this line if needed */ - #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - - #define ERR_IS_INITIALIZED "Bereits initialisiert" - #define ERR_NOT_INITIALIZED "Nicht initialisiert" - #define ERR_INVALID_ARGUMENT "Ungültiges Argument" - #define ERR_FILES_STILL_OPEN "Dateien noch immer geöffnet" - #define ERR_NO_DIR_CREATE "Fehler beim Erzeugen der Verzeichnisse" - #define ERR_OUT_OF_MEMORY "Kein Speicher mehr frei" - #define ERR_NOT_IN_SEARCH_PATH "Eintrag nicht im Suchpfad enthalten" - #define ERR_NOT_SUPPORTED "Befehl nicht unterstützt" - #define ERR_UNSUPPORTED_ARCHIVE "Archiv-Typ nicht unterstützt" - #define ERR_NOT_A_HANDLE "Ist kein Dateideskriptor" - #define ERR_INSECURE_FNAME "Unsicherer Dateiname" - #define ERR_SYMLINK_DISALLOWED "Symbolische Verweise deaktiviert" - #define ERR_NO_WRITE_DIR "Schreibverzeichnis ist nicht gesetzt" - #define ERR_NO_SUCH_FILE "Datei nicht gefunden" - #define ERR_NO_SUCH_PATH "Pfad nicht gefunden" - #define ERR_NO_SUCH_VOLUME "Datencontainer nicht gefunden" - #define ERR_PAST_EOF "Hinter dem Ende der Datei" - #define ERR_ARC_IS_READ_ONLY "Archiv ist schreibgeschützt" - #define ERR_IO_ERROR "Ein/Ausgabe Fehler" - #define ERR_CANT_SET_WRITE_DIR "Kann Schreibverzeichnis nicht setzen" - #define ERR_SYMLINK_LOOP "Endlosschleife durch symbolische Verweise" - #define ERR_COMPRESSION "(De)Kompressionsfehler" - #define ERR_NOT_IMPLEMENTED "Nicht implementiert" - #define ERR_OS_ERROR "Betriebssystem meldete Fehler" - #define ERR_FILE_EXISTS "Datei existiert bereits" - #define ERR_NOT_A_FILE "Ist keine Datei" - #define ERR_NOT_A_DIR "Ist kein Verzeichnis" - #define ERR_NOT_AN_ARCHIVE "Ist kein Archiv" - #define ERR_CORRUPTED "Beschädigtes Archiv" - #define ERR_SEEK_OUT_OF_RANGE "Suche war ausserhalb der Reichweite" - #define ERR_BAD_FILENAME "Unzulässiger Dateiname" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS verursachte einen ungültigen Systemaufruf" - #define ERR_ARGV0_IS_NULL "argv0 ist NULL" - #define ERR_NEED_DICT "brauche Wörterbuch" - #define ERR_DATA_ERROR "Datenfehler" - #define ERR_MEMORY_ERROR "Speicherfehler" - #define ERR_BUFFER_ERROR "Bufferfehler" - #define ERR_VERSION_ERROR "Versionskonflikt" - #define ERR_UNKNOWN_ERROR "Unbekannter Fehler" - #define ERR_SEARCHPATH_TRUNC "Suchpfad war abgeschnitten" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() war abgeschnitten" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() bekam kein Verzeichnis" - #define ERR_DISK_FULL "Laufwerk ist voll" - #define ERR_DIRECTORY_FULL "Verzeichnis ist voll" - #define ERR_MACOS_GENERIC "MacOS meldete Fehler (%d)" - #define ERR_OS2_GENERIC "OS/2 meldete Fehler (%d)" - #define ERR_VOL_LOCKED_HW "Datencontainer ist durch Hardware gesperrt" - #define ERR_VOL_LOCKED_SW "Datencontainer ist durch Software gesperrt" - #define ERR_FILE_LOCKED "Datei ist gesperrt" - #define ERR_FILE_OR_DIR_BUSY "Datei/Verzeichnis ist beschäftigt" - #define ERR_FILE_ALREADY_OPEN_W "Datei schon im Schreibmodus geöffnet" - #define ERR_FILE_ALREADY_OPEN_R "Datei schon im Lesemodus geöffnet" - #define ERR_INVALID_REFNUM "Ungültige Referenznummer" - #define ERR_GETTING_FILE_POS "Fehler beim Finden der Dateiposition" - #define ERR_VOLUME_OFFLINE "Datencontainer ist offline" - #define ERR_PERMISSION_DENIED "Zugriff verweigert" - #define ERR_VOL_ALREADY_ONLINE "Datencontainer ist bereits online" - #define ERR_NO_SUCH_DRIVE "Laufwerk nicht vorhanden" - #define ERR_NOT_MAC_DISK "Ist kein Macintosh Laufwerk" - #define ERR_VOL_EXTERNAL_FS "Datencontainer liegt auf einem externen Dateisystem" - #define ERR_PROBLEM_RENAME "Fehler beim Umbenennen" - #define ERR_BAD_MASTER_BLOCK "Beschädigter Hauptverzeichnisblock" - #define ERR_CANT_MOVE_FORBIDDEN "Verschieben nicht erlaubt" - #define ERR_WRONG_VOL_TYPE "Falscher Datencontainer-Typ" - #define ERR_SERVER_VOL_LOST "Datencontainer am Server wurde getrennt" - #define ERR_FILE_ID_NOT_FOUND "Dateikennung nicht gefunden" - #define ERR_FILE_ID_EXISTS "Dateikennung existiert bereits" - #define ERR_SERVER_NO_RESPOND "Server antwortet nicht" - #define ERR_USER_AUTH_FAILED "Benutzerauthentifizierung fehlgeschlagen" - #define ERR_PWORD_EXPIRED "Passwort am Server ist abgelaufen" - #define ERR_ACCESS_DENIED "Zugriff verweigert" - #define ERR_NOT_A_DOS_DISK "Ist kein DOS-Laufwerk" - #define ERR_SHARING_VIOLATION "Zugriffsverletzung" - #define ERR_CANNOT_MAKE "Kann nicht erzeugen" - #define ERR_DEV_IN_USE "Gerät wird bereits benutzt" - #define ERR_OPEN_FAILED "Öffnen fehlgeschlagen" - #define ERR_PIPE_BUSY "Pipeverbindung ist belegt" - #define ERR_SHARING_BUF_EXCEEDED "Zugriffsbuffer überschritten" - #define ERR_TOO_MANY_HANDLES "Zu viele offene Dateien" - #define ERR_SEEK_ERROR "Fehler beim Suchen" - #define ERR_DEL_CWD "Aktuelles Arbeitsverzeichnis darf nicht gelöscht werden" - #define ERR_WRITE_PROTECT_ERROR "Schreibschutzfehler" - #define ERR_WRITE_FAULT "Schreibfehler" - #define ERR_LOCK_VIOLATION "Sperrverletzung" - #define ERR_GEN_FAILURE "Allgemeiner Fehler" - #define ERR_UNCERTAIN_MEDIA "Unsicheres Medium" - #define ERR_PROT_VIOLATION "Schutzverletzung" - #define ERR_BROKEN_PIPE "Pipeverbindung unterbrochen" - -#elif (PHYSFS_LANG == PHYSFS_LANG_RUSSIAN) - #define DIR_ARCHIVE_DESCRIPTION "Не архив, непосредственный ввод/вывод файловой системы" - #define GRP_ARCHIVE_DESCRIPTION "Формат группового файла Build engine" - #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format" - #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format" - #define ZIP_ARCHIVE_DESCRIPTION "PkZip/WinZip/Info-Zip совместимый" - #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" /* !!! FIXME: translate this line if needed */ - #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - - #define ERR_IS_INITIALIZED "Уже инициализирован" - #define ERR_NOT_INITIALIZED "Не инициализирован" - #define ERR_INVALID_ARGUMENT "Неверный аргумент" - #define ERR_FILES_STILL_OPEN "Файлы еще открыты" - #define ERR_NO_DIR_CREATE "Не могу создать каталоги" - #define ERR_OUT_OF_MEMORY "Кончилась память" - #define ERR_NOT_IN_SEARCH_PATH "Нет такого элемента в пути поиска" - #define ERR_NOT_SUPPORTED "Операция не поддерживается" - #define ERR_UNSUPPORTED_ARCHIVE "Архивы такого типа не поддерживаются" - #define ERR_NOT_A_HANDLE "Не файловый дескриптор" - #define ERR_INSECURE_FNAME "Небезопасное имя файла" - #define ERR_SYMLINK_DISALLOWED "Символьные ссылки отключены" - #define ERR_NO_WRITE_DIR "Каталог для записи не установлен" - #define ERR_NO_SUCH_FILE "Файл не найден" - #define ERR_NO_SUCH_PATH "Путь не найден" - #define ERR_NO_SUCH_VOLUME "Том не найден" - #define ERR_PAST_EOF "За концом файла" - #define ERR_ARC_IS_READ_ONLY "Архив только для чтения" - #define ERR_IO_ERROR "Ошибка ввода/вывода" - #define ERR_CANT_SET_WRITE_DIR "Не могу установить каталог для записи" - #define ERR_SYMLINK_LOOP "Бесконечный цикл символьной ссылки" - #define ERR_COMPRESSION "Ошибка (Рас)паковки" - #define ERR_NOT_IMPLEMENTED "Не реализовано" - #define ERR_OS_ERROR "Операционная система сообщила ошибку" - #define ERR_FILE_EXISTS "Файл уже существует" - #define ERR_NOT_A_FILE "Не файл" - #define ERR_NOT_A_DIR "Не каталог" - #define ERR_NOT_AN_ARCHIVE "Не архив" - #define ERR_CORRUPTED "Поврежденный архив" - #define ERR_SEEK_OUT_OF_RANGE "Позиционирование за пределы" - #define ERR_BAD_FILENAME "Неверное имя файла" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS выполнила неверный системный вызов" - #define ERR_ARGV0_IS_NULL "argv0 is NULL" - #define ERR_NEED_DICT "нужен словарь" - #define ERR_DATA_ERROR "ошибка данных" - #define ERR_MEMORY_ERROR "ошибка памяти" - #define ERR_BUFFER_ERROR "ошибка буфера" - #define ERR_VERSION_ERROR "ошибка версии" - #define ERR_UNKNOWN_ERROR "неизвестная ошибка" - #define ERR_SEARCHPATH_TRUNC "Путь поиска обрезан" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() обрезан" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() не получил каталог" - #define ERR_DISK_FULL "Диск полон" - #define ERR_DIRECTORY_FULL "Каталог полон" - #define ERR_MACOS_GENERIC "MacOS сообщила ошибку (%d)" - #define ERR_OS2_GENERIC "OS/2 сообщила ошибку (%d)" - #define ERR_VOL_LOCKED_HW "Том блокирован аппаратно" - #define ERR_VOL_LOCKED_SW "Том блокирован программно" - #define ERR_FILE_LOCKED "Файл заблокирован" - #define ERR_FILE_OR_DIR_BUSY "Файл/каталог занят" - #define ERR_FILE_ALREADY_OPEN_W "Файл уже открыт на запись" - #define ERR_FILE_ALREADY_OPEN_R "Файл уже открыт на чтение" - #define ERR_INVALID_REFNUM "Неверное количество ссылок" - #define ERR_GETTING_FILE_POS "Ошибка при получении позиции файла" - #define ERR_VOLUME_OFFLINE "Том отсоединен" - #define ERR_PERMISSION_DENIED "Отказано в разрешении" - #define ERR_VOL_ALREADY_ONLINE "Том уже подсоединен" - #define ERR_NO_SUCH_DRIVE "Нет такого диска" - #define ERR_NOT_MAC_DISK "Не диск Macintosh" - #define ERR_VOL_EXTERNAL_FS "Том принадлежит внешней файловой системе" - #define ERR_PROBLEM_RENAME "Проблема при переименовании" - #define ERR_BAD_MASTER_BLOCK "Плохой главный блок каталога" - #define ERR_CANT_MOVE_FORBIDDEN "Попытка переместить запрещена" - #define ERR_WRONG_VOL_TYPE "Неверный тип тома" - #define ERR_SERVER_VOL_LOST "Серверный том был отсоединен" - #define ERR_FILE_ID_NOT_FOUND "Идентификатор файла не найден" - #define ERR_FILE_ID_EXISTS "Идентификатор файла уже существует" - #define ERR_SERVER_NO_RESPOND "Сервер не отвечает" - #define ERR_USER_AUTH_FAILED "Идентификация пользователя не удалась" - #define ERR_PWORD_EXPIRED "Пароль на сервере устарел" - #define ERR_ACCESS_DENIED "Отказано в доступе" - #define ERR_NOT_A_DOS_DISK "Не диск DOS" - #define ERR_SHARING_VIOLATION "Нарушение совместного доступа" - #define ERR_CANNOT_MAKE "Не могу собрать" - #define ERR_DEV_IN_USE "Устройство уже используется" - #define ERR_OPEN_FAILED "Открытие не удалось" - #define ERR_PIPE_BUSY "Конвейер занят" - #define ERR_SHARING_BUF_EXCEEDED "Разделяемый буфер переполнен" - #define ERR_TOO_MANY_HANDLES "Слишком много открытых дескрипторов" - #define ERR_SEEK_ERROR "Ошибка позиционирования" - #define ERR_DEL_CWD "Попытка удалить текущий рабочий каталог" - #define ERR_WRITE_PROTECT_ERROR "Ошибка защиты записи" - #define ERR_WRITE_FAULT "Ошибка записи" - #define ERR_LOCK_VIOLATION "Нарушение блокировки" - #define ERR_GEN_FAILURE "Общий сбой" - #define ERR_UNCERTAIN_MEDIA "Неопределенный носитель" - #define ERR_PROT_VIOLATION "Нарушение защиты" - #define ERR_BROKEN_PIPE "Сломанный конвейер" - - -#elif (PHYSFS_LANG == PHYSFS_LANG_FRENCH) - #define DIR_ARCHIVE_DESCRIPTION "Pas d'archive, E/S directes sur système de fichiers" - #define GRP_ARCHIVE_DESCRIPTION "Format Groupfile du moteur Build" - #define HOG_ARCHIVE_DESCRIPTION "Descent I/II HOG file format" - #define MVL_ARCHIVE_DESCRIPTION "Descent II Movielib format" - #define QPAK_ARCHIVE_DESCRIPTION "Quake I/II format" - #define ZIP_ARCHIVE_DESCRIPTION "Compatible PkZip/WinZip/Info-Zip" - #define WAD_ARCHIVE_DESCRIPTION "Format WAD du moteur DOOM" - #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - - #define ERR_IS_INITIALIZED "Déjà initialisé" - #define ERR_NOT_INITIALIZED "Non initialisé" - #define ERR_INVALID_ARGUMENT "Argument invalide" - #define ERR_FILES_STILL_OPEN "Fichiers encore ouverts" - #define ERR_NO_DIR_CREATE "Echec de la création de répertoires" - #define ERR_OUT_OF_MEMORY "A court de mémoire" - #define ERR_NOT_IN_SEARCH_PATH "Aucune entrée dans le chemin de recherche" - #define ERR_NOT_SUPPORTED "Opération non supportée" - #define ERR_UNSUPPORTED_ARCHIVE "Type d'archive non supportée" - #define ERR_NOT_A_HANDLE "Pas un descripteur de fichier" - #define ERR_INSECURE_FNAME "Nom de fichier dangereux" - #define ERR_SYMLINK_DISALLOWED "Les liens symboliques sont désactivés" - #define ERR_NO_WRITE_DIR "Le répertoire d'écriture n'est pas spécifié" - #define ERR_NO_SUCH_FILE "Fichier non trouvé" - #define ERR_NO_SUCH_PATH "Chemin non trouvé" - #define ERR_NO_SUCH_VOLUME "Volume non trouvé" - #define ERR_PAST_EOF "Au-delà de la fin du fichier" - #define ERR_ARC_IS_READ_ONLY "L'archive est en lecture seule" - #define ERR_IO_ERROR "Erreur E/S" - #define ERR_CANT_SET_WRITE_DIR "Ne peut utiliser le répertoire d'écriture" - #define ERR_SYMLINK_LOOP "Boucle infinie dans les liens symboliques" - #define ERR_COMPRESSION "Erreur de (dé)compression" - #define ERR_NOT_IMPLEMENTED "Non implémenté" - #define ERR_OS_ERROR "Erreur rapportée par le système d'exploitation" - #define ERR_FILE_EXISTS "Le fichier existe déjà" - #define ERR_NOT_A_FILE "Pas un fichier" - #define ERR_NOT_A_DIR "Pas un répertoire" - #define ERR_NOT_AN_ARCHIVE "Pas une archive" - #define ERR_CORRUPTED "Archive corrompue" - #define ERR_SEEK_OUT_OF_RANGE "Pointeur de fichier hors de portée" - #define ERR_BAD_FILENAME "Mauvais nom de fichier" - #define ERR_PHYSFS_BAD_OS_CALL "(BOGUE) PhysicsFS a fait un mauvais appel système, le salaud" - #define ERR_ARGV0_IS_NULL "argv0 est NULL" - #define ERR_NEED_DICT "a besoin du dico" - #define ERR_DATA_ERROR "erreur de données" - #define ERR_MEMORY_ERROR "erreur mémoire" - #define ERR_BUFFER_ERROR "erreur tampon" - #define ERR_VERSION_ERROR "erreur de version" - #define ERR_UNKNOWN_ERROR "erreur inconnue" - #define ERR_SEARCHPATH_TRUNC "Le chemin de recherche a été tronqué" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() a été tronqué" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() n'a pas de répertoire" - #define ERR_DISK_FULL "Disque plein" - #define ERR_DIRECTORY_FULL "Répertoire plein" - #define ERR_MACOS_GENERIC "Erreur rapportée par MacOS (%d)" - #define ERR_OS2_GENERIC "Erreur rapportée par OS/2 (%d)" - #define ERR_VOL_LOCKED_HW "Le volume est verrouillé matériellement" - #define ERR_VOL_LOCKED_SW "Le volume est verrouillé par logiciel" - #define ERR_FILE_LOCKED "Fichier verrouillé" - #define ERR_FILE_OR_DIR_BUSY "Fichier/répertoire occupé" - #define ERR_FILE_ALREADY_OPEN_W "Fichier déjà ouvert en écriture" - #define ERR_FILE_ALREADY_OPEN_R "Fichier déjà ouvert en lecture" - #define ERR_INVALID_REFNUM "Numéro de référence invalide" - #define ERR_GETTING_FILE_POS "Erreur lors de l'obtention de la position du pointeur de fichier" - #define ERR_VOLUME_OFFLINE "Le volume n'est pas en ligne" - #define ERR_PERMISSION_DENIED "Permission refusée" - #define ERR_VOL_ALREADY_ONLINE "Volumé déjà en ligne" - #define ERR_NO_SUCH_DRIVE "Lecteur inexistant" - #define ERR_NOT_MAC_DISK "Pas un disque Macintosh" - #define ERR_VOL_EXTERNAL_FS "Le volume appartient à un système de fichiers externe" - #define ERR_PROBLEM_RENAME "Problème lors du renommage" - #define ERR_BAD_MASTER_BLOCK "Mauvais block maitre de répertoire" - #define ERR_CANT_MOVE_FORBIDDEN "Essai de déplacement interdit" - #define ERR_WRONG_VOL_TYPE "Mauvais type de volume" - #define ERR_SERVER_VOL_LOST "Le volume serveur a été déconnecté" - #define ERR_FILE_ID_NOT_FOUND "Identificateur de fichier non trouvé" - #define ERR_FILE_ID_EXISTS "Identificateur de fichier existe déjà" - #define ERR_SERVER_NO_RESPOND "Le serveur ne répond pas" - #define ERR_USER_AUTH_FAILED "Authentification de l'utilisateur échouée" - #define ERR_PWORD_EXPIRED "Le mot de passe a expiré sur le serveur" - #define ERR_ACCESS_DENIED "Accès refusé" - #define ERR_NOT_A_DOS_DISK "Pas un disque DOS" - #define ERR_SHARING_VIOLATION "Violation de partage" - #define ERR_CANNOT_MAKE "Ne peut faire" - #define ERR_DEV_IN_USE "Périphérique déjà en utilisation" - #define ERR_OPEN_FAILED "Ouverture échouée" - #define ERR_PIPE_BUSY "Le tube est occupé" - #define ERR_SHARING_BUF_EXCEEDED "Tampon de partage dépassé" - #define ERR_TOO_MANY_HANDLES "Trop de descripteurs ouverts" - #define ERR_SEEK_ERROR "Erreur de positionement" - #define ERR_DEL_CWD "Essai de supprimer le répertoire courant" - #define ERR_WRITE_PROTECT_ERROR "Erreur de protection en écriture" - #define ERR_WRITE_FAULT "Erreur d'écriture" - #define ERR_LOCK_VIOLATION "Violation de verrou" - #define ERR_GEN_FAILURE "Echec général" - #define ERR_UNCERTAIN_MEDIA "Média incertain" - #define ERR_PROT_VIOLATION "Violation de protection" - #define ERR_BROKEN_PIPE "Tube cassé" - -#elif (PHYSFS_LANG == PHYSFS_LANG_PORTUGUESE_BR) - #define DIR_ARCHIVE_DESCRIPTION "Não arquivo, E/S sistema de arquivos direto" - #define GRP_ARCHIVE_DESCRIPTION "Formato Groupfile do engine Build" - #define HOG_ARCHIVE_DESCRIPTION "Formato Descent I/II HOG file" - #define MVL_ARCHIVE_DESCRIPTION "Formato Descent II Movielib" - #define QPAK_ARCHIVE_DESCRIPTION "Formato Quake I/II" - #define ZIP_ARCHIVE_DESCRIPTION "Formato compatível PkZip/WinZip/Info-Zip" - #define WAD_ARCHIVE_DESCRIPTION "Formato WAD do engine DOOM" - #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" /* !!! FIXME: translate this line if needed */ - #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - - #define ERR_IS_INITIALIZED "Já inicializado" - #define ERR_NOT_INITIALIZED "Não inicializado" - #define ERR_INVALID_ARGUMENT "Argumento inválido" - #define ERR_FILES_STILL_OPEN "Arquivos ainda abertos" - #define ERR_NO_DIR_CREATE "Falha na criação de diretórios" - #define ERR_OUT_OF_MEMORY "Memória insuficiente" - #define ERR_NOT_IN_SEARCH_PATH "Entrada não encontrada no caminho de busca" - #define ERR_NOT_SUPPORTED "Operação não suportada" - #define ERR_UNSUPPORTED_ARCHIVE "Tipo de arquivo não suportado" - #define ERR_NOT_A_HANDLE "Não é um handler de arquivo" - #define ERR_INSECURE_FNAME "Nome de arquivo inseguro" - #define ERR_SYMLINK_DISALLOWED "Links simbólicos desabilitados" - #define ERR_NO_WRITE_DIR "Diretório de escrita não definido" - #define ERR_NO_SUCH_FILE "Arquivo não encontrado" - #define ERR_NO_SUCH_PATH "Caminho não encontrado" - #define ERR_NO_SUCH_VOLUME "Volume não encontrado" - #define ERR_PAST_EOF "Passou o fim do arquivo" - #define ERR_ARC_IS_READ_ONLY "Arquivo é somente de leitura" - #define ERR_IO_ERROR "Erro de E/S" - #define ERR_CANT_SET_WRITE_DIR "Não foi possível definir diretório de escrita" - #define ERR_SYMLINK_LOOP "Loop infinito de link simbólico" - #define ERR_COMPRESSION "Erro de (Des)compressão" - #define ERR_NOT_IMPLEMENTED "Não implementado" - #define ERR_OS_ERROR "Erro reportado pelo Sistema Operacional" - #define ERR_FILE_EXISTS "Arquivo já existente" - #define ERR_NOT_A_FILE "Não é um arquivo" - #define ERR_NOT_A_DIR "Não é um diretório" - #define ERR_NOT_AN_ARCHIVE "Não é um pacote" - #define ERR_CORRUPTED "Pacote corrompido" - #define ERR_SEEK_OUT_OF_RANGE "Posicionamento além do tamanho" - #define ERR_BAD_FILENAME "Nome de arquivo inválido" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS realizou uma chamada de sistema inválida" - #define ERR_ARGV0_IS_NULL "argv0 é NULL" - #define ERR_NEED_DICT "precisa de diretório" - #define ERR_DATA_ERROR "erro nos dados" - #define ERR_MEMORY_ERROR "erro de memória" - #define ERR_BUFFER_ERROR "erro de buffer" - #define ERR_VERSION_ERROR "erro na version" - #define ERR_UNKNOWN_ERROR "erro desconhecido" - #define ERR_SEARCHPATH_TRUNC "Caminho de procura quebrado" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() foi quebrado" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() nao teve diretório" - #define ERR_DISK_FULL "Disco cheio" - #define ERR_DIRECTORY_FULL "Diretório cheio" - #define ERR_MACOS_GENERIC "MacOS reportou um erro (%d)" - #define ERR_OS2_GENERIC "OS/2 reportou um erro (%d)" - #define ERR_VOL_LOCKED_HW "Volume travado por hardware" - #define ERR_VOL_LOCKED_SW "Volume travado por software" - #define ERR_FILE_LOCKED "Arquivo travado" - #define ERR_FILE_OR_DIR_BUSY "Arquivo/Diretório está em uso" - #define ERR_FILE_ALREADY_OPEN_W "Arquivo já aberto para escrita" - #define ERR_FILE_ALREADY_OPEN_R "Arquivo já aberto para leitura" - #define ERR_INVALID_REFNUM "Número de referência" - #define ERR_GETTING_FILE_POS "Erro ao tentar obter posição do arquivo" - #define ERR_VOLUME_OFFLINE "Volume está indisponível" - #define ERR_PERMISSION_DENIED "Permissão negada" - #define ERR_VOL_ALREADY_ONLINE "Volume disponível" - #define ERR_NO_SUCH_DRIVE "Drive inexistente" - #define ERR_NOT_MAC_DISK "Não é um disco Macintosh" - #define ERR_VOL_EXTERNAL_FS "Volume pertence a um sistema de arquivos externo" - #define ERR_PROBLEM_RENAME "Problema durante renomeação" - #define ERR_BAD_MASTER_BLOCK "Bloco master do diretório inválido" - #define ERR_CANT_MOVE_FORBIDDEN "Tentativa de mover proibida" - #define ERR_WRONG_VOL_TYPE "Tipo inválido de volume" - #define ERR_SERVER_VOL_LOST "Volume servidor desconectado" - #define ERR_FILE_ID_NOT_FOUND "ID de Arquivo não encontrado" - #define ERR_FILE_ID_EXISTS "ID de Arquivo já existente" - #define ERR_SERVER_NO_RESPOND "Servidor não respondendo" - #define ERR_USER_AUTH_FAILED "Autenticação de usuário falhada" - #define ERR_PWORD_EXPIRED "Password foi expirada no servidor" - #define ERR_ACCESS_DENIED "Accesso negado" - #define ERR_NOT_A_DOS_DISK "Não é um disco DOS" - #define ERR_SHARING_VIOLATION "Violação de compartilhamento" - #define ERR_CANNOT_MAKE "Não pode ser feito" - #define ERR_DEV_IN_USE "Device já em uso" - #define ERR_OPEN_FAILED "Falaha na abertura" - #define ERR_PIPE_BUSY "Fila ocupada" - #define ERR_SHARING_BUF_EXCEEDED "Buffer de compartilhamento excedeu" - #define ERR_TOO_MANY_HANDLES "Muitos handles abertos" - #define ERR_SEEK_ERROR "Erro de posicionamento" - #define ERR_DEL_CWD "Tentando remover diretório de trabalho atual" - #define ERR_WRITE_PROTECT_ERROR "Erro de proteção de escrita" - #define ERR_WRITE_FAULT "Erro de escrita" - #define ERR_LOCK_VIOLATION "Violação de trava" - #define ERR_GEN_FAILURE "Falha geral" - #define ERR_UNCERTAIN_MEDIA "Media incerta" - #define ERR_PROT_VIOLATION "Violação de proteção" - #define ERR_BROKEN_PIPE "Fila quebrada" - -#elif (PHYSFS_LANG == PHYSFS_LANG_SPANISH) - #define DIR_ARCHIVE_DESCRIPTION "No es un archivo, E/S directa al sistema de ficheros" - #define GRP_ARCHIVE_DESCRIPTION "Formato Build engine Groupfile" - #define HOG_ARCHIVE_DESCRIPTION "Formato Descent I/II HOG file" - #define MVL_ARCHIVE_DESCRIPTION "Formato Descent II Movielib" - #define QPAK_ARCHIVE_DESCRIPTION "Formato Quake I/II" - #define ZIP_ARCHIVE_DESCRIPTION "Compatible con PkZip/WinZip/Info-Zip" - #define WAD_ARCHIVE_DESCRIPTION "DOOM engine format" /* !!! FIXME: translate this line if needed */ - #define LZMA_ARCHIVE_DESCRIPTION "LZMA (7zip) format" /* !!! FIXME: translate this line if needed */ - - #define ERR_IS_INITIALIZED "Ya estaba inicializado" - #define ERR_NOT_INITIALIZED "No está inicializado" - #define ERR_INVALID_ARGUMENT "Argumento inválido" - #define ERR_FILES_STILL_OPEN "Archivos aún abiertos" - #define ERR_NO_DIR_CREATE "Fallo al crear los directorios" - #define ERR_OUT_OF_MEMORY "Memoria agotada" - #define ERR_NOT_IN_SEARCH_PATH "No existe tal entrada en la ruta de búsqueda" - #define ERR_NOT_SUPPORTED "Operación no soportada" - #define ERR_UNSUPPORTED_ARCHIVE "Tipo de archivo no soportado" - #define ERR_NOT_A_HANDLE "No es un manejador de ficheo (file handle)" - #define ERR_INSECURE_FNAME "Nombre de archivo inseguro" - #define ERR_SYMLINK_DISALLOWED "Los enlaces simbólicos están desactivados" - #define ERR_NO_WRITE_DIR "No has configurado un directorio de escritura" - #define ERR_NO_SUCH_FILE "Archivo no encontrado" - #define ERR_NO_SUCH_PATH "Ruta no encontrada" - #define ERR_NO_SUCH_VOLUME "Volumen no encontrado" - #define ERR_PAST_EOF "Te pasaste del final del archivo" - #define ERR_ARC_IS_READ_ONLY "El archivo es de sólo lectura" - #define ERR_IO_ERROR "Error E/S" - #define ERR_CANT_SET_WRITE_DIR "No puedo configurar el directorio de escritura" - #define ERR_SYMLINK_LOOP "Bucle infnito de enlaces simbólicos" - #define ERR_COMPRESSION "Error de (des)compresión" - #define ERR_NOT_IMPLEMENTED "No implementado" - #define ERR_OS_ERROR "El sistema operativo ha devuelto un error" - #define ERR_FILE_EXISTS "El archivo ya existe" - #define ERR_NOT_A_FILE "No es un archivo" - #define ERR_NOT_A_DIR "No es un directorio" - #define ERR_NOT_AN_ARCHIVE "No es un archivo" - #define ERR_CORRUPTED "Archivo corrupto" - #define ERR_SEEK_OUT_OF_RANGE "Búsqueda fuera de rango" - #define ERR_BAD_FILENAME "Nombre de archivo incorrecto" - #define ERR_PHYSFS_BAD_OS_CALL "(BUG) PhysicsFS ha hecho una llamada incorrecta al sistema" - #define ERR_ARGV0_IS_NULL "argv0 es NULL" - #define ERR_NEED_DICT "necesito diccionario" - #define ERR_DATA_ERROR "error de datos" - #define ERR_MEMORY_ERROR "error de memoria" - #define ERR_BUFFER_ERROR "error de buffer" - #define ERR_VERSION_ERROR "error de versión" - #define ERR_UNKNOWN_ERROR "error desconocido" - #define ERR_SEARCHPATH_TRUNC "La ruta de búsqueda ha sido truncada" - #define ERR_GETMODFN_TRUNC "GetModuleFileName() ha sido truncado" - #define ERR_GETMODFN_NO_DIR "GetModuleFileName() no tenia directorio" - #define ERR_DISK_FULL "El disco está lleno" - #define ERR_DIRECTORY_FULL "El directorio está lleno" - #define ERR_MACOS_GENERIC "MacOS ha devuelto un error (%d)" - #define ERR_OS2_GENERIC "OS/2 ha devuelto un error (%d)" - #define ERR_VOL_LOCKED_HW "El volumen está bloqueado por el hardware" - #define ERR_VOL_LOCKED_SW "El volumen está bloqueado por el software" - #define ERR_FILE_LOCKED "El archivo está bloqueado" - #define ERR_FILE_OR_DIR_BUSY "Fichero o directorio ocupados" - #define ERR_FILE_ALREADY_OPEN_W "Fichero ya abierto para escritura" - #define ERR_FILE_ALREADY_OPEN_R "Fichero ya abierto para lectura" - #define ERR_INVALID_REFNUM "El número de referencia no es válido" - #define ERR_GETTING_FILE_POS "Error al tomar la posición del fichero" - #define ERR_VOLUME_OFFLINE "El volumen está desconectado" - #define ERR_PERMISSION_DENIED "Permiso denegado" - #define ERR_VOL_ALREADY_ONLINE "El volumen ya estaba conectado" - #define ERR_NO_SUCH_DRIVE "No existe tal unidad" - #define ERR_NOT_MAC_DISK "No es un disco Macintosh" - #define ERR_VOL_EXTERNAL_FS "El volumen pertence a un sistema de ficheros externo" - #define ERR_PROBLEM_RENAME "Problemas al renombrar" - #define ERR_BAD_MASTER_BLOCK "Bloque maestro de directorios incorrecto" - #define ERR_CANT_MOVE_FORBIDDEN "Intento de mover forbidden" - #define ERR_WRONG_VOL_TYPE "Tipo de volumen incorrecto" - #define ERR_SERVER_VOL_LOST "El servidor de volúmenes ha sido desconectado" - #define ERR_FILE_ID_NOT_FOUND "Identificador de archivo no encontrado" - #define ERR_FILE_ID_EXISTS "El identificador de archivo ya existe" - #define ERR_SERVER_NO_RESPOND "El servidor no responde" - #define ERR_USER_AUTH_FAILED "Fallo al autentificar el usuario" - #define ERR_PWORD_EXPIRED "La Password en el servidor ha caducado" - #define ERR_ACCESS_DENIED "Acceso denegado" - #define ERR_NOT_A_DOS_DISK "No es un disco de DOS" - #define ERR_SHARING_VIOLATION "Violación al compartir" - #define ERR_CANNOT_MAKE "No puedo hacer make" - #define ERR_DEV_IN_USE "El dispositivo ya estaba en uso" - #define ERR_OPEN_FAILED "Fallo al abrir" - #define ERR_PIPE_BUSY "Tubería ocupada" - #define ERR_SHARING_BUF_EXCEEDED "Buffer de compartición sobrepasado" - #define ERR_TOO_MANY_HANDLES "Demasiados manejadores (handles)" - #define ERR_SEEK_ERROR "Error de búsqueda" - #define ERR_DEL_CWD "Intentando borrar el directorio de trabajo actual" - #define ERR_WRITE_PROTECT_ERROR "Error de protección contra escritura" - #define ERR_WRITE_FAULT "Fallo al escribir" - #define ERR_LOCK_VIOLATION "Violación del bloqueo" - #define ERR_GEN_FAILURE "Fallo general" - #define ERR_UNCERTAIN_MEDIA "Medio incierto" - #define ERR_PROT_VIOLATION "Violación de la protección" - #define ERR_BROKEN_PIPE "Tubería rota" - -#else - #error Please define PHYSFS_LANG. -#endif - -/* end LANG section. */ - -struct __PHYSFS_DIRHANDLE__; -struct __PHYSFS_FILEFUNCTIONS__; - - -/* !!! FIXME: find something better than "dvoid" and "fvoid" ... */ -/* Opaque data for file and dir handlers... */ -typedef void dvoid; -typedef void fvoid; - - -typedef struct -{ - /* - * Basic info about this archiver... - */ - const PHYSFS_ArchiveInfo *info; - - - /* - * DIRECTORY ROUTINES: - * These functions are for dir handles. Generate a handle with the - * openArchive() method, then pass it as the "opaque" dvoid to the - * others. - * - * Symlinks should always be followed; PhysicsFS will use the - * isSymLink() method and make a judgement on whether to - * continue to call other methods based on that. - */ - - - /* - * Returns non-zero if (filename) is a valid archive that this - * driver can handle. This filename is in platform-dependent - * notation. forWriting is non-zero if this is to be used for - * the write directory, and zero if this is to be used for an - * element of the search path. - */ - int (*isArchive)(const char *filename, int forWriting); - - /* - * Open a dirhandle for dir/archive (name). - * This filename is in platform-dependent notation. - * forWriting is non-zero if this is to be used for - * the write directory, and zero if this is to be used for an - * element of the search path. - * Returns NULL on failure, and calls __PHYSFS_setError(). - * Returns non-NULL on success. The pointer returned will be - * passed as the "opaque" parameter for later calls. - */ - void *(*openArchive)(const char *name, int forWriting); - - /* - * List all files in (dirname). Each file is passed to (callback), - * where a copy is made if appropriate, so you should dispose of - * it properly upon return from the callback. - * You should omit symlinks if (omitSymLinks) is non-zero. - * If you have a failure, report as much as you can. - * (dirname) is in platform-independent notation. - */ - void (*enumerateFiles)(dvoid *opaque, - const char *dirname, - int omitSymLinks, - PHYSFS_EnumFilesCallback callback, - const char *origdir, - void *callbackdata); - - /* - * Returns non-zero if filename can be opened for reading. - * This filename is in platform-independent notation. - * You should not follow symlinks. - */ - int (*exists)(dvoid *opaque, const char *name); - - /* - * Returns non-zero if filename is really a directory. - * This filename is in platform-independent notation. - * Symlinks should be followed; if what the symlink points - * to is missing, or isn't a directory, then the retval is zero. - * - * Regardless of success or failure, please set *fileExists to - * non-zero if the file existed (even if it's a broken symlink!), - * zero if it did not. - */ - int (*isDirectory)(dvoid *opaque, const char *name, int *fileExists); - - /* - * Returns non-zero if filename is really a symlink. - * This filename is in platform-independent notation. - * - * Regardless of success or failure, please set *fileExists to - * non-zero if the file existed (even if it's a broken symlink!), - * zero if it did not. - */ - int (*isSymLink)(dvoid *opaque, const char *name, int *fileExists); - - /* - * Retrieve the last modification time (mtime) of a file. - * Returns -1 on failure, or the file's mtime in seconds since - * the epoch (Jan 1, 1970) on success. - * This filename is in platform-independent notation. - * - * Regardless of success or failure, please set *exists to - * non-zero if the file existed (even if it's a broken symlink!), - * zero if it did not. - */ - PHYSFS_sint64 (*getLastModTime)(dvoid *opaque, const char *fnm, int *exist); - - /* - * Open file for reading. - * This filename is in platform-independent notation. - * If you can't handle multiple opens of the same file, - * you can opt to fail for the second call. - * Fail if the file does not exist. - * Returns NULL on failure, and calls __PHYSFS_setError(). - * Returns non-NULL on success. The pointer returned will be - * passed as the "opaque" parameter for later file calls. - * - * Regardless of success or failure, please set *fileExists to - * non-zero if the file existed (even if it's a broken symlink!), - * zero if it did not. - */ - fvoid *(*openRead)(dvoid *opaque, const char *fname, int *fileExists); - - /* - * Open file for writing. - * If the file does not exist, it should be created. If it exists, - * it should be truncated to zero bytes. The writing - * offset should be the start of the file. - * This filename is in platform-independent notation. - * If you can't handle multiple opens of the same file, - * you can opt to fail for the second call. - * Returns NULL on failure, and calls __PHYSFS_setError(). - * Returns non-NULL on success. The pointer returned will be - * passed as the "opaque" parameter for later file calls. - */ - fvoid *(*openWrite)(dvoid *opaque, const char *filename); - - /* - * Open file for appending. - * If the file does not exist, it should be created. The writing - * offset should be the end of the file. - * This filename is in platform-independent notation. - * If you can't handle multiple opens of the same file, - * you can opt to fail for the second call. - * Returns NULL on failure, and calls __PHYSFS_setError(). - * Returns non-NULL on success. The pointer returned will be - * passed as the "opaque" parameter for later file calls. - */ - fvoid *(*openAppend)(dvoid *opaque, const char *filename); - - /* - * Delete a file in the archive/directory. - * Return non-zero on success, zero on failure. - * This filename is in platform-independent notation. - * This method may be NULL. - * On failure, call __PHYSFS_setError(). - */ - int (*remove)(dvoid *opaque, const char *filename); - - /* - * Create a directory in the archive/directory. - * If the application is trying to make multiple dirs, PhysicsFS - * will split them up into multiple calls before passing them to - * your driver. - * Return non-zero on success, zero on failure. - * This filename is in platform-independent notation. - * This method may be NULL. - * On failure, call __PHYSFS_setError(). - */ - int (*mkdir)(dvoid *opaque, const char *filename); - - /* - * Close directories/archives, and free any associated memory, - * including (opaque) itself if applicable. Implementation can assume - * that it won't be called if there are still files open from - * this archive. - */ - void (*dirClose)(dvoid *opaque); - - - - /* - * FILE ROUTINES: - * These functions are for file handles generated by the open*() methods. - * They are distinguished by taking a "fvoid" instead of a "dvoid" for - * the opaque handle. - */ - - /* - * Read more from the file. - * Returns number of objects of (objSize) bytes read from file, -1 - * if complete failure. - * On failure, call __PHYSFS_setError(). - */ - PHYSFS_sint64 (*read)(fvoid *opaque, void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount); - - /* - * Write more to the file. Archives don't have to implement this. - * (Set it to NULL if not implemented). - * Returns number of objects of (objSize) bytes written to file, -1 - * if complete failure. - * On failure, call __PHYSFS_setError(). - */ - PHYSFS_sint64 (*write)(fvoid *opaque, const void *buffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount); - - /* - * Returns non-zero if at end of file. - */ - int (*eof)(fvoid *opaque); - - /* - * Returns byte offset from start of file. - */ - PHYSFS_sint64 (*tell)(fvoid *opaque); - - /* - * Move read/write pointer to byte offset from start of file. - * Returns non-zero on success, zero on error. - * On failure, call __PHYSFS_setError(). - */ - int (*seek)(fvoid *opaque, PHYSFS_uint64 offset); - - /* - * Return number of bytes available in the file, or -1 if you - * aren't able to determine. - * On failure, call __PHYSFS_setError(). - */ - PHYSFS_sint64 (*fileLength)(fvoid *opaque); - - /* - * Close the file, and free associated resources, including (opaque) - * if applicable. Returns non-zero on success, zero if can't close - * file. On failure, call __PHYSFS_setError(). - */ - int (*fileClose)(fvoid *opaque); -} PHYSFS_Archiver; - - -/* - * Call this to set the message returned by PHYSFS_getLastError(). - * Please only use the ERR_* constants above, or add new constants to the - * above group, but I want these all in one place. - * - * Calling this with a NULL argument is a safe no-op. - */ -void __PHYSFS_setError(const char *err); - - -/* - * Convert (dirName) to platform-dependent notation, then prepend (prepend) - * and append (append) to the converted string. - * - * So, on Win32, calling: - * __PHYSFS_convertToDependent("C:\", "my/files", NULL); - * ...will return the string "C:\my\files". - * - * This is a convenience function; you might want to hack something out that - * is less generic (and therefore more efficient). - * - * Be sure to free() the return value when done with it. - */ -char *__PHYSFS_convertToDependent(const char *prepend, - const char *dirName, - const char *append); - - -/* This byteorder stuff was lifted from SDL. http://www.libsdl.org/ */ -#define PHYSFS_LIL_ENDIAN 1234 -#define PHYSFS_BIG_ENDIAN 4321 - -#if defined(__i386__) || defined(__ia64__) || \ - defined(_M_IX86) || defined(_M_IA64) || defined(_M_X64) || \ - (defined(__alpha__) || defined(__alpha)) || \ - defined(__arm__) || defined(ARM) || \ - (defined(__mips__) && defined(__MIPSEL__)) || \ - defined(__SYMBIAN32__) || \ - defined(__x86_64__) || \ - defined(__LITTLE_ENDIAN__) -#define PHYSFS_BYTEORDER PHYSFS_LIL_ENDIAN -#else -#define PHYSFS_BYTEORDER PHYSFS_BIG_ENDIAN -#endif - - -/* - * When sorting the entries in an archive, we use a modified QuickSort. - * When there are less then PHYSFS_QUICKSORT_THRESHOLD entries left to sort, - * we switch over to a BubbleSort for the remainder. Tweak to taste. - * - * You can override this setting by defining PHYSFS_QUICKSORT_THRESHOLD - * before #including "physfs_internal.h". - */ -#ifndef PHYSFS_QUICKSORT_THRESHOLD -#define PHYSFS_QUICKSORT_THRESHOLD 4 -#endif - -/* - * Sort an array (or whatever) of (max) elements. This uses a mixture of - * a QuickSort and BubbleSort internally. - * (cmpfn) is used to determine ordering, and (swapfn) does the actual - * swapping of elements in the list. - * - * See zip.c for an example. - */ -void __PHYSFS_sort(void *entries, PHYSFS_uint32 max, - int (*cmpfn)(void *, PHYSFS_uint32, PHYSFS_uint32), - void (*swapfn)(void *, PHYSFS_uint32, PHYSFS_uint32)); - - -/* These get used all over for lessening code clutter. */ -#define BAIL_MACRO(e, r) { __PHYSFS_setError(e); return r; } -#define BAIL_IF_MACRO(c, e, r) if (c) { __PHYSFS_setError(e); return r; } -#define BAIL_MACRO_MUTEX(e, m, r) { __PHYSFS_setError(e); __PHYSFS_platformReleaseMutex(m); return r; } -#define BAIL_IF_MACRO_MUTEX(c, e, m, r) if (c) { __PHYSFS_setError(e); __PHYSFS_platformReleaseMutex(m); return r; } -#define GOTO_MACRO(e, g) { __PHYSFS_setError(e); goto g; } -#define GOTO_IF_MACRO(c, e, g) if (c) { __PHYSFS_setError(e); goto g; } -#define GOTO_MACRO_MUTEX(e, m, g) { __PHYSFS_setError(e); __PHYSFS_platformReleaseMutex(m); goto g; } -#define GOTO_IF_MACRO_MUTEX(c, e, m, g) if (c) { __PHYSFS_setError(e); __PHYSFS_platformReleaseMutex(m); goto g; } - -#define __PHYSFS_ARRAYLEN(x) ( (sizeof (x)) / (sizeof (x[0])) ) - -#if (defined __GNUC__) -#define __PHYSFS_SI64(x) x##LL -#define __PHYSFS_UI64(x) x##ULL -#elif (defined _MSC_VER) -#define __PHYSFS_SI64(x) x##i64 -#define __PHYSFS_UI64(x) x##ui64 -#else -#define __PHYSFS_SI64(x) x -#define __PHYSFS_UI64(x) x -#endif - - -/* - * Check if a ui64 will fit in the platform's address space. - * The initial sizeof check will optimize this macro out entirely on - * 64-bit (and larger?!) platforms, and the other condition will - * return zero or non-zero if the variable will fit in the platform's - * size_t, suitable to pass to malloc. This is kinda messy, but effective. - */ -#define __PHYSFS_ui64FitsAddressSpace(s) ( \ - (sizeof (PHYSFS_uint64) > sizeof (size_t)) && \ - ((s) > (__PHYSFS_UI64(0xFFFFFFFFFFFFFFFF) >> (64-(sizeof(size_t)*8)))) \ -) - - -/* - * This is a strcasecmp() or stricmp() replacement that expects both strings - * to be in UTF-8 encoding. It will do "case folding" to decide if the - * Unicode codepoints in the strings match. - * - * It will report which string is "greater than" the other, but be aware that - * this doesn't necessarily mean anything: 'a' may be "less than" 'b', but - * a random Kanji codepoint has no meaningful alphabetically relationship to - * a Greek Lambda, but being able to assign a reliable "value" makes sorting - * algorithms possible, if not entirely sane. Most cases should treat the - * return value as "equal" or "not equal". - */ -int __PHYSFS_utf8strcasecmp(const char *s1, const char *s2); - -/* - * This works like __PHYSFS_utf8strcasecmp(), but takes a character (NOT BYTE - * COUNT) argument, like strcasencmp(). - */ -int __PHYSFS_utf8strnicmp(const char *s1, const char *s2, PHYSFS_uint32 l); - -/* - * stricmp() that guarantees to only work with low ASCII. The C runtime - * stricmp() might try to apply a locale/codepage/etc, which we don't want. - */ -int __PHYSFS_stricmpASCII(const char *s1, const char *s2); - -/* - * strnicmp() that guarantees to only work with low ASCII. The C runtime - * strnicmp() might try to apply a locale/codepage/etc, which we don't want. - */ -int __PHYSFS_strnicmpASCII(const char *s1, const char *s2, PHYSFS_uint32 l); - - -/* - * The current allocator. Not valid before PHYSFS_init is called! - */ -extern PHYSFS_Allocator __PHYSFS_AllocatorHooks; - -/* convenience macro to make this less cumbersome internally... */ -#define allocator __PHYSFS_AllocatorHooks - -/*--------------------------------------------------------------------------*/ -/*--------------------------------------------------------------------------*/ -/*------------ ----------------*/ -/*------------ You MUST implement the following functions ----------------*/ -/*------------ if porting to a new platform. ----------------*/ -/*------------ (see platform/unix.c for an example) ----------------*/ -/*------------ ----------------*/ -/*--------------------------------------------------------------------------*/ -/*--------------------------------------------------------------------------*/ - - -/* - * The dir separator; "/" on unix, "\\" on win32, ":" on MacOS, etc... - * Obviously, this isn't a function, but it IS a null-terminated string. - */ -extern const char *__PHYSFS_platformDirSeparator; - - -/* - * Initialize the platform. This is called when PHYSFS_init() is called from - * the application. You can use this to (for example) determine what version - * of Windows you're running. - * - * Return zero if there was a catastrophic failure (which prevents you from - * functioning at all), and non-zero otherwise. - */ -int __PHYSFS_platformInit(void); - - -/* - * Deinitialize the platform. This is called when PHYSFS_deinit() is called - * from the application. You can use this to clean up anything you've - * allocated in your platform driver. - * - * Return zero if there was a catastrophic failure (which prevents you from - * functioning at all), and non-zero otherwise. - */ -int __PHYSFS_platformDeinit(void); - - -/* - * Open a file for reading. (filename) is in platform-dependent notation. The - * file pointer should be positioned on the first byte of the file. - * - * The return value will be some platform-specific datatype that is opaque to - * the caller; it could be a (FILE *) under Unix, or a (HANDLE *) under win32. - * - * The same file can be opened for read multiple times, and each should have - * a unique file handle; this is frequently employed to prevent race - * conditions in the archivers. - * - * Call __PHYSFS_setError() and return (NULL) if the file can't be opened. - */ -void *__PHYSFS_platformOpenRead(const char *filename); - - -/* - * Open a file for writing. (filename) is in platform-dependent notation. If - * the file exists, it should be truncated to zero bytes, and if it doesn't - * exist, it should be created as a zero-byte file. The file pointer should - * be positioned on the first byte of the file. - * - * The return value will be some platform-specific datatype that is opaque to - * the caller; it could be a (FILE *) under Unix, or a (HANDLE *) under win32, - * etc. - * - * Opening a file for write multiple times has undefined results. - * - * Call __PHYSFS_setError() and return (NULL) if the file can't be opened. - */ -void *__PHYSFS_platformOpenWrite(const char *filename); - - -/* - * Open a file for appending. (filename) is in platform-dependent notation. If - * the file exists, the file pointer should be place just past the end of the - * file, so that the first write will be one byte after the current end of - * the file. If the file doesn't exist, it should be created as a zero-byte - * file. The file pointer should be positioned on the first byte of the file. - * - * The return value will be some platform-specific datatype that is opaque to - * the caller; it could be a (FILE *) under Unix, or a (HANDLE *) under win32, - * etc. - * - * Opening a file for append multiple times has undefined results. - * - * Call __PHYSFS_setError() and return (NULL) if the file can't be opened. - */ -void *__PHYSFS_platformOpenAppend(const char *filename); - - -/* - * Read more data from a platform-specific file handle. (opaque) should be - * cast to whatever data type your platform uses. Read a maximum of (count) - * objects of (size) 8-bit bytes to the area pointed to by (buffer). If there - * isn't enough data available, return the number of full objects read, and - * position the file pointer at the start of the first incomplete object. - * On success, return (count) and position the file pointer one byte past - * the end of the last read object. Return (-1) if there is a catastrophic - * error, and call __PHYSFS_setError() to describe the problem; the file - * pointer should not move in such a case. - */ -PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count); - -/* - * Write more data to a platform-specific file handle. (opaque) should be - * cast to whatever data type your platform uses. Write a maximum of (count) - * objects of (size) 8-bit bytes from the area pointed to by (buffer). If - * there isn't enough data available, return the number of full objects - * written, and position the file pointer at the start of the first - * incomplete object. Return (-1) if there is a catastrophic error, and call - * __PHYSFS_setError() to describe the problem; the file pointer should not - * move in such a case. - */ -PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count); - -/* - * Set the file pointer to a new position. (opaque) should be cast to - * whatever data type your platform uses. (pos) specifies the number - * of 8-bit bytes to seek to from the start of the file. Seeking past the - * end of the file is an error condition, and you should check for it. - * - * Not all file types can seek; this is to be expected by the caller. - * - * On error, call __PHYSFS_setError() and return zero. On success, return - * a non-zero value. - */ -int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos); - - -/* - * Get the file pointer's position, in an 8-bit byte offset from the start of - * the file. (opaque) should be cast to whatever data type your platform - * uses. - * - * Not all file types can "tell"; this is to be expected by the caller. - * - * On error, call __PHYSFS_setError() and return -1. On success, return >= 0. - */ -PHYSFS_sint64 __PHYSFS_platformTell(void *opaque); - - -/* - * Determine the current size of a file, in 8-bit bytes, from an open file. - * - * The caller expects that this information may not be available for all - * file types on all platforms. - * - * Return -1 if you can't do it, and call __PHYSFS_setError(). Otherwise, - * return the file length in 8-bit bytes. - */ -PHYSFS_sint64 __PHYSFS_platformFileLength(void *handle); - -/* - * Determine if a file is at EOF. (opaque) should be cast to whatever data - * type your platform uses. - * - * The caller expects that there was a short read before calling this. - * - * Return non-zero if EOF, zero if it is _not_ EOF. - */ -int __PHYSFS_platformEOF(void *opaque); - -/* - * Flush any pending writes to disk. (opaque) should be cast to whatever data - * type your platform uses. Be sure to check for errors; the caller expects - * that this function can fail if there was a flushing error, etc. - * - * Return zero on failure, non-zero on success. - */ -int __PHYSFS_platformFlush(void *opaque); - -/* - * Flush and close a file. (opaque) should be cast to whatever data type - * your platform uses. Be sure to check for errors when closing; the - * caller expects that this function can fail if there was a flushing - * error, etc. - * - * You should clean up all resources associated with (opaque). - * - * Return zero on failure, non-zero on success. - */ -int __PHYSFS_platformClose(void *opaque); - -/* - * Platform implementation of PHYSFS_getCdRomDirsCallback()... - * CD directories are discovered and reported to the callback one at a time. - * Pointers passed to the callback are assumed to be invalid to the - * application after the callback returns, so you can free them or whatever. - * Callback does not assume results will be sorted in any meaningful way. - */ -void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data); - -/* - * Calculate the base dir, if your platform needs special consideration. - * Just return NULL if the standard routines will suffice. (see - * calculateBaseDir() in physfs.c ...) - * Caller will free() the retval if it's not NULL. - */ -char *__PHYSFS_platformCalcBaseDir(const char *argv0); - -/* - * Get the platform-specific user name. - * Caller will free() the retval if it's not NULL. If it's NULL, the username - * will default to "default". - */ -char *__PHYSFS_platformGetUserName(void); - -/* - * Get the platform-specific user dir. - * Caller will free() the retval if it's not NULL. If it's NULL, the userdir - * will default to basedir/username. - */ -char *__PHYSFS_platformGetUserDir(void); - -/* - * Return a pointer that uniquely identifies the current thread. - * On a platform without threading, (0x1) will suffice. These numbers are - * arbitrary; the only requirement is that no two threads have the same - * pointer. - */ -void *__PHYSFS_platformGetThreadID(void); - -/* - * Return non-zero if filename (in platform-dependent notation) exists. - * Symlinks should NOT be followed; at this stage, we do not care what the - * symlink points to. Please call __PHYSFS_SetError() with the details of - * why the file does not exist, if it doesn't; you are in a better position - * to know (path not found, bogus filename, file itself is missing, etc). - */ -int __PHYSFS_platformExists(const char *fname); - -/* - * Return the last modified time (in seconds since the epoch) of a file. - * Returns -1 on failure. (fname) is in platform-dependent notation. - * Symlinks should be followed; if what the symlink points to is missing, - * then the retval is -1. - */ -PHYSFS_sint64 __PHYSFS_platformGetLastModTime(const char *fname); - -/* - * Return non-zero if filename (in platform-dependent notation) is a symlink. - */ -int __PHYSFS_platformIsSymLink(const char *fname); - - -/* - * Return non-zero if filename (in platform-dependent notation) is a symlink. - * Symlinks should be followed; if what the symlink points to is missing, - * or isn't a directory, then the retval is false. - */ -int __PHYSFS_platformIsDirectory(const char *fname); - - -/* - * Convert (dirName) to platform-dependent notation, then prepend (prepend) - * and append (append) to the converted string. - * - * So, on Win32, calling: - * __PHYSFS_platformCvtToDependent("C:\", "my/files", NULL); - * ...will return the string "C:\my\files". - * - * This can be implemented in a platform-specific manner, so you can get - * get a speed boost that the default implementation can't, since - * you can make assumptions about the size of strings, etc.. - * - * Platforms that choose not to implement this may just call - * __PHYSFS_convertToDependent() as a passthrough, which may fit the bill - * already. - * - * Be sure to free() the return value when done with it. - */ -char *__PHYSFS_platformCvtToDependent(const char *prepend, - const char *dirName, - const char *append); - - -/* - * Enumerate a directory of files. This follows the rules for the - * PHYSFS_Archiver->enumerateFiles() method (see above), except that the - * (dirName) that is passed to this function is converted to - * platform-DEPENDENT notation by the caller. The PHYSFS_Archiver version - * uses platform-independent notation. Note that ".", "..", and other - * metaentries should always be ignored. - */ -void __PHYSFS_platformEnumerateFiles(const char *dirname, - int omitSymLinks, - PHYSFS_EnumFilesCallback callback, - const char *origdir, - void *callbackdata); - - -/* - * Get the current working directory. The return value should be an - * absolute path in platform-dependent notation. The caller will deallocate - * the return value with the standard C runtime free() function when it - * is done with it. - * On error, return NULL and set the error message. - */ -char *__PHYSFS_platformCurrentDir(void); - - -/* - * Get the real physical path to a file. (path) is specified in - * platform-dependent notation, as should your return value be. - * All relative paths should be removed, leaving you with an absolute - * path. Symlinks should be resolved, too, so that the returned value is - * the most direct path to a file. - * The return value will be deallocated with the standard C runtime free() - * function when the caller is done with it. - * On error, return NULL and set the error message. - */ -char *__PHYSFS_platformRealPath(const char *path); - - -/* - * Make a directory in the actual filesystem. (path) is specified in - * platform-dependent notation. On error, return zero and set the error - * message. Return non-zero on success. - */ -int __PHYSFS_platformMkDir(const char *path); - - -/* - * Remove a file or directory entry in the actual filesystem. (path) is - * specified in platform-dependent notation. Note that this deletes files - * _and_ directories, so you might need to do some determination. - * Non-empty directories should report an error and not delete themselves - * or their contents. - * - * Deleting a symlink should remove the link, not what it points to. - * - * On error, return zero and set the error message. Return non-zero on success. - */ -int __PHYSFS_platformDelete(const char *path); - - -/* - * Create a platform-specific mutex. This can be whatever datatype your - * platform uses for mutexes, but it is cast to a (void *) for abstractness. - * - * Return (NULL) if you couldn't create one. Systems without threads can - * return any arbitrary non-NULL value. - */ -void *__PHYSFS_platformCreateMutex(void); - -/* - * Destroy a platform-specific mutex, and clean up any resources associated - * with it. (mutex) is a value previously returned by - * __PHYSFS_platformCreateMutex(). This can be a no-op on single-threaded - * platforms. - */ -void __PHYSFS_platformDestroyMutex(void *mutex); - -/* - * Grab possession of a platform-specific mutex. Mutexes should be recursive; - * that is, the same thread should be able to call this function multiple - * times in a row without causing a deadlock. This function should block - * until a thread can gain possession of the mutex. - * - * Return non-zero if the mutex was grabbed, zero if there was an - * unrecoverable problem grabbing it (this should not be a matter of - * timing out! We're talking major system errors; block until the mutex - * is available otherwise.) - * - * _DO NOT_ call __PHYSFS_setError() in here! Since setError calls this - * function, you'll cause an infinite recursion. This means you can't - * use the BAIL_*MACRO* macros, either. - */ -int __PHYSFS_platformGrabMutex(void *mutex); - -/* - * Relinquish possession of the mutex when this method has been called - * once for each time that platformGrabMutex was called. Once possession has - * been released, the next thread in line to grab the mutex (if any) may - * proceed. - * - * _DO NOT_ call __PHYSFS_setError() in here! Since setError calls this - * function, you'll cause an infinite recursion. This means you can't - * use the BAIL_*MACRO* macros, either. - */ -void __PHYSFS_platformReleaseMutex(void *mutex); - -/* - * Called at the start of PHYSFS_init() to prepare the allocator, if the user - * hasn't selected their own allocator via PHYSFS_setAllocator(). - * If the platform has a custom allocator, it should fill in the fields of - * (a) with the proper function pointers and return non-zero. - * If the platform just wants to use malloc()/free()/etc, return zero - * immediately and the higher level will handle it. The Init and Deinit - * fields of (a) are optional...set them to NULL if you don't need them. - * Everything else must be implemented. All rules follow those for - * PHYSFS_setAllocator(). If Init isn't NULL, it will be called shortly - * after this function returns non-zero. - */ -int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a); - -#ifdef __cplusplus -} -#endif - -#endif - -/* end of physfs_internal.h ... */ - diff --git a/jni/physfs-2.0.3/physfs_platforms.h b/jni/physfs-2.0.3/physfs_platforms.h deleted file mode 100644 index 112193cd..00000000 --- a/jni/physfs-2.0.3/physfs_platforms.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef _INCL_PHYSFS_PLATFORMS -#define _INCL_PHYSFS_PLATFORMS - -#ifndef __PHYSICSFS_INTERNAL__ -#error Do not include this header from your applications. -#endif - -/* - * These only define the platforms to determine which files in the platforms - * directory should be compiled. For example, technically BeOS can be called - * a "unix" system, but since it doesn't use unix.c, we don't define - * PHYSFS_PLATFORM_UNIX on that system. - */ - -#if (defined __HAIKU__) -# define PHYSFS_PLATFORM_HAIKU -# define PHYSFS_PLATFORM_BEOS -# define PHYSFS_PLATFORM_POSIX -#elif ((defined __BEOS__) || (defined __beos__)) -# define PHYSFS_PLATFORM_BEOS -# define PHYSFS_PLATFORM_POSIX -#elif (defined _WIN32_WCE) || (defined _WIN64_WCE) -# define PHYSFS_PLATFORM_POCKETPC -#elif (((defined _WIN32) || (defined _WIN64)) && (!defined __CYGWIN__)) -# define PHYSFS_PLATFORM_WINDOWS -#elif (defined OS2) -# define PHYSFS_PLATFORM_OS2 -#elif ((defined __MACH__) && (defined __APPLE__)) -/* To check if iphone or not, we need to include this file */ -# include -# if ((TARGET_IPHONE_SIMULATOR) || (TARGET_OS_IPHONE)) -# define PHYSFS_PLATFORM_UNIX -# define PHYSFS_PLATFORM_POSIX -# define PHYSFS_NO_CDROM_SUPPORT -# else -# define PHYSFS_PLATFORM_MACOSX -# define PHYSFS_PLATFORM_POSIX -# endif -#elif defined(macintosh) -# error Classic Mac OS support was dropped from PhysicsFS 2.0. Move to OS X. -#elif defined(unix) || defined(__unix__) -# define PHYSFS_PLATFORM_UNIX -# define PHYSFS_PLATFORM_POSIX -#else -# error Unknown platform. -#endif - -#endif /* include-once blocker. */ - diff --git a/jni/physfs-2.0.3/platform/os2.c b/jni/physfs-2.0.3/platform/os2.c deleted file mode 100644 index 3372ca35..00000000 --- a/jni/physfs-2.0.3/platform/os2.c +++ /dev/null @@ -1,702 +0,0 @@ -/* - * OS/2 support routines for PhysicsFS. - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_platforms.h" - -#ifdef PHYSFS_PLATFORM_OS2 - -#define INCL_DOSSEMAPHORES -#define INCL_DOSDATETIME -#define INCL_DOSFILEMGR -#define INCL_DOSMODULEMGR -#define INCL_DOSERRORS -#define INCL_DOSPROCESS -#define INCL_DOSDEVICES -#define INCL_DOSDEVIOCTL -#define INCL_DOSMISC -#include - -#include -#include -#include -#include -#include -#include - -#include "physfs_internal.h" - -const char *__PHYSFS_platformDirSeparator = "\\"; - - -static const char *get_os2_error_string(APIRET rc) -{ - switch (rc) - { - case NO_ERROR: return(NULL); /* not an error. */ - case ERROR_INTERRUPT: return(NULL); /* not an error. */ - case ERROR_TIMEOUT: return(NULL); /* not an error. */ - case ERROR_NOT_ENOUGH_MEMORY: return(ERR_OUT_OF_MEMORY); - case ERROR_FILE_NOT_FOUND: return(ERR_NO_SUCH_FILE); - case ERROR_PATH_NOT_FOUND: return(ERR_NO_SUCH_PATH); - case ERROR_ACCESS_DENIED: return(ERR_ACCESS_DENIED); - case ERROR_NOT_DOS_DISK: return(ERR_NOT_A_DOS_DISK); - case ERROR_SHARING_VIOLATION: return(ERR_SHARING_VIOLATION); - case ERROR_CANNOT_MAKE: return(ERR_CANNOT_MAKE); - case ERROR_DEVICE_IN_USE: return(ERR_DEV_IN_USE); - case ERROR_OPEN_FAILED: return(ERR_OPEN_FAILED); - case ERROR_DISK_FULL: return(ERR_DISK_FULL); - case ERROR_PIPE_BUSY: return(ERR_PIPE_BUSY); - case ERROR_SHARING_BUFFER_EXCEEDED: return(ERR_SHARING_BUF_EXCEEDED); - case ERROR_FILENAME_EXCED_RANGE: return(ERR_BAD_FILENAME); - case ERROR_META_EXPANSION_TOO_LONG: return(ERR_BAD_FILENAME); - case ERROR_TOO_MANY_HANDLES: return(ERR_TOO_MANY_HANDLES); - case ERROR_TOO_MANY_OPEN_FILES: return(ERR_TOO_MANY_HANDLES); - case ERROR_NO_MORE_SEARCH_HANDLES: return(ERR_TOO_MANY_HANDLES); - case ERROR_SEEK_ON_DEVICE: return(ERR_SEEK_ERROR); - case ERROR_NEGATIVE_SEEK: return(ERR_SEEK_OUT_OF_RANGE); - /*!!! FIXME: Where did this go? case ERROR_DEL_CURRENT_DIRECTORY: return(ERR_DEL_CWD);*/ - case ERROR_WRITE_PROTECT: return(ERR_WRITE_PROTECT_ERROR); - case ERROR_WRITE_FAULT: return(ERR_WRITE_FAULT); - case ERROR_LOCK_VIOLATION: return(ERR_LOCK_VIOLATION); - case ERROR_GEN_FAILURE: return(ERR_GEN_FAILURE); - case ERROR_UNCERTAIN_MEDIA: return(ERR_UNCERTAIN_MEDIA); - case ERROR_PROTECTION_VIOLATION: return(ERR_PROT_VIOLATION); - case ERROR_BROKEN_PIPE: return(ERR_BROKEN_PIPE); - - case ERROR_INVALID_PARAMETER: - case ERROR_INVALID_NAME: - case ERROR_INVALID_DRIVE: - case ERROR_INVALID_HANDLE: - case ERROR_INVALID_FUNCTION: - case ERROR_INVALID_LEVEL: - case ERROR_INVALID_CATEGORY: - case ERROR_DUPLICATE_NAME: - case ERROR_BUFFER_OVERFLOW: - case ERROR_BAD_LENGTH: - case ERROR_BAD_DRIVER_LEVEL: - case ERROR_DIRECT_ACCESS_HANDLE: - case ERROR_NOT_OWNER: - return(ERR_PHYSFS_BAD_OS_CALL); - - default: return(ERR_OS2_GENERIC); - } /* switch */ - - return(NULL); -} /* get_os2_error_string */ - - -static APIRET os2err(APIRET retval) -{ - char buf[128]; - const char *err = get_os2_error_string(retval); - if (err == ERR_OS2_GENERIC) - { - snprintf(buf, sizeof (buf), ERR_OS2_GENERIC, (int) retval); - err = buf; - } /* if */ - - if (err != NULL) - __PHYSFS_setError(err); - - return(retval); -} /* os2err */ - - -/* (be gentle, this function isn't very robust.) */ -static void cvt_path_to_correct_case(char *buf) -{ - char *fname = buf + 3; /* point to first element. */ - char *ptr = strchr(fname, '\\'); /* find end of first element. */ - - buf[0] = toupper(buf[0]); /* capitalize drive letter. */ - - /* - * Go through each path element, and enumerate its parent dir until - * a case-insensitive match is found. If one is (and it SHOULD be) - * then overwrite the original element with the correct case. - * If there's an error, or the path has vanished for some reason, it - * won't hurt to have the original case, so we just keep going. - */ - while (fname != NULL) - { - char spec[CCHMAXPATH]; - FILEFINDBUF3 fb; - HDIR hdir = HDIR_CREATE; - ULONG count = 1; - APIRET rc; - - *(fname - 1) = '\0'; /* isolate parent dir string. */ - - strcpy(spec, buf); /* copy isolated parent dir... */ - strcat(spec, "\\*.*"); /* ...and add wildcard search spec. */ - - if (ptr != NULL) /* isolate element to find (fname is the start). */ - *ptr = '\0'; - - rc = DosFindFirst(spec, &hdir, FILE_DIRECTORY, - &fb, sizeof (fb), &count, FIL_STANDARD); - if (rc == NO_ERROR) - { - while (count == 1) /* while still entries to enumerate... */ - { - if (__PHYSFS_stricmpASCII(fb.achName, fname) == 0) - { - strcpy(fname, fb.achName); - break; /* there it is. Overwrite and stop searching. */ - } /* if */ - - DosFindNext(hdir, &fb, sizeof (fb), &count); - } /* while */ - DosFindClose(hdir); - } /* if */ - - *(fname - 1) = '\\'; /* unisolate parent dir. */ - fname = ptr; /* point to next element. */ - if (ptr != NULL) - { - *ptr = '\\'; /* unisolate element. */ - ptr = strchr(++fname, '\\'); /* find next element. */ - } /* if */ - } /* while */ -} /* cvt_file_to_correct_case */ - - -static char *baseDir = NULL; - -int __PHYSFS_platformInit(void) -{ - char buf[CCHMAXPATH]; - APIRET rc; - PTIB ptib; - PPIB ppib; - PHYSFS_sint32 len; - - assert(baseDir == NULL); - BAIL_IF_MACRO(os2err(DosGetInfoBlocks(&ptib, &ppib)) != NO_ERROR, NULL, 0); - rc = DosQueryModuleName(ppib->pib_hmte, sizeof (buf), (PCHAR) buf); - BAIL_IF_MACRO(os2err(rc) != NO_ERROR, NULL, 0); - - /* chop off filename, leave path. */ - for (len = strlen(buf) - 1; len >= 0; len--) - { - if (buf[len] == '\\') - { - buf[len] = '\0'; - break; - } /* if */ - } /* for */ - - assert(len > 0); /* should have been a "x:\\" on the front on string. */ - - /* The string is capitalized! Figure out the REAL case... */ - cvt_path_to_correct_case(buf); - - baseDir = (char *) allocator.Malloc(len + 1); - BAIL_IF_MACRO(baseDir == NULL, ERR_OUT_OF_MEMORY, 0); - strcpy(baseDir, buf); - return(1); /* success. */ -} /* __PHYSFS_platformInit */ - - -int __PHYSFS_platformDeinit(void) -{ - assert(baseDir != NULL); - allocator.Free(baseDir); - baseDir = NULL; - return(1); /* success. */ -} /* __PHYSFS_platformDeinit */ - - -static int disc_is_inserted(ULONG drive) -{ - int rc; - char buf[20]; - DosError(FERR_DISABLEHARDERR | FERR_DISABLEEXCEPTION); - rc = DosQueryFSInfo(drive + 1, FSIL_VOLSER, buf, sizeof (buf)); - DosError(FERR_ENABLEHARDERR | FERR_ENABLEEXCEPTION); - return(rc == NO_ERROR); -} /* is_cdrom_inserted */ - - -/* looks like "CD01" in ASCII (littleendian)...used for an ioctl. */ -#define CD01 0x31304443 - -static int is_cdrom_drive(ULONG drive) -{ - PHYSFS_uint32 param, data; - ULONG ul1, ul2; - APIRET rc; - HFILE hfile = NULLHANDLE; - char drivename[3] = { 'A' + drive, ':', '\0' }; - - rc = DosOpen(drivename, &hfile, &ul1, 0, 0, - OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW, - OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR | - OPEN_FLAGS_NOINHERIT | OPEN_SHARE_DENYNONE, NULL); - BAIL_IF_MACRO(rc != NO_ERROR, NULL, 0); - - data = 0; - param = PHYSFS_swapULE32(CD01); - ul1 = ul2 = sizeof (PHYSFS_uint32); - rc = DosDevIOCtl(hfile, IOCTL_CDROMDISK, CDROMDISK_GETDRIVER, - ¶m, sizeof (param), &ul1, &data, sizeof (data), &ul2); - - DosClose(hfile); - return((rc == NO_ERROR) && (PHYSFS_swapULE32(data) == CD01)); -} /* is_cdrom_drive */ - - -void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) -{ - ULONG dummy = 0; - ULONG drivemap = 0; - ULONG i, bit; - APIRET rc = DosQueryCurrentDisk(&dummy, &drivemap); - if (os2err(rc) != NO_ERROR) - return; - - for (i = 0, bit = 1; i < 26; i++, bit <<= 1) - { - if (drivemap & bit) /* this logical drive exists. */ - { - if ((is_cdrom_drive(i)) && (disc_is_inserted(i))) - { - char drive[4] = "x:\\"; - drive[0] = ('A' + i); - cb(data, drive); - } /* if */ - } /* if */ - } /* for */ -} /* __PHYSFS_platformDetectAvailableCDs */ - - -char *__PHYSFS_platformCalcBaseDir(const char *argv0) -{ - char *retval = (char *) allocator.Malloc(strlen(baseDir) + 1); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - strcpy(retval, baseDir); /* calculated at init time. */ - return(retval); -} /* __PHYSFS_platformCalcBaseDir */ - - -char *__PHYSFS_platformGetUserName(void) -{ - return(NULL); /* (*shrug*) */ -} /* __PHYSFS_platformGetUserName */ - - -char *__PHYSFS_platformGetUserDir(void) -{ - return(__PHYSFS_platformCalcBaseDir(NULL)); -} /* __PHYSFS_platformGetUserDir */ - - -int __PHYSFS_platformExists(const char *fname) -{ - FILESTATUS3 fs; - APIRET rc = DosQueryPathInfo(fname, FIL_STANDARD, &fs, sizeof (fs)); - return(os2err(rc) == NO_ERROR); -} /* __PHYSFS_platformExists */ - - -int __PHYSFS_platformIsSymLink(const char *fname) -{ - return(0); /* no symlinks in OS/2. */ -} /* __PHYSFS_platformIsSymlink */ - - -int __PHYSFS_platformIsDirectory(const char *fname) -{ - FILESTATUS3 fs; - APIRET rc = DosQueryPathInfo(fname, FIL_STANDARD, &fs, sizeof (fs)); - BAIL_IF_MACRO(os2err(rc) != NO_ERROR, NULL, 0) - return((fs.attrFile & FILE_DIRECTORY) != 0); -} /* __PHYSFS_platformIsDirectory */ - - -/* !!! FIXME: can we lose the malloc here? */ -char *__PHYSFS_platformCvtToDependent(const char *prepend, - const char *dirName, - const char *append) -{ - int len = ((prepend) ? strlen(prepend) : 0) + - ((append) ? strlen(append) : 0) + - strlen(dirName) + 1; - char *retval = allocator.Malloc(len); - char *p; - - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - - if (prepend) - strcpy(retval, prepend); - else - retval[0] = '\0'; - - strcat(retval, dirName); - - if (append) - strcat(retval, append); - - for (p = strchr(retval, '/'); p != NULL; p = strchr(p + 1, '/')) - *p = '\\'; - - return(retval); -} /* __PHYSFS_platformCvtToDependent */ - - -void __PHYSFS_platformEnumerateFiles(const char *dirname, - int omitSymLinks, - PHYSFS_EnumFilesCallback callback, - const char *origdir, - void *callbackdata) -{ - char spec[CCHMAXPATH]; - FILEFINDBUF3 fb; - HDIR hdir = HDIR_CREATE; - ULONG count = 1; - APIRET rc; - - if (strlen(dirname) > sizeof (spec) - 5) - { - __PHYSFS_setError(ERR_BAD_FILENAME); - return; - } /* if */ - - strcpy(spec, dirname); - strcat(spec, (spec[strlen(spec) - 1] != '\\') ? "\\*.*" : "*.*"); - - rc = DosFindFirst(spec, &hdir, - FILE_DIRECTORY | FILE_ARCHIVED | - FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM, - &fb, sizeof (fb), &count, FIL_STANDARD); - - if (os2err(rc) != NO_ERROR) - return; - - while (count == 1) - { - if ((strcmp(fb.achName, ".") != 0) && (strcmp(fb.achName, "..") != 0)) - callback(callbackdata, origdir, fb.achName); - - DosFindNext(hdir, &fb, sizeof (fb), &count); - } /* while */ - - DosFindClose(hdir); -} /* __PHYSFS_platformEnumerateFiles */ - - -char *__PHYSFS_platformCurrentDir(void) -{ - char *retval; - ULONG currentDisk; - ULONG dummy; - ULONG pathSize = 0; - APIRET rc; - BYTE byte; - - rc = DosQueryCurrentDisk(¤tDisk, &dummy); - BAIL_IF_MACRO(os2err(rc) != NO_ERROR, NULL, NULL); - - /* The first call just tells us how much space we need for the string. */ - rc = DosQueryCurrentDir(currentDisk, &byte, &pathSize); - pathSize++; /* Add space for null terminator. */ - retval = (char *) allocator.Malloc(pathSize + 3); /* plus "x:\\" */ - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - - /* Actually get the string this time. */ - rc = DosQueryCurrentDir(currentDisk, (PBYTE) (retval + 3), &pathSize); - if (os2err(rc) != NO_ERROR) - { - allocator.Free(retval); - return(NULL); - } /* if */ - - retval[0] = ('A' + (currentDisk - 1)); - retval[1] = ':'; - retval[2] = '\\'; - return(retval); -} /* __PHYSFS_platformCurrentDir */ - - -char *__PHYSFS_platformRealPath(const char *path) -{ - char buf[CCHMAXPATH]; - char *retval; - APIRET rc = DosQueryPathInfo(path, FIL_QUERYFULLNAME, buf, sizeof (buf)); - BAIL_IF_MACRO(os2err(rc) != NO_ERROR, NULL, NULL); - retval = (char *) allocator.Malloc(strlen(buf) + 1); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - strcpy(retval, buf); - return(retval); -} /* __PHYSFS_platformRealPath */ - - -int __PHYSFS_platformMkDir(const char *path) -{ - return(os2err(DosCreateDir(path, NULL)) == NO_ERROR); -} /* __PHYSFS_platformMkDir */ - - -void *__PHYSFS_platformOpenRead(const char *filename) -{ - ULONG actionTaken = 0; - HFILE hfile = NULLHANDLE; - - /* - * File must be opened SHARE_DENYWRITE and ACCESS_READONLY, otherwise - * DosQueryFileInfo() will fail if we try to get a file length, etc. - */ - os2err(DosOpen(filename, &hfile, &actionTaken, 0, FILE_NORMAL, - OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW, - OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NO_LOCALITY | - OPEN_FLAGS_NOINHERIT | OPEN_SHARE_DENYWRITE | - OPEN_ACCESS_READONLY, NULL)); - - return((void *) hfile); -} /* __PHYSFS_platformOpenRead */ - - -void *__PHYSFS_platformOpenWrite(const char *filename) -{ - ULONG actionTaken = 0; - HFILE hfile = NULLHANDLE; - - /* - * File must be opened SHARE_DENYWRITE and ACCESS_READWRITE, otherwise - * DosQueryFileInfo() will fail if we try to get a file length, etc. - */ - os2err(DosOpen(filename, &hfile, &actionTaken, 0, FILE_NORMAL, - OPEN_ACTION_REPLACE_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW, - OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NO_LOCALITY | - OPEN_FLAGS_NOINHERIT | OPEN_SHARE_DENYWRITE | - OPEN_ACCESS_READWRITE, NULL)); - - return((void *) hfile); -} /* __PHYSFS_platformOpenWrite */ - - -void *__PHYSFS_platformOpenAppend(const char *filename) -{ - ULONG dummy = 0; - HFILE hfile = NULLHANDLE; - APIRET rc; - - /* - * File must be opened SHARE_DENYWRITE and ACCESS_READWRITE, otherwise - * DosQueryFileInfo() will fail if we try to get a file length, etc. - */ - rc = os2err(DosOpen(filename, &hfile, &dummy, 0, FILE_NORMAL, - OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_CREATE_IF_NEW, - OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NO_LOCALITY | - OPEN_FLAGS_NOINHERIT | OPEN_SHARE_DENYWRITE | - OPEN_ACCESS_READWRITE, NULL)); - - if (rc == NO_ERROR) - { - if (os2err(DosSetFilePtr(hfile, 0, FILE_END, &dummy)) != NO_ERROR) - { - DosClose(hfile); - hfile = NULLHANDLE; - } /* if */ - } /* if */ - - return((void *) hfile); -} /* __PHYSFS_platformOpenAppend */ - - -PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count) -{ - HFILE hfile = (HFILE) opaque; - PHYSFS_sint64 retval; - ULONG br; - - for (retval = 0; retval < count; retval++) - { - os2err(DosRead(hfile, buffer, size, &br)); - if (br < size) - { - DosSetFilePtr(hfile, -br, FILE_CURRENT, &br); /* try to cleanup. */ - return(retval); - } /* if */ - - buffer = (void *) ( ((char *) buffer) + size ); - } /* for */ - - return(retval); -} /* __PHYSFS_platformRead */ - - -PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count) -{ - HFILE hfile = (HFILE) opaque; - PHYSFS_sint64 retval; - ULONG bw; - - for (retval = 0; retval < count; retval++) - { - os2err(DosWrite(hfile, buffer, size, &bw)); - if (bw < size) - { - DosSetFilePtr(hfile, -bw, FILE_CURRENT, &bw); /* try to cleanup. */ - return(retval); - } /* if */ - - buffer = (void *) ( ((char *) buffer) + size ); - } /* for */ - - return(retval); -} /* __PHYSFS_platformWrite */ - - -int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos) -{ - ULONG dummy; - HFILE hfile = (HFILE) opaque; - LONG dist = (LONG) pos; - - /* hooray for 32-bit filesystem limits! :) */ - BAIL_IF_MACRO((PHYSFS_uint64) dist != pos, ERR_SEEK_OUT_OF_RANGE, 0); - - return(os2err(DosSetFilePtr(hfile, dist, FILE_BEGIN, &dummy)) == NO_ERROR); -} /* __PHYSFS_platformSeek */ - - -PHYSFS_sint64 __PHYSFS_platformTell(void *opaque) -{ - ULONG pos; - HFILE hfile = (HFILE) opaque; - APIRET rc = os2err(DosSetFilePtr(hfile, 0, FILE_CURRENT, &pos)); - BAIL_IF_MACRO(rc != NO_ERROR, NULL, -1); - return((PHYSFS_sint64) pos); -} /* __PHYSFS_platformTell */ - - -PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque) -{ - FILESTATUS3 fs; - HFILE hfile = (HFILE) opaque; - APIRET rc = DosQueryFileInfo(hfile, FIL_STANDARD, &fs, sizeof (fs)); - BAIL_IF_MACRO(os2err(rc) != NO_ERROR, NULL, -1); - return((PHYSFS_sint64) fs.cbFile); -} /* __PHYSFS_platformFileLength */ - - -int __PHYSFS_platformEOF(void *opaque) -{ - PHYSFS_sint64 len, pos; - - len = __PHYSFS_platformFileLength(opaque); - BAIL_IF_MACRO(len == -1, NULL, 1); /* (*shrug*) */ - pos = __PHYSFS_platformTell(opaque); - BAIL_IF_MACRO(pos == -1, NULL, 1); /* (*shrug*) */ - - return(pos >= len); -} /* __PHYSFS_platformEOF */ - - -int __PHYSFS_platformFlush(void *opaque) -{ - return(os2err(DosResetBuffer((HFILE) opaque)) == NO_ERROR); -} /* __PHYSFS_platformFlush */ - - -int __PHYSFS_platformClose(void *opaque) -{ - return(os2err(DosClose((HFILE) opaque)) == NO_ERROR); -} /* __PHYSFS_platformClose */ - - -int __PHYSFS_platformDelete(const char *path) -{ - if (__PHYSFS_platformIsDirectory(path)) - return(os2err(DosDeleteDir(path)) == NO_ERROR); - - return(os2err(DosDelete(path)) == NO_ERROR); -} /* __PHYSFS_platformDelete */ - - -PHYSFS_sint64 __PHYSFS_platformGetLastModTime(const char *fname) -{ - PHYSFS_sint64 retval; - struct tm tm; - FILESTATUS3 fs; - APIRET rc = DosQueryPathInfo(fname, FIL_STANDARD, &fs, sizeof (fs)); - BAIL_IF_MACRO(os2err(rc) != NO_ERROR, NULL, -1); - - /* Convert to a format that mktime() can grok... */ - tm.tm_sec = ((PHYSFS_uint32) fs.ftimeLastWrite.twosecs) * 2; - tm.tm_min = fs.ftimeLastWrite.minutes; - tm.tm_hour = fs.ftimeLastWrite.hours; - tm.tm_mday = fs.fdateLastWrite.day; - tm.tm_mon = fs.fdateLastWrite.month; - tm.tm_year = ((PHYSFS_uint32) fs.fdateLastWrite.year) + 80; - tm.tm_wday = -1 /*st_localtz.wDayOfWeek*/; - tm.tm_yday = -1; - tm.tm_isdst = -1; - - /* Convert to a format PhysicsFS can grok... */ - retval = (PHYSFS_sint64) mktime(&tm); - BAIL_IF_MACRO(retval == -1, strerror(errno), -1); - return(retval); -} /* __PHYSFS_platformGetLastModTime */ - - -void *__PHYSFS_platformGetThreadID(void) -{ - PTIB ptib; - PPIB ppib; - - /* - * Allegedly, this API never fails, but we'll punt and return a - * default value (zero might as well do) if it does. - */ - BAIL_IF_MACRO(os2err(DosGetInfoBlocks(&ptib, &ppib)) != NO_ERROR, 0, 0); - return((void *) ptib->tib_ordinal); -} /* __PHYSFS_platformGetThreadID */ - - -void *__PHYSFS_platformCreateMutex(void) -{ - HMTX hmtx = NULLHANDLE; - os2err(DosCreateMutexSem(NULL, &hmtx, 0, 0)); - return((void *) hmtx); -} /* __PHYSFS_platformCreateMutex */ - - -void __PHYSFS_platformDestroyMutex(void *mutex) -{ - DosCloseMutexSem((HMTX) mutex); -} /* __PHYSFS_platformDestroyMutex */ - - -int __PHYSFS_platformGrabMutex(void *mutex) -{ - /* Do _NOT_ call os2err() (which sets the physfs error msg) in here! */ - return(DosRequestMutexSem((HMTX) mutex, SEM_INDEFINITE_WAIT) == NO_ERROR); -} /* __PHYSFS_platformGrabMutex */ - - -void __PHYSFS_platformReleaseMutex(void *mutex) -{ - DosReleaseMutexSem((HMTX) mutex); -} /* __PHYSFS_platformReleaseMutex */ - - -/* !!! FIXME: Don't use C runtime for allocators? */ -int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a) -{ - return(0); /* just use malloc() and friends. */ -} /* __PHYSFS_platformSetDefaultAllocator */ - -#endif /* PHYSFS_PLATFORM_OS2 */ - -/* end of os2.c ... */ - diff --git a/jni/physfs-2.0.3/platform/pocketpc.c b/jni/physfs-2.0.3/platform/pocketpc.c deleted file mode 100644 index c49c0cf0..00000000 --- a/jni/physfs-2.0.3/platform/pocketpc.c +++ /dev/null @@ -1,612 +0,0 @@ -/* - * PocketPC support routines for PhysicsFS. - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_platforms.h" - -#ifdef PHYSFS_PLATFORM_POCKETPC - -#include -#include - -#include "physfs_internal.h" - -#define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF -#define INVALID_SET_FILE_POINTER 0xFFFFFFFF -typedef struct -{ - HANDLE handle; - int readonly; -} winCEfile; - - -const char *__PHYSFS_platformDirSeparator = "\\"; -static char *userDir = NULL; - -/* - * Figure out what the last failing Win32 API call was, and - * generate a human-readable string for the error message. - * - * The return value is a static buffer that is overwritten with - * each call to this function. - */ -static const char *win32strerror(void) -{ - static TCHAR msgbuf[255]; - TCHAR *ptr = msgbuf; - - FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - msgbuf, - sizeof (msgbuf) / sizeof (TCHAR), - NULL - ); - - /* chop off newlines. */ - for (ptr = msgbuf; *ptr; ptr++) - { - if ((*ptr == '\n') || (*ptr == '\r')) - { - *ptr = ' '; - break; - } /* if */ - } /* for */ - - return((const char *) msgbuf); -} /* win32strerror */ - - -/* !!! FIXME: need to check all of these for NULLs. */ -#define UTF8_TO_UNICODE_STACK_MACRO(w_assignto, str) { \ - if (str == NULL) \ - w_assignto = NULL; \ - else { \ - const PHYSFS_uint64 len = (PHYSFS_uint64) ((strlen(str) * 4) + 1); \ - w_assignto = (char *) __PHYSFS_smallAlloc(len); \ - PHYSFS_uc2fromutf8(str, (PHYSFS_uint16 *) w_assignto, len); \ - } \ -} \ - - -static char *getExePath() -{ - DWORD buflen; - int success = 0; - TCHAR *ptr = NULL; - TCHAR *retval = (TCHAR*) allocator.Malloc(sizeof (TCHAR) * (MAX_PATH + 1)); - char *charretval; - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - - retval[0] = _T('\0'); - /* !!! FIXME: don't preallocate here? */ - /* !!! FIXME: use smallAlloc? */ - buflen = GetModuleFileName(NULL, retval, MAX_PATH + 1); - if (buflen <= 0) - __PHYSFS_setError(win32strerror()); - else - { - retval[buflen] = '\0'; /* does API always null-terminate this? */ - ptr = retval+buflen; - while( ptr != retval ) - { - if( *ptr != _T('\\') ) - *ptr-- = _T('\0'); - else - break; - } /* while */ - success = 1; - } /* else */ - - if (!success) - { - allocator.Free(retval); - return(NULL); /* physfs error message will be set, above. */ - } /* if */ - - buflen = (buflen * 4) + 1; - charretval = (char *) allocator.Malloc(buflen); - if (charretval != NULL) - PHYSFS_utf8fromucs2((const PHYSFS_uint16 *) retval, charretval, buflen); - allocator.Free(retval); - return(charretval); /* w00t. */ -} /* getExePath */ - - -int __PHYSFS_platformInit(void) -{ - userDir = getExePath(); - BAIL_IF_MACRO(userDir == NULL, NULL, 0); /* failed? */ - return(1); /* always succeed. */ -} /* __PHYSFS_platformInit */ - - -int __PHYSFS_platformDeinit(void) -{ - allocator.Free(userDir); - return(1); /* always succeed. */ -} /* __PHYSFS_platformDeinit */ - - -void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) -{ - /* no-op on this platform. */ -} /* __PHYSFS_platformDetectAvailableCDs */ - - -char *__PHYSFS_platformCalcBaseDir(const char *argv0) -{ - return(getExePath()); -} /* __PHYSFS_platformCalcBaseDir */ - - -char *__PHYSFS_platformGetUserName(void) -{ - BAIL_MACRO(ERR_NOT_IMPLEMENTED, NULL); -} /* __PHYSFS_platformGetUserName */ - - -char *__PHYSFS_platformGetUserDir(void) -{ - return userDir; - BAIL_MACRO(ERR_NOT_IMPLEMENTED, NULL); -} /* __PHYSFS_platformGetUserDir */ - - -void *__PHYSFS_platformGetThreadID(void) -{ - return((void *)1); /* single threaded. */ -} /* __PHYSFS_platformGetThreadID */ - - -int __PHYSFS_platformExists(const char *fname) -{ - int retval = 0; - wchar_t *w_fname = NULL; - - UTF8_TO_UNICODE_STACK_MACRO(w_fname, fname); - if (w_fname != NULL) - retval = (GetFileAttributes(w_fname) != INVALID_FILE_ATTRIBUTES); - __PHYSFS_smallFree(w_fname); - - return(retval); -} /* __PHYSFS_platformExists */ - - -int __PHYSFS_platformIsSymLink(const char *fname) -{ - BAIL_MACRO(ERR_NOT_IMPLEMENTED, 0); -} /* __PHYSFS_platformIsSymlink */ - - -int __PHYSFS_platformIsDirectory(const char *fname) -{ - int retval = 0; - wchar_t *w_fname = NULL; - - UTF8_TO_UNICODE_STACK_MACRO(w_fname, fname); - if (w_fname != NULL) - retval = ((GetFileAttributes(w_fname) & FILE_ATTRIBUTE_DIRECTORY) != 0); - __PHYSFS_smallFree(w_fname); - - return(retval); -} /* __PHYSFS_platformIsDirectory */ - - -char *__PHYSFS_platformCvtToDependent(const char *prepend, - const char *dirName, - const char *append) -{ - int len = ((prepend) ? strlen(prepend) : 0) + - ((append) ? strlen(append) : 0) + - strlen(dirName) + 1; - char *retval = (char *) allocator.Malloc(len); - char *p; - - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - - if (prepend) - strcpy(retval, prepend); - else - retval[0] = '\0'; - - strcat(retval, dirName); - - if (append) - strcat(retval, append); - - for (p = strchr(retval, '/'); p != NULL; p = strchr(p + 1, '/')) - *p = '\\'; - - return(retval); -} /* __PHYSFS_platformCvtToDependent */ - - -static int doEnumCallback(const wchar_t *w_fname) -{ - const PHYSFS_uint64 len = (PHYSFS_uint64) ((wcslen(w_fname) * 4) + 1); - char *str = (char *) __PHYSFS_smallAlloc(len); - PHYSFS_utf8fromucs2((const PHYSFS_uint16 *) w_fname, str, len); - callback(callbackdata, origdir, str); - __PHYSFS_smallFree(str); - return 1; -} /* doEnumCallback */ - - -void __PHYSFS_platformEnumerateFiles(const char *dirname, - int omitSymLinks, - PHYSFS_EnumFilesCallback callback, - const char *origdir, - void *callbackdata) -{ - HANDLE dir; - WIN32_FIND_DATA ent; - char *SearchPath; - wchar_t *w_SearchPath; - size_t len = strlen(dirname); - - /* Allocate a new string for path, maybe '\\', "*", and NULL terminator */ - SearchPath = (char *) __PHYSFS_smallAlloc(len + 3); - BAIL_IF_MACRO(SearchPath == NULL, ERR_OUT_OF_MEMORY, NULL); - - /* Copy current dirname */ - strcpy(SearchPath, dirname); - - /* if there's no '\\' at the end of the path, stick one in there. */ - if (SearchPath[len - 1] != '\\') - { - SearchPath[len++] = '\\'; - SearchPath[len] = '\0'; - } /* if */ - - /* Append the "*" to the end of the string */ - strcat(SearchPath, "*"); - - UTF8_TO_UNICODE_STACK_MACRO(w_SearchPath, SearchPath); - __PHYSFS_smallFree(SearchPath); - dir = FindFirstFile(w_SearchPath, &ent); - __PHYSFS_smallFree(w_SearchPath); - - if (dir == INVALID_HANDLE_VALUE) - return; - - do - { - const char *str = NULL; - - if (wcscmp(ent.cFileName, L".") == 0) - continue; - - if (wcscmp(ent.cFileName, L"..") == 0) - continue; - - if (!doEnumCallback(ent.cFileName)) - break; - } while (FindNextFile(dir, &ent) != 0); - - FindClose(dir); -} /* __PHYSFS_platformEnumerateFiles */ - - -char *__PHYSFS_platformCurrentDir(void) -{ - return("\\"); -} /* __PHYSFS_platformCurrentDir */ - - -char *__PHYSFS_platformRealPath(const char *path) -{ - char *retval = (char *) allocator.Malloc(strlen(path) + 1); - strcpy(retval,path); - return(retval); -} /* __PHYSFS_platformRealPath */ - - -int __PHYSFS_platformMkDir(const char *path) -{ - int retval = 0; - wchar_t *w_path = NULL; - UTF8_TO_UNICODE_STACK_MACRO(w_path, path); - if (w_path != NULL) - { - retval = CreateDirectory(w_path, NULL); - __PHYSFS_smallFree(w_fname); - } /* if */ - return(retval); -} /* __PHYSFS_platformMkDir */ - - -static void *doOpen(const char *fname, DWORD mode, DWORD creation, int rdonly) -{ - HANDLE fileHandle; - winCEfile *retval; - wchar_t *w_fname = NULL; - - UTF8_TO_UNICODE_STACK_MACRO(w_fname, fname); - fileHandle = CreateFile(w_fname, mode, FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, creation, FILE_ATTRIBUTE_NORMAL, NULL); - __PHYSFS_smallFree(w_fname); - - BAIL_IF_MACRO(fileHandle == INVALID_HANDLE_VALUE, win32strerror(), NULL); - - retval = (winCEfile *) allocator.Malloc(sizeof (winCEfile)); - if (retval == NULL) - { - CloseHandle(fileHandle); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); - } /* if */ - - retval->readonly = rdonly; - retval->handle = fileHandle; - return(retval); -} /* doOpen */ - - -void *__PHYSFS_platformOpenRead(const char *filename) -{ - return(doOpen(filename, GENERIC_READ, OPEN_EXISTING, 1)); -} /* __PHYSFS_platformOpenRead */ - - -void *__PHYSFS_platformOpenWrite(const char *filename) -{ - return(doOpen(filename, GENERIC_WRITE, CREATE_ALWAYS, 0)); -} /* __PHYSFS_platformOpenWrite */ - - -void *__PHYSFS_platformOpenAppend(const char *filename) -{ - void *retval = doOpen(filename, GENERIC_WRITE, OPEN_ALWAYS, 0); - if (retval != NULL) - { - HANDLE h = ((winCEfile *) retval)->handle; - if (SetFilePointer(h, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) - { - const char *err = win32strerror(); - CloseHandle(h); - allocator.Free(retval); - BAIL_MACRO(err, NULL); - } /* if */ - } /* if */ - - return(retval); - -} /* __PHYSFS_platformOpenAppend */ - - -PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count) -{ - HANDLE Handle = ((winCEfile *) opaque)->handle; - DWORD CountOfBytesRead; - PHYSFS_sint64 retval; - - /* Read data from the file */ - /*!!! - uint32 might be a greater # than DWORD */ - if (!ReadFile(Handle, buffer, count * size, &CountOfBytesRead, NULL)) - { - retval = -1; - } /* if */ - else - { - /* Return the number of "objects" read. */ - /* !!! - What if not the right amount of bytes was read to make an object? */ - retval = CountOfBytesRead / size; - } /* else */ - - return(retval); - -} /* __PHYSFS_platformRead */ - - -PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count) -{ - HANDLE Handle = ((winCEfile *) opaque)->handle; - DWORD CountOfBytesWritten; - PHYSFS_sint64 retval; - - /* Read data from the file */ - /*!!! - uint32 might be a greater # than DWORD */ - if (!WriteFile(Handle, buffer, count * size, &CountOfBytesWritten, NULL)) - { - retval = -1; - } /* if */ - else - { - /* Return the number of "objects" read. */ - /*!!! - What if not the right number of bytes was written? */ - retval = CountOfBytesWritten / size; - } /* else */ - - return(retval); - -} /* __PHYSFS_platformWrite */ - - -int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos) -{ - HANDLE Handle = ((winCEfile *) opaque)->handle; - DWORD HighOrderPos; - DWORD rc; - - /* Get the high order 32-bits of the position */ - //HighOrderPos = HIGHORDER_UINT64(pos); - HighOrderPos = (unsigned long)(pos>>32); - - /*!!! SetFilePointer needs a signed 64-bit value. */ - /* Move pointer "pos" count from start of file */ - rc = SetFilePointer(Handle, (unsigned long)(pos&0x00000000ffffffff), - &HighOrderPos, FILE_BEGIN); - - if ((rc == INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR)) - { - BAIL_MACRO(win32strerror(), 0); - } - - return(1); /* No error occured */ -} /* __PHYSFS_platformSeek */ - - -PHYSFS_sint64 __PHYSFS_platformTell(void *opaque) -{ - HANDLE Handle = ((winCEfile *) opaque)->handle; - DWORD HighPos = 0; - DWORD LowPos; - PHYSFS_sint64 retval; - - /* Get current position */ - LowPos = SetFilePointer(Handle, 0, &HighPos, FILE_CURRENT); - if ((LowPos == INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR)) - { - BAIL_MACRO(win32strerror(), -1); - } /* if */ - else - { - /* Combine the high/low order to create the 64-bit position value */ - retval = (((PHYSFS_uint64) HighPos) << 32) | LowPos; - //assert(retval >= 0); - } /* else */ - - return(retval); -} /* __PHYSFS_platformTell */ - - -PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque) -{ - HANDLE Handle = ((winCEfile *) opaque)->handle; - DWORD SizeHigh; - DWORD SizeLow; - PHYSFS_sint64 retval; - - SizeLow = GetFileSize(Handle, &SizeHigh); - if ((SizeLow == INVALID_SET_FILE_POINTER) && (GetLastError() != NO_ERROR)) - { - BAIL_MACRO(win32strerror(), -1); - } /* if */ - else - { - /* Combine the high/low order to create the 64-bit position value */ - retval = (((PHYSFS_uint64) SizeHigh) << 32) | SizeLow; - //assert(retval >= 0); - } /* else */ - - return(retval); -} /* __PHYSFS_platformFileLength */ - - -int __PHYSFS_platformEOF(void *opaque) -{ - const PHYSFS_sint64 FileLength = __PHYSFS_platformFileLength(opaque); - PHYSFS_sint64 FilePosition; - int retval = 0; - - if (FileLength == 0) - return 1; /* we're definitely at EOF. */ - - /* Get the current position in the file */ - if ((FilePosition = __PHYSFS_platformTell(opaque)) != -1) - { - /* Non-zero if EOF is equal to the file length */ - retval = (FilePosition == FileLength); - } /* if */ - - return(retval); -} /* __PHYSFS_platformEOF */ - - -int __PHYSFS_platformFlush(void *opaque) -{ - winCEfile *fh = ((winCEfile *) opaque); - if (!fh->readonly) - BAIL_IF_MACRO(!FlushFileBuffers(fh->handle), win32strerror(), 0); - - return(1); -} /* __PHYSFS_platformFlush */ - - -int __PHYSFS_platformClose(void *opaque) -{ - HANDLE Handle = ((winCEfile *) opaque)->handle; - BAIL_IF_MACRO(!CloseHandle(Handle), win32strerror(), 0); - allocator.Free(opaque); - return(1); -} /* __PHYSFS_platformClose */ - - -int __PHYSFS_platformDelete(const char *path) -{ - wchar_t *w_path = NULL; - UTF8_TO_UNICODE_STACK_MACRO(w_path, path); - - /* If filename is a folder */ - if (GetFileAttributes(w_path) == FILE_ATTRIBUTE_DIRECTORY) - { - int retval = !RemoveDirectory(w_path); - __PHYSFS_smallFree(w_path); - BAIL_IF_MACRO(retval, win32strerror(), 0); - } /* if */ - else - { - int retval = !DeleteFile(w_path); - __PHYSFS_smallFree(w_path); - BAIL_IF_MACRO(retval, win32strerror(), 0); - } /* else */ - - return(1); /* if you got here, it worked. */ -} /* __PHYSFS_platformDelete */ - - -/* - * !!! FIXME: why aren't we using Critical Sections instead of Mutexes? - * !!! FIXME: mutexes on Windows are for cross-process sync. CritSects are - * !!! FIXME: mutexes for threads in a single process and are faster. - */ -void *__PHYSFS_platformCreateMutex(void) -{ - return((void *) CreateMutex(NULL, FALSE, NULL)); -} /* __PHYSFS_platformCreateMutex */ - - -void __PHYSFS_platformDestroyMutex(void *mutex) -{ - CloseHandle((HANDLE) mutex); -} /* __PHYSFS_platformDestroyMutex */ - - -int __PHYSFS_platformGrabMutex(void *mutex) -{ - return(WaitForSingleObject((HANDLE) mutex, INFINITE) != WAIT_FAILED); -} /* __PHYSFS_platformGrabMutex */ - - -void __PHYSFS_platformReleaseMutex(void *mutex) -{ - ReleaseMutex((HANDLE) mutex); -} /* __PHYSFS_platformReleaseMutex */ - - -PHYSFS_sint64 __PHYSFS_platformGetLastModTime(const char *fname) -{ - BAIL_MACRO(ERR_NOT_IMPLEMENTED, -1); -} /* __PHYSFS_platformGetLastModTime */ - - -/* !!! FIXME: Don't use C runtime for allocators? */ -int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a) -{ - return(0); /* just use malloc() and friends. */ -} /* __PHYSFS_platformSetDefaultAllocator */ - -#endif /* PHYSFS_PLATFORM_POCKETPC */ - -/* end of pocketpc.c ... */ - diff --git a/jni/physfs-2.0.3/platform/posix.c b/jni/physfs-2.0.3/platform/posix.c deleted file mode 100644 index 652d9f77..00000000 --- a/jni/physfs-2.0.3/platform/posix.c +++ /dev/null @@ -1,424 +0,0 @@ -/* - * Posix-esque support routines for PhysicsFS. - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_platforms.h" - -#ifdef PHYSFS_PLATFORM_POSIX - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef PHYSFS_HAVE_LLSEEK -#include -#endif - -#include "physfs_internal.h" - - -const char *__PHYSFS_platformDirSeparator = "/"; - - -char *__PHYSFS_platformCopyEnvironmentVariable(const char *varname) -{ - const char *envr = getenv(varname); - char *retval = NULL; - - if (envr != NULL) - { - retval = (char *) allocator.Malloc(strlen(envr) + 1); - if (retval != NULL) - strcpy(retval, envr); - } /* if */ - - return(retval); -} /* __PHYSFS_platformCopyEnvironmentVariable */ - - -static char *getUserNameByUID(void) -{ - uid_t uid = getuid(); - struct passwd *pw; - char *retval = NULL; - - pw = getpwuid(uid); - if ((pw != NULL) && (pw->pw_name != NULL)) - { - retval = (char *) allocator.Malloc(strlen(pw->pw_name) + 1); - if (retval != NULL) - strcpy(retval, pw->pw_name); - } /* if */ - - return(retval); -} /* getUserNameByUID */ - - -static char *getUserDirByUID(void) -{ - uid_t uid = getuid(); - struct passwd *pw; - char *retval = NULL; - - pw = getpwuid(uid); - if ((pw != NULL) && (pw->pw_dir != NULL)) - { - retval = (char *) allocator.Malloc(strlen(pw->pw_dir) + 1); - if (retval != NULL) - strcpy(retval, pw->pw_dir); - } /* if */ - - return(retval); -} /* getUserDirByUID */ - - -char *__PHYSFS_platformGetUserName(void) -{ - char *retval = getUserNameByUID(); - if (retval == NULL) - retval = __PHYSFS_platformCopyEnvironmentVariable("USER"); - return(retval); -} /* __PHYSFS_platformGetUserName */ - - -char *__PHYSFS_platformGetUserDir(void) -{ - char *retval = __PHYSFS_platformCopyEnvironmentVariable("HOME"); - - /* if the environment variable was set, make sure it's really a dir. */ - if (retval != NULL) - { - struct stat statbuf; - if ((stat(retval, &statbuf) == -1) || (S_ISDIR(statbuf.st_mode) == 0)) - { - allocator.Free(retval); - retval = NULL; - } /* if */ - } /* if */ - - if (retval == NULL) - retval = getUserDirByUID(); - - return(retval); -} /* __PHYSFS_platformGetUserDir */ - - -int __PHYSFS_platformExists(const char *fname) -{ - struct stat statbuf; - BAIL_IF_MACRO(lstat(fname, &statbuf) == -1, strerror(errno), 0); - return(1); -} /* __PHYSFS_platformExists */ - - -int __PHYSFS_platformIsSymLink(const char *fname) -{ - struct stat statbuf; - BAIL_IF_MACRO(lstat(fname, &statbuf) == -1, strerror(errno), 0); - return( (S_ISLNK(statbuf.st_mode)) ? 1 : 0 ); -} /* __PHYSFS_platformIsSymlink */ - - -int __PHYSFS_platformIsDirectory(const char *fname) -{ - struct stat statbuf; - BAIL_IF_MACRO(stat(fname, &statbuf) == -1, strerror(errno), 0); - return( (S_ISDIR(statbuf.st_mode)) ? 1 : 0 ); -} /* __PHYSFS_platformIsDirectory */ - - -char *__PHYSFS_platformCvtToDependent(const char *prepend, - const char *dirName, - const char *append) -{ - int len = ((prepend) ? strlen(prepend) : 0) + - ((append) ? strlen(append) : 0) + - strlen(dirName) + 1; - char *retval = (char *) allocator.Malloc(len); - - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - - /* platform-independent notation is Unix-style already. :) */ - - if (prepend) - strcpy(retval, prepend); - else - retval[0] = '\0'; - - strcat(retval, dirName); - - if (append) - strcat(retval, append); - - return(retval); -} /* __PHYSFS_platformCvtToDependent */ - - - -void __PHYSFS_platformEnumerateFiles(const char *dirname, - int omitSymLinks, - PHYSFS_EnumFilesCallback callback, - const char *origdir, - void *callbackdata) -{ - DIR *dir; - struct dirent *ent; - int bufsize = 0; - char *buf = NULL; - int dlen = 0; - - if (omitSymLinks) /* !!! FIXME: this malloc sucks. */ - { - dlen = strlen(dirname); - bufsize = dlen + 256; - buf = (char *) allocator.Malloc(bufsize); - if (buf == NULL) - return; - strcpy(buf, dirname); - if (buf[dlen - 1] != '/') - { - buf[dlen++] = '/'; - buf[dlen] = '\0'; - } /* if */ - } /* if */ - - errno = 0; - dir = opendir(dirname); - if (dir == NULL) - { - allocator.Free(buf); - return; - } /* if */ - - while ((ent = readdir(dir)) != NULL) - { - if (strcmp(ent->d_name, ".") == 0) - continue; - - if (strcmp(ent->d_name, "..") == 0) - continue; - - if (omitSymLinks) - { - char *p; - int len = strlen(ent->d_name) + dlen + 1; - if (len > bufsize) - { - p = (char *) allocator.Realloc(buf, len); - if (p == NULL) - continue; - buf = p; - bufsize = len; - } /* if */ - - strcpy(buf + dlen, ent->d_name); - if (__PHYSFS_platformIsSymLink(buf)) - continue; - } /* if */ - - callback(callbackdata, origdir, ent->d_name); - } /* while */ - - allocator.Free(buf); - closedir(dir); -} /* __PHYSFS_platformEnumerateFiles */ - - -int __PHYSFS_platformMkDir(const char *path) -{ - int rc; - errno = 0; - rc = mkdir(path, S_IRWXU); - BAIL_IF_MACRO(rc == -1, strerror(errno), 0); - return(1); -} /* __PHYSFS_platformMkDir */ - - -static void *doOpen(const char *filename, int mode) -{ - const int appending = (mode & O_APPEND); - int fd; - int *retval; - errno = 0; - - /* O_APPEND doesn't actually behave as we'd like. */ - mode &= ~O_APPEND; - - fd = open(filename, mode, S_IRUSR | S_IWUSR); - BAIL_IF_MACRO(fd < 0, strerror(errno), NULL); - - if (appending) - { - if (lseek(fd, 0, SEEK_END) < 0) - { - close(fd); - BAIL_MACRO(strerror(errno), NULL); - } /* if */ - } /* if */ - - retval = (int *) allocator.Malloc(sizeof (int)); - if (retval == NULL) - { - close(fd); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); - } /* if */ - - *retval = fd; - return((void *) retval); -} /* doOpen */ - - -void *__PHYSFS_platformOpenRead(const char *filename) -{ - return(doOpen(filename, O_RDONLY)); -} /* __PHYSFS_platformOpenRead */ - - -void *__PHYSFS_platformOpenWrite(const char *filename) -{ - return(doOpen(filename, O_WRONLY | O_CREAT | O_TRUNC)); -} /* __PHYSFS_platformOpenWrite */ - - -void *__PHYSFS_platformOpenAppend(const char *filename) -{ - return(doOpen(filename, O_WRONLY | O_CREAT | O_APPEND)); -} /* __PHYSFS_platformOpenAppend */ - - -PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count) -{ - int fd = *((int *) opaque); - int max = size * count; - int rc = read(fd, buffer, max); - - BAIL_IF_MACRO(rc == -1, strerror(errno), rc); - assert(rc <= max); - - if ((rc < max) && (size > 1)) - lseek(fd, -(rc % size), SEEK_CUR); /* rollback to object boundary. */ - - return(rc / size); -} /* __PHYSFS_platformRead */ - - -PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count) -{ - int fd = *((int *) opaque); - int max = size * count; - int rc = write(fd, (void *) buffer, max); - - BAIL_IF_MACRO(rc == -1, strerror(errno), rc); - assert(rc <= max); - - if ((rc < max) && (size > 1)) - lseek(fd, -(rc % size), SEEK_CUR); /* rollback to object boundary. */ - - return(rc / size); -} /* __PHYSFS_platformWrite */ - - -int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos) -{ - int fd = *((int *) opaque); - - #ifdef PHYSFS_HAVE_LLSEEK - unsigned long offset_high = ((pos >> 32) & 0xFFFFFFFF); - unsigned long offset_low = (pos & 0xFFFFFFFF); - loff_t retoffset; - int rc = llseek(fd, offset_high, offset_low, &retoffset, SEEK_SET); - BAIL_IF_MACRO(rc == -1, strerror(errno), 0); - #else - BAIL_IF_MACRO(lseek(fd, (int) pos, SEEK_SET) == -1, strerror(errno), 0); - #endif - - return(1); -} /* __PHYSFS_platformSeek */ - - -PHYSFS_sint64 __PHYSFS_platformTell(void *opaque) -{ - int fd = *((int *) opaque); - PHYSFS_sint64 retval; - - #ifdef PHYSFS_HAVE_LLSEEK - loff_t retoffset; - int rc = llseek(fd, 0, &retoffset, SEEK_CUR); - BAIL_IF_MACRO(rc == -1, strerror(errno), -1); - retval = (PHYSFS_sint64) retoffset; - #else - retval = (PHYSFS_sint64) lseek(fd, 0, SEEK_CUR); - BAIL_IF_MACRO(retval == -1, strerror(errno), -1); - #endif - - return(retval); -} /* __PHYSFS_platformTell */ - - -PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque) -{ - int fd = *((int *) opaque); - struct stat statbuf; - BAIL_IF_MACRO(fstat(fd, &statbuf) == -1, strerror(errno), -1); - return((PHYSFS_sint64) statbuf.st_size); -} /* __PHYSFS_platformFileLength */ - - -int __PHYSFS_platformEOF(void *opaque) -{ - PHYSFS_sint64 pos = __PHYSFS_platformTell(opaque); - PHYSFS_sint64 len = __PHYSFS_platformFileLength(opaque); - return((pos < 0) || (len < 0) || (pos >= len)); -} /* __PHYSFS_platformEOF */ - - -int __PHYSFS_platformFlush(void *opaque) -{ - int fd = *((int *) opaque); - BAIL_IF_MACRO(fsync(fd) == -1, strerror(errno), 0); - return(1); -} /* __PHYSFS_platformFlush */ - - -int __PHYSFS_platformClose(void *opaque) -{ - int fd = *((int *) opaque); - BAIL_IF_MACRO(close(fd) == -1, strerror(errno), 0); - allocator.Free(opaque); - return(1); -} /* __PHYSFS_platformClose */ - - -int __PHYSFS_platformDelete(const char *path) -{ - BAIL_IF_MACRO(remove(path) == -1, strerror(errno), 0); - return(1); -} /* __PHYSFS_platformDelete */ - - -PHYSFS_sint64 __PHYSFS_platformGetLastModTime(const char *fname) -{ - struct stat statbuf; - BAIL_IF_MACRO(stat(fname, &statbuf) < 0, strerror(errno), -1); - return statbuf.st_mtime; -} /* __PHYSFS_platformGetLastModTime */ - -#endif /* PHYSFS_PLATFORM_POSIX */ - -/* end of posix.c ... */ - diff --git a/jni/physfs-2.0.3/platform/windows.c b/jni/physfs-2.0.3/platform/windows.c deleted file mode 100644 index 2ced9a4a..00000000 --- a/jni/physfs-2.0.3/platform/windows.c +++ /dev/null @@ -1,1408 +0,0 @@ -/* - * Windows support routines for PhysicsFS. - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon, and made sane by Gregory S. Read. - */ - -#define __PHYSICSFS_INTERNAL__ -#include "physfs_platforms.h" - -#ifdef PHYSFS_PLATFORM_WINDOWS - -/* Forcibly disable UNICODE, since we manage this ourselves. */ -#ifdef UNICODE -#undef UNICODE -#endif - -#include -#include -#include -#include -#include -#include -#include - -#include "physfs_internal.h" - -#define LOWORDER_UINT64(pos) ((PHYSFS_uint32) (pos & 0xFFFFFFFF)) -#define HIGHORDER_UINT64(pos) ((PHYSFS_uint32) ((pos >> 32) & 0xFFFFFFFF)) - -/* - * Users without the platform SDK don't have this defined. The original docs - * for SetFilePointer() just said to compare with 0xFFFFFFFF, so this should - * work as desired. - */ -#define PHYSFS_INVALID_SET_FILE_POINTER 0xFFFFFFFF - -/* just in case... */ -#define PHYSFS_INVALID_FILE_ATTRIBUTES 0xFFFFFFFF - -/* Not defined before the Vista SDK. */ -#define PHYSFS_IO_REPARSE_TAG_SYMLINK 0xA000000C - - -#define UTF8_TO_UNICODE_STACK_MACRO(w_assignto, str) { \ - if (str == NULL) \ - w_assignto = NULL; \ - else { \ - const PHYSFS_uint64 len = (PHYSFS_uint64) ((strlen(str) + 1) * 2); \ - w_assignto = (WCHAR *) __PHYSFS_smallAlloc(len); \ - if (w_assignto != NULL) \ - PHYSFS_utf8ToUcs2(str, (PHYSFS_uint16 *) w_assignto, len); \ - } \ -} \ - -static PHYSFS_uint64 wStrLen(const WCHAR *wstr) -{ - PHYSFS_uint64 len = 0; - while (*(wstr++)) - len++; - return(len); -} /* wStrLen */ - -static char *unicodeToUtf8Heap(const WCHAR *w_str) -{ - char *retval = NULL; - if (w_str != NULL) - { - void *ptr = NULL; - const PHYSFS_uint64 len = (wStrLen(w_str) * 4) + 1; - retval = allocator.Malloc(len); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - PHYSFS_utf8FromUcs2((const PHYSFS_uint16 *) w_str, retval, len); - ptr = allocator.Realloc(retval, strlen(retval) + 1); /* shrink. */ - if (ptr != NULL) - retval = (char *) ptr; - } /* if */ - return(retval); -} /* unicodeToUtf8Heap */ - - -static char *codepageToUtf8Heap(const char *cpstr) -{ - char *retval = NULL; - if (cpstr != NULL) - { - const int len = (int) (strlen(cpstr) + 1); - WCHAR *wbuf = (WCHAR *) __PHYSFS_smallAlloc(len * sizeof (WCHAR)); - BAIL_IF_MACRO(wbuf == NULL, ERR_OUT_OF_MEMORY, NULL); - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, cpstr, len, wbuf, len); - retval = (char *) allocator.Malloc(len * 4); - if (retval == NULL) - __PHYSFS_setError(ERR_OUT_OF_MEMORY); - else - PHYSFS_utf8FromUcs2(wbuf, retval, len * 4); - __PHYSFS_smallFree(wbuf); - } /* if */ - return(retval); -} /* codepageToUtf8Heap */ - - -typedef struct -{ - HANDLE handle; - int readonly; -} WinApiFile; - - -static char *userDir = NULL; -static int osHasUnicode = 0; - - -/* pointers for APIs that may not exist on some Windows versions... */ -static HANDLE libKernel32 = NULL; -static HANDLE libUserEnv = NULL; -static HANDLE libAdvApi32 = NULL; -static DWORD (WINAPI *pGetModuleFileNameW)(HMODULE, LPWCH, DWORD); -static BOOL (WINAPI *pGetUserProfileDirectoryW)(HANDLE, LPWSTR, LPDWORD); -static BOOL (WINAPI *pGetUserNameW)(LPWSTR, LPDWORD); -static DWORD (WINAPI *pGetFileAttributesW)(LPCWSTR); -static HANDLE (WINAPI *pFindFirstFileW)(LPCWSTR, LPWIN32_FIND_DATAW); -static BOOL (WINAPI *pFindNextFileW)(HANDLE, LPWIN32_FIND_DATAW); -static DWORD (WINAPI *pGetCurrentDirectoryW)(DWORD, LPWSTR); -static BOOL (WINAPI *pDeleteFileW)(LPCWSTR); -static BOOL (WINAPI *pRemoveDirectoryW)(LPCWSTR); -static BOOL (WINAPI *pCreateDirectoryW)(LPCWSTR, LPSECURITY_ATTRIBUTES); -static BOOL (WINAPI *pGetFileAttributesExA) - (LPCSTR, GET_FILEEX_INFO_LEVELS, LPVOID); -static BOOL (WINAPI *pGetFileAttributesExW) - (LPCWSTR, GET_FILEEX_INFO_LEVELS, LPVOID); -static DWORD (WINAPI *pFormatMessageW) - (DWORD, LPCVOID, DWORD, DWORD, LPWSTR, DWORD, va_list *); -static HANDLE (WINAPI *pCreateFileW) - (LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE); - - -/* - * Fallbacks for missing Unicode functions on Win95/98/ME. These are filled - * into the function pointers if looking up the real Unicode entry points - * in the system DLLs fails, so they're never used on WinNT/XP/Vista/etc. - * They make an earnest effort to convert to/from UTF-8 and UCS-2 to - * the user's current codepage. - */ - -static BOOL WINAPI fallbackGetUserNameW(LPWSTR buf, LPDWORD len) -{ - const DWORD cplen = *len; - char *cpstr = __PHYSFS_smallAlloc(cplen); - BOOL retval = GetUserNameA(cpstr, len); - if (buf != NULL) - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, cpstr, cplen, buf, *len); - __PHYSFS_smallFree(cpstr); - return(retval); -} /* fallbackGetUserNameW */ - -static DWORD WINAPI fallbackFormatMessageW(DWORD dwFlags, LPCVOID lpSource, - DWORD dwMessageId, DWORD dwLangId, - LPWSTR lpBuf, DWORD nSize, - va_list *Arguments) -{ - char *cpbuf = (char *) __PHYSFS_smallAlloc(nSize); - DWORD retval = FormatMessageA(dwFlags, lpSource, dwMessageId, dwLangId, - cpbuf, nSize, Arguments); - if (retval > 0) - MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,cpbuf,retval,lpBuf,nSize); - __PHYSFS_smallFree(cpbuf); - return(retval); -} /* fallbackFormatMessageW */ - -static DWORD WINAPI fallbackGetModuleFileNameW(HMODULE hMod, LPWCH lpBuf, - DWORD nSize) -{ - char *cpbuf = (char *) __PHYSFS_smallAlloc(nSize); - DWORD retval = GetModuleFileNameA(hMod, cpbuf, nSize); - if (retval > 0) - MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,cpbuf,retval,lpBuf,nSize); - __PHYSFS_smallFree(cpbuf); - return(retval); -} /* fallbackGetModuleFileNameW */ - -static DWORD WINAPI fallbackGetFileAttributesW(LPCWSTR fname) -{ - DWORD retval = 0; - const int buflen = (int) (wStrLen(fname) + 1); - char *cpstr = (char *) __PHYSFS_smallAlloc(buflen); - WideCharToMultiByte(CP_ACP, 0, fname, buflen, cpstr, buflen, NULL, NULL); - retval = GetFileAttributesA(cpstr); - __PHYSFS_smallFree(cpstr); - return(retval); -} /* fallbackGetFileAttributesW */ - -static DWORD WINAPI fallbackGetCurrentDirectoryW(DWORD buflen, LPWSTR buf) -{ - DWORD retval = 0; - char *cpbuf = NULL; - if (buf != NULL) - cpbuf = (char *) __PHYSFS_smallAlloc(buflen); - retval = GetCurrentDirectoryA(buflen, cpbuf); - if (cpbuf != NULL) - { - MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,cpbuf,retval,buf,buflen); - __PHYSFS_smallFree(cpbuf); - } /* if */ - return(retval); -} /* fallbackGetCurrentDirectoryW */ - -static BOOL WINAPI fallbackRemoveDirectoryW(LPCWSTR dname) -{ - BOOL retval = 0; - const int buflen = (int) (wStrLen(dname) + 1); - char *cpstr = (char *) __PHYSFS_smallAlloc(buflen); - WideCharToMultiByte(CP_ACP, 0, dname, buflen, cpstr, buflen, NULL, NULL); - retval = RemoveDirectoryA(cpstr); - __PHYSFS_smallFree(cpstr); - return(retval); -} /* fallbackRemoveDirectoryW */ - -static BOOL WINAPI fallbackCreateDirectoryW(LPCWSTR dname, - LPSECURITY_ATTRIBUTES attr) -{ - BOOL retval = 0; - const int buflen = (int) (wStrLen(dname) + 1); - char *cpstr = (char *) __PHYSFS_smallAlloc(buflen); - WideCharToMultiByte(CP_ACP, 0, dname, buflen, cpstr, buflen, NULL, NULL); - retval = CreateDirectoryA(cpstr, attr); - __PHYSFS_smallFree(cpstr); - return(retval); -} /* fallbackCreateDirectoryW */ - -static BOOL WINAPI fallbackDeleteFileW(LPCWSTR fname) -{ - BOOL retval = 0; - const int buflen = (int) (wStrLen(fname) + 1); - char *cpstr = (char *) __PHYSFS_smallAlloc(buflen); - WideCharToMultiByte(CP_ACP, 0, fname, buflen, cpstr, buflen, NULL, NULL); - retval = DeleteFileA(cpstr); - __PHYSFS_smallFree(cpstr); - return(retval); -} /* fallbackDeleteFileW */ - -static HANDLE WINAPI fallbackCreateFileW(LPCWSTR fname, - DWORD dwDesiredAccess, DWORD dwShareMode, - LPSECURITY_ATTRIBUTES lpSecurityAttrs, - DWORD dwCreationDisposition, - DWORD dwFlagsAndAttrs, HANDLE hTemplFile) -{ - HANDLE retval; - const int buflen = (int) (wStrLen(fname) + 1); - char *cpstr = (char *) __PHYSFS_smallAlloc(buflen); - WideCharToMultiByte(CP_ACP, 0, fname, buflen, cpstr, buflen, NULL, NULL); - retval = CreateFileA(cpstr, dwDesiredAccess, dwShareMode, lpSecurityAttrs, - dwCreationDisposition, dwFlagsAndAttrs, hTemplFile); - __PHYSFS_smallFree(cpstr); - return(retval); -} /* fallbackCreateFileW */ - - -#if (PHYSFS_MINIMUM_GCC_VERSION(3,3)) - typedef FARPROC __attribute__((__may_alias__)) PHYSFS_FARPROC; -#else - typedef FARPROC PHYSFS_FARPROC; -#endif - - -static void symLookup(HMODULE dll, PHYSFS_FARPROC *addr, const char *sym, - int reallyLook, PHYSFS_FARPROC fallback) -{ - PHYSFS_FARPROC proc; - proc = (PHYSFS_FARPROC) ((reallyLook) ? GetProcAddress(dll, sym) : NULL); - if (proc == NULL) - proc = fallback; /* may also be NULL. */ - *addr = proc; -} /* symLookup */ - - -static int findApiSymbols(void) -{ - HMODULE dll = NULL; - - #define LOOKUP_NOFALLBACK(x, reallyLook) \ - symLookup(dll, (PHYSFS_FARPROC *) &p##x, #x, reallyLook, NULL) - - #define LOOKUP(x, reallyLook) \ - symLookup(dll, (PHYSFS_FARPROC *) &p##x, #x, \ - reallyLook, (PHYSFS_FARPROC) fallback##x) - - /* Apparently Win9x HAS the Unicode entry points, they just don't WORK. */ - /* ...so don't look them up unless we're on NT+. (see osHasUnicode.) */ - - dll = libUserEnv = LoadLibraryA("userenv.dll"); - if (dll != NULL) - LOOKUP_NOFALLBACK(GetUserProfileDirectoryW, osHasUnicode); - - /* !!! FIXME: what do they call advapi32.dll on Win64? */ - dll = libAdvApi32 = LoadLibraryA("advapi32.dll"); - if (dll != NULL) - LOOKUP(GetUserNameW, osHasUnicode); - - /* !!! FIXME: what do they call kernel32.dll on Win64? */ - dll = libKernel32 = LoadLibraryA("kernel32.dll"); - if (dll != NULL) - { - LOOKUP_NOFALLBACK(GetFileAttributesExA, 1); - LOOKUP_NOFALLBACK(GetFileAttributesExW, osHasUnicode); - LOOKUP_NOFALLBACK(FindFirstFileW, osHasUnicode); - LOOKUP_NOFALLBACK(FindNextFileW, osHasUnicode); - LOOKUP(GetModuleFileNameW, osHasUnicode); - LOOKUP(FormatMessageW, osHasUnicode); - LOOKUP(GetFileAttributesW, osHasUnicode); - LOOKUP(GetCurrentDirectoryW, osHasUnicode); - LOOKUP(CreateDirectoryW, osHasUnicode); - LOOKUP(RemoveDirectoryW, osHasUnicode); - LOOKUP(CreateFileW, osHasUnicode); - LOOKUP(DeleteFileW, osHasUnicode); - } /* if */ - - #undef LOOKUP_NOFALLBACK - #undef LOOKUP - - return(1); -} /* findApiSymbols */ - - -const char *__PHYSFS_platformDirSeparator = "\\"; - - -/* - * Figure out what the last failing Windows API call was, and - * generate a human-readable string for the error message. - * - * The return value is a static buffer that is overwritten with - * each call to this function. - */ -static const char *winApiStrError(void) -{ - static char utf8buf[255]; - WCHAR msgbuf[255]; - WCHAR *ptr; - DWORD rc = pFormatMessageW( - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - msgbuf, __PHYSFS_ARRAYLEN(msgbuf), - NULL); - - if (rc == 0) - msgbuf[0] = '\0'; /* oh well. */ - - /* chop off newlines. */ - for (ptr = msgbuf; *ptr; ptr++) - { - if ((*ptr == '\n') || (*ptr == '\r')) - { - *ptr = '\0'; - break; - } /* if */ - } /* for */ - - /* may truncate, but oh well. */ - PHYSFS_utf8FromUcs2((PHYSFS_uint16 *) msgbuf, utf8buf, sizeof (utf8buf)); - return((const char *) utf8buf); -} /* winApiStrError */ - - -static char *getExePath(void) -{ - DWORD buflen = 64; - LPWSTR modpath = NULL; - char *retval = NULL; - - while (1) - { - DWORD rc; - void *ptr; - - if ( !(ptr = allocator.Realloc(modpath, buflen*sizeof(WCHAR))) ) - { - allocator.Free(modpath); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); - } /* if */ - modpath = (LPWSTR) ptr; - - rc = pGetModuleFileNameW(NULL, modpath, buflen); - if (rc == 0) - { - allocator.Free(modpath); - BAIL_MACRO(winApiStrError(), NULL); - } /* if */ - - if (rc < buflen) - { - buflen = rc; - break; - } /* if */ - - buflen *= 2; - } /* while */ - - if (buflen > 0) /* just in case... */ - { - WCHAR *ptr = (modpath + buflen) - 1; - while (ptr != modpath) - { - if (*ptr == '\\') - break; - ptr--; - } /* while */ - - if ((ptr == modpath) && (*ptr != '\\')) - __PHYSFS_setError(ERR_GETMODFN_NO_DIR); - else - { - *(ptr + 1) = '\0'; /* chop off filename. */ - retval = unicodeToUtf8Heap(modpath); - } /* else */ - } /* else */ - allocator.Free(modpath); - - return(retval); /* w00t. */ -} /* getExePath */ - - -/* - * Try to make use of GetUserProfileDirectoryW(), which isn't available on - * some common variants of Win32. If we can't use this, we just punt and - * use the physfs base dir for the user dir, too. - * - * On success, module-scope variable (userDir) will have a pointer to - * a malloc()'d string of the user's profile dir, and a non-zero value is - * returned. If we can't determine the profile dir, (userDir) will - * be NULL, and zero is returned. - */ -static int determineUserDir(void) -{ - if (userDir != NULL) - return(1); /* already good to go. */ - - /* - * GetUserProfileDirectoryW() is only available on NT 4.0 and later. - * This means Win95/98/ME (and CE?) users have to do without, so for - * them, we'll default to the base directory when we can't get the - * function pointer. Since this is originally an NT API, we don't - * offer a non-Unicode fallback. - */ - if (pGetUserProfileDirectoryW != NULL) - { - HANDLE accessToken = NULL; /* Security handle to process */ - HANDLE processHandle = GetCurrentProcess(); - if (OpenProcessToken(processHandle, TOKEN_QUERY, &accessToken)) - { - DWORD psize = 0; - WCHAR dummy = 0; - LPWSTR wstr = NULL; - BOOL rc = 0; - - /* - * Should fail. Will write the size of the profile path in - * psize. Also note that the second parameter can't be - * NULL or the function fails. - */ - rc = pGetUserProfileDirectoryW(accessToken, &dummy, &psize); - assert(!rc); /* !!! FIXME: handle this gracefully. */ - (void)rc; - - /* Allocate memory for the profile directory */ - wstr = (LPWSTR) __PHYSFS_smallAlloc(psize * sizeof (WCHAR)); - if (wstr != NULL) - { - if (pGetUserProfileDirectoryW(accessToken, wstr, &psize)) - userDir = unicodeToUtf8Heap(wstr); - __PHYSFS_smallFree(wstr); - } /* else */ - } /* if */ - - CloseHandle(accessToken); - } /* if */ - - if (userDir == NULL) /* couldn't get profile for some reason. */ - { - /* Might just be a non-NT system; resort to the basedir. */ - userDir = getExePath(); - BAIL_IF_MACRO(userDir == NULL, NULL, 0); /* STILL failed?! */ - } /* if */ - - return(1); /* We made it: hit the showers. */ -} /* determineUserDir */ - - -static BOOL mediaInDrive(const char *drive) -{ - UINT oldErrorMode; - DWORD tmp; - BOOL retval; - - /* Prevent windows warning message appearing when checking media size */ - oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS); - - /* If this function succeeds, there's media in the drive */ - retval = GetVolumeInformationA(drive, NULL, 0, NULL, NULL, &tmp, NULL, 0); - - /* Revert back to old windows error handler */ - SetErrorMode(oldErrorMode); - - return(retval); -} /* mediaInDrive */ - - -void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) -{ - /* !!! FIXME: Can CD drives be non-drive letter paths? */ - /* !!! FIXME: (so can they be Unicode paths?) */ - char drive_str[4] = "x:\\"; - char ch; - for (ch = 'A'; ch <= 'Z'; ch++) - { - drive_str[0] = ch; - if (GetDriveType(drive_str) == DRIVE_CDROM && mediaInDrive(drive_str)) - cb(data, drive_str); - } /* for */ -} /* __PHYSFS_platformDetectAvailableCDs */ - - -char *__PHYSFS_platformCalcBaseDir(const char *argv0) -{ - if ((argv0 != NULL) && (strchr(argv0, '\\') != NULL)) - return(NULL); /* default behaviour can handle this. */ - - return(getExePath()); -} /* __PHYSFS_platformCalcBaseDir */ - - -char *__PHYSFS_platformGetUserName(void) -{ - DWORD bufsize = 0; - char *retval = NULL; - - if (pGetUserNameW(NULL, &bufsize) == 0) /* This SHOULD fail. */ - { - LPWSTR wbuf = (LPWSTR) __PHYSFS_smallAlloc(bufsize * sizeof (WCHAR)); - BAIL_IF_MACRO(wbuf == NULL, ERR_OUT_OF_MEMORY, NULL); - if (pGetUserNameW(wbuf, &bufsize) == 0) /* ?! */ - __PHYSFS_setError(winApiStrError()); - else - retval = unicodeToUtf8Heap(wbuf); - __PHYSFS_smallFree(wbuf); - } /* if */ - - return(retval); -} /* __PHYSFS_platformGetUserName */ - - -char *__PHYSFS_platformGetUserDir(void) -{ - char *retval = (char *) allocator.Malloc(strlen(userDir) + 1); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - strcpy(retval, userDir); /* calculated at init time. */ - return(retval); -} /* __PHYSFS_platformGetUserDir */ - - -void *__PHYSFS_platformGetThreadID(void) -{ - return( (void *) ((size_t) GetCurrentThreadId()) ); -} /* __PHYSFS_platformGetThreadID */ - - -static int doPlatformExists(LPWSTR wpath) -{ - BAIL_IF_MACRO - ( - pGetFileAttributesW(wpath) == PHYSFS_INVALID_FILE_ATTRIBUTES, - winApiStrError(), 0 - ); - return(1); -} /* doPlatformExists */ - - -int __PHYSFS_platformExists(const char *fname) -{ - int retval = 0; - LPWSTR wpath; - UTF8_TO_UNICODE_STACK_MACRO(wpath, fname); - BAIL_IF_MACRO(wpath == NULL, ERR_OUT_OF_MEMORY, 0); - retval = doPlatformExists(wpath); - __PHYSFS_smallFree(wpath); - return(retval); -} /* __PHYSFS_platformExists */ - - -static int isSymlinkAttrs(const DWORD attr, const DWORD tag) -{ - return ( (attr & FILE_ATTRIBUTE_REPARSE_POINT) && - (tag == PHYSFS_IO_REPARSE_TAG_SYMLINK) ); -} /* isSymlinkAttrs */ - - -int __PHYSFS_platformIsSymLink(const char *fname) -{ - /* !!! FIXME: - * Windows Vista can have NTFS symlinks. Can older Windows releases have - * them when talking to a network file server? What happens when you - * mount a NTFS partition on XP that was plugged into a Vista install - * that made a symlink? - */ - - int retval = 0; - LPWSTR wpath; - HANDLE dir; - WIN32_FIND_DATAW entw; - - /* no unicode entry points? Probably no symlinks. */ - BAIL_IF_MACRO(pFindFirstFileW == NULL, NULL, 0); - - UTF8_TO_UNICODE_STACK_MACRO(wpath, fname); - BAIL_IF_MACRO(wpath == NULL, ERR_OUT_OF_MEMORY, 0); - - /* !!! FIXME: filter wildcard chars? */ - dir = pFindFirstFileW(wpath, &entw); - if (dir != INVALID_HANDLE_VALUE) - { - retval = isSymlinkAttrs(entw.dwFileAttributes, entw.dwReserved0); - FindClose(dir); - } /* if */ - - __PHYSFS_smallFree(wpath); - return(retval); -} /* __PHYSFS_platformIsSymlink */ - - -int __PHYSFS_platformIsDirectory(const char *fname) -{ - int retval = 0; - LPWSTR wpath; - UTF8_TO_UNICODE_STACK_MACRO(wpath, fname); - BAIL_IF_MACRO(wpath == NULL, ERR_OUT_OF_MEMORY, 0); - retval = ((pGetFileAttributesW(wpath) & FILE_ATTRIBUTE_DIRECTORY) != 0); - __PHYSFS_smallFree(wpath); - return(retval); -} /* __PHYSFS_platformIsDirectory */ - - -char *__PHYSFS_platformCvtToDependent(const char *prepend, - const char *dirName, - const char *append) -{ - int len = ((prepend) ? strlen(prepend) : 0) + - ((append) ? strlen(append) : 0) + - strlen(dirName) + 1; - char *retval = (char *) allocator.Malloc(len); - char *p; - - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - - if (prepend) - strcpy(retval, prepend); - else - retval[0] = '\0'; - - strcat(retval, dirName); - - if (append) - strcat(retval, append); - - for (p = strchr(retval, '/'); p != NULL; p = strchr(p + 1, '/')) - *p = '\\'; - - return(retval); -} /* __PHYSFS_platformCvtToDependent */ - - -void __PHYSFS_platformEnumerateFiles(const char *dirname, - int omitSymLinks, - PHYSFS_EnumFilesCallback callback, - const char *origdir, - void *callbackdata) -{ - const int unicode = (pFindFirstFileW != NULL) && (pFindNextFileW != NULL); - HANDLE dir = INVALID_HANDLE_VALUE; - WIN32_FIND_DATA ent; - WIN32_FIND_DATAW entw; - size_t len = strlen(dirname); - char *searchPath = NULL; - WCHAR *wSearchPath = NULL; - char *utf8 = NULL; - - /* Allocate a new string for path, maybe '\\', "*", and NULL terminator */ - searchPath = (char *) __PHYSFS_smallAlloc(len + 3); - if (searchPath == NULL) - return; - - /* Copy current dirname */ - strcpy(searchPath, dirname); - - /* if there's no '\\' at the end of the path, stick one in there. */ - if (searchPath[len - 1] != '\\') - { - searchPath[len++] = '\\'; - searchPath[len] = '\0'; - } /* if */ - - /* Append the "*" to the end of the string */ - strcat(searchPath, "*"); - - UTF8_TO_UNICODE_STACK_MACRO(wSearchPath, searchPath); - if (wSearchPath == NULL) - return; /* oh well. */ - - if (unicode) - dir = pFindFirstFileW(wSearchPath, &entw); - else - { - const int len = (int) (wStrLen(wSearchPath) + 1); - char *cp = (char *) __PHYSFS_smallAlloc(len); - if (cp != NULL) - { - WideCharToMultiByte(CP_ACP, 0, wSearchPath, len, cp, len, 0, 0); - dir = FindFirstFileA(cp, &ent); - __PHYSFS_smallFree(cp); - } /* if */ - } /* else */ - - __PHYSFS_smallFree(wSearchPath); - __PHYSFS_smallFree(searchPath); - if (dir == INVALID_HANDLE_VALUE) - return; - - if (unicode) - { - do - { - const DWORD attr = entw.dwFileAttributes; - const DWORD tag = entw.dwReserved0; - const WCHAR *fn = entw.cFileName; - if ((fn[0] == '.') && (fn[1] == '\0')) - continue; - if ((fn[0] == '.') && (fn[1] == '.') && (fn[2] == '\0')) - continue; - if ((omitSymLinks) && (isSymlinkAttrs(attr, tag))) - continue; - - utf8 = unicodeToUtf8Heap(fn); - if (utf8 != NULL) - { - callback(callbackdata, origdir, utf8); - allocator.Free(utf8); - } /* if */ - } while (pFindNextFileW(dir, &entw) != 0); - } /* if */ - - else /* ANSI fallback. */ - { - do - { - const DWORD attr = ent.dwFileAttributes; - const DWORD tag = ent.dwReserved0; - const char *fn = ent.cFileName; - if ((fn[0] == '.') && (fn[1] == '\0')) - continue; - if ((fn[0] == '.') && (fn[1] == '.') && (fn[2] == '\0')) - continue; - if ((omitSymLinks) && (isSymlinkAttrs(attr, tag))) - continue; - - utf8 = codepageToUtf8Heap(fn); - if (utf8 != NULL) - { - callback(callbackdata, origdir, utf8); - allocator.Free(utf8); - } /* if */ - } while (FindNextFileA(dir, &ent) != 0); - } /* else */ - - FindClose(dir); -} /* __PHYSFS_platformEnumerateFiles */ - - -char *__PHYSFS_platformCurrentDir(void) -{ - char *retval = NULL; - WCHAR *wbuf = NULL; - DWORD buflen = 0; - - buflen = pGetCurrentDirectoryW(buflen, NULL); - wbuf = (WCHAR *) __PHYSFS_smallAlloc((buflen + 2) * sizeof (WCHAR)); - BAIL_IF_MACRO(wbuf == NULL, ERR_OUT_OF_MEMORY, NULL); - pGetCurrentDirectoryW(buflen, wbuf); - - if (wbuf[buflen - 2] == '\\') - wbuf[buflen-1] = '\0'; /* just in case... */ - else - { - wbuf[buflen - 1] = '\\'; - wbuf[buflen] = '\0'; - } /* else */ - - retval = unicodeToUtf8Heap(wbuf); - __PHYSFS_smallFree(wbuf); - return(retval); -} /* __PHYSFS_platformCurrentDir */ - - -/* this could probably use a cleanup. */ -char *__PHYSFS_platformRealPath(const char *path) -{ - /* !!! FIXME: this should return NULL if (path) doesn't exist? */ - /* !!! FIXME: Need to handle symlinks in Vista... */ - /* !!! FIXME: try GetFullPathName() instead? */ - /* this function should be UTF-8 clean. */ - char *retval = NULL; - char *p = NULL; - - BAIL_IF_MACRO(path == NULL, ERR_INVALID_ARGUMENT, NULL); - BAIL_IF_MACRO(*path == '\0', ERR_INVALID_ARGUMENT, NULL); - - retval = (char *) allocator.Malloc(MAX_PATH); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - - /* - * If in \\server\path format, it's already an absolute path. - * We'll need to check for "." and ".." dirs, though, just in case. - */ - if ((path[0] == '\\') && (path[1] == '\\')) - strcpy(retval, path); - - else - { - char *currentDir = __PHYSFS_platformCurrentDir(); - if (currentDir == NULL) - { - allocator.Free(retval); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); - } /* if */ - - if (path[1] == ':') /* drive letter specified? */ - { - /* - * Apparently, "D:mypath" is the same as "D:\\mypath" if - * D: is not the current drive. However, if D: is the - * current drive, then "D:mypath" is a relative path. Ugh. - */ - if (path[2] == '\\') /* maybe an absolute path? */ - strcpy(retval, path); - else /* definitely an absolute path. */ - { - if (path[0] == currentDir[0]) /* current drive; relative. */ - { - strcpy(retval, currentDir); - strcat(retval, path + 2); - } /* if */ - - else /* not current drive; absolute. */ - { - retval[0] = path[0]; - retval[1] = ':'; - retval[2] = '\\'; - strcpy(retval + 3, path + 2); - } /* else */ - } /* else */ - } /* if */ - - else /* no drive letter specified. */ - { - if (path[0] == '\\') /* absolute path. */ - { - retval[0] = currentDir[0]; - retval[1] = ':'; - strcpy(retval + 2, path); - } /* if */ - else - { - strcpy(retval, currentDir); - strcat(retval, path); - } /* else */ - } /* else */ - - allocator.Free(currentDir); - } /* else */ - - /* (whew.) Ok, now take out "." and ".." path entries... */ - - p = retval; - while ( (p = strstr(p, "\\.")) != NULL) - { - /* it's a "." entry that doesn't end the string. */ - if (p[2] == '\\') - memmove(p + 1, p + 3, strlen(p + 3) + 1); - - /* it's a "." entry that ends the string. */ - else if (p[2] == '\0') - p[0] = '\0'; - - /* it's a ".." entry. */ - else if (p[2] == '.') - { - char *prevEntry = p - 1; - while ((prevEntry != retval) && (*prevEntry != '\\')) - prevEntry--; - - if (prevEntry == retval) /* make it look like a "." entry. */ - memmove(p + 1, p + 2, strlen(p + 2) + 1); - else - { - if (p[3] != '\0') /* doesn't end string. */ - *prevEntry = '\0'; - else /* ends string. */ - memmove(prevEntry + 1, p + 4, strlen(p + 4) + 1); - - p = prevEntry; - } /* else */ - } /* else if */ - - else - { - p++; /* look past current char. */ - } /* else */ - } /* while */ - - /* shrink the retval's memory block if possible... */ - p = (char *) allocator.Realloc(retval, strlen(retval) + 1); - if (p != NULL) - retval = p; - - return(retval); -} /* __PHYSFS_platformRealPath */ - - -int __PHYSFS_platformMkDir(const char *path) -{ - WCHAR *wpath; - DWORD rc; - UTF8_TO_UNICODE_STACK_MACRO(wpath, path); - rc = pCreateDirectoryW(wpath, NULL); - __PHYSFS_smallFree(wpath); - BAIL_IF_MACRO(rc == 0, winApiStrError(), 0); - return(1); -} /* __PHYSFS_platformMkDir */ - - - /* - * Get OS info and save the important parts. - * - * Returns non-zero if successful, otherwise it returns zero on failure. - */ -static int getOSInfo(void) -{ - OSVERSIONINFO osVerInfo; /* Information about the OS */ - osVerInfo.dwOSVersionInfoSize = sizeof(osVerInfo); - BAIL_IF_MACRO(!GetVersionEx(&osVerInfo), winApiStrError(), 0); - osHasUnicode = (osVerInfo.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS); - return(1); -} /* getOSInfo */ - - -int __PHYSFS_platformInit(void) -{ - BAIL_IF_MACRO(!getOSInfo(), NULL, 0); - BAIL_IF_MACRO(!findApiSymbols(), NULL, 0); - BAIL_IF_MACRO(!determineUserDir(), NULL, 0); - return(1); /* It's all good */ -} /* __PHYSFS_platformInit */ - - -int __PHYSFS_platformDeinit(void) -{ - HANDLE *libs[] = { &libKernel32, &libUserEnv, &libAdvApi32, NULL }; - int i; - - allocator.Free(userDir); - userDir = NULL; - - for (i = 0; libs[i] != NULL; i++) - { - const HANDLE lib = *(libs[i]); - if (lib) - FreeLibrary(lib); - *(libs[i]) = NULL; - } /* for */ - - return(1); /* It's all good */ -} /* __PHYSFS_platformDeinit */ - - -static void *doOpen(const char *fname, DWORD mode, DWORD creation, int rdonly) -{ - HANDLE fileHandle; - WinApiFile *retval; - WCHAR *wfname; - - UTF8_TO_UNICODE_STACK_MACRO(wfname, fname); - BAIL_IF_MACRO(wfname == NULL, ERR_OUT_OF_MEMORY, NULL); - fileHandle = pCreateFileW(wfname, mode, FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, creation, FILE_ATTRIBUTE_NORMAL, NULL); - __PHYSFS_smallFree(wfname); - - BAIL_IF_MACRO - ( - fileHandle == INVALID_HANDLE_VALUE, - winApiStrError(), NULL - ); - - retval = (WinApiFile *) allocator.Malloc(sizeof (WinApiFile)); - if (retval == NULL) - { - CloseHandle(fileHandle); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); - } /* if */ - - retval->readonly = rdonly; - retval->handle = fileHandle; - return(retval); -} /* doOpen */ - - -void *__PHYSFS_platformOpenRead(const char *filename) -{ - return(doOpen(filename, GENERIC_READ, OPEN_EXISTING, 1)); -} /* __PHYSFS_platformOpenRead */ - - -void *__PHYSFS_platformOpenWrite(const char *filename) -{ - return(doOpen(filename, GENERIC_WRITE, CREATE_ALWAYS, 0)); -} /* __PHYSFS_platformOpenWrite */ - - -void *__PHYSFS_platformOpenAppend(const char *filename) -{ - void *retval = doOpen(filename, GENERIC_WRITE, OPEN_ALWAYS, 0); - if (retval != NULL) - { - HANDLE h = ((WinApiFile *) retval)->handle; - DWORD rc = SetFilePointer(h, 0, NULL, FILE_END); - if (rc == PHYSFS_INVALID_SET_FILE_POINTER) - { - const char *err = winApiStrError(); - CloseHandle(h); - allocator.Free(retval); - BAIL_MACRO(err, NULL); - } /* if */ - } /* if */ - - return(retval); -} /* __PHYSFS_platformOpenAppend */ - - -PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count) -{ - HANDLE Handle = ((WinApiFile *) opaque)->handle; - DWORD CountOfBytesRead; - PHYSFS_sint64 retval; - - /* Read data from the file */ - /* !!! FIXME: uint32 might be a greater # than DWORD */ - if(!ReadFile(Handle, buffer, count * size, &CountOfBytesRead, NULL)) - { - BAIL_MACRO(winApiStrError(), -1); - } /* if */ - else - { - /* Return the number of "objects" read. */ - /* !!! FIXME: What if not the right amount of bytes was read to make an object? */ - retval = CountOfBytesRead / size; - } /* else */ - - return(retval); -} /* __PHYSFS_platformRead */ - - -PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, - PHYSFS_uint32 size, PHYSFS_uint32 count) -{ - HANDLE Handle = ((WinApiFile *) opaque)->handle; - DWORD CountOfBytesWritten; - PHYSFS_sint64 retval; - - /* Read data from the file */ - /* !!! FIXME: uint32 might be a greater # than DWORD */ - if(!WriteFile(Handle, buffer, count * size, &CountOfBytesWritten, NULL)) - { - BAIL_MACRO(winApiStrError(), -1); - } /* if */ - else - { - /* Return the number of "objects" read. */ - /* !!! FIXME: What if not the right number of bytes was written? */ - retval = CountOfBytesWritten / size; - } /* else */ - - return(retval); -} /* __PHYSFS_platformWrite */ - - -int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos) -{ - HANDLE Handle = ((WinApiFile *) opaque)->handle; - LONG HighOrderPos; - PLONG pHighOrderPos; - DWORD rc; - - /* Get the high order 32-bits of the position */ - HighOrderPos = HIGHORDER_UINT64(pos); - - /* - * MSDN: "If you do not need the high-order 32 bits, this - * pointer must be set to NULL." - */ - pHighOrderPos = (HighOrderPos) ? &HighOrderPos : NULL; - - /* - * !!! FIXME: MSDN: "Windows Me/98/95: If the pointer - * !!! FIXME: lpDistanceToMoveHigh is not NULL, then it must - * !!! FIXME: point to either 0, INVALID_SET_FILE_POINTER, or - * !!! FIXME: the sign extension of the value of lDistanceToMove. - * !!! FIXME: Any other value will be rejected." - */ - - /* Move pointer "pos" count from start of file */ - rc = SetFilePointer(Handle, LOWORDER_UINT64(pos), - pHighOrderPos, FILE_BEGIN); - - if ( (rc == PHYSFS_INVALID_SET_FILE_POINTER) && - (GetLastError() != NO_ERROR) ) - { - BAIL_MACRO(winApiStrError(), 0); - } /* if */ - - return(1); /* No error occured */ -} /* __PHYSFS_platformSeek */ - - -PHYSFS_sint64 __PHYSFS_platformTell(void *opaque) -{ - HANDLE Handle = ((WinApiFile *) opaque)->handle; - LONG HighPos = 0; - DWORD LowPos; - PHYSFS_sint64 retval; - - /* Get current position */ - LowPos = SetFilePointer(Handle, 0, &HighPos, FILE_CURRENT); - if ( (LowPos == PHYSFS_INVALID_SET_FILE_POINTER) && - (GetLastError() != NO_ERROR) ) - { - BAIL_MACRO(winApiStrError(), -1); - } /* if */ - else - { - /* Combine the high/low order to create the 64-bit position value */ - retval = (((PHYSFS_uint64) HighPos) << 32) | LowPos; - assert(retval >= 0); - } /* else */ - - return(retval); -} /* __PHYSFS_platformTell */ - - -PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque) -{ - HANDLE Handle = ((WinApiFile *) opaque)->handle; - DWORD SizeHigh; - DWORD SizeLow; - PHYSFS_sint64 retval; - - SizeLow = GetFileSize(Handle, &SizeHigh); - if ( (SizeLow == PHYSFS_INVALID_SET_FILE_POINTER) && - (GetLastError() != NO_ERROR) ) - { - BAIL_MACRO(winApiStrError(), -1); - } /* if */ - else - { - /* Combine the high/low order to create the 64-bit position value */ - retval = (((PHYSFS_uint64) SizeHigh) << 32) | SizeLow; - assert(retval >= 0); - } /* else */ - - return(retval); -} /* __PHYSFS_platformFileLength */ - - -int __PHYSFS_platformEOF(void *opaque) -{ - const PHYSFS_sint64 FileLength = __PHYSFS_platformFileLength(opaque); - PHYSFS_sint64 FilePosition; - int retval = 0; - - if (FileLength == 0) - return 1; /* we're definitely at EOF. */ - - /* Get the current position in the file */ - if ((FilePosition = __PHYSFS_platformTell(opaque)) != -1) - { - /* Non-zero if EOF is equal to the file length */ - retval = (FilePosition == FileLength); - } /* if */ - - return(retval); -} /* __PHYSFS_platformEOF */ - - -int __PHYSFS_platformFlush(void *opaque) -{ - WinApiFile *fh = ((WinApiFile *) opaque); - if (!fh->readonly) - BAIL_IF_MACRO(!FlushFileBuffers(fh->handle), winApiStrError(), 0); - - return(1); -} /* __PHYSFS_platformFlush */ - - -int __PHYSFS_platformClose(void *opaque) -{ - HANDLE Handle = ((WinApiFile *) opaque)->handle; - BAIL_IF_MACRO(!CloseHandle(Handle), winApiStrError(), 0); - allocator.Free(opaque); - return(1); -} /* __PHYSFS_platformClose */ - - -static int doPlatformDelete(LPWSTR wpath) -{ - /* If filename is a folder */ - if (pGetFileAttributesW(wpath) & FILE_ATTRIBUTE_DIRECTORY) - { - BAIL_IF_MACRO(!pRemoveDirectoryW(wpath), winApiStrError(), 0); - } /* if */ - else - { - BAIL_IF_MACRO(!pDeleteFileW(wpath), winApiStrError(), 0); - } /* else */ - - return(1); /* if you made it here, it worked. */ -} /* doPlatformDelete */ - - -int __PHYSFS_platformDelete(const char *path) -{ - int retval = 0; - LPWSTR wpath; - UTF8_TO_UNICODE_STACK_MACRO(wpath, path); - BAIL_IF_MACRO(wpath == NULL, ERR_OUT_OF_MEMORY, 0); - retval = doPlatformDelete(wpath); - __PHYSFS_smallFree(wpath); - return(retval); -} /* __PHYSFS_platformDelete */ - - -/* - * !!! FIXME: why aren't we using Critical Sections instead of Mutexes? - * !!! FIXME: mutexes on Windows are for cross-process sync. CritSects are - * !!! FIXME: mutexes for threads in a single process and are faster. - */ -void *__PHYSFS_platformCreateMutex(void) -{ - return((void *) CreateMutex(NULL, FALSE, NULL)); -} /* __PHYSFS_platformCreateMutex */ - - -void __PHYSFS_platformDestroyMutex(void *mutex) -{ - CloseHandle((HANDLE) mutex); -} /* __PHYSFS_platformDestroyMutex */ - - -int __PHYSFS_platformGrabMutex(void *mutex) -{ - return(WaitForSingleObject((HANDLE) mutex, INFINITE) != WAIT_FAILED); -} /* __PHYSFS_platformGrabMutex */ - - -void __PHYSFS_platformReleaseMutex(void *mutex) -{ - ReleaseMutex((HANDLE) mutex); -} /* __PHYSFS_platformReleaseMutex */ - - -static PHYSFS_sint64 FileTimeToPhysfsTime(const FILETIME *ft) -{ - SYSTEMTIME st_utc; - SYSTEMTIME st_localtz; - TIME_ZONE_INFORMATION tzi; - DWORD tzid; - PHYSFS_sint64 retval; - struct tm tm; - - BAIL_IF_MACRO(!FileTimeToSystemTime(ft, &st_utc), winApiStrError(), -1); - tzid = GetTimeZoneInformation(&tzi); - BAIL_IF_MACRO(tzid == TIME_ZONE_ID_INVALID, winApiStrError(), -1); - - /* (This API is unsupported and fails on non-NT systems. */ - if (!SystemTimeToTzSpecificLocalTime(&tzi, &st_utc, &st_localtz)) - { - /* do it by hand. Grumble... */ - ULARGE_INTEGER ui64; - FILETIME new_ft; - ui64.LowPart = ft->dwLowDateTime; - ui64.HighPart = ft->dwHighDateTime; - - if (tzid == TIME_ZONE_ID_STANDARD) - tzi.Bias += tzi.StandardBias; - else if (tzid == TIME_ZONE_ID_DAYLIGHT) - tzi.Bias += tzi.DaylightBias; - - /* convert from minutes to 100-nanosecond increments... */ - ui64.QuadPart -= (((LONGLONG) tzi.Bias) * (600000000)); - - /* Move it back into a FILETIME structure... */ - new_ft.dwLowDateTime = ui64.LowPart; - new_ft.dwHighDateTime = ui64.HighPart; - - /* Convert to something human-readable... */ - if (!FileTimeToSystemTime(&new_ft, &st_localtz)) - BAIL_MACRO(winApiStrError(), -1); - } /* if */ - - /* Convert to a format that mktime() can grok... */ - tm.tm_sec = st_localtz.wSecond; - tm.tm_min = st_localtz.wMinute; - tm.tm_hour = st_localtz.wHour; - tm.tm_mday = st_localtz.wDay; - tm.tm_mon = st_localtz.wMonth - 1; - tm.tm_year = st_localtz.wYear - 1900; - tm.tm_wday = -1 /*st_localtz.wDayOfWeek*/; - tm.tm_yday = -1; - tm.tm_isdst = -1; - - /* Convert to a format PhysicsFS can grok... */ - retval = (PHYSFS_sint64) mktime(&tm); - BAIL_IF_MACRO(retval == -1, strerror(errno), -1); - return(retval); -} /* FileTimeToPhysfsTime */ - - -PHYSFS_sint64 __PHYSFS_platformGetLastModTime(const char *fname) -{ - PHYSFS_sint64 retval = -1; - WIN32_FILE_ATTRIBUTE_DATA attr; - int rc = 0; - - memset(&attr, '\0', sizeof (attr)); - - /* GetFileAttributesEx didn't show up until Win98 and NT4. */ - if ((pGetFileAttributesExW != NULL) || (pGetFileAttributesExA != NULL)) - { - WCHAR *wstr; - UTF8_TO_UNICODE_STACK_MACRO(wstr, fname); - if (wstr != NULL) /* if NULL, maybe the fallback will work. */ - { - if (pGetFileAttributesExW != NULL) /* NT/XP/Vista/etc system. */ - rc = pGetFileAttributesExW(wstr, GetFileExInfoStandard, &attr); - else /* Win98/ME system */ - { - const int len = (int) (wStrLen(wstr) + 1); - char *cp = (char *) __PHYSFS_smallAlloc(len); - if (cp != NULL) - { - WideCharToMultiByte(CP_ACP, 0, wstr, len, cp, len, 0, 0); - rc = pGetFileAttributesExA(cp, GetFileExInfoStandard, &attr); - __PHYSFS_smallFree(cp); - } /* if */ - } /* else */ - __PHYSFS_smallFree(wstr); - } /* if */ - } /* if */ - - if (rc) /* had API entry point and it worked. */ - { - /* 0 return value indicates an error or not supported */ - if ( (attr.ftLastWriteTime.dwHighDateTime != 0) || - (attr.ftLastWriteTime.dwLowDateTime != 0) ) - { - retval = FileTimeToPhysfsTime(&attr.ftLastWriteTime); - } /* if */ - } /* if */ - - /* GetFileTime() has been in the Win32 API since the start. */ - if (retval == -1) /* try a fallback... */ - { - FILETIME ft; - BOOL rc; - const char *err; - WinApiFile *f = (WinApiFile *) __PHYSFS_platformOpenRead(fname); - BAIL_IF_MACRO(f == NULL, NULL, -1) - rc = GetFileTime(f->handle, NULL, NULL, &ft); - err = winApiStrError(); - CloseHandle(f->handle); - allocator.Free(f); - BAIL_IF_MACRO(!rc, err, -1); - retval = FileTimeToPhysfsTime(&ft); - } /* if */ - - return(retval); -} /* __PHYSFS_platformGetLastModTime */ - - -/* !!! FIXME: Don't use C runtime for allocators? */ -int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a) -{ - return(0); /* just use malloc() and friends. */ -} /* __PHYSFS_platformSetDefaultAllocator */ - -#endif /* PHYSFS_PLATFORM_WINDOWS */ - -/* end of windows.c ... */ - - diff --git a/jni/physfs-2.0.3/test/wxtest_physfs.cpp b/jni/physfs-2.0.3/test/wxtest_physfs.cpp deleted file mode 100644 index 09890e56..00000000 --- a/jni/physfs-2.0.3/test/wxtest_physfs.cpp +++ /dev/null @@ -1,486 +0,0 @@ -/** - * Test program for PhysicsFS, using wxWidgets. May only work on Unix. - * - * Please see the file LICENSE.txt in the source's root directory. - * - * This file written by Ryan C. Gordon. - */ - -#if ( (defined(__MACH__)) && (defined(__APPLE__)) ) -#define PLATFORM_MACOSX 1 -#include -#endif - -#include -#include -#include -#include -#include - -#include -#include - -#include "physfs.h" - -#define TEST_VER_MAJOR 2 -#define TEST_VER_MINOR 0 -#define TEST_VER_PATCH 3 - -//static PHYSFS_uint32 do_buffer_size = 0; - -enum WxTestPhysfsMenuCommands -{ - // start with standard menu items, since using the wxIDs will map them - // to sane things in the platform's UI (gnome icons in GTK+, moves the - // about and quit items to the Apple menu on Mac OS X, etc). - MENUCMD_About = wxID_ABOUT, - MENUCMD_Quit = wxID_EXIT, - - // non-standard menu items go here. - MENUCMD_Init = wxID_HIGHEST, - MENUCMD_Deinit, - MENUCMD_AddArchive, - MENUCMD_Mount, - MENUCMD_Remove, - MENUCMD_GetCDs, - MENUCMD_SetWriteDir, - MENUCMD_PermitSymLinks, - MENUCMD_SetSaneConfig, - MENUCMD_MkDir, - MENUCMD_Delete, - MENUCMD_Cat, - MENUCMD_SetBuffer, - MENUCMD_StressBuffer, - MENUCMD_Append, - MENUCMD_Write, - MENUCMD_GetLastError, - -/* - { "getdirsep", cmd_getdirsep, 0, NULL }, - { "getsearchpath", cmd_getsearchpath, 0, NULL }, - { "getbasedir", cmd_getbasedir, 0, NULL }, - { "getuserdir", cmd_getuserdir, 0, NULL }, - { "getwritedir", cmd_getwritedir, 0, NULL }, - { "getrealdir", cmd_getrealdir, 1, "" }, - { "exists", cmd_exists, 1, "" }, - { "isdir", cmd_isdir, 1, "" }, - { "issymlink", cmd_issymlink, 1, "" }, - { "filelength", cmd_filelength, 1, "" }, - { "getlastmodtime", cmd_getlastmodtime, 1, "" }, -*/ -}; - - -class WxTestPhysfsFrame : public wxFrame -{ -public: - WxTestPhysfsFrame(const wxChar *argv0); - - void rebuildTree(); - - void onMenuInit(wxCommandEvent &evt); - void onMenuDeinit(wxCommandEvent &evt); - void onMenuAddArchive(wxCommandEvent &evt); - void onMenuGetCDs(wxCommandEvent &evt); - void onMenuPermitSymLinks(wxCommandEvent &evt); - -private: - wxTreeCtrl *fileTree; - wxTreeItemId stateItem; - wxTreeItemId fsItem; - - int err(int success); - void fillFileSystemTree(const char *path, const wxTreeItemId &item); - void doInit(const char *argv0); - void doDeinit(); - - DECLARE_EVENT_TABLE() -}; - -BEGIN_EVENT_TABLE(WxTestPhysfsFrame, wxFrame) - EVT_MENU(MENUCMD_Init, WxTestPhysfsFrame::onMenuInit) - EVT_MENU(MENUCMD_Deinit, WxTestPhysfsFrame::onMenuDeinit) - EVT_MENU(MENUCMD_AddArchive, WxTestPhysfsFrame::onMenuAddArchive) - EVT_MENU(MENUCMD_GetCDs, WxTestPhysfsFrame::onMenuGetCDs) - EVT_MENU(MENUCMD_PermitSymLinks, WxTestPhysfsFrame::onMenuPermitSymLinks) -END_EVENT_TABLE() - - - -// This is the the Application itself. -class WxTestPhysfsApp : public wxApp -{ -public: - WxTestPhysfsApp() : mainWindow(NULL) { /* no-op. */ } - virtual bool OnInit(); - -private: - WxTestPhysfsFrame *mainWindow; -}; - -DECLARE_APP(WxTestPhysfsApp) - - -static inline char *newstr(const char *str) -{ - char *retval = NULL; - if (str != NULL) - { - retval = new char[strlen(str) + 1]; - strcpy(retval, str); - } // if - return retval; -} // newstr - -static char *newutf8(const wxString &wxstr) -{ - #if wxUSE_UNICODE - size_t len = wxstr.Len() + 1; - char *utf8text = new char[len * 6]; - wxConvUTF8.WC2MB(utf8text, wxstr, len); - return utf8text; - #else - return newstr(wxstr); - #endif -} // newutf8 - - -WxTestPhysfsFrame::WxTestPhysfsFrame(const wxChar *argv0) - : wxFrame(NULL, -1, wxT("WxTestPhysfs")) -{ - this->CreateStatusBar(); - - wxMenuBar *menuBar = new wxMenuBar; - - wxMenu *stuffMenu = new wxMenu; - stuffMenu->Append(MENUCMD_Init, wxT("&Init")); - stuffMenu->Append(MENUCMD_Deinit, wxT("&Deinit")); - stuffMenu->Append(MENUCMD_AddArchive, wxT("&Add Archive")); - stuffMenu->Append(MENUCMD_Mount, wxT("&Mount Archive")); - stuffMenu->Append(MENUCMD_Remove, wxT("&Remove Archive")); - stuffMenu->Append(MENUCMD_GetCDs, wxT("&Get CD-ROM drives")); - stuffMenu->Append(MENUCMD_SetWriteDir, wxT("&Set Write Dir")); - stuffMenu->Append(MENUCMD_SetSaneConfig, wxT("Set Sane &Config")); - stuffMenu->Append(MENUCMD_MkDir, wxT("M&kDir")); - stuffMenu->Append(MENUCMD_Delete, wxT("D&elete")); - stuffMenu->Append(MENUCMD_Cat, wxT("&Cat")); - stuffMenu->Append(MENUCMD_SetBuffer, wxT("Set &Buffer")); - stuffMenu->Append(MENUCMD_StressBuffer, wxT("Stress &Test Buffer")); - stuffMenu->Append(MENUCMD_Append, wxT("&Append")); - stuffMenu->Append(MENUCMD_Write, wxT("&Write")); - stuffMenu->Append(MENUCMD_Write, wxT("&Update getLastError")); - stuffMenu->AppendCheckItem(MENUCMD_PermitSymLinks, wxT("&Permit symlinks")); - menuBar->Append(stuffMenu, wxT("&Stuff")); - - //wxMenu *helpMenu = new wxMenu; - //helpMenu->Append(MENUCMD_About, wxT("&About\tF1")); - //menuBar->Append(helpMenu, wxT("&Help")); - - this->SetMenuBar(menuBar); - - this->fileTree = new wxTreeCtrl(this, -1); - - // The sizer just makes sure that fileTree owns whole client area. - wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); - sizer->Add(this->fileTree, 1, wxALL | wxEXPAND | wxALIGN_CENTRE); - sizer->SetItemMinSize(this->fileTree, 1, 1); - this->SetSizer(sizer); - - char *utf8argv0 = newutf8(wxString(argv0)); - this->doInit(utf8argv0); - delete[] utf8argv0; -} // WxTestPhysfsFrame::WxTestPhysfsFrame - - -int WxTestPhysfsFrame::err(int success) -{ - if (success) - this->SetStatusText(wxT("")); - else - this->SetStatusText(wxString(PHYSFS_getLastError(), wxConvUTF8)); - return success; -} // WxTestPhysfsFrame::err - - -void WxTestPhysfsFrame::fillFileSystemTree(const char *path, - const wxTreeItemId &item) -{ - char **rc = PHYSFS_enumerateFiles(path); - char **i; - wxTreeItemId id; - - if (rc == NULL) - { - const wxString quote(wxT("'")); - wxString str(wxT("Enumeration error: ")); - str << quote << wxString(PHYSFS_getLastError(), wxConvUTF8) << quote; - id = this->fileTree->AppendItem(item, str); - this->fileTree->SetItemTextColour(id, wxColour(255, 0, 0)); - } // if - else - { - for (i = rc; *i != NULL; i++) - { - id = this->fileTree->AppendItem(item, wxString(*i, wxConvUTF8)); - const int len = strlen(path) + strlen(*i) + 2; - char *fname = new char[len]; - const char *origdir = path; - if (strcmp(origdir, "/") == 0) - origdir = ""; - snprintf(fname, len, "%s/%s", origdir, *i); - - if (PHYSFS_isDirectory(fname)) - { - this->fileTree->SetItemTextColour(id, wxColour(0, 0, 255)); - this->fillFileSystemTree(fname, id); - } // if - - else if (PHYSFS_isSymbolicLink(fname)) - { - this->fileTree->SetItemTextColour(id, wxColour(0, 255, 0)); - } // else if - - else // ...file. - { - } // else - - delete[] fname; - } // for - - PHYSFS_freeList(rc); - } // else -} // fillFileSystemTree - - -void WxTestPhysfsFrame::rebuildTree() -{ - const wxString dot(wxT(".")); - const wxString quote(wxT("'")); - wxTreeItemId item; - wxString str; - const char *cstr = NULL; - const bool wasInit = PHYSFS_isInit() ? true : false; - - this->fileTree->DeleteAllItems(); - wxTreeItemId root = this->fileTree->AddRoot(wxT("PhysicsFS")); - this->stateItem = this->fileTree->AppendItem(root, wxT("Library state")); - - str = wxT("Initialized: "); - str << ((wasInit) ? wxT("true") : wxT("false")); - this->fileTree->AppendItem(this->stateItem, str); - - this->fileTree->Expand(this->stateItem); - this->fileTree->Expand(root); - - // Fill in version information... - - PHYSFS_Version ver; - item = this->stateItem; - str = wxT("wxtest_physfs version: "); - str << TEST_VER_MAJOR << dot << TEST_VER_MINOR << dot << TEST_VER_PATCH; - this->fileTree->AppendItem(item, str); - PHYSFS_VERSION(&ver); - str = wxT("Compiled against PhysicsFS version: "); - str << (int) ver.major << dot << (int) ver.minor << dot << ver.patch; - this->fileTree->AppendItem(item, str); - PHYSFS_getLinkedVersion(&ver); - str = wxT("Linked against PhysicsFS version: "); - str << (int) ver.major << dot << (int) ver.minor << dot << ver.patch; - this->fileTree->AppendItem(item, str); - - if (!wasInit) - return; // nothing else to do before initialization... - - str = wxT("Symbolic links permitted: "); - str << ((PHYSFS_symbolicLinksPermitted()) ? wxT("true") : wxT("false")); - this->fileTree->AppendItem(this->stateItem, str); - - str = wxT("Native directory separator: "); - str << quote << wxString(PHYSFS_getDirSeparator(), wxConvUTF8) << quote; - this->fileTree->AppendItem(this->stateItem, str); - - // Fill in supported archives... - - item = this->fileTree->AppendItem(this->stateItem, wxT("Archivers")); - const PHYSFS_ArchiveInfo **arcs = PHYSFS_supportedArchiveTypes(); - if (*arcs == NULL) - this->fileTree->AppendItem(item, wxT("(none)")); - else - { - const PHYSFS_ArchiveInfo **i; - for (i = arcs; *i != NULL; i++) - { - const wxString ext((*i)->extension, wxConvUTF8); - const wxString desc((*i)->description, wxConvUTF8); - const wxString auth((*i)->author, wxConvUTF8); - const wxString url((*i)->url, wxConvUTF8); - wxTreeItemId arcitem = this->fileTree->AppendItem(item, ext); - this->fileTree->AppendItem(arcitem, desc); - this->fileTree->AppendItem(arcitem, auth); - this->fileTree->AppendItem(arcitem, url); - } // for - } // else - - - // Fill in the standard paths... - - item = this->fileTree->AppendItem(this->stateItem, wxT("Paths")); - str = wxT("Base directory: "); - str << quote << wxString(PHYSFS_getBaseDir(), wxConvUTF8) << quote; - this->fileTree->AppendItem(item, str); - str = wxT("User directory: "); - str << quote << wxString(PHYSFS_getUserDir(), wxConvUTF8) << quote; - this->fileTree->AppendItem(item, str); - str = wxT("Write directory: "); - if ((cstr = PHYSFS_getWriteDir()) == NULL) - str << wxT("(NULL)"); - else - str << quote << wxString(cstr ? cstr : "(NULL)", wxConvUTF8) << quote; - this->fileTree->AppendItem(item, str); - //str = wxT("Preference directory: "); - //str << wxString(PHYSFS_getUserDir(), wxConvUTF8); - //this->fileTree->AppendItem(item, str); - - // Fill in the CD-ROMs... - - item = this->fileTree->AppendItem(this->stateItem, wxT("CD-ROMs")); - char **cds = PHYSFS_getCdRomDirs(); - if (cds == NULL) - { - str = wxT("Error: "); - str << quote << wxString(PHYSFS_getLastError(), wxConvUTF8) << quote; - wxTreeItemId id = this->fileTree->AppendItem(item, str); - this->fileTree->SetItemTextColour(id, wxColour(255, 0, 0)); - } // if - else - { - if (*cds == NULL) - this->fileTree->AppendItem(item, wxT("(none)")); - else - { - char **i; - for (i = cds; *i != NULL; i++) - this->fileTree->AppendItem(item, wxString(*i, wxConvUTF8)); - } // else - PHYSFS_freeList(cds); - } // else - - // Fill in search path... - - item = this->fileTree->AppendItem(this->stateItem, wxT("Search path")); - char **sp = PHYSFS_getSearchPath(); - if (sp == NULL) - { - str = wxT("Error: "); - str << quote << wxString(PHYSFS_getLastError(), wxConvUTF8) << quote; - wxTreeItemId id = this->fileTree->AppendItem(item, str); - this->fileTree->SetItemTextColour(id, wxColour(255, 0, 0)); - } // if - else - { - if (*sp == NULL) - this->fileTree->AppendItem(item, wxT("(none)")); - else - { - char **i; - for (i = sp; *i != NULL; i++) - this->fileTree->AppendItem(item, wxString(*i, wxConvUTF8)); - } // else - PHYSFS_freeList(sp); - } // else - - // Now fill in the filesystem... - - this->fsItem = this->fileTree->AppendItem(root, wxT("Filesystem")); - this->fillFileSystemTree("/", this->fsItem); - this->fileTree->Expand(this->fsItem); -} // WxTestPhysfsFrame::rebuildTree - - -void WxTestPhysfsFrame::doInit(const char *argv0) -{ - if (!this->err(PHYSFS_init(argv0))) - ::wxMessageBox(wxT("PHYSFS_init() failed!"), wxT("wxTestPhysfs")); - this->rebuildTree(); -} // WxTestPhysfsFrame::doInit - - -void WxTestPhysfsFrame::doDeinit() -{ - if (!this->err(PHYSFS_deinit())) - ::wxMessageBox(wxT("PHYSFS_deinit() failed!"), wxT("wxTestPhysfs")); - this->rebuildTree(); -} // WxTestPhysfsFrame::doDeinit - - -void WxTestPhysfsFrame::onMenuInit(wxCommandEvent &evt) -{ - wxString argv0(wxGetApp().argv[0] == NULL ? wxT("") : wxGetApp().argv[0]); - wxString str(wxGetTextFromUser(wxT("PHYSFS_init"), - wxT("argv[0]? (cancel for NULL)"), argv0)); - char *cstr = str.IsEmpty() ? NULL : newutf8(str); - this->doInit(cstr); - delete[] cstr; -} // WxTestPhysfsFrame::onMenuInit - - -void WxTestPhysfsFrame::onMenuDeinit(wxCommandEvent &evt) -{ - this->doDeinit(); -} // WxTestPhysfsFrame::onMenuDeinit - - -void WxTestPhysfsFrame::onMenuAddArchive(wxCommandEvent &evt) -{ - wxString arc = wxFileSelector(wxT("Choose archive to add")); - if (!arc.IsEmpty()) - { - char *cstr = newutf8(arc); - // !!! FIXME: add to start/end? - if (!this->err(PHYSFS_addToSearchPath(cstr, 1))) - ::wxMessageBox(wxT("PHYSFS_addToSearchPath() failed!"), wxT("wxTestPhysfs")); - delete[] cstr; - this->rebuildTree(); - } // if -} // WxTestPhysfsFrame::onMenuAddArchive - - -void WxTestPhysfsFrame::onMenuGetCDs(wxCommandEvent &evt) -{ - this->rebuildTree(); // This will call PHYSFS_getCdRomDirs()... -} // WxTestPhysfsFrame::onMenuGetCDs - - -void WxTestPhysfsFrame::onMenuPermitSymLinks(wxCommandEvent &evt) -{ - PHYSFS_permitSymbolicLinks(evt.IsChecked() ? 1 : 0); - this->rebuildTree(); -} // WxTestPhysfsFrame::onMenuPermitSymLinks - - - -IMPLEMENT_APP(WxTestPhysfsApp) - -bool WxTestPhysfsApp::OnInit() -{ - #if PLATFORM_MACOSX - // This lets a stdio app become a GUI app. Otherwise, you won't get - // GUI events from the system and other things will fail to work. - // Putting the app in an application bundle does the same thing. - // TransformProcessType() is a 10.3+ API. SetFrontProcess() is 10.0+. - if (TransformProcessType != NULL) // check it as a weak symbol. - { - ProcessSerialNumber psn = { 0, kCurrentProcess }; - TransformProcessType(&psn, kProcessTransformToForegroundApplication); - SetFrontProcess(&psn); - } // if - #endif - - this->mainWindow = new WxTestPhysfsFrame(this->argv[0]); - this->mainWindow->Show(true); - SetTopWindow(this->mainWindow); - return true; -} // WxTestPhysfsApp::OnInit - -// end of wxtest_physfs.cpp ... - diff --git a/jni/physfs-2.0.3/zlib123/README b/jni/physfs-2.0.3/zlib123/README deleted file mode 100644 index 758cc500..00000000 --- a/jni/physfs-2.0.3/zlib123/README +++ /dev/null @@ -1,125 +0,0 @@ -ZLIB DATA COMPRESSION LIBRARY - -zlib 1.2.3 is a general purpose data compression library. All the code is -thread safe. The data format used by the zlib library is described by RFCs -(Request for Comments) 1950 to 1952 in the files -http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) -and rfc1952.txt (gzip format). These documents are also available in other -formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html - -All functions of the compression library are documented in the file zlib.h -(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example -of the library is given in the file example.c which also tests that the library -is working correctly. Another example is given in the file minigzip.c. The -compression library itself is composed of all source files except example.c and -minigzip.c. - -To compile all files and run the test program, follow the instructions given at -the top of Makefile. In short "make test; make install" should work for most -machines. For Unix: "./configure; make test; make install". For MSDOS, use one -of the special makefiles such as Makefile.msc. For VMS, use make_vms.com. - -Questions about zlib should be sent to , or to Gilles Vollant - for the Windows DLL version. The zlib home page is -http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem, -please check this site to verify that you have the latest version of zlib; -otherwise get the latest version and check whether the problem still exists or -not. - -PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking -for help. - -Mark Nelson wrote an article about zlib for the Jan. 1997 -issue of Dr. Dobb's Journal; a copy of the article is available in -http://dogma.net/markn/articles/zlibtool/zlibtool.htm - -The changes made in version 1.2.3 are documented in the file ChangeLog. - -Unsupported third party contributions are provided in directory "contrib". - -A Java implementation of zlib is available in the Java Development Kit -http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html -See the zlib home page http://www.zlib.org for details. - -A Perl interface to zlib written by Paul Marquess is in the -CPAN (Comprehensive Perl Archive Network) sites -http://www.cpan.org/modules/by-module/Compress/ - -A Python interface to zlib written by A.M. Kuchling is -available in Python 1.5 and later versions, see -http://www.python.org/doc/lib/module-zlib.html - -A zlib binding for TCL written by Andreas Kupries is -availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html - -An experimental package to read and write files in .zip format, written on top -of zlib by Gilles Vollant , is available in the -contrib/minizip directory of zlib. - - -Notes for some targets: - -- For Windows DLL versions, please see win32/DLL_FAQ.txt - -- For 64-bit Irix, deflate.c must be compiled without any optimization. With - -O, one libpng test fails. The test works in 32 bit mode (with the -n32 - compiler flag). The compiler bug has been reported to SGI. - -- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works - when compiled with cc. - -- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is - necessary to get gzprintf working correctly. This is done by configure. - -- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with - other compilers. Use "make test" to check your compiler. - -- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers. - -- For PalmOs, see http://palmzlib.sourceforge.net/ - -- When building a shared, i.e. dynamic library on Mac OS X, the library must be - installed before testing (do "make install" before "make test"), since the - library location is specified in the library. - - -Acknowledgments: - - The deflate format used by zlib was defined by Phil Katz. The deflate - and zlib specifications were written by L. Peter Deutsch. Thanks to all the - people who reported problems and suggested various improvements in zlib; - they are too numerous to cite here. - -Copyright notice: - - (C) 1995-2004 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 - -If you use the zlib library in a product, we would appreciate *not* -receiving lengthy legal documents to sign. The sources are provided -for free but without warranty of any kind. The library has been -entirely written by Jean-loup Gailly and Mark Adler; it does not -include third-party code. - -If you redistribute modified sources, we would appreciate that you include -in the file ChangeLog history information documenting your changes. Please -read the FAQ for more information on the distribution of modified source -versions. diff --git a/jni/physfs-2.0.3/zlib123/adler32.c b/jni/physfs-2.0.3/zlib123/adler32.c deleted file mode 100644 index 007ba262..00000000 --- a/jni/physfs-2.0.3/zlib123/adler32.c +++ /dev/null @@ -1,149 +0,0 @@ -/* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2004 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#define ZLIB_INTERNAL -#include "zlib.h" - -#define BASE 65521UL /* 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) {adler += (buf)[i]; sum2 += adler;} -#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); - -/* use NO_DIVIDE if your processor does not do division in hardware */ -#ifdef NO_DIVIDE -# define MOD(a) \ - do { \ - if (a >= (BASE << 16)) a -= (BASE << 16); \ - if (a >= (BASE << 15)) a -= (BASE << 15); \ - if (a >= (BASE << 14)) a -= (BASE << 14); \ - if (a >= (BASE << 13)) a -= (BASE << 13); \ - if (a >= (BASE << 12)) a -= (BASE << 12); \ - if (a >= (BASE << 11)) a -= (BASE << 11); \ - if (a >= (BASE << 10)) a -= (BASE << 10); \ - if (a >= (BASE << 9)) a -= (BASE << 9); \ - if (a >= (BASE << 8)) a -= (BASE << 8); \ - if (a >= (BASE << 7)) a -= (BASE << 7); \ - if (a >= (BASE << 6)) a -= (BASE << 6); \ - if (a >= (BASE << 5)) a -= (BASE << 5); \ - if (a >= (BASE << 4)) a -= (BASE << 4); \ - if (a >= (BASE << 3)) a -= (BASE << 3); \ - if (a >= (BASE << 2)) a -= (BASE << 2); \ - if (a >= (BASE << 1)) a -= (BASE << 1); \ - if (a >= BASE) a -= BASE; \ - } while (0) -# define MOD4(a) \ - do { \ - if (a >= (BASE << 4)) a -= (BASE << 4); \ - if (a >= (BASE << 3)) a -= (BASE << 3); \ - if (a >= (BASE << 2)) a -= (BASE << 2); \ - if (a >= (BASE << 1)) a -= (BASE << 1); \ - if (a >= BASE) a -= BASE; \ - } while (0) -#else -# define MOD(a) a %= BASE -# define MOD4(a) a %= BASE -#endif - -/* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) - uLong adler; - const Bytef *buf; - uInt len; -{ - unsigned long sum2; - unsigned n; - - /* split Adler-32 into component sums */ - sum2 = (adler >> 16) & 0xffff; - adler &= 0xffff; - - /* in case user likes doing a byte at a time, keep it fast */ - if (len == 1) { - adler += buf[0]; - if (adler >= BASE) - adler -= BASE; - sum2 += adler; - if (sum2 >= BASE) - sum2 -= BASE; - return adler | (sum2 << 16); - } - - /* initial Adler-32 value (deferred check for len == 1 speed) */ - if (buf == Z_NULL) - return 1L; - - /* in case short lengths are provided, keep it somewhat fast */ - if (len < 16) { - while (len--) { - adler += *buf++; - sum2 += adler; - } - if (adler >= BASE) - adler -= BASE; - MOD4(sum2); /* only added so many BASE's */ - return adler | (sum2 << 16); - } - - /* do length NMAX blocks -- requires just one modulo operation */ - while (len >= NMAX) { - len -= NMAX; - n = NMAX / 16; /* NMAX is divisible by 16 */ - do { - DO16(buf); /* 16 sums unrolled */ - buf += 16; - } while (--n); - MOD(adler); - MOD(sum2); - } - - /* do remaining bytes (less than NMAX, still just one modulo) */ - if (len) { /* avoid modulos if none remaining */ - while (len >= 16) { - len -= 16; - DO16(buf); - buf += 16; - } - while (len--) { - adler += *buf++; - sum2 += adler; - } - MOD(adler); - MOD(sum2); - } - - /* return recombined sums */ - return adler | (sum2 << 16); -} - -/* ========================================================================= */ -uLong ZEXPORT adler32_combine(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off_t len2; -{ - unsigned long sum1; - unsigned long sum2; - unsigned rem; - - /* the derivation of this formula is left as an exercise for the reader */ - rem = (unsigned)(len2 % BASE); - sum1 = adler1 & 0xffff; - sum2 = rem * sum1; - MOD(sum2); - sum1 += (adler2 & 0xffff) + BASE - 1; - sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; - if (sum1 > BASE) sum1 -= BASE; - if (sum1 > BASE) sum1 -= BASE; - if (sum2 > (BASE << 1)) sum2 -= (BASE << 1); - if (sum2 > BASE) sum2 -= BASE; - return sum1 | (sum2 << 16); -} diff --git a/jni/physfs-2.0.3/zlib123/compress.c b/jni/physfs-2.0.3/zlib123/compress.c deleted file mode 100644 index df04f014..00000000 --- a/jni/physfs-2.0.3/zlib123/compress.c +++ /dev/null @@ -1,79 +0,0 @@ -/* compress.c -- compress a memory buffer - * Copyright (C) 1995-2003 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#define ZLIB_INTERNAL -#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); -} - -/* =========================================================================== - If the default memLevel or windowBits for deflateInit() is changed, then - this function needs to be updated. - */ -uLong ZEXPORT compressBound (sourceLen) - uLong sourceLen; -{ - return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; -} diff --git a/jni/physfs-2.0.3/zlib123/crc32.c b/jni/physfs-2.0.3/zlib123/crc32.c deleted file mode 100644 index f658a9ef..00000000 --- a/jni/physfs-2.0.3/zlib123/crc32.c +++ /dev/null @@ -1,423 +0,0 @@ -/* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-2005 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - * - * Thanks to Rodney Brown for his contribution of faster - * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing - * tables for updating the shift register in one step with three exclusive-ors - * instead of four steps with four exclusive-ors. This results in about a - * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. - */ - -/* @(#) $Id$ */ - -/* - Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore - protection on the static variables used to control the first-use generation - of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should - first call get_crc_table() to initialize the tables before allowing more than - one thread to use crc32(). - */ - -#ifdef MAKECRCH -# include -# ifndef DYNAMIC_CRC_TABLE -# define DYNAMIC_CRC_TABLE -# endif /* !DYNAMIC_CRC_TABLE */ -#endif /* MAKECRCH */ - -#include "zutil.h" /* for STDC and FAR definitions */ - -#define local static - -/* Find a four-byte integer type for crc32_little() and crc32_big(). */ -#ifndef NOBYFOUR -# ifdef STDC /* need ANSI C limits.h to determine sizes */ -# include -# define BYFOUR -# if (UINT_MAX == 0xffffffffUL) - typedef unsigned int u4; -# else -# if (ULONG_MAX == 0xffffffffUL) - typedef unsigned long u4; -# else -# if (USHRT_MAX == 0xffffffffUL) - typedef unsigned short u4; -# else -# undef BYFOUR /* can't find a four-byte integer type! */ -# endif -# endif -# endif -# endif /* STDC */ -#endif /* !NOBYFOUR */ - -/* Definitions for doing the crc four data bytes at a time. */ -#ifdef BYFOUR -# define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \ - (((w)&0xff00)<<8)+(((w)&0xff)<<24)) - local unsigned long crc32_little OF((unsigned long, - const unsigned char FAR *, unsigned)); - local unsigned long crc32_big OF((unsigned long, - const unsigned char FAR *, unsigned)); -# define TBLS 8 -#else -# define TBLS 1 -#endif /* BYFOUR */ - -/* Local functions for crc concatenation */ -local unsigned long gf2_matrix_times OF((unsigned long *mat, - unsigned long vec)); -local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); - -#ifdef DYNAMIC_CRC_TABLE - -local volatile int crc_table_empty = 1; -local unsigned long FAR crc_table[TBLS][256]; -local void make_crc_table OF((void)); -#ifdef MAKECRCH - local void write_table OF((FILE *, const unsigned long FAR *)); -#endif /* MAKECRCH */ -/* - Generate tables 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 first table is simply the CRC of all possible eight bit values. This is - all the information needed to generate CRCs on data a byte at a time for all - combinations of CRC register values and incoming bytes. The remaining tables - allow for word-at-a-time CRC calculation for both big-endian and little- - endian machines, where a word is four bytes. -*/ -local void make_crc_table() -{ - unsigned long c; - int n, k; - unsigned long poly; /* polynomial exclusive-or pattern */ - /* terms of polynomial defining this crc (except x^32): */ - static volatile int first = 1; /* flag to limit concurrent making */ - static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; - - /* See if another task is already doing this (not thread-safe, but better - than nothing -- significantly reduces duration of vulnerability in - case the advice about DYNAMIC_CRC_TABLE is ignored) */ - if (first) { - first = 0; - - /* make exclusive-or pattern from polynomial (0xedb88320UL) */ - poly = 0UL; - for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++) - poly |= 1UL << (31 - p[n]); - - /* generate a crc for every 8-bit value */ - for (n = 0; n < 256; n++) { - c = (unsigned long)n; - for (k = 0; k < 8; k++) - c = c & 1 ? poly ^ (c >> 1) : c >> 1; - crc_table[0][n] = c; - } - -#ifdef BYFOUR - /* generate crc for each value followed by one, two, and three zeros, - and then the byte reversal of those as well as the first table */ - for (n = 0; n < 256; n++) { - c = crc_table[0][n]; - crc_table[4][n] = REV(c); - for (k = 1; k < 4; k++) { - c = crc_table[0][c & 0xff] ^ (c >> 8); - crc_table[k][n] = c; - crc_table[k + 4][n] = REV(c); - } - } -#endif /* BYFOUR */ - - crc_table_empty = 0; - } - else { /* not first */ - /* wait for the other guy to finish (not efficient, but rare) */ - while (crc_table_empty) - ; - } - -#ifdef MAKECRCH - /* write out CRC tables to crc32.h */ - { - FILE *out; - - out = fopen("crc32.h", "w"); - if (out == NULL) return; - fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); - fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); - fprintf(out, "local const unsigned long FAR "); - fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); - write_table(out, crc_table[0]); -# ifdef BYFOUR - fprintf(out, "#ifdef BYFOUR\n"); - for (k = 1; k < 8; k++) { - fprintf(out, " },\n {\n"); - write_table(out, crc_table[k]); - } - fprintf(out, "#endif\n"); -# endif /* BYFOUR */ - fprintf(out, " }\n};\n"); - fclose(out); - } -#endif /* MAKECRCH */ -} - -#ifdef MAKECRCH -local void write_table(out, table) - FILE *out; - const unsigned long FAR *table; -{ - int n; - - for (n = 0; n < 256; n++) - fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", table[n], - n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); -} -#endif /* MAKECRCH */ - -#else /* !DYNAMIC_CRC_TABLE */ -/* ======================================================================== - * Tables of CRC-32s of all single-byte values, made by make_crc_table(). - */ -#include "crc32.h" -#endif /* DYNAMIC_CRC_TABLE */ - -/* ========================================================================= - * This function can be used by asm versions of crc32() - */ -const unsigned long FAR * ZEXPORT get_crc_table() -{ -#ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) - make_crc_table(); -#endif /* DYNAMIC_CRC_TABLE */ - return (const unsigned long FAR *)crc_table; -} - -/* ========================================================================= */ -#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) -#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 - -/* ========================================================================= */ -unsigned long ZEXPORT crc32(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; -{ - if (buf == Z_NULL) return 0UL; - -#ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) - make_crc_table(); -#endif /* DYNAMIC_CRC_TABLE */ - -#ifdef BYFOUR - if (sizeof(void *) == sizeof(ptrdiff_t)) { - u4 endian; - - endian = 1; - if (*((unsigned char *)(&endian))) - return crc32_little(crc, buf, len); - else - return crc32_big(crc, buf, len); - } -#endif /* BYFOUR */ - crc = crc ^ 0xffffffffUL; - while (len >= 8) { - DO8; - len -= 8; - } - if (len) do { - DO1; - } while (--len); - return crc ^ 0xffffffffUL; -} - -#ifdef BYFOUR - -/* ========================================================================= */ -#define DOLIT4 c ^= *buf4++; \ - c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ - crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] -#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 - -/* ========================================================================= */ -local unsigned long crc32_little(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; -{ - register u4 c; - register const u4 FAR *buf4; - - c = (u4)crc; - c = ~c; - while (len && ((ptrdiff_t)buf & 3)) { - c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); - len--; - } - - buf4 = (const u4 FAR *)(const void FAR *)buf; - while (len >= 32) { - DOLIT32; - len -= 32; - } - while (len >= 4) { - DOLIT4; - len -= 4; - } - buf = (const unsigned char FAR *)buf4; - - if (len) do { - c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); - } while (--len); - c = ~c; - return (unsigned long)c; -} - -/* ========================================================================= */ -#define DOBIG4 c ^= *++buf4; \ - c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ - crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] -#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 - -/* ========================================================================= */ -local unsigned long crc32_big(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; -{ - register u4 c; - register const u4 FAR *buf4; - - c = REV((u4)crc); - c = ~c; - while (len && ((ptrdiff_t)buf & 3)) { - c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); - len--; - } - - buf4 = (const u4 FAR *)(const void FAR *)buf; - buf4--; - while (len >= 32) { - DOBIG32; - len -= 32; - } - while (len >= 4) { - DOBIG4; - len -= 4; - } - buf4++; - buf = (const unsigned char FAR *)buf4; - - if (len) do { - c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); - } while (--len); - c = ~c; - return (unsigned long)(REV(c)); -} - -#endif /* BYFOUR */ - -#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */ - -/* ========================================================================= */ -local unsigned long gf2_matrix_times(mat, vec) - unsigned long *mat; - unsigned long vec; -{ - unsigned long sum; - - sum = 0; - while (vec) { - if (vec & 1) - sum ^= *mat; - vec >>= 1; - mat++; - } - return sum; -} - -/* ========================================================================= */ -local void gf2_matrix_square(square, mat) - unsigned long *square; - unsigned long *mat; -{ - int n; - - for (n = 0; n < GF2_DIM; n++) - square[n] = gf2_matrix_times(mat, mat[n]); -} - -/* ========================================================================= */ -uLong ZEXPORT crc32_combine(crc1, crc2, len2) - uLong crc1; - uLong crc2; - z_off_t len2; -{ - int n; - unsigned long row; - unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ - unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ - - /* degenerate case */ - if (len2 == 0) - return crc1; - - /* put operator for one zero bit in odd */ - odd[0] = 0xedb88320L; /* CRC-32 polynomial */ - row = 1; - for (n = 1; n < GF2_DIM; n++) { - odd[n] = row; - row <<= 1; - } - - /* put operator for two zero bits in even */ - gf2_matrix_square(even, odd); - - /* put operator for four zero bits in odd */ - gf2_matrix_square(odd, even); - - /* apply len2 zeros to crc1 (first square will put the operator for one - zero byte, eight zero bits, in even) */ - do { - /* apply zeros operator for this bit of len2 */ - gf2_matrix_square(even, odd); - if (len2 & 1) - crc1 = gf2_matrix_times(even, crc1); - len2 >>= 1; - - /* if no more bits set, then done */ - if (len2 == 0) - break; - - /* another iteration of the loop with odd and even swapped */ - gf2_matrix_square(odd, even); - if (len2 & 1) - crc1 = gf2_matrix_times(odd, crc1); - len2 >>= 1; - - /* if no more bits set, then done */ - } while (len2 != 0); - - /* return combined crc */ - crc1 ^= crc2; - return crc1; -} diff --git a/jni/physfs-2.0.3/zlib123/crc32.h b/jni/physfs-2.0.3/zlib123/crc32.h deleted file mode 100644 index 8053b611..00000000 --- a/jni/physfs-2.0.3/zlib123/crc32.h +++ /dev/null @@ -1,441 +0,0 @@ -/* crc32.h -- tables for rapid CRC calculation - * Generated automatically by crc32.c - */ - -local const unsigned long FAR crc_table[TBLS][256] = -{ - { - 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, - 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, - 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, - 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, - 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, - 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, - 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, - 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, - 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, - 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, - 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, - 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, - 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, - 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, - 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, - 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, - 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, - 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, - 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, - 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, - 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, - 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, - 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, - 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, - 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, - 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, - 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, - 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, - 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, - 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, - 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, - 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, - 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, - 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, - 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, - 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, - 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, - 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, - 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, - 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, - 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, - 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, - 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, - 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, - 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, - 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, - 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, - 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, - 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, - 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, - 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, - 0x2d02ef8dUL -#ifdef BYFOUR - }, - { - 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, - 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL, - 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, - 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL, - 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, - 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, - 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, - 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, - 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL, - 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, - 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL, - 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, - 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL, - 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, - 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, - 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, - 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, - 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL, - 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, - 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL, - 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, - 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL, - 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, - 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL, - 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, - 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, - 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL, - 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, - 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL, - 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, - 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL, - 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, - 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, - 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, - 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, - 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL, - 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, - 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL, - 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, - 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL, - 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, - 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, - 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, - 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, - 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL, - 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, - 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL, - 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, - 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL, - 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, - 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, - 0x9324fd72UL - }, - { - 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, - 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL, - 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, - 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL, - 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, - 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, - 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, - 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, - 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL, - 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, - 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL, - 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, - 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL, - 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, - 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, - 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, - 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, - 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL, - 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, - 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL, - 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, - 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL, - 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, - 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, - 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, - 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, - 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL, - 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, - 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL, - 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, - 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL, - 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, - 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, - 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, - 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, - 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL, - 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, - 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL, - 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, - 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL, - 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, - 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, - 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, - 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, - 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL, - 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, - 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL, - 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, - 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL, - 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, - 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, - 0xbe9834edUL - }, - { - 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, - 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL, - 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, - 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL, - 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, - 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, - 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, - 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, - 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL, - 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, - 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL, - 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, - 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL, - 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, - 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, - 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, - 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, - 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL, - 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, - 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL, - 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, - 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL, - 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, - 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, - 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, - 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, - 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL, - 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, - 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL, - 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, - 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL, - 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, - 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, - 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, - 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, - 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL, - 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, - 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL, - 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, - 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL, - 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, - 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, - 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, - 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, - 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL, - 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, - 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL, - 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, - 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL, - 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, - 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, - 0xde0506f1UL - }, - { - 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, - 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL, - 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, - 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL, - 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, - 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, - 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, - 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, - 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL, - 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, - 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL, - 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, - 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL, - 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, - 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, - 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, - 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, - 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL, - 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, - 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL, - 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, - 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL, - 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, - 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, - 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, - 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, - 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL, - 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, - 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL, - 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, - 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL, - 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, - 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, - 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, - 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, - 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL, - 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, - 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL, - 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, - 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL, - 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, - 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, - 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, - 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, - 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL, - 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, - 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL, - 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, - 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL, - 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, - 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, - 0x8def022dUL - }, - { - 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, - 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL, - 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, - 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL, - 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, - 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, - 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, - 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, - 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL, - 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, - 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL, - 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, - 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL, - 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, - 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, - 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, - 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, - 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL, - 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, - 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL, - 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, - 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL, - 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, - 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, - 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, - 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, - 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL, - 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, - 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL, - 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, - 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL, - 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, - 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, - 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, - 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, - 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL, - 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, - 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL, - 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, - 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL, - 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, - 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, - 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, - 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, - 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL, - 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, - 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL, - 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, - 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL, - 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, - 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, - 0x72fd2493UL - }, - { - 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, - 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL, - 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, - 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL, - 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, - 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, - 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, - 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, - 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL, - 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, - 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL, - 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, - 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL, - 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, - 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, - 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, - 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, - 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL, - 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, - 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL, - 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, - 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL, - 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, - 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, - 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, - 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, - 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL, - 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, - 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL, - 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, - 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL, - 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, - 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, - 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, - 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, - 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL, - 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, - 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL, - 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, - 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL, - 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, - 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, - 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, - 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, - 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL, - 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, - 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL, - 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, - 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL, - 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, - 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, - 0xed3498beUL - }, - { - 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, - 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL, - 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, - 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL, - 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, - 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, - 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, - 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, - 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL, - 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, - 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL, - 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, - 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL, - 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, - 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, - 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, - 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, - 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL, - 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, - 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL, - 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, - 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL, - 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, - 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, - 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, - 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, - 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL, - 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, - 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL, - 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, - 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL, - 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, - 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, - 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, - 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, - 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL, - 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, - 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL, - 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, - 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL, - 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, - 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, - 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, - 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, - 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL, - 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, - 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL, - 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, - 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL, - 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, - 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, - 0xf10605deUL -#endif - } -}; diff --git a/jni/physfs-2.0.3/zlib123/deflate.c b/jni/physfs-2.0.3/zlib123/deflate.c deleted file mode 100644 index 29ce1f64..00000000 --- a/jni/physfs-2.0.3/zlib123/deflate.c +++ /dev/null @@ -1,1736 +0,0 @@ -/* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2005 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 http://www.ietf.org/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.2.3 Copyright 1995-2005 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)); -#ifndef FASTEST -local block_state deflate_slow OF((deflate_state *s, int flush)); -#endif -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)); -#ifndef FASTEST -#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 -#endif -local uInt longest_match_fast OF((deflate_state *s, IPos cur_match)); - -#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; - -#ifdef FASTEST -local const config configuration_table[2] = { -/* good lazy nice chain */ -/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ -/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ -#else -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}, /* max 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}}; /* max compression */ -#endif - -/* 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 */ - -#ifndef NO_DUMMY_DECL -struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ -#endif - -/* =========================================================================== - * 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)]), \ - match_head = s->prev[(str) & s->w_mask] = 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 wrap = 1; - 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 == (alloc_func)0) { - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; - } - if (strm->zfree == (free_func)0) strm->zfree = zcfree; - -#ifdef FASTEST - if (level != 0) level = 1; -#else - if (level == Z_DEFAULT_COMPRESSION) level = 6; -#endif - - if (windowBits < 0) { /* suppress zlib wrapper */ - wrap = 0; - windowBits = -windowBits; - } -#ifdef GZIP - else if (windowBits > 15) { - wrap = 2; /* write gzip wrapper instead */ - windowBits -= 16; - } -#endif - if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || - windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || - strategy < 0 || strategy > Z_FIXED) { - return Z_STREAM_ERROR; - } - if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ - 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->wrap = wrap; - s->gzhead = Z_NULL; - 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) { - s->status = FINISH_STATE; - 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->wrap == 2 || - (strm->state->wrap == 1 && strm->state->status != INIT_STATE)) - return Z_STREAM_ERROR; - - s = strm->state; - if (s->wrap) - strm->adler = adler32(strm->adler, dictionary, dictLength); - - if (length < MIN_MATCH) return Z_OK; - if (length > MAX_DIST(s)) { - length = MAX_DIST(s); - dictionary += dictLength - length; /* use the tail of the dictionary */ - } - 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 == (alloc_func)0 || strm->zfree == (free_func)0) { - 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->wrap < 0) { - s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ - } - s->status = s->wrap ? INIT_STATE : BUSY_STATE; - strm->adler = -#ifdef GZIP - s->wrap == 2 ? crc32(0L, Z_NULL, 0) : -#endif - adler32(0L, Z_NULL, 0); - s->last_flush = Z_NO_FLUSH; - - _tr_init(s); - lm_init(s); - - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflateSetHeader (strm, head) - z_streamp strm; - gz_headerp head; -{ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - if (strm->state->wrap != 2) return Z_STREAM_ERROR; - strm->state->gzhead = head; - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflatePrime (strm, bits, value) - z_streamp strm; - int bits; - int value; -{ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - strm->state->bi_valid = bits; - strm->state->bi_buf = (ush)(value & ((1 << bits) - 1)); - 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; - -#ifdef FASTEST - if (level != 0) level = 1; -#else - if (level == Z_DEFAULT_COMPRESSION) level = 6; -#endif - if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { - 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; -} - -/* ========================================================================= */ -int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) - z_streamp strm; - int good_length; - int max_lazy; - int nice_length; - int max_chain; -{ - deflate_state *s; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - s = strm->state; - s->good_match = good_length; - s->max_lazy_match = max_lazy; - s->nice_match = nice_length; - s->max_chain_length = max_chain; - return Z_OK; -} - -/* ========================================================================= - * For the default windowBits of 15 and memLevel of 8, this function returns - * a close to exact, as well as small, upper bound on the compressed size. - * They are coded as constants here for a reason--if the #define's are - * changed, then this function needs to be changed as well. The return - * value for 15 and 8 only works for those exact settings. - * - * For any setting other than those defaults for windowBits and memLevel, - * the value returned is a conservative worst case for the maximum expansion - * resulting from using fixed blocks instead of stored blocks, which deflate - * can emit on compressed data for some combinations of the parameters. - * - * This function could be more sophisticated to provide closer upper bounds - * for every combination of windowBits and memLevel, as well as wrap. - * But even the conservative upper bound of about 14% expansion does not - * seem onerous for output buffer allocation. - */ -uLong ZEXPORT deflateBound(strm, sourceLen) - z_streamp strm; - uLong sourceLen; -{ - deflate_state *s; - uLong destLen; - - /* conservative upper bound */ - destLen = sourceLen + - ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11; - - /* if can't get parameters, return conservative bound */ - if (strm == Z_NULL || strm->state == Z_NULL) - return destLen; - - /* if not default parameters, return conservative bound */ - s = strm->state; - if (s->w_bits != 15 || s->hash_bits != 8 + 7) - return destLen; - - /* default settings: return tight bound for that case */ - return compressBound(sourceLen); -} - -/* ========================================================================= - * 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 header */ - if (s->status == INIT_STATE) { -#ifdef GZIP - if (s->wrap == 2) { - strm->adler = crc32(0L, Z_NULL, 0); - put_byte(s, 31); - put_byte(s, 139); - put_byte(s, 8); - if (s->gzhead == NULL) { - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, OS_CODE); - s->status = BUSY_STATE; - } - else { - put_byte(s, (s->gzhead->text ? 1 : 0) + - (s->gzhead->hcrc ? 2 : 0) + - (s->gzhead->extra == Z_NULL ? 0 : 4) + - (s->gzhead->name == Z_NULL ? 0 : 8) + - (s->gzhead->comment == Z_NULL ? 0 : 16) - ); - put_byte(s, (Byte)(s->gzhead->time & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, s->gzhead->os & 0xff); - if (s->gzhead->extra != NULL) { - put_byte(s, s->gzhead->extra_len & 0xff); - put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); - } - if (s->gzhead->hcrc) - strm->adler = crc32(strm->adler, s->pending_buf, - s->pending); - s->gzindex = 0; - s->status = EXTRA_STATE; - } - } - else -#endif - { - uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; - uInt level_flags; - - if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) - level_flags = 0; - else if (s->level < 6) - level_flags = 1; - else if (s->level == 6) - level_flags = 2; - else - 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 = adler32(0L, Z_NULL, 0); - } - } -#ifdef GZIP - if (s->status == EXTRA_STATE) { - if (s->gzhead->extra != NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - - while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) - break; - } - put_byte(s, s->gzhead->extra[s->gzindex]); - s->gzindex++; - } - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (s->gzindex == s->gzhead->extra_len) { - s->gzindex = 0; - s->status = NAME_STATE; - } - } - else - s->status = NAME_STATE; - } - if (s->status == NAME_STATE) { - if (s->gzhead->name != NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->name[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) { - s->gzindex = 0; - s->status = COMMENT_STATE; - } - } - else - s->status = COMMENT_STATE; - } - if (s->status == COMMENT_STATE) { - if (s->gzhead->comment != NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->comment[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) - s->status = HCRC_STATE; - } - else - s->status = HCRC_STATE; - } - if (s->status == HCRC_STATE) { - if (s->gzhead->hcrc) { - if (s->pending + 2 > s->pending_buf_size) - flush_pending(strm); - if (s->pending + 2 <= s->pending_buf_size) { - put_byte(s, (Byte)(strm->adler & 0xff)); - put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); - strm->adler = crc32(0L, Z_NULL, 0); - s->status = BUSY_STATE; - } - } - else - s->status = BUSY_STATE; - } -#endif - - /* 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_BUF_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->wrap <= 0) return Z_STREAM_END; - - /* Write the trailer */ -#ifdef GZIP - if (s->wrap == 2) { - put_byte(s, (Byte)(strm->adler & 0xff)); - put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); - put_byte(s, (Byte)((strm->adler >> 16) & 0xff)); - put_byte(s, (Byte)((strm->adler >> 24) & 0xff)); - put_byte(s, (Byte)(strm->total_in & 0xff)); - put_byte(s, (Byte)((strm->total_in >> 8) & 0xff)); - put_byte(s, (Byte)((strm->total_in >> 16) & 0xff)); - put_byte(s, (Byte)((strm->total_in >> 24) & 0xff)); - } - else -#endif - { - 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. - */ - if (s->wrap > 0) s->wrap = -s->wrap; /* 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 != EXTRA_STATE && - status != NAME_STATE && - status != COMMENT_STATE && - status != HCRC_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; - - zmemcpy(dest, source, sizeof(z_stream)); - - ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); - if (ds == Z_NULL) return Z_MEM_ERROR; - dest->state = (struct internal_state FAR *) ds; - zmemcpy(ds, ss, sizeof(deflate_state)); - 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 /* MAXSEG_64K */ -} - -/* =========================================================================== - * 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->wrap == 1) { - strm->adler = adler32(strm->adler, strm->next_in, len); - } -#ifdef GZIP - else if (strm->state->wrap == 2) { - strm->adler = crc32(strm->adler, strm->next_in, len); - } -#endif - 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; -#ifndef FASTEST -#ifdef ASMV - match_init(); /* initialize the asm code */ -#endif -#endif -} - -#ifndef FASTEST -/* =========================================================================== - * 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. - */ -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. Note that the checks below - * for insufficient lookahead only occur occasionally for performance - * reasons. Therefore uninitialized memory will be accessed, and - * conditional jumps will be made that depend on those values. - * However the length of the match is limited to the lookahead, so - * the output of deflate is not affected by the uninitialized values. - */ -#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 */ -#endif /* FASTEST */ - -/* --------------------------------------------------------------------------- - * Optimized version for level == 1 or strategy == Z_RLE only - */ -local uInt longest_match_fast(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 (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; -} - -#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 /* DEBUG */ - -/* =========================================================================== - * 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 (sizeof(int) <= 2) { - 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 && lookahead == 1 (input done a 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. - */ - 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.) - */ - /* %%% avoid this when Z_RLE */ - 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). - */ -#ifdef FASTEST - if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) || - (s->strategy == Z_RLE && s->strstart - hash_head == 1)) { - s->match_length = longest_match_fast (s, hash_head); - } -#else - if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) { - s->match_length = longest_match (s, hash_head); - } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { - s->match_length = longest_match_fast (s, hash_head); - } -#endif - /* longest_match() or longest_match_fast() 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 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; -} - -#ifndef FASTEST -/* =========================================================================== - * 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->strategy != Z_RLE) { - s->match_length = longest_match (s, hash_head); - } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) { - s->match_length = longest_match_fast (s, hash_head); - } - /* longest_match() or longest_match_fast() sets match_start */ - - if (s->match_length <= 5 && (s->strategy == Z_FILTERED -#if TOO_FAR <= 32767 - || (s->match_length == MIN_MATCH && - s->strstart - s->match_start > TOO_FAR) -#endif - )) { - - /* 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; -} -#endif /* FASTEST */ - -#if 0 -/* =========================================================================== - * For Z_RLE, simply look for runs of bytes, generate matches only of distance - * one. Do not maintain a hash table. (It will be regenerated if this run of - * deflate switches away from Z_RLE.) - */ -local block_state deflate_rle(s, flush) - deflate_state *s; - int flush; -{ - int bflush; /* set if current block must be flushed */ - uInt run; /* length of run */ - uInt max; /* maximum length of run */ - uInt prev; /* byte at distance one to match */ - Bytef *scan; /* scan for end of run */ - - for (;;) { - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the longest encodable run. - */ - if (s->lookahead < MAX_MATCH) { - fill_window(s); - if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) { - return need_more; - } - if (s->lookahead == 0) break; /* flush the current block */ - } - - /* See how many times the previous byte repeats */ - run = 0; - if (s->strstart > 0) { /* if there is a previous byte, that is */ - max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH; - scan = s->window + s->strstart - 1; - prev = *scan++; - do { - if (*scan++ != prev) - break; - } while (++run < max); - } - - /* Emit match if have run of MIN_MATCH or longer, else emit literal */ - if (run >= MIN_MATCH) { - check_match(s, s->strstart, s->strstart - 1, run); - _tr_tally_dist(s, 1, run - MIN_MATCH, bflush); - s->lookahead -= run; - s->strstart += run; - } 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; -} -#endif diff --git a/jni/physfs-2.0.3/zlib123/deflate.h b/jni/physfs-2.0.3/zlib123/deflate.h deleted file mode 100644 index 05a5ab3a..00000000 --- a/jni/physfs-2.0.3/zlib123/deflate.h +++ /dev/null @@ -1,331 +0,0 @@ -/* deflate.h -- internal compression state - * Copyright (C) 1995-2004 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" - -/* define NO_GZIP when compiling if you want to disable gzip header and - trailer creation by deflate(). NO_GZIP would be used to avoid linking in - the crc code when it is not needed. For shared libraries, gzip encoding - should be left enabled. */ -#ifndef NO_GZIP -# define GZIP -#endif - -/* =========================================================================== - * 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 EXTRA_STATE 69 -#define NAME_STATE 73 -#define COMMENT_STATE 91 -#define HCRC_STATE 103 -#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 */ - uInt pending; /* nb of bytes in the pending buffer */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ - gz_headerp gzhead; /* gzip header information to write */ - uInt gzindex; /* where in extra, name, or comment */ - 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 /* DEFLATE_H */ diff --git a/jni/physfs-2.0.3/zlib123/gzio.c b/jni/physfs-2.0.3/zlib123/gzio.c deleted file mode 100644 index 7e90f492..00000000 --- a/jni/physfs-2.0.3/zlib123/gzio.c +++ /dev/null @@ -1,1026 +0,0 @@ -/* gzio.c -- IO on .gz files - * Copyright (C) 1995-2005 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - * - * Compile this file with -DNO_GZCOMPRESS to avoid the compression code. - */ - -/* @(#) $Id$ */ - -#include - -#include "zutil.h" - -#ifdef NO_DEFLATE /* for compatibility with old definition */ -# define NO_GZCOMPRESS -#endif - -#ifndef NO_DUMMY_DECL -struct internal_state {int dummy;}; /* for buggy compilers */ -#endif - -#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 - -#ifdef __MVS__ -# pragma map (fdopen , "\174\174FDOPEN") - FILE *fdopen(int, const char *); -#endif - -#ifndef STDC -extern voidp malloc OF((uInt size)); -extern void free OF((voidpf ptr)); -#endif - -#define ALLOC(size) malloc(size) -#define TRYFREE(p) {if (p) free(p);} - -static int const 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' */ - z_off_t start; /* start of compressed data in file (header skipped) */ - z_off_t in; /* bytes into deflate or inflate */ - z_off_t out; /* bytes out of deflate or inflate */ - int back; /* one character push-back */ - int last; /* true if push-back is last character */ -} 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 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). -*/ -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->in = 0; - s->out = 0; - s->back = EOF; - 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 if (*p == 'R') { - strategy = Z_RLE; - } 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_GZCOMPRESS - 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->start = 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 - * start anyway in write mode, so this initialization is not - * necessary. - */ - } else { - check_header(s); /* skip the .gz header */ - s->start = 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[46]; /* allow for up to 128-bit integers */ - - 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 = (uInt)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; - - /* Assure two bytes in the buffer so we can peek ahead -- handle case - where first byte of header is at the end of the buffer after the last - gzip segment */ - len = s->stream.avail_in; - if (len < 2) { - if (len) s->inbuf[0] = s->stream.next_in[0]; - errno = 0; - len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file); - if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO; - s->stream.avail_in += len; - s->stream.next_in = s->inbuf; - if (s->stream.avail_in < 2) { - s->transparent = s->stream.avail_in; - return; - } - } - - /* Peek ahead to check the gzip magic header */ - if (s->stream.next_in[0] != gz_magic[0] || - s->stream.next_in[1] != gz_magic[1]) { - s->transparent = 1; - return; - } - s->stream.avail_in -= 2; - s->stream.next_in += 2; - - /* Check the rest of the gzip header */ - 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_GZCOMPRESS - 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; - - if (s->stream.avail_out && s->back != EOF) { - *next_out++ = s->back; - s->stream.next_out++; - s->stream.avail_out--; - s->back = EOF; - s->out++; - start++; - if (s->last) { - s->z_err = Z_STREAM_END; - return 1; - } - } - - 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 -= - (uInt)fread(next_out, 1, s->stream.avail_out, s->file); - } - len -= s->stream.avail_out; - s->in += len; - s->out += 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 = (uInt)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->in += s->stream.avail_in; - s->out += s->stream.avail_out; - s->z_err = inflate(&(s->stream), Z_NO_FLUSH); - s->in -= s->stream.avail_in; - s->out -= s->stream.avail_out; - - 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->out in case of concatenated .gz files. - * Check for such files: - */ - check_header(s); - if (s->z_err == Z_OK) { - inflateReset(&(s->stream)); - 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)); - - if (len == s->stream.avail_out && - (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO)) - return -1; - 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; -} - - -/* =========================================================================== - Push one byte back onto the stream. -*/ -int ZEXPORT gzungetc(c, file) - int c; - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF; - s->back = c; - s->out--; - s->last = (s->z_err == Z_STREAM_END); - if (s->last) s->z_err = Z_OK; - s->z_eof = 0; - return c; -} - - -/* =========================================================================== - 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_GZCOMPRESS -/* =========================================================================== - 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; - voidpc 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->in += s->stream.avail_in; - s->out += s->stream.avail_out; - s->z_err = deflate(&(s->stream), Z_NO_FLUSH); - s->in -= s->stream.avail_in; - s->out -= s->stream.avail_out; - 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; - - buf[sizeof(buf) - 1] = 0; - va_start(va, format); -#ifdef NO_vsnprintf -# ifdef HAS_vsprintf_void - (void)vsprintf(buf, format, va); - va_end(va); - for (len = 0; len < sizeof(buf); len++) - if (buf[len] == 0) break; -# else - len = vsprintf(buf, format, va); - va_end(va); -# endif -#else -# ifdef HAS_vsnprintf_void - (void)vsnprintf(buf, sizeof(buf), format, va); - va_end(va); - len = strlen(buf); -# else - len = vsnprintf(buf, sizeof(buf), format, va); - va_end(va); -# endif -#endif - if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 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; - - buf[sizeof(buf) - 1] = 0; -#ifdef NO_snprintf -# ifdef HAS_sprintf_void - sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); - for (len = 0; len < sizeof(buf); len++) - if (buf[len] == 0) break; -# else - len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -# endif -#else -# ifdef HAS_snprintf_void - 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); - len = strlen(buf); -# else - len = 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); -# endif -#endif - if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 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->out += s->stream.avail_out; - s->z_err = deflate(&(s->stream), flush); - s->out -= s->stream.avail_out; - - /* 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_GZCOMPRESS */ - -/* =========================================================================== - 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_GZCOMPRESS - return -1L; -#else - if (whence == SEEK_SET) { - offset -= s->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 */ - if (s->inbuf == Z_NULL) return -1L; - 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 s->in; -#endif - } - /* Rest of function is for reading only */ - - /* compute absolute position */ - if (whence == SEEK_CUR) { - offset += s->out; - } - if (offset < 0) return -1L; - - if (s->transparent) { - /* map to fseek */ - s->back = EOF; - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - if (fseek(s->file, offset, SEEK_SET) < 0) return -1L; - - s->in = s->out = offset; - return offset; - } - - /* For a negative seek, rewind and use positive seek */ - if (offset >= s->out) { - offset -= s->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); - if (s->outbuf == Z_NULL) return -1L; - } - if (offset && s->back != EOF) { - s->back = EOF; - s->out++; - offset--; - if (s->last) s->z_err = Z_STREAM_END; - } - 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 s->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->back = EOF; - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - s->crc = crc32(0L, Z_NULL, 0); - if (!s->transparent) (void)inflateReset(&s->stream); - s->in = 0; - s->out = 0; - return fseek(s->file, s->start, 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; - - /* With concatenated compressed files that can have embedded - * crc trailers, z_eof is no longer the only/best indicator of EOF - * on a gz_stream. Handle end-of-stream error explicitly here. - */ - if (s == NULL || s->mode != 'r') return 0; - if (s->z_eof) return 1; - return s->z_err == Z_STREAM_END; -} - -/* =========================================================================== - Returns 1 if reading and doing so transparently, otherwise zero. -*/ -int ZEXPORT gzdirect (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'r') return 0; - return s->transparent; -} - -/* =========================================================================== - 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; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL) return Z_STREAM_ERROR; - - if (s->mode == 'w') { -#ifdef NO_GZCOMPRESS - return Z_STREAM_ERROR; -#else - if (do_flush (file, Z_FINISH) != Z_OK) - return destroy((gz_stream*)file); - - putLong (s->file, s->crc); - putLong (s->file, (uLong)(s->in & 0xffffffff)); -#endif - } - return destroy((gz_stream*)file); -} - -#ifdef STDC -# define zstrerror(errnum) strerror(errnum) -#else -# define zstrerror(errnum) "" -#endif - -/* =========================================================================== - 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. -*/ -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); - if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR); - strcpy(s->msg, s->path); - strcat(s->msg, ": "); - strcat(s->msg, m); - return (const char*)s->msg; -} - -/* =========================================================================== - Clear the error and end-of-file flags, and do the same for the real file. -*/ -void ZEXPORT gzclearerr (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL) return; - if (s->z_err != Z_STREAM_END) s->z_err = Z_OK; - s->z_eof = 0; - clearerr(s->file); -} diff --git a/jni/physfs-2.0.3/zlib123/infback.c b/jni/physfs-2.0.3/zlib123/infback.c deleted file mode 100644 index 455dbc9e..00000000 --- a/jni/physfs-2.0.3/zlib123/infback.c +++ /dev/null @@ -1,623 +0,0 @@ -/* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2005 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - This code is largely copied from inflate.c. Normally either infback.o or - inflate.o would be linked into an application--not both. The interface - with inffast.c is retained so that optimized assembler-coded versions of - inflate_fast() can be used with either inflate.c or infback.c. - */ - -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" -#include "inffast.h" - -/* function prototypes */ -local void fixedtables OF((struct inflate_state FAR *state)); - -/* - strm provides memory allocation functions in zalloc and zfree, or - Z_NULL to use the library memory allocation functions. - - windowBits is in the range 8..15, and window is a user-supplied - window and output buffer that is 2**windowBits bytes. - */ -int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) -z_streamp strm; -int windowBits; -unsigned char FAR *window; -const char *version; -int stream_size; -{ - struct inflate_state FAR *state; - - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - stream_size != (int)(sizeof(z_stream))) - return Z_VERSION_ERROR; - if (strm == Z_NULL || window == Z_NULL || - windowBits < 8 || windowBits > 15) - return Z_STREAM_ERROR; - strm->msg = Z_NULL; /* in case we return an error */ - if (strm->zalloc == (alloc_func)0) { - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; - } - if (strm->zfree == (free_func)0) strm->zfree = zcfree; - state = (struct inflate_state FAR *)ZALLOC(strm, 1, - sizeof(struct inflate_state)); - if (state == Z_NULL) return Z_MEM_ERROR; - Tracev((stderr, "inflate: allocated\n")); - strm->state = (struct internal_state FAR *)state; - state->dmax = 32768U; - state->wbits = windowBits; - state->wsize = 1U << windowBits; - state->window = window; - state->write = 0; - state->whave = 0; - return Z_OK; -} - -/* - Return state with length and distance decoding tables and index sizes set to - fixed code decoding. Normally this returns fixed tables from inffixed.h. - If BUILDFIXED is defined, then instead this routine builds the tables the - first time it's called, and returns those tables the first time and - thereafter. This reduces the size of the code by about 2K bytes, in - exchange for a little execution time. However, BUILDFIXED should not be - used for threaded applications, since the rewriting of the tables and virgin - may not be thread-safe. - */ -local void fixedtables(state) -struct inflate_state FAR *state; -{ -#ifdef BUILDFIXED - static int virgin = 1; - static code *lenfix, *distfix; - static code fixed[544]; - - /* build fixed huffman tables if first call (may not be thread safe) */ - if (virgin) { - unsigned sym, bits; - static code *next; - - /* literal/length table */ - sym = 0; - while (sym < 144) state->lens[sym++] = 8; - while (sym < 256) state->lens[sym++] = 9; - while (sym < 280) state->lens[sym++] = 7; - while (sym < 288) state->lens[sym++] = 8; - next = fixed; - lenfix = next; - bits = 9; - inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); - - /* distance table */ - sym = 0; - while (sym < 32) state->lens[sym++] = 5; - distfix = next; - bits = 5; - inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); - - /* do this just once */ - virgin = 0; - } -#else /* !BUILDFIXED */ -# include "inffixed.h" -#endif /* BUILDFIXED */ - state->lencode = lenfix; - state->lenbits = 9; - state->distcode = distfix; - state->distbits = 5; -} - -/* Macros for inflateBack(): */ - -/* Load returned state from inflate_fast() */ -#define LOAD() \ - do { \ - put = strm->next_out; \ - left = strm->avail_out; \ - next = strm->next_in; \ - have = strm->avail_in; \ - hold = state->hold; \ - bits = state->bits; \ - } while (0) - -/* Set state from registers for inflate_fast() */ -#define RESTORE() \ - do { \ - strm->next_out = put; \ - strm->avail_out = left; \ - strm->next_in = next; \ - strm->avail_in = have; \ - state->hold = hold; \ - state->bits = bits; \ - } while (0) - -/* Clear the input bit accumulator */ -#define INITBITS() \ - do { \ - hold = 0; \ - bits = 0; \ - } while (0) - -/* Assure that some input is available. If input is requested, but denied, - then return a Z_BUF_ERROR from inflateBack(). */ -#define PULL() \ - do { \ - if (have == 0) { \ - have = in(in_desc, &next); \ - if (have == 0) { \ - next = Z_NULL; \ - ret = Z_BUF_ERROR; \ - goto inf_leave; \ - } \ - } \ - } while (0) - -/* Get a byte of input into the bit accumulator, or return from inflateBack() - with an error if there is no input available. */ -#define PULLBYTE() \ - do { \ - PULL(); \ - have--; \ - hold += (unsigned long)(*next++) << bits; \ - bits += 8; \ - } while (0) - -/* Assure that there are at least n bits in the bit accumulator. If there is - not enough available input to do that, then return from inflateBack() with - an error. */ -#define NEEDBITS(n) \ - do { \ - while (bits < (unsigned)(n)) \ - PULLBYTE(); \ - } while (0) - -/* Return the low n bits of the bit accumulator (n < 16) */ -#define BITS(n) \ - ((unsigned)hold & ((1U << (n)) - 1)) - -/* Remove n bits from the bit accumulator */ -#define DROPBITS(n) \ - do { \ - hold >>= (n); \ - bits -= (unsigned)(n); \ - } while (0) - -/* Remove zero to seven bits as needed to go to a byte boundary */ -#define BYTEBITS() \ - do { \ - hold >>= bits & 7; \ - bits -= bits & 7; \ - } while (0) - -/* Assure that some output space is available, by writing out the window - if it's full. If the write fails, return from inflateBack() with a - Z_BUF_ERROR. */ -#define ROOM() \ - do { \ - if (left == 0) { \ - put = state->window; \ - left = state->wsize; \ - state->whave = left; \ - if (out(out_desc, put, left)) { \ - ret = Z_BUF_ERROR; \ - goto inf_leave; \ - } \ - } \ - } while (0) - -/* - strm provides the memory allocation functions and window buffer on input, - and provides information on the unused input on return. For Z_DATA_ERROR - returns, strm will also provide an error message. - - in() and out() are the call-back input and output functions. When - inflateBack() needs more input, it calls in(). When inflateBack() has - filled the window with output, or when it completes with data in the - window, it calls out() to write out the data. The application must not - change the provided input until in() is called again or inflateBack() - returns. The application must not change the window/output buffer until - inflateBack() returns. - - in() and out() are called with a descriptor parameter provided in the - inflateBack() call. This parameter can be a structure that provides the - information required to do the read or write, as well as accumulated - information on the input and output such as totals and check values. - - in() should return zero on failure. out() should return non-zero on - failure. If either in() or out() fails, than inflateBack() returns a - Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it - was in() or out() that caused in the error. Otherwise, inflateBack() - returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format - error, or Z_MEM_ERROR if it could not allocate memory for the state. - inflateBack() can also return Z_STREAM_ERROR if the input parameters - are not correct, i.e. strm is Z_NULL or the state was not initialized. - */ -int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) -z_streamp strm; -in_func in; -void FAR *in_desc; -out_func out; -void FAR *out_desc; -{ - struct inflate_state FAR *state; - unsigned char FAR *next; /* next input */ - unsigned char FAR *put; /* next output */ - unsigned have, left; /* available input and output */ - unsigned long hold; /* bit buffer */ - unsigned bits; /* bits in bit buffer */ - unsigned copy; /* number of stored or match bytes to copy */ - unsigned char FAR *from; /* where to copy match bytes from */ - code this; /* current decoding table entry */ - code last; /* parent table entry */ - unsigned len; /* length to copy for repeats, bits to drop */ - int ret; /* return code */ - static const unsigned short order[19] = /* permutation of code lengths */ - {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - - /* Check that the strm exists and that the state was initialized */ - if (strm == Z_NULL || strm->state == Z_NULL) - return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - - /* Reset the state */ - strm->msg = Z_NULL; - state->mode = TYPE; - state->last = 0; - state->whave = 0; - next = strm->next_in; - have = next != Z_NULL ? strm->avail_in : 0; - hold = 0; - bits = 0; - put = state->window; - left = state->wsize; - - /* Inflate until end of block marked as last */ - for (;;) - switch (state->mode) { - case TYPE: - /* determine and dispatch block type */ - if (state->last) { - BYTEBITS(); - state->mode = DONE; - break; - } - NEEDBITS(3); - state->last = BITS(1); - DROPBITS(1); - switch (BITS(2)) { - case 0: /* stored block */ - Tracev((stderr, "inflate: stored block%s\n", - state->last ? " (last)" : "")); - state->mode = STORED; - break; - case 1: /* fixed block */ - fixedtables(state); - Tracev((stderr, "inflate: fixed codes block%s\n", - state->last ? " (last)" : "")); - state->mode = LEN; /* decode codes */ - break; - case 2: /* dynamic block */ - Tracev((stderr, "inflate: dynamic codes block%s\n", - state->last ? " (last)" : "")); - state->mode = TABLE; - break; - case 3: - strm->msg = (char *)"invalid block type"; - state->mode = BAD; - } - DROPBITS(2); - break; - - case STORED: - /* get and verify stored block length */ - BYTEBITS(); /* go to byte boundary */ - NEEDBITS(32); - if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { - strm->msg = (char *)"invalid stored block lengths"; - state->mode = BAD; - break; - } - state->length = (unsigned)hold & 0xffff; - Tracev((stderr, "inflate: stored length %u\n", - state->length)); - INITBITS(); - - /* copy stored block from input to output */ - while (state->length != 0) { - copy = state->length; - PULL(); - ROOM(); - if (copy > have) copy = have; - if (copy > left) copy = left; - zmemcpy(put, next, copy); - have -= copy; - next += copy; - left -= copy; - put += copy; - state->length -= copy; - } - Tracev((stderr, "inflate: stored end\n")); - state->mode = TYPE; - break; - - case TABLE: - /* get dynamic table entries descriptor */ - NEEDBITS(14); - state->nlen = BITS(5) + 257; - DROPBITS(5); - state->ndist = BITS(5) + 1; - DROPBITS(5); - state->ncode = BITS(4) + 4; - DROPBITS(4); -#ifndef PKZIP_BUG_WORKAROUND - if (state->nlen > 286 || state->ndist > 30) { - strm->msg = (char *)"too many length or distance symbols"; - state->mode = BAD; - break; - } -#endif - Tracev((stderr, "inflate: table sizes ok\n")); - - /* get code length code lengths (not a typo) */ - state->have = 0; - while (state->have < state->ncode) { - NEEDBITS(3); - state->lens[order[state->have++]] = (unsigned short)BITS(3); - DROPBITS(3); - } - while (state->have < 19) - state->lens[order[state->have++]] = 0; - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 7; - ret = inflate_table(CODES, state->lens, 19, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid code lengths set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: code lengths ok\n")); - - /* get length and distance code code lengths */ - state->have = 0; - while (state->have < state->nlen + state->ndist) { - for (;;) { - this = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(this.bits) <= bits) break; - PULLBYTE(); - } - if (this.val < 16) { - NEEDBITS(this.bits); - DROPBITS(this.bits); - state->lens[state->have++] = this.val; - } - else { - if (this.val == 16) { - NEEDBITS(this.bits + 2); - DROPBITS(this.bits); - if (state->have == 0) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - len = (unsigned)(state->lens[state->have - 1]); - copy = 3 + BITS(2); - DROPBITS(2); - } - else if (this.val == 17) { - NEEDBITS(this.bits + 3); - DROPBITS(this.bits); - len = 0; - copy = 3 + BITS(3); - DROPBITS(3); - } - else { - NEEDBITS(this.bits + 7); - DROPBITS(this.bits); - len = 0; - copy = 11 + BITS(7); - DROPBITS(7); - } - if (state->have + copy > state->nlen + state->ndist) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - while (copy--) - state->lens[state->have++] = (unsigned short)len; - } - } - - /* handle error breaks in while */ - if (state->mode == BAD) break; - - /* build code tables */ - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 9; - ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid literal/lengths set"; - state->mode = BAD; - break; - } - state->distcode = (code const FAR *)(state->next); - state->distbits = 6; - ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, - &(state->next), &(state->distbits), state->work); - if (ret) { - strm->msg = (char *)"invalid distances set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: codes ok\n")); - state->mode = LEN; - - case LEN: - /* use inflate_fast() if we have enough input and output */ - if (have >= 6 && left >= 258) { - RESTORE(); - if (state->whave < state->wsize) - state->whave = state->wsize - left; - inflate_fast(strm, state->wsize); - LOAD(); - break; - } - - /* get a literal, length, or end-of-block code */ - for (;;) { - this = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(this.bits) <= bits) break; - PULLBYTE(); - } - if (this.op && (this.op & 0xf0) == 0) { - last = this; - for (;;) { - this = state->lencode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + this.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - } - DROPBITS(this.bits); - state->length = (unsigned)this.val; - - /* process literal */ - if (this.op == 0) { - Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", this.val)); - ROOM(); - *put++ = (unsigned char)(state->length); - left--; - state->mode = LEN; - break; - } - - /* process end of block */ - if (this.op & 32) { - Tracevv((stderr, "inflate: end of block\n")); - state->mode = TYPE; - break; - } - - /* invalid code */ - if (this.op & 64) { - strm->msg = (char *)"invalid literal/length code"; - state->mode = BAD; - break; - } - - /* length code -- get extra bits, if any */ - state->extra = (unsigned)(this.op) & 15; - if (state->extra != 0) { - NEEDBITS(state->extra); - state->length += BITS(state->extra); - DROPBITS(state->extra); - } - Tracevv((stderr, "inflate: length %u\n", state->length)); - - /* get distance code */ - for (;;) { - this = state->distcode[BITS(state->distbits)]; - if ((unsigned)(this.bits) <= bits) break; - PULLBYTE(); - } - if ((this.op & 0xf0) == 0) { - last = this; - for (;;) { - this = state->distcode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + this.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - } - DROPBITS(this.bits); - if (this.op & 64) { - strm->msg = (char *)"invalid distance code"; - state->mode = BAD; - break; - } - state->offset = (unsigned)this.val; - - /* get distance extra bits, if any */ - state->extra = (unsigned)(this.op) & 15; - if (state->extra != 0) { - NEEDBITS(state->extra); - state->offset += BITS(state->extra); - DROPBITS(state->extra); - } - if (state->offset > state->wsize - (state->whave < state->wsize ? - left : 0)) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } - Tracevv((stderr, "inflate: distance %u\n", state->offset)); - - /* copy match from window to output */ - do { - ROOM(); - copy = state->wsize - state->offset; - if (copy < left) { - from = put + copy; - copy = left - copy; - } - else { - from = put - state->offset; - copy = left; - } - if (copy > state->length) copy = state->length; - state->length -= copy; - left -= copy; - do { - *put++ = *from++; - } while (--copy); - } while (state->length != 0); - break; - - case DONE: - /* inflate stream terminated properly -- write leftover output */ - ret = Z_STREAM_END; - if (left < state->wsize) { - if (out(out_desc, state->window, state->wsize - left)) - ret = Z_BUF_ERROR; - } - goto inf_leave; - - case BAD: - ret = Z_DATA_ERROR; - goto inf_leave; - - default: /* can't happen, but makes compilers happy */ - ret = Z_STREAM_ERROR; - goto inf_leave; - } - - /* Return unused input */ - inf_leave: - strm->next_in = next; - strm->avail_in = have; - return ret; -} - -int ZEXPORT inflateBackEnd(strm) -z_streamp strm; -{ - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) - return Z_STREAM_ERROR; - ZFREE(strm, strm->state); - strm->state = Z_NULL; - Tracev((stderr, "inflate: end\n")); - return Z_OK; -} diff --git a/jni/physfs-2.0.3/zlib123/inffast.c b/jni/physfs-2.0.3/zlib123/inffast.c deleted file mode 100644 index bbee92ed..00000000 --- a/jni/physfs-2.0.3/zlib123/inffast.c +++ /dev/null @@ -1,318 +0,0 @@ -/* inffast.c -- fast decoding - * Copyright (C) 1995-2004 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" -#include "inffast.h" - -#ifndef ASMINF - -/* Allow machine dependent optimization for post-increment or pre-increment. - Based on testing to date, - Pre-increment preferred for: - - PowerPC G3 (Adler) - - MIPS R5000 (Randers-Pehrson) - Post-increment preferred for: - - none - No measurable difference: - - Pentium III (Anderson) - - M68060 (Nikl) - */ -#ifdef POSTINC -# define OFF 0 -# define PUP(a) *(a)++ -#else -# define OFF 1 -# define PUP(a) *++(a) -#endif - -/* - Decode literal, length, and distance codes and write out the resulting - literal and match bytes until either not enough input or output is - available, an end-of-block is encountered, or a data error is encountered. - When large enough input and output buffers are supplied to inflate(), for - example, a 16K input buffer and a 64K output buffer, more than 95% of the - inflate execution time is spent in this routine. - - Entry assumptions: - - state->mode == LEN - strm->avail_in >= 6 - strm->avail_out >= 258 - start >= strm->avail_out - state->bits < 8 - - On return, state->mode is one of: - - LEN -- ran out of enough output space or enough available input - TYPE -- reached end of block code, inflate() to interpret next block - BAD -- error in block data - - Notes: - - - The maximum input bits used by a length/distance pair is 15 bits for the - length code, 5 bits for the length extra, 15 bits for the distance code, - and 13 bits for the distance extra. This totals 48 bits, or six bytes. - Therefore if strm->avail_in >= 6, then there is enough input to avoid - checking for available input while decoding. - - - The maximum bytes that a single length/distance pair can output is 258 - bytes, which is the maximum length that can be coded. inflate_fast() - requires strm->avail_out >= 258 for each loop to avoid checking for - output space. - */ -void inflate_fast(strm, start) -z_streamp strm; -unsigned start; /* inflate()'s starting value for strm->avail_out */ -{ - struct inflate_state FAR *state; - unsigned char FAR *in; /* local strm->next_in */ - unsigned char FAR *last; /* while in < last, enough input available */ - unsigned char FAR *out; /* local strm->next_out */ - unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ - unsigned char FAR *end; /* while out < end, enough space available */ -#ifdef INFLATE_STRICT - unsigned dmax; /* maximum distance from zlib header */ -#endif - unsigned wsize; /* window size or zero if not using window */ - unsigned whave; /* valid bytes in the window */ - unsigned write; /* window write index */ - unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ - unsigned long hold; /* local strm->hold */ - unsigned bits; /* local strm->bits */ - code const FAR *lcode; /* local strm->lencode */ - code const FAR *dcode; /* local strm->distcode */ - unsigned lmask; /* mask for first level of length codes */ - unsigned dmask; /* mask for first level of distance codes */ - code this; /* retrieved table entry */ - unsigned op; /* code bits, operation, extra bits, or */ - /* window position, window bytes to copy */ - unsigned len; /* match length, unused bytes */ - unsigned dist; /* match distance */ - unsigned char FAR *from; /* where to copy match from */ - - /* copy state to local variables */ - state = (struct inflate_state FAR *)strm->state; - in = strm->next_in - OFF; - last = in + (strm->avail_in - 5); - out = strm->next_out - OFF; - beg = out - (start - strm->avail_out); - end = out + (strm->avail_out - 257); -#ifdef INFLATE_STRICT - dmax = state->dmax; -#endif - wsize = state->wsize; - whave = state->whave; - write = state->write; - window = state->window; - hold = state->hold; - bits = state->bits; - lcode = state->lencode; - dcode = state->distcode; - lmask = (1U << state->lenbits) - 1; - dmask = (1U << state->distbits) - 1; - - /* decode literals and length/distances until end-of-block or not enough - input data or output space */ - do { - if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - this = lcode[hold & lmask]; - dolen: - op = (unsigned)(this.bits); - hold >>= op; - bits -= op; - op = (unsigned)(this.op); - if (op == 0) { /* literal */ - Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", this.val)); - PUP(out) = (unsigned char)(this.val); - } - else if (op & 16) { /* length base */ - len = (unsigned)(this.val); - op &= 15; /* number of extra bits */ - if (op) { - if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - len += (unsigned)hold & ((1U << op) - 1); - hold >>= op; - bits -= op; - } - Tracevv((stderr, "inflate: length %u\n", len)); - if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - this = dcode[hold & dmask]; - dodist: - op = (unsigned)(this.bits); - hold >>= op; - bits -= op; - op = (unsigned)(this.op); - if (op & 16) { /* distance base */ - dist = (unsigned)(this.val); - op &= 15; /* number of extra bits */ - if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - } - dist += (unsigned)hold & ((1U << op) - 1); -#ifdef INFLATE_STRICT - if (dist > dmax) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#endif - hold >>= op; - bits -= op; - Tracevv((stderr, "inflate: distance %u\n", dist)); - op = (unsigned)(out - beg); /* max distance in output */ - if (dist > op) { /* see if copy from window */ - op = dist - op; /* distance back in window */ - if (op > whave) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } - from = window - OFF; - if (write == 0) { /* very common case */ - from += wsize - op; - if (op < len) { /* some from window */ - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = out - dist; /* rest from output */ - } - } - else if (write < op) { /* wrap around window */ - from += wsize + write - op; - op -= write; - if (op < len) { /* some from end of window */ - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = window - OFF; - if (write < len) { /* some from start of window */ - op = write; - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = out - dist; /* rest from output */ - } - } - } - else { /* contiguous in window */ - from += write - op; - if (op < len) { /* some from window */ - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = out - dist; /* rest from output */ - } - } - while (len > 2) { - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); - len -= 3; - } - if (len) { - PUP(out) = PUP(from); - if (len > 1) - PUP(out) = PUP(from); - } - } - else { - from = out - dist; /* copy direct from output */ - do { /* minimum length is three */ - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); - len -= 3; - } while (len > 2); - if (len) { - PUP(out) = PUP(from); - if (len > 1) - PUP(out) = PUP(from); - } - } - } - else if ((op & 64) == 0) { /* 2nd level distance code */ - this = dcode[this.val + (hold & ((1U << op) - 1))]; - goto dodist; - } - else { - strm->msg = (char *)"invalid distance code"; - state->mode = BAD; - break; - } - } - else if ((op & 64) == 0) { /* 2nd level length code */ - this = lcode[this.val + (hold & ((1U << op) - 1))]; - goto dolen; - } - else if (op & 32) { /* end-of-block */ - Tracevv((stderr, "inflate: end of block\n")); - state->mode = TYPE; - break; - } - else { - strm->msg = (char *)"invalid literal/length code"; - state->mode = BAD; - break; - } - } while (in < last && out < end); - - /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ - len = bits >> 3; - in -= len; - bits -= len << 3; - hold &= (1U << bits) - 1; - - /* update state and return */ - strm->next_in = in + OFF; - strm->next_out = out + OFF; - strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); - strm->avail_out = (unsigned)(out < end ? - 257 + (end - out) : 257 - (out - end)); - state->hold = hold; - state->bits = bits; - return; -} - -/* - inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): - - Using bit fields for code structure - - Different op definition to avoid & for extra bits (do & for table bits) - - Three separate decoding do-loops for direct, window, and write == 0 - - Special case for distance > 1 copies to do overlapped load and store copy - - Explicit branch predictions (based on measured branch probabilities) - - Deferring match copy and interspersed it with decoding subsequent codes - - Swapping literal/length else - - Swapping window/direct else - - Larger unrolled copy loops (three is about right) - - Moving len -= 3 statement into middle of loop - */ - -#endif /* !ASMINF */ diff --git a/jni/physfs-2.0.3/zlib123/inffast.h b/jni/physfs-2.0.3/zlib123/inffast.h deleted file mode 100644 index 1e88d2d9..00000000 --- a/jni/physfs-2.0.3/zlib123/inffast.h +++ /dev/null @@ -1,11 +0,0 @@ -/* inffast.h -- header to use inffast.c - * Copyright (C) 1995-2003 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. - */ - -void inflate_fast OF((z_streamp strm, unsigned start)); diff --git a/jni/physfs-2.0.3/zlib123/inffixed.h b/jni/physfs-2.0.3/zlib123/inffixed.h deleted file mode 100644 index 75ed4b59..00000000 --- a/jni/physfs-2.0.3/zlib123/inffixed.h +++ /dev/null @@ -1,94 +0,0 @@ - /* inffixed.h -- table for decoding fixed codes - * Generated automatically by makefixed(). - */ - - /* 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. - */ - - static const code lenfix[512] = { - {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48}, - {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128}, - {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59}, - {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176}, - {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20}, - {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100}, - {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8}, - {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216}, - {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76}, - {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114}, - {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2}, - {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148}, - {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42}, - {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86}, - {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15}, - {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236}, - {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62}, - {0,9,220},{18,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,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31}, - {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162}, - {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25}, - {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105}, - {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4}, - {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202}, - {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69}, - {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125}, - {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13}, - {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195}, - {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35}, - {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91}, - {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19}, - {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246}, - {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55}, - {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135}, - {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99}, - {0,8,127},{0,8,63},{0,9,222},{18,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,0},{0,8,80},{0,8,16}, - {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96}, - {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6}, - {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209}, - {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72}, - {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116}, - {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4}, - {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153}, - {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44}, - {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82}, - {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11}, - {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, - {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58}, - {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138}, - {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51}, - {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173}, - {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30}, - {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,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,0}, - {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195}, - {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65}, - {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121}, - {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9}, - {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258}, - {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37}, - {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93}, - {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23}, - {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251}, - {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51}, - {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, - {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67}, - {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183}, - {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23}, - {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103}, - {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9}, - {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223}, - {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79}, - {0,9,255} - }; - - static const code distfix[32] = { - {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025}, - {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193}, - {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385}, - {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577}, - {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, - {22,5,193},{64,5,0} - }; diff --git a/jni/physfs-2.0.3/zlib123/inflate.c b/jni/physfs-2.0.3/zlib123/inflate.c deleted file mode 100644 index 792fdee8..00000000 --- a/jni/physfs-2.0.3/zlib123/inflate.c +++ /dev/null @@ -1,1368 +0,0 @@ -/* inflate.c -- zlib decompression - * Copyright (C) 1995-2005 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - * Change history: - * - * 1.2.beta0 24 Nov 2002 - * - First version -- complete rewrite of inflate to simplify code, avoid - * creation of window when not needed, minimize use of window when it is - * needed, make inffast.c even faster, implement gzip decoding, and to - * improve code readability and style over the previous zlib inflate code - * - * 1.2.beta1 25 Nov 2002 - * - Use pointers for available input and output checking in inffast.c - * - Remove input and output counters in inffast.c - * - Change inffast.c entry and loop from avail_in >= 7 to >= 6 - * - Remove unnecessary second byte pull from length extra in inffast.c - * - Unroll direct copy to three copies per loop in inffast.c - * - * 1.2.beta2 4 Dec 2002 - * - Change external routine names to reduce potential conflicts - * - Correct filename to inffixed.h for fixed tables in inflate.c - * - Make hbuf[] unsigned char to match parameter type in inflate.c - * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset) - * to avoid negation problem on Alphas (64 bit) in inflate.c - * - * 1.2.beta3 22 Dec 2002 - * - Add comments on state->bits assertion in inffast.c - * - Add comments on op field in inftrees.h - * - Fix bug in reuse of allocated window after inflateReset() - * - Remove bit fields--back to byte structure for speed - * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths - * - Change post-increments to pre-increments in inflate_fast(), PPC biased? - * - Add compile time option, POSTINC, to use post-increments instead (Intel?) - * - Make MATCH copy in inflate() much faster for when inflate_fast() not used - * - Use local copies of stream next and avail values, as well as local bit - * buffer and bit count in inflate()--for speed when inflate_fast() not used - * - * 1.2.beta4 1 Jan 2003 - * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings - * - Move a comment on output buffer sizes from inffast.c to inflate.c - * - Add comments in inffast.c to introduce the inflate_fast() routine - * - Rearrange window copies in inflate_fast() for speed and simplification - * - Unroll last copy for window match in inflate_fast() - * - Use local copies of window variables in inflate_fast() for speed - * - Pull out common write == 0 case for speed in inflate_fast() - * - Make op and len in inflate_fast() unsigned for consistency - * - Add FAR to lcode and dcode declarations in inflate_fast() - * - Simplified bad distance check in inflate_fast() - * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new - * source file infback.c to provide a call-back interface to inflate for - * programs like gzip and unzip -- uses window as output buffer to avoid - * window copying - * - * 1.2.beta5 1 Jan 2003 - * - Improved inflateBack() interface to allow the caller to provide initial - * input in strm. - * - Fixed stored blocks bug in inflateBack() - * - * 1.2.beta6 4 Jan 2003 - * - Added comments in inffast.c on effectiveness of POSTINC - * - Typecasting all around to reduce compiler warnings - * - Changed loops from while (1) or do {} while (1) to for (;;), again to - * make compilers happy - * - Changed type of window in inflateBackInit() to unsigned char * - * - * 1.2.beta7 27 Jan 2003 - * - Changed many types to unsigned or unsigned short to avoid warnings - * - Added inflateCopy() function - * - * 1.2.0 9 Mar 2003 - * - Changed inflateBack() interface to provide separate opaque descriptors - * for the in() and out() functions - * - Changed inflateBack() argument and in_func typedef to swap the length - * and buffer address return values for the input function - * - Check next_in and next_out for Z_NULL on entry to inflate() - * - * The history for versions after 1.2.0 are in ChangeLog in zlib distribution. - */ - -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" -#include "inffast.h" - -#ifdef MAKEFIXED -# ifndef BUILDFIXED -# define BUILDFIXED -# endif -#endif - -/* function prototypes */ -local void fixedtables OF((struct inflate_state FAR *state)); -local int updatewindow OF((z_streamp strm, unsigned out)); -#ifdef BUILDFIXED - void makefixed OF((void)); -#endif -local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, - unsigned len)); - -int ZEXPORT inflateReset(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - strm->total_in = strm->total_out = state->total = 0; - strm->msg = Z_NULL; - strm->adler = 1; /* to support ill-conceived Java test suite */ - state->mode = HEAD; - state->last = 0; - state->havedict = 0; - state->dmax = 32768U; - state->head = Z_NULL; - state->wsize = 0; - state->whave = 0; - state->write = 0; - state->hold = 0; - state->bits = 0; - state->lencode = state->distcode = state->next = state->codes; - Tracev((stderr, "inflate: reset\n")); - return Z_OK; -} - -int ZEXPORT inflatePrime(strm, bits, value) -z_streamp strm; -int bits; -int value; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; - value &= (1L << bits) - 1; - state->hold += value << state->bits; - state->bits += bits; - return Z_OK; -} - -int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) -z_streamp strm; -int windowBits; -const char *version; -int stream_size; -{ - struct inflate_state FAR *state; - - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - stream_size != (int)(sizeof(z_stream))) - return Z_VERSION_ERROR; - if (strm == Z_NULL) return Z_STREAM_ERROR; - strm->msg = Z_NULL; /* in case we return an error */ - if (strm->zalloc == (alloc_func)0) { - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; - } - if (strm->zfree == (free_func)0) strm->zfree = zcfree; - state = (struct inflate_state FAR *) - ZALLOC(strm, 1, sizeof(struct inflate_state)); - if (state == Z_NULL) return Z_MEM_ERROR; - Tracev((stderr, "inflate: allocated\n")); - strm->state = (struct internal_state FAR *)state; - if (windowBits < 0) { - state->wrap = 0; - windowBits = -windowBits; - } - else { - state->wrap = (windowBits >> 4) + 1; -#ifdef GUNZIP - if (windowBits < 48) windowBits &= 15; -#endif - } - if (windowBits < 8 || windowBits > 15) { - ZFREE(strm, state); - strm->state = Z_NULL; - return Z_STREAM_ERROR; - } - state->wbits = (unsigned)windowBits; - state->window = Z_NULL; - return inflateReset(strm); -} - -int ZEXPORT inflateInit_(strm, version, stream_size) -z_streamp strm; -const char *version; -int stream_size; -{ - return inflateInit2_(strm, DEF_WBITS, version, stream_size); -} - -/* - Return state with length and distance decoding tables and index sizes set to - fixed code decoding. Normally this returns fixed tables from inffixed.h. - If BUILDFIXED is defined, then instead this routine builds the tables the - first time it's called, and returns those tables the first time and - thereafter. This reduces the size of the code by about 2K bytes, in - exchange for a little execution time. However, BUILDFIXED should not be - used for threaded applications, since the rewriting of the tables and virgin - may not be thread-safe. - */ -local void fixedtables(state) -struct inflate_state FAR *state; -{ -#ifdef BUILDFIXED - static int virgin = 1; - static code *lenfix, *distfix; - static code fixed[544]; - - /* build fixed huffman tables if first call (may not be thread safe) */ - if (virgin) { - unsigned sym, bits; - static code *next; - - /* literal/length table */ - sym = 0; - while (sym < 144) state->lens[sym++] = 8; - while (sym < 256) state->lens[sym++] = 9; - while (sym < 280) state->lens[sym++] = 7; - while (sym < 288) state->lens[sym++] = 8; - next = fixed; - lenfix = next; - bits = 9; - inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); - - /* distance table */ - sym = 0; - while (sym < 32) state->lens[sym++] = 5; - distfix = next; - bits = 5; - inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); - - /* do this just once */ - virgin = 0; - } -#else /* !BUILDFIXED */ -# include "inffixed.h" -#endif /* BUILDFIXED */ - state->lencode = lenfix; - state->lenbits = 9; - state->distcode = distfix; - state->distbits = 5; -} - -#ifdef MAKEFIXED -#include - -/* - Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also - defines BUILDFIXED, so the tables are built on the fly. makefixed() writes - those tables to stdout, which would be piped to inffixed.h. A small program - can simply call makefixed to do this: - - void makefixed(void); - - int main(void) - { - makefixed(); - return 0; - } - - Then that can be linked with zlib built with MAKEFIXED defined and run: - - a.out > inffixed.h - */ -void makefixed() -{ - unsigned low, size; - struct inflate_state state; - - fixedtables(&state); - puts(" /* inffixed.h -- table for decoding fixed codes"); - puts(" * Generated automatically by makefixed()."); - puts(" */"); - puts(""); - puts(" /* WARNING: this file should *not* be used by applications."); - puts(" It is part of the implementation of this library and is"); - puts(" subject to change. Applications should only use zlib.h."); - puts(" */"); - puts(""); - size = 1U << 9; - printf(" static const code lenfix[%u] = {", size); - low = 0; - for (;;) { - if ((low % 7) == 0) printf("\n "); - printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits, - state.lencode[low].val); - if (++low == size) break; - putchar(','); - } - puts("\n };"); - size = 1U << 5; - printf("\n static const code distfix[%u] = {", size); - low = 0; - for (;;) { - if ((low % 6) == 0) printf("\n "); - printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, - state.distcode[low].val); - if (++low == size) break; - putchar(','); - } - puts("\n };"); -} -#endif /* MAKEFIXED */ - -/* - Update the window with the last wsize (normally 32K) bytes written before - returning. If window does not exist yet, create it. This is only called - when a window is already in use, or when output has been written during this - inflate call, but the end of the deflate stream has not been reached yet. - It is also called to create a window for dictionary data when a dictionary - is loaded. - - Providing output buffers larger than 32K to inflate() should provide a speed - advantage, since only the last 32K of output is copied to the sliding window - upon return from inflate(), and since all distances after the first 32K of - output will fall in the output data, making match copies simpler and faster. - The advantage may be dependent on the size of the processor's data caches. - */ -local int updatewindow(strm, out) -z_streamp strm; -unsigned out; -{ - struct inflate_state FAR *state; - unsigned copy, dist; - - state = (struct inflate_state FAR *)strm->state; - - /* if it hasn't been done already, allocate space for the window */ - if (state->window == Z_NULL) { - state->window = (unsigned char FAR *) - ZALLOC(strm, 1U << state->wbits, - sizeof(unsigned char)); - if (state->window == Z_NULL) return 1; - } - - /* if window not in use yet, initialize */ - if (state->wsize == 0) { - state->wsize = 1U << state->wbits; - state->write = 0; - state->whave = 0; - } - - /* copy state->wsize or less output bytes into the circular window */ - copy = out - strm->avail_out; - if (copy >= state->wsize) { - zmemcpy(state->window, strm->next_out - state->wsize, state->wsize); - state->write = 0; - state->whave = state->wsize; - } - else { - dist = state->wsize - state->write; - if (dist > copy) dist = copy; - zmemcpy(state->window + state->write, strm->next_out - copy, dist); - copy -= dist; - if (copy) { - zmemcpy(state->window, strm->next_out - copy, copy); - state->write = copy; - state->whave = state->wsize; - } - else { - state->write += dist; - if (state->write == state->wsize) state->write = 0; - if (state->whave < state->wsize) state->whave += dist; - } - } - return 0; -} - -/* Macros for inflate(): */ - -/* check function to use adler32() for zlib or crc32() for gzip */ -#ifdef GUNZIP -# define UPDATE(check, buf, len) \ - (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) -#else -# define UPDATE(check, buf, len) adler32(check, buf, len) -#endif - -/* check macros for header crc */ -#ifdef GUNZIP -# define CRC2(check, word) \ - do { \ - hbuf[0] = (unsigned char)(word); \ - hbuf[1] = (unsigned char)((word) >> 8); \ - check = crc32(check, hbuf, 2); \ - } while (0) - -# define CRC4(check, word) \ - do { \ - hbuf[0] = (unsigned char)(word); \ - hbuf[1] = (unsigned char)((word) >> 8); \ - hbuf[2] = (unsigned char)((word) >> 16); \ - hbuf[3] = (unsigned char)((word) >> 24); \ - check = crc32(check, hbuf, 4); \ - } while (0) -#endif - -/* Load registers with state in inflate() for speed */ -#define LOAD() \ - do { \ - put = strm->next_out; \ - left = strm->avail_out; \ - next = strm->next_in; \ - have = strm->avail_in; \ - hold = state->hold; \ - bits = state->bits; \ - } while (0) - -/* Restore state from registers in inflate() */ -#define RESTORE() \ - do { \ - strm->next_out = put; \ - strm->avail_out = left; \ - strm->next_in = next; \ - strm->avail_in = have; \ - state->hold = hold; \ - state->bits = bits; \ - } while (0) - -/* Clear the input bit accumulator */ -#define INITBITS() \ - do { \ - hold = 0; \ - bits = 0; \ - } while (0) - -/* Get a byte of input into the bit accumulator, or return from inflate() - if there is no input available. */ -#define PULLBYTE() \ - do { \ - if (have == 0) goto inf_leave; \ - have--; \ - hold += (unsigned long)(*next++) << bits; \ - bits += 8; \ - } while (0) - -/* Assure that there are at least n bits in the bit accumulator. If there is - not enough available input to do that, then return from inflate(). */ -#define NEEDBITS(n) \ - do { \ - while (bits < (unsigned)(n)) \ - PULLBYTE(); \ - } while (0) - -/* Return the low n bits of the bit accumulator (n < 16) */ -#define BITS(n) \ - ((unsigned)hold & ((1U << (n)) - 1)) - -/* Remove n bits from the bit accumulator */ -#define DROPBITS(n) \ - do { \ - hold >>= (n); \ - bits -= (unsigned)(n); \ - } while (0) - -/* Remove zero to seven bits as needed to go to a byte boundary */ -#define BYTEBITS() \ - do { \ - hold >>= bits & 7; \ - bits -= bits & 7; \ - } while (0) - -/* Reverse the bytes in a 32-bit value */ -#define REVERSE(q) \ - ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ - (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) - -/* - inflate() uses a state machine to process as much input data and generate as - much output data as possible before returning. The state machine is - structured roughly as follows: - - for (;;) switch (state) { - ... - case STATEn: - if (not enough input data or output space to make progress) - return; - ... make progress ... - state = STATEm; - break; - ... - } - - so when inflate() is called again, the same case is attempted again, and - if the appropriate resources are provided, the machine proceeds to the - next state. The NEEDBITS() macro is usually the way the state evaluates - whether it can proceed or should return. NEEDBITS() does the return if - the requested bits are not available. The typical use of the BITS macros - is: - - NEEDBITS(n); - ... do something with BITS(n) ... - DROPBITS(n); - - where NEEDBITS(n) either returns from inflate() if there isn't enough - input left to load n bits into the accumulator, or it continues. BITS(n) - gives the low n bits in the accumulator. When done, DROPBITS(n) drops - the low n bits off the accumulator. INITBITS() clears the accumulator - and sets the number of available bits to zero. BYTEBITS() discards just - enough bits to put the accumulator on a byte boundary. After BYTEBITS() - and a NEEDBITS(8), then BITS(8) would return the next byte in the stream. - - NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return - if there is no input available. The decoding of variable length codes uses - PULLBYTE() directly in order to pull just enough bytes to decode the next - code, and no more. - - Some states loop until they get enough input, making sure that enough - state information is maintained to continue the loop where it left off - if NEEDBITS() returns in the loop. For example, want, need, and keep - would all have to actually be part of the saved state in case NEEDBITS() - returns: - - case STATEw: - while (want < need) { - NEEDBITS(n); - keep[want++] = BITS(n); - DROPBITS(n); - } - state = STATEx; - case STATEx: - - As shown above, if the next state is also the next case, then the break - is omitted. - - A state may also return if there is not enough output space available to - complete that state. Those states are copying stored data, writing a - literal byte, and copying a matching string. - - When returning, a "goto inf_leave" is used to update the total counters, - update the check value, and determine whether any progress has been made - during that inflate() call in order to return the proper return code. - Progress is defined as a change in either strm->avail_in or strm->avail_out. - When there is a window, goto inf_leave will update the window with the last - output written. If a goto inf_leave occurs in the middle of decompression - and there is no window currently, goto inf_leave will create one and copy - output to the window for the next call of inflate(). - - In this implementation, the flush parameter of inflate() only affects the - return code (per zlib.h). inflate() always writes as much as possible to - strm->next_out, given the space available and the provided input--the effect - documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers - the allocation of and copying into a sliding window until necessary, which - provides the effect documented in zlib.h for Z_FINISH when the entire input - stream available. So the only thing the flush parameter actually does is: - when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it - will return Z_BUF_ERROR if it has not reached the end of the stream. - */ - -int ZEXPORT inflate(strm, flush) -z_streamp strm; -int flush; -{ - struct inflate_state FAR *state; - unsigned char FAR *next; /* next input */ - unsigned char FAR *put; /* next output */ - unsigned have, left; /* available input and output */ - unsigned long hold; /* bit buffer */ - unsigned bits; /* bits in bit buffer */ - unsigned in, out; /* save starting available input and output */ - unsigned copy; /* number of stored or match bytes to copy */ - unsigned char FAR *from; /* where to copy match bytes from */ - code this; /* current decoding table entry */ - code last; /* parent table entry */ - unsigned len; /* length to copy for repeats, bits to drop */ - int ret; /* return code */ -#ifdef GUNZIP - unsigned char hbuf[4]; /* buffer for gzip header crc calculation */ -#endif - static const unsigned short order[19] = /* permutation of code lengths */ - {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - - if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || - (strm->next_in == Z_NULL && strm->avail_in != 0)) - return Z_STREAM_ERROR; - - state = (struct inflate_state FAR *)strm->state; - if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */ - LOAD(); - in = have; - out = left; - ret = Z_OK; - for (;;) - switch (state->mode) { - case HEAD: - if (state->wrap == 0) { - state->mode = TYPEDO; - break; - } - NEEDBITS(16); -#ifdef GUNZIP - if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ - state->check = crc32(0L, Z_NULL, 0); - CRC2(state->check, hold); - INITBITS(); - state->mode = FLAGS; - break; - } - state->flags = 0; /* expect zlib header */ - if (state->head != Z_NULL) - state->head->done = -1; - if (!(state->wrap & 1) || /* check if zlib header allowed */ -#else - if ( -#endif - ((BITS(8) << 8) + (hold >> 8)) % 31) { - strm->msg = (char *)"incorrect header check"; - state->mode = BAD; - break; - } - if (BITS(4) != Z_DEFLATED) { - strm->msg = (char *)"unknown compression method"; - state->mode = BAD; - break; - } - DROPBITS(4); - len = BITS(4) + 8; - if (len > state->wbits) { - strm->msg = (char *)"invalid window size"; - state->mode = BAD; - break; - } - state->dmax = 1U << len; - Tracev((stderr, "inflate: zlib header ok\n")); - strm->adler = state->check = adler32(0L, Z_NULL, 0); - state->mode = hold & 0x200 ? DICTID : TYPE; - INITBITS(); - break; -#ifdef GUNZIP - case FLAGS: - NEEDBITS(16); - state->flags = (int)(hold); - if ((state->flags & 0xff) != Z_DEFLATED) { - strm->msg = (char *)"unknown compression method"; - state->mode = BAD; - break; - } - if (state->flags & 0xe000) { - strm->msg = (char *)"unknown header flags set"; - state->mode = BAD; - break; - } - if (state->head != Z_NULL) - state->head->text = (int)((hold >> 8) & 1); - if (state->flags & 0x0200) CRC2(state->check, hold); - INITBITS(); - state->mode = TIME; - case TIME: - NEEDBITS(32); - if (state->head != Z_NULL) - state->head->time = hold; - if (state->flags & 0x0200) CRC4(state->check, hold); - INITBITS(); - state->mode = OS; - case OS: - NEEDBITS(16); - if (state->head != Z_NULL) { - state->head->xflags = (int)(hold & 0xff); - state->head->os = (int)(hold >> 8); - } - if (state->flags & 0x0200) CRC2(state->check, hold); - INITBITS(); - state->mode = EXLEN; - case EXLEN: - if (state->flags & 0x0400) { - NEEDBITS(16); - state->length = (unsigned)(hold); - if (state->head != Z_NULL) - state->head->extra_len = (unsigned)hold; - if (state->flags & 0x0200) CRC2(state->check, hold); - INITBITS(); - } - else if (state->head != Z_NULL) - state->head->extra = Z_NULL; - state->mode = EXTRA; - case EXTRA: - if (state->flags & 0x0400) { - copy = state->length; - if (copy > have) copy = have; - if (copy) { - if (state->head != Z_NULL && - state->head->extra != Z_NULL) { - len = state->head->extra_len - state->length; - zmemcpy(state->head->extra + len, next, - len + copy > state->head->extra_max ? - state->head->extra_max - len : copy); - } - if (state->flags & 0x0200) - state->check = crc32(state->check, next, copy); - have -= copy; - next += copy; - state->length -= copy; - } - if (state->length) goto inf_leave; - } - state->length = 0; - state->mode = NAME; - case NAME: - if (state->flags & 0x0800) { - if (have == 0) goto inf_leave; - copy = 0; - do { - len = (unsigned)(next[copy++]); - if (state->head != Z_NULL && - state->head->name != Z_NULL && - state->length < state->head->name_max) - state->head->name[state->length++] = len; - } while (len && copy < have); - if (state->flags & 0x0200) - state->check = crc32(state->check, next, copy); - have -= copy; - next += copy; - if (len) goto inf_leave; - } - else if (state->head != Z_NULL) - state->head->name = Z_NULL; - state->length = 0; - state->mode = COMMENT; - case COMMENT: - if (state->flags & 0x1000) { - if (have == 0) goto inf_leave; - copy = 0; - do { - len = (unsigned)(next[copy++]); - if (state->head != Z_NULL && - state->head->comment != Z_NULL && - state->length < state->head->comm_max) - state->head->comment[state->length++] = len; - } while (len && copy < have); - if (state->flags & 0x0200) - state->check = crc32(state->check, next, copy); - have -= copy; - next += copy; - if (len) goto inf_leave; - } - else if (state->head != Z_NULL) - state->head->comment = Z_NULL; - state->mode = HCRC; - case HCRC: - if (state->flags & 0x0200) { - NEEDBITS(16); - if (hold != (state->check & 0xffff)) { - strm->msg = (char *)"header crc mismatch"; - state->mode = BAD; - break; - } - INITBITS(); - } - if (state->head != Z_NULL) { - state->head->hcrc = (int)((state->flags >> 9) & 1); - state->head->done = 1; - } - strm->adler = state->check = crc32(0L, Z_NULL, 0); - state->mode = TYPE; - break; -#endif - case DICTID: - NEEDBITS(32); - strm->adler = state->check = REVERSE(hold); - INITBITS(); - state->mode = DICT; - case DICT: - if (state->havedict == 0) { - RESTORE(); - return Z_NEED_DICT; - } - strm->adler = state->check = adler32(0L, Z_NULL, 0); - state->mode = TYPE; - case TYPE: - if (flush == Z_BLOCK) goto inf_leave; - case TYPEDO: - if (state->last) { - BYTEBITS(); - state->mode = CHECK; - break; - } - NEEDBITS(3); - state->last = BITS(1); - DROPBITS(1); - switch (BITS(2)) { - case 0: /* stored block */ - Tracev((stderr, "inflate: stored block%s\n", - state->last ? " (last)" : "")); - state->mode = STORED; - break; - case 1: /* fixed block */ - fixedtables(state); - Tracev((stderr, "inflate: fixed codes block%s\n", - state->last ? " (last)" : "")); - state->mode = LEN; /* decode codes */ - break; - case 2: /* dynamic block */ - Tracev((stderr, "inflate: dynamic codes block%s\n", - state->last ? " (last)" : "")); - state->mode = TABLE; - break; - case 3: - strm->msg = (char *)"invalid block type"; - state->mode = BAD; - } - DROPBITS(2); - break; - case STORED: - BYTEBITS(); /* go to byte boundary */ - NEEDBITS(32); - if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { - strm->msg = (char *)"invalid stored block lengths"; - state->mode = BAD; - break; - } - state->length = (unsigned)hold & 0xffff; - Tracev((stderr, "inflate: stored length %u\n", - state->length)); - INITBITS(); - state->mode = COPY; - case COPY: - copy = state->length; - if (copy) { - if (copy > have) copy = have; - if (copy > left) copy = left; - if (copy == 0) goto inf_leave; - zmemcpy(put, next, copy); - have -= copy; - next += copy; - left -= copy; - put += copy; - state->length -= copy; - break; - } - Tracev((stderr, "inflate: stored end\n")); - state->mode = TYPE; - break; - case TABLE: - NEEDBITS(14); - state->nlen = BITS(5) + 257; - DROPBITS(5); - state->ndist = BITS(5) + 1; - DROPBITS(5); - state->ncode = BITS(4) + 4; - DROPBITS(4); -#ifndef PKZIP_BUG_WORKAROUND - if (state->nlen > 286 || state->ndist > 30) { - strm->msg = (char *)"too many length or distance symbols"; - state->mode = BAD; - break; - } -#endif - Tracev((stderr, "inflate: table sizes ok\n")); - state->have = 0; - state->mode = LENLENS; - case LENLENS: - while (state->have < state->ncode) { - NEEDBITS(3); - state->lens[order[state->have++]] = (unsigned short)BITS(3); - DROPBITS(3); - } - while (state->have < 19) - state->lens[order[state->have++]] = 0; - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 7; - ret = inflate_table(CODES, state->lens, 19, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid code lengths set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: code lengths ok\n")); - state->have = 0; - state->mode = CODELENS; - case CODELENS: - while (state->have < state->nlen + state->ndist) { - for (;;) { - this = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(this.bits) <= bits) break; - PULLBYTE(); - } - if (this.val < 16) { - NEEDBITS(this.bits); - DROPBITS(this.bits); - state->lens[state->have++] = this.val; - } - else { - if (this.val == 16) { - NEEDBITS(this.bits + 2); - DROPBITS(this.bits); - if (state->have == 0) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - len = state->lens[state->have - 1]; - copy = 3 + BITS(2); - DROPBITS(2); - } - else if (this.val == 17) { - NEEDBITS(this.bits + 3); - DROPBITS(this.bits); - len = 0; - copy = 3 + BITS(3); - DROPBITS(3); - } - else { - NEEDBITS(this.bits + 7); - DROPBITS(this.bits); - len = 0; - copy = 11 + BITS(7); - DROPBITS(7); - } - if (state->have + copy > state->nlen + state->ndist) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - while (copy--) - state->lens[state->have++] = (unsigned short)len; - } - } - - /* handle error breaks in while */ - if (state->mode == BAD) break; - - /* build code tables */ - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 9; - ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid literal/lengths set"; - state->mode = BAD; - break; - } - state->distcode = (code const FAR *)(state->next); - state->distbits = 6; - ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, - &(state->next), &(state->distbits), state->work); - if (ret) { - strm->msg = (char *)"invalid distances set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: codes ok\n")); - state->mode = LEN; - case LEN: - if (have >= 6 && left >= 258) { - RESTORE(); - inflate_fast(strm, out); - LOAD(); - break; - } - for (;;) { - this = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(this.bits) <= bits) break; - PULLBYTE(); - } - if (this.op && (this.op & 0xf0) == 0) { - last = this; - for (;;) { - this = state->lencode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + this.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - } - DROPBITS(this.bits); - state->length = (unsigned)this.val; - if ((int)(this.op) == 0) { - Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", this.val)); - state->mode = LIT; - break; - } - if (this.op & 32) { - Tracevv((stderr, "inflate: end of block\n")); - state->mode = TYPE; - break; - } - if (this.op & 64) { - strm->msg = (char *)"invalid literal/length code"; - state->mode = BAD; - break; - } - state->extra = (unsigned)(this.op) & 15; - state->mode = LENEXT; - case LENEXT: - if (state->extra) { - NEEDBITS(state->extra); - state->length += BITS(state->extra); - DROPBITS(state->extra); - } - Tracevv((stderr, "inflate: length %u\n", state->length)); - state->mode = DIST; - case DIST: - for (;;) { - this = state->distcode[BITS(state->distbits)]; - if ((unsigned)(this.bits) <= bits) break; - PULLBYTE(); - } - if ((this.op & 0xf0) == 0) { - last = this; - for (;;) { - this = state->distcode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + this.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - } - DROPBITS(this.bits); - if (this.op & 64) { - strm->msg = (char *)"invalid distance code"; - state->mode = BAD; - break; - } - state->offset = (unsigned)this.val; - state->extra = (unsigned)(this.op) & 15; - state->mode = DISTEXT; - case DISTEXT: - if (state->extra) { - NEEDBITS(state->extra); - state->offset += BITS(state->extra); - DROPBITS(state->extra); - } -#ifdef INFLATE_STRICT - if (state->offset > state->dmax) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#endif - if (state->offset > state->whave + out - left) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } - Tracevv((stderr, "inflate: distance %u\n", state->offset)); - state->mode = MATCH; - case MATCH: - if (left == 0) goto inf_leave; - copy = out - left; - if (state->offset > copy) { /* copy from window */ - copy = state->offset - copy; - if (copy > state->write) { - copy -= state->write; - from = state->window + (state->wsize - copy); - } - else - from = state->window + (state->write - copy); - if (copy > state->length) copy = state->length; - } - else { /* copy from output */ - from = put - state->offset; - copy = state->length; - } - if (copy > left) copy = left; - left -= copy; - state->length -= copy; - do { - *put++ = *from++; - } while (--copy); - if (state->length == 0) state->mode = LEN; - break; - case LIT: - if (left == 0) goto inf_leave; - *put++ = (unsigned char)(state->length); - left--; - state->mode = LEN; - break; - case CHECK: - if (state->wrap) { - NEEDBITS(32); - out -= left; - strm->total_out += out; - state->total += out; - if (out) - strm->adler = state->check = - UPDATE(state->check, put - out, out); - out = left; - if (( -#ifdef GUNZIP - state->flags ? hold : -#endif - REVERSE(hold)) != state->check) { - strm->msg = (char *)"incorrect data check"; - state->mode = BAD; - break; - } - INITBITS(); - Tracev((stderr, "inflate: check matches trailer\n")); - } -#ifdef GUNZIP - state->mode = LENGTH; - case LENGTH: - if (state->wrap && state->flags) { - NEEDBITS(32); - if (hold != (state->total & 0xffffffffUL)) { - strm->msg = (char *)"incorrect length check"; - state->mode = BAD; - break; - } - INITBITS(); - Tracev((stderr, "inflate: length matches trailer\n")); - } -#endif - state->mode = DONE; - case DONE: - ret = Z_STREAM_END; - goto inf_leave; - case BAD: - ret = Z_DATA_ERROR; - goto inf_leave; - case MEM: - return Z_MEM_ERROR; - case SYNC: - default: - return Z_STREAM_ERROR; - } - - /* - Return from inflate(), updating the total counts and the check value. - If there was no progress during the inflate() call, return a buffer - error. Call updatewindow() to create and/or update the window state. - Note: a memory error from inflate() is non-recoverable. - */ - inf_leave: - RESTORE(); - if (state->wsize || (state->mode < CHECK && out != strm->avail_out)) - if (updatewindow(strm, out)) { - state->mode = MEM; - return Z_MEM_ERROR; - } - in -= strm->avail_in; - out -= strm->avail_out; - strm->total_in += in; - strm->total_out += out; - state->total += out; - if (state->wrap && out) - strm->adler = state->check = - UPDATE(state->check, strm->next_out - out, out); - strm->data_type = state->bits + (state->last ? 64 : 0) + - (state->mode == TYPE ? 128 : 0); - if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) - ret = Z_BUF_ERROR; - return ret; -} - -int ZEXPORT inflateEnd(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) - return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (state->window != Z_NULL) ZFREE(strm, state->window); - ZFREE(strm, strm->state); - strm->state = Z_NULL; - Tracev((stderr, "inflate: end\n")); - return Z_OK; -} - -int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) -z_streamp strm; -const Bytef *dictionary; -uInt dictLength; -{ - struct inflate_state FAR *state; - unsigned long id; - - /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (state->wrap != 0 && state->mode != DICT) - return Z_STREAM_ERROR; - - /* check for correct dictionary id */ - if (state->mode == DICT) { - id = adler32(0L, Z_NULL, 0); - id = adler32(id, dictionary, dictLength); - if (id != state->check) - return Z_DATA_ERROR; - } - - /* copy dictionary to window */ - if (updatewindow(strm, strm->avail_out)) { - state->mode = MEM; - return Z_MEM_ERROR; - } - if (dictLength > state->wsize) { - zmemcpy(state->window, dictionary + dictLength - state->wsize, - state->wsize); - state->whave = state->wsize; - } - else { - zmemcpy(state->window + state->wsize - dictLength, dictionary, - dictLength); - state->whave = dictLength; - } - state->havedict = 1; - Tracev((stderr, "inflate: dictionary set\n")); - return Z_OK; -} - -int ZEXPORT inflateGetHeader(strm, head) -z_streamp strm; -gz_headerp head; -{ - struct inflate_state FAR *state; - - /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; - - /* save header structure */ - state->head = head; - head->done = 0; - return Z_OK; -} - -/* - Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found - or when out of input. When called, *have is the number of pattern bytes - found in order so far, in 0..3. On return *have is updated to the new - state. If on return *have equals four, then the pattern was found and the - return value is how many bytes were read including the last byte of the - pattern. If *have is less than four, then the pattern has not been found - yet and the return value is len. In the latter case, syncsearch() can be - called again with more data and the *have state. *have is initialized to - zero for the first call. - */ -local unsigned syncsearch(have, buf, len) -unsigned FAR *have; -unsigned char FAR *buf; -unsigned len; -{ - unsigned got; - unsigned next; - - got = *have; - next = 0; - while (next < len && got < 4) { - if ((int)(buf[next]) == (got < 2 ? 0 : 0xff)) - got++; - else if (buf[next]) - got = 0; - else - got = 4 - got; - next++; - } - *have = got; - return next; -} - -int ZEXPORT inflateSync(strm) -z_streamp strm; -{ - unsigned len; /* number of bytes to look at or looked at */ - unsigned long in, out; /* temporary to save total_in and total_out */ - unsigned char buf[4]; /* to restore bit buffer to byte string */ - struct inflate_state FAR *state; - - /* check parameters */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; - - /* if first time, start search in bit buffer */ - if (state->mode != SYNC) { - state->mode = SYNC; - state->hold <<= state->bits & 7; - state->bits -= state->bits & 7; - len = 0; - while (state->bits >= 8) { - buf[len++] = (unsigned char)(state->hold); - state->hold >>= 8; - state->bits -= 8; - } - state->have = 0; - syncsearch(&(state->have), buf, len); - } - - /* search available input */ - len = syncsearch(&(state->have), strm->next_in, strm->avail_in); - strm->avail_in -= len; - strm->next_in += len; - strm->total_in += len; - - /* return no joy or set up to restart inflate() on a new block */ - if (state->have != 4) return Z_DATA_ERROR; - in = strm->total_in; out = strm->total_out; - inflateReset(strm); - strm->total_in = in; strm->total_out = out; - state->mode = TYPE; - 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(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - return state->mode == STORED && state->bits == 0; -} - -int ZEXPORT inflateCopy(dest, source) -z_streamp dest; -z_streamp source; -{ - struct inflate_state FAR *state; - struct inflate_state FAR *copy; - unsigned char FAR *window; - unsigned wsize; - - /* check input */ - if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || - source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) - return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)source->state; - - /* allocate space */ - copy = (struct inflate_state FAR *) - ZALLOC(source, 1, sizeof(struct inflate_state)); - if (copy == Z_NULL) return Z_MEM_ERROR; - window = Z_NULL; - if (state->window != Z_NULL) { - window = (unsigned char FAR *) - ZALLOC(source, 1U << state->wbits, sizeof(unsigned char)); - if (window == Z_NULL) { - ZFREE(source, copy); - return Z_MEM_ERROR; - } - } - - /* copy state */ - zmemcpy(dest, source, sizeof(z_stream)); - zmemcpy(copy, state, sizeof(struct inflate_state)); - if (state->lencode >= state->codes && - state->lencode <= state->codes + ENOUGH - 1) { - copy->lencode = copy->codes + (state->lencode - state->codes); - copy->distcode = copy->codes + (state->distcode - state->codes); - } - copy->next = copy->codes + (state->next - state->codes); - if (window != Z_NULL) { - wsize = 1U << state->wbits; - zmemcpy(window, state->window, wsize); - } - copy->window = window; - dest->state = (struct internal_state FAR *)copy; - return Z_OK; -} diff --git a/jni/physfs-2.0.3/zlib123/inflate.h b/jni/physfs-2.0.3/zlib123/inflate.h deleted file mode 100644 index 07bd3e78..00000000 --- a/jni/physfs-2.0.3/zlib123/inflate.h +++ /dev/null @@ -1,115 +0,0 @@ -/* inflate.h -- internal inflate state definition - * Copyright (C) 1995-2004 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. - */ - -/* define NO_GZIP when compiling if you want to disable gzip header and - trailer decoding by inflate(). NO_GZIP would be used to avoid linking in - the crc code when it is not needed. For shared libraries, gzip decoding - should be left enabled. */ -#ifndef NO_GZIP -# define GUNZIP -#endif - -/* Possible inflate modes between inflate() calls */ -typedef enum { - HEAD, /* i: waiting for magic header */ - FLAGS, /* i: waiting for method and flags (gzip) */ - TIME, /* i: waiting for modification time (gzip) */ - OS, /* i: waiting for extra flags and operating system (gzip) */ - EXLEN, /* i: waiting for extra length (gzip) */ - EXTRA, /* i: waiting for extra bytes (gzip) */ - NAME, /* i: waiting for end of file name (gzip) */ - COMMENT, /* i: waiting for end of comment (gzip) */ - HCRC, /* i: waiting for header crc (gzip) */ - DICTID, /* i: waiting for dictionary check value */ - DICT, /* waiting for inflateSetDictionary() call */ - TYPE, /* i: waiting for type bits, including last-flag bit */ - TYPEDO, /* i: same, but skip check to exit inflate on new block */ - STORED, /* i: waiting for stored size (length and complement) */ - COPY, /* i/o: waiting for input or output to copy stored block */ - TABLE, /* i: waiting for dynamic block table lengths */ - LENLENS, /* i: waiting for code length code lengths */ - CODELENS, /* i: waiting for length/lit and distance code lengths */ - LEN, /* i: waiting for length/lit code */ - LENEXT, /* i: waiting for length extra bits */ - DIST, /* i: waiting for distance code */ - DISTEXT, /* i: waiting for distance extra bits */ - MATCH, /* o: waiting for output space to copy string */ - LIT, /* o: waiting for output space to write literal */ - CHECK, /* i: waiting for 32-bit check value */ - LENGTH, /* i: waiting for 32-bit length (gzip) */ - DONE, /* finished check, done -- remain here until reset */ - BAD, /* got a data error -- remain here until reset */ - MEM, /* got an inflate() memory error -- remain here until reset */ - SYNC /* looking for synchronization bytes to restart inflate() */ -} inflate_mode; - -/* - State transitions between above modes - - - (most modes can go to the BAD or MEM mode -- not shown for clarity) - - Process header: - HEAD -> (gzip) or (zlib) - (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME - NAME -> COMMENT -> HCRC -> TYPE - (zlib) -> DICTID or TYPE - DICTID -> DICT -> TYPE - Read deflate blocks: - TYPE -> STORED or TABLE or LEN or CHECK - STORED -> COPY -> TYPE - TABLE -> LENLENS -> CODELENS -> LEN - Read deflate codes: - LEN -> LENEXT or LIT or TYPE - LENEXT -> DIST -> DISTEXT -> MATCH -> LEN - LIT -> LEN - Process trailer: - CHECK -> LENGTH -> DONE - */ - -/* state maintained between inflate() calls. Approximately 7K bytes. */ -struct inflate_state { - inflate_mode mode; /* current inflate mode */ - int last; /* true if processing last block */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ - int havedict; /* true if dictionary provided */ - int flags; /* gzip header method and flags (0 if zlib) */ - unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ - unsigned long check; /* protected copy of check value */ - unsigned long total; /* protected copy of output count */ - gz_headerp head; /* where to save gzip header information */ - /* sliding window */ - unsigned wbits; /* log base 2 of requested window size */ - unsigned wsize; /* window size or zero if not using window */ - unsigned whave; /* valid bytes in the window */ - unsigned write; /* window write index */ - unsigned char FAR *window; /* allocated sliding window, if needed */ - /* bit accumulator */ - unsigned long hold; /* input bit accumulator */ - unsigned bits; /* number of bits in "in" */ - /* for string and stored block copying */ - unsigned length; /* literal or length of data to copy */ - unsigned offset; /* distance back to copy string from */ - /* for table and code decoding */ - unsigned extra; /* extra bits needed */ - /* fixed and dynamic code tables */ - code const FAR *lencode; /* starting table for length/literal codes */ - code const FAR *distcode; /* starting table for distance codes */ - unsigned lenbits; /* index bits for lencode */ - unsigned distbits; /* index bits for distcode */ - /* dynamic table building */ - unsigned ncode; /* number of code length code lengths */ - unsigned nlen; /* number of length code lengths */ - unsigned ndist; /* number of distance code lengths */ - unsigned have; /* number of code lengths in lens[] */ - code FAR *next; /* next available space in codes[] */ - unsigned short lens[320]; /* temporary storage for code lengths */ - unsigned short work[288]; /* work area for code table building */ - code codes[ENOUGH]; /* space for code tables */ -}; diff --git a/jni/physfs-2.0.3/zlib123/inftrees.c b/jni/physfs-2.0.3/zlib123/inftrees.c deleted file mode 100644 index 8a9c13ff..00000000 --- a/jni/physfs-2.0.3/zlib123/inftrees.c +++ /dev/null @@ -1,329 +0,0 @@ -/* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2005 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "inftrees.h" - -#define MAXBITS 15 - -const char inflate_copyright[] = - " inflate 1.2.3 Copyright 1995-2005 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. - */ - -/* - Build a set of tables to decode the provided canonical Huffman code. - The code lengths are lens[0..codes-1]. The result starts at *table, - whose indices are 0..2^bits-1. work is a writable array of at least - lens shorts, which is used as a work area. type is the type of code - to be generated, CODES, LENS, or DISTS. On return, zero is success, - -1 is an invalid code, and +1 means that ENOUGH isn't enough. table - on return points to the next available entry's address. bits is the - requested root table index bits, and on return it is the actual root - table index bits. It will differ if the request is greater than the - longest code or if it is less than the shortest code. - */ -int inflate_table(type, lens, codes, table, bits, work) -codetype type; -unsigned short FAR *lens; -unsigned codes; -code FAR * FAR *table; -unsigned FAR *bits; -unsigned short FAR *work; -{ - unsigned len; /* a code's length in bits */ - unsigned sym; /* index of code symbols */ - unsigned min, max; /* minimum and maximum code lengths */ - unsigned root; /* number of index bits for root table */ - unsigned curr; /* number of index bits for current table */ - unsigned drop; /* code bits to drop for sub-table */ - int left; /* number of prefix codes available */ - unsigned used; /* code entries in table used */ - unsigned huff; /* Huffman code */ - unsigned incr; /* for incrementing code, index */ - unsigned fill; /* index for replicating entries */ - unsigned low; /* low bits for current root entry */ - unsigned mask; /* mask for low root bits */ - code this; /* table entry for duplication */ - code FAR *next; /* next available space in table */ - const unsigned short FAR *base; /* base value table to use */ - const unsigned short FAR *extra; /* extra bits table to use */ - int end; /* use base and extra for symbol > end */ - unsigned short count[MAXBITS+1]; /* number of codes of each length */ - unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ - static const unsigned short lbase[31] = { /* Length codes 257..285 base */ - 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}; - static const unsigned short lext[31] = { /* Length codes 257..285 extra */ - 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196}; - static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ - 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, 0, 0}; - static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ - 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, - 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, - 28, 28, 29, 29, 64, 64}; - - /* - Process a set of code lengths to create a canonical Huffman code. The - code lengths are lens[0..codes-1]. Each length corresponds to the - symbols 0..codes-1. The Huffman code is generated by first sorting the - symbols by length from short to long, and retaining the symbol order - for codes with equal lengths. Then the code starts with all zero bits - for the first code of the shortest length, and the codes are integer - increments for the same length, and zeros are appended as the length - increases. For the deflate format, these bits are stored backwards - from their more natural integer increment ordering, and so when the - decoding tables are built in the large loop below, the integer codes - are incremented backwards. - - This routine assumes, but does not check, that all of the entries in - lens[] are in the range 0..MAXBITS. The caller must assure this. - 1..MAXBITS is interpreted as that code length. zero means that that - symbol does not occur in this code. - - The codes are sorted by computing a count of codes for each length, - creating from that a table of starting indices for each length in the - sorted table, and then entering the symbols in order in the sorted - table. The sorted table is work[], with that space being provided by - the caller. - - The length counts are used for other purposes as well, i.e. finding - the minimum and maximum length codes, determining if there are any - codes at all, checking for a valid set of lengths, and looking ahead - at length counts to determine sub-table sizes when building the - decoding tables. - */ - - /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ - for (len = 0; len <= MAXBITS; len++) - count[len] = 0; - for (sym = 0; sym < codes; sym++) - count[lens[sym]]++; - - /* bound code lengths, force root to be within code lengths */ - root = *bits; - for (max = MAXBITS; max >= 1; max--) - if (count[max] != 0) break; - if (root > max) root = max; - if (max == 0) { /* no symbols to code at all */ - this.op = (unsigned char)64; /* invalid code marker */ - this.bits = (unsigned char)1; - this.val = (unsigned short)0; - *(*table)++ = this; /* make a table to force an error */ - *(*table)++ = this; - *bits = 1; - return 0; /* no symbols, but wait for decoding to report error */ - } - for (min = 1; min <= MAXBITS; min++) - if (count[min] != 0) break; - if (root < min) root = min; - - /* check for an over-subscribed or incomplete set of lengths */ - left = 1; - for (len = 1; len <= MAXBITS; len++) { - left <<= 1; - left -= count[len]; - if (left < 0) return -1; /* over-subscribed */ - } - if (left > 0 && (type == CODES || max != 1)) - return -1; /* incomplete set */ - - /* generate offsets into symbol table for each length for sorting */ - offs[1] = 0; - for (len = 1; len < MAXBITS; len++) - offs[len + 1] = offs[len] + count[len]; - - /* sort symbols by length, by symbol order within each length */ - for (sym = 0; sym < codes; sym++) - if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; - - /* - Create and fill in decoding tables. In this loop, the table being - filled is at next and has curr index bits. The code being used is huff - with length len. That code is converted to an index by dropping drop - bits off of the bottom. For codes where len is less than drop + curr, - those top drop + curr - len bits are incremented through all values to - fill the table with replicated entries. - - root is the number of index bits for the root table. When len exceeds - root, sub-tables are created pointed to by the root entry with an index - of the low root bits of huff. This is saved in low to check for when a - new sub-table should be started. drop is zero when the root table is - being filled, and drop is root when sub-tables are being filled. - - When a new sub-table is needed, it is necessary to look ahead in the - code lengths to determine what size sub-table is needed. The length - counts are used for this, and so count[] is decremented as codes are - entered in the tables. - - used keeps track of how many table entries have been allocated from the - provided *table space. It is checked when a LENS table is being made - against the space in *table, ENOUGH, minus the maximum space needed by - the worst case distance code, MAXD. This should never happen, but the - sufficiency of ENOUGH has not been proven exhaustively, hence the check. - This assumes that when type == LENS, bits == 9. - - sym increments through all symbols, and the loop terminates when - all codes of length max, i.e. all codes, have been processed. This - routine permits incomplete codes, so another loop after this one fills - in the rest of the decoding tables with invalid code markers. - */ - - /* set up for code type */ - switch (type) { - case CODES: - base = extra = work; /* dummy value--not used */ - end = 19; - break; - case LENS: - base = lbase; - base -= 257; - extra = lext; - extra -= 257; - end = 256; - break; - default: /* DISTS */ - base = dbase; - extra = dext; - end = -1; - } - - /* initialize state for loop */ - huff = 0; /* starting code */ - sym = 0; /* starting code symbol */ - len = min; /* starting code length */ - next = *table; /* current table to fill in */ - curr = root; /* current table index bits */ - drop = 0; /* current bits to drop from code for index */ - low = (unsigned)(-1); /* trigger new sub-table when len > root */ - used = 1U << root; /* use root table entries */ - mask = used - 1; /* mask for comparing low */ - - /* check available table space */ - if (type == LENS && used >= ENOUGH - MAXD) - return 1; - - /* process all codes and make table entries */ - for (;;) { - /* create table entry */ - this.bits = (unsigned char)(len - drop); - if ((int)(work[sym]) < end) { - this.op = (unsigned char)0; - this.val = work[sym]; - } - else if ((int)(work[sym]) > end) { - this.op = (unsigned char)(extra[work[sym]]); - this.val = base[work[sym]]; - } - else { - this.op = (unsigned char)(32 + 64); /* end of block */ - this.val = 0; - } - - /* replicate for those indices with low len bits equal to huff */ - incr = 1U << (len - drop); - fill = 1U << curr; - min = fill; /* save offset to next table */ - do { - fill -= incr; - next[(huff >> drop) + fill] = this; - } while (fill != 0); - - /* backwards increment the len-bit code huff */ - incr = 1U << (len - 1); - while (huff & incr) - incr >>= 1; - if (incr != 0) { - huff &= incr - 1; - huff += incr; - } - else - huff = 0; - - /* go to next symbol, update count, len */ - sym++; - if (--(count[len]) == 0) { - if (len == max) break; - len = lens[work[sym]]; - } - - /* create new sub-table if needed */ - if (len > root && (huff & mask) != low) { - /* if first time, transition to sub-tables */ - if (drop == 0) - drop = root; - - /* increment past last table */ - next += min; /* here min is 1 << curr */ - - /* determine length of next table */ - curr = len - drop; - left = (int)(1 << curr); - while (curr + drop < max) { - left -= count[curr + drop]; - if (left <= 0) break; - curr++; - left <<= 1; - } - - /* check for enough space */ - used += 1U << curr; - if (type == LENS && used >= ENOUGH - MAXD) - return 1; - - /* point entry in root table to sub-table */ - low = huff & mask; - (*table)[low].op = (unsigned char)curr; - (*table)[low].bits = (unsigned char)root; - (*table)[low].val = (unsigned short)(next - *table); - } - } - - /* - Fill in rest of table for incomplete codes. This loop is similar to the - loop above in incrementing huff for table indices. It is assumed that - len is equal to curr + drop, so there is no loop needed to increment - through high index bits. When the current sub-table is filled, the loop - drops back to the root table to fill in any remaining entries there. - */ - this.op = (unsigned char)64; /* invalid code marker */ - this.bits = (unsigned char)(len - drop); - this.val = (unsigned short)0; - while (huff != 0) { - /* when done with sub-table, drop back to root table */ - if (drop != 0 && (huff & mask) != low) { - drop = 0; - len = root; - next = *table; - this.bits = (unsigned char)len; - } - - /* put invalid code marker in table */ - next[huff >> drop] = this; - - /* backwards increment the len-bit code huff */ - incr = 1U << (len - 1); - while (huff & incr) - incr >>= 1; - if (incr != 0) { - huff &= incr - 1; - huff += incr; - } - else - huff = 0; - } - - /* set return parameters */ - *table += used; - *bits = root; - return 0; -} diff --git a/jni/physfs-2.0.3/zlib123/inftrees.h b/jni/physfs-2.0.3/zlib123/inftrees.h deleted file mode 100644 index b1104c87..00000000 --- a/jni/physfs-2.0.3/zlib123/inftrees.h +++ /dev/null @@ -1,55 +0,0 @@ -/* inftrees.h -- header to use inftrees.c - * Copyright (C) 1995-2005 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. - */ - -/* Structure for decoding tables. Each entry provides either the - information needed to do the operation requested by the code that - indexed that table entry, or it provides a pointer to another - table that indexes more bits of the code. op indicates whether - the entry is a pointer to another table, a literal, a length or - distance, an end-of-block, or an invalid code. For a table - pointer, the low four bits of op is the number of index bits of - that table. For a length or distance, the low four bits of op - is the number of extra bits to get after the code. bits is - the number of bits in this code or part of the code to drop off - of the bit buffer. val is the actual byte to output in the case - of a literal, the base length or distance, or the offset from - the current table to the next table. Each entry is four bytes. */ -typedef struct { - unsigned char op; /* operation, extra bits, table bits */ - unsigned char bits; /* bits in this part of the code */ - unsigned short val; /* offset in table or code value */ -} code; - -/* op values as set by inflate_table(): - 00000000 - literal - 0000tttt - table link, tttt != 0 is the number of table index bits - 0001eeee - length or distance, eeee is the number of extra bits - 01100000 - end of block - 01000000 - invalid code - */ - -/* Maximum size of dynamic tree. The maximum found in a long but non- - exhaustive search was 1444 code structures (852 for length/literals - and 592 for distances, the latter actually the result of an - exhaustive search). The true maximum is not known, but the value - below is more than safe. */ -#define ENOUGH 2048 -#define MAXD 592 - -/* Type of code to build for inftable() */ -typedef enum { - CODES, - LENS, - DISTS -} codetype; - -extern int inflate_table OF((codetype type, unsigned short FAR *lens, - unsigned codes, code FAR * FAR *table, - unsigned FAR *bits, unsigned short FAR *work)); diff --git a/jni/physfs-2.0.3/zlib123/trees.c b/jni/physfs-2.0.3/zlib123/trees.c deleted file mode 100644 index 395e4e16..00000000 --- a/jni/physfs-2.0.3/zlib123/trees.c +++ /dev/null @@ -1,1219 +0,0 @@ -/* trees.c -- output deflated data using Huffman coding - * Copyright (C) 1995-2005 Jean-loup Gailly - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - * ALGORITHM - * - * The "deflation" process uses several Huffman trees. The more - * common source values are represented by shorter bit sequences. - * - * Each code tree is stored in a compressed form which is itself - * a Huffman encoding of the lengths of all the code strings (in - * ascending order by source values). The actual code strings are - * reconstructed from the lengths in the inflate process, as described - * in the deflate specification. - * - * REFERENCES - * - * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification". - * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc - * - * Storer, James A. - * Data Compression: Methods and Theory, pp. 49-50. - * Computer Science Press, 1988. ISBN 0-7167-8156-5. - * - * Sedgewick, R. - * Algorithms, p290. - * Addison-Wesley, 1983. ISBN 0-201-06672-6. - */ - -/* @(#) $Id$ */ - -/* #define GEN_TREES_H */ - -#include "deflate.h" - -#ifdef DEBUG -# include -#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 */ - - -/* 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 ((unsigned) 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)((s->depth[n] >= s->depth[m] ? - 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 binary or text */ - if (stored_len > 0 && s->strm->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 the block lengths 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 (s->strategy == Z_FIXED || 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((uInt)(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 BINARY or TEXT, using a crude approximation: - * set it to Z_TEXT if all symbols are either printable characters (33 to 255) - * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise. - * IN assertion: the fields Freq of dyn_ltree are set. - */ -local void set_data_type(s) - deflate_state *s; -{ - int n; - - for (n = 0; n < 9; n++) - if (s->dyn_ltree[n].Freq != 0) - break; - if (n == 9) - for (n = 14; n < 32; n++) - if (s->dyn_ltree[n].Freq != 0) - break; - s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY; -} - -/* =========================================================================== - * 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/jni/physfs-2.0.3/zlib123/trees.h b/jni/physfs-2.0.3/zlib123/trees.h deleted file mode 100644 index 72facf90..00000000 --- a/jni/physfs-2.0.3/zlib123/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/jni/physfs-2.0.3/zlib123/uncompr.c b/jni/physfs-2.0.3/zlib123/uncompr.c deleted file mode 100644 index b59e3d0d..00000000 --- a/jni/physfs-2.0.3/zlib123/uncompr.c +++ /dev/null @@ -1,61 +0,0 @@ -/* uncompr.c -- decompress a memory buffer - * Copyright (C) 1995-2003 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#define ZLIB_INTERNAL -#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); - if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) - return Z_DATA_ERROR; - return err; - } - *destLen = stream.total_out; - - err = inflateEnd(&stream); - return err; -} diff --git a/jni/physfs-2.0.3/zlib123/zconf.h b/jni/physfs-2.0.3/zlib123/zconf.h deleted file mode 100644 index 03a9431c..00000000 --- a/jni/physfs-2.0.3/zlib123/zconf.h +++ /dev/null @@ -1,332 +0,0 @@ -/* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2005 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#ifndef ZCONF_H -#define ZCONF_H - -/* - * 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. - */ -#ifdef Z_PREFIX -# define deflateInit_ z_deflateInit_ -# define deflate z_deflate -# define deflateEnd z_deflateEnd -# define inflateInit_ z_inflateInit_ -# define inflate z_inflate -# define inflateEnd z_inflateEnd -# define deflateInit2_ z_deflateInit2_ -# define deflateSetDictionary z_deflateSetDictionary -# define deflateCopy z_deflateCopy -# define deflateReset z_deflateReset -# define deflateParams z_deflateParams -# define deflateBound z_deflateBound -# define deflatePrime z_deflatePrime -# define inflateInit2_ z_inflateInit2_ -# define inflateSetDictionary z_inflateSetDictionary -# define inflateSync z_inflateSync -# define inflateSyncPoint z_inflateSyncPoint -# define inflateCopy z_inflateCopy -# define inflateReset z_inflateReset -# define inflateBack z_inflateBack -# define inflateBackEnd z_inflateBackEnd -# define compress z_compress -# define compress2 z_compress2 -# define compressBound z_compressBound -# define uncompress z_uncompress -# define adler32 z_adler32 -# define crc32 z_crc32 -# define get_crc_table z_get_crc_table -# define zError z_zError - -# define alloc_func z_alloc_func -# define free_func z_free_func -# define in_func z_in_func -# define out_func z_out_func -# define Byte z_Byte -# define uInt z_uInt -# define uLong z_uLong -# define Bytef z_Bytef -# define charf z_charf -# define intf z_intf -# define uIntf z_uIntf -# define uLongf z_uLongf -# define voidpf z_voidpf -# define voidp z_voidp -#endif - -#if defined(__MSDOS__) && !defined(MSDOS) -# define MSDOS -#endif -#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) -# define OS2 -#endif -#if defined(_WINDOWS) && !defined(WINDOWS) -# define WINDOWS -#endif -#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) -# ifndef WIN32 -# define WIN32 -# endif -#endif -#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) -# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) -# ifndef SYS16BIT -# define SYS16BIT -# endif -# endif -#endif - -/* - * Compile with -DMAXSEG_64K if the alloc function cannot allocate more - * than 64k bytes at a time (needed on systems with 16-bit int). - */ -#ifdef SYS16BIT -# define MAXSEG_64K -#endif -#ifdef MSDOS -# define UNALIGNED_OK -#endif - -#ifdef __STDC_VERSION__ -# ifndef STDC -# define STDC -# endif -# if __STDC_VERSION__ >= 199901L -# ifndef STDC99 -# define STDC99 -# endif -# endif -#endif -#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) -# define STDC -#endif -#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) -# define STDC -#endif -#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) -# define STDC -#endif -#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) -# define STDC -#endif - -#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ -# define STDC -#endif - -#ifndef STDC -# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ -# define const /* note: need a more gentle solution here */ -# endif -#endif - -/* Some Mac compilers merge all .h files incorrectly: */ -#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) -# define NO_DUMMY_DECL -#endif - -/* Maximum value for memLevel in deflateInit2 */ -#ifndef MAX_MEM_LEVEL -# ifdef MAXSEG_64K -# define MAX_MEM_LEVEL 8 -# else -# define MAX_MEM_LEVEL 9 -# endif -#endif - -/* Maximum value for windowBits in deflateInit2 and inflateInit2. - * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files - * created by gzip. (Files created by minigzip can still be extracted by - * gzip.) - */ -#ifndef MAX_WBITS -# define MAX_WBITS 15 /* 32K LZ77 window */ -#endif - -/* The memory requirements for deflate are (in bytes): - (1 << (windowBits+2)) + (1 << (memLevel+9)) - that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) - plus a few kilobytes for small objects. For example, if you want to reduce - the default memory requirements from 256K to 128K, compile with - make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" - Of course this will generally degrade compression (there's no free lunch). - - The memory requirements for inflate are (in bytes) 1 << windowBits - that is, 32K for windowBits=15 (default value) plus a few kilobytes - for small objects. -*/ - - /* Type declarations */ - -#ifndef OF /* function prototypes */ -# 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). - * This was tested only with MSC; for other MSDOS compilers you may have - * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, - * just define FAR to be empty. - */ -#ifdef SYS16BIT -# if defined(M_I86SM) || defined(M_I86MM) - /* MSC small or medium model */ -# define SMALL_MEDIUM -# ifdef _MSC_VER -# define FAR _far -# else -# define FAR far -# endif -# endif -# if (defined(__SMALL__) || defined(__MEDIUM__)) - /* Turbo C small or medium model */ -# define SMALL_MEDIUM -# ifdef __BORLANDC__ -# define FAR _far -# else -# define FAR far -# endif -# endif -#endif - -#if defined(WINDOWS) || defined(WIN32) - /* If building or using zlib as a DLL, define ZLIB_DLL. - * This is not mandatory, but it offers a little performance increase. - */ -# ifdef ZLIB_DLL -# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) -# ifdef ZLIB_INTERNAL -# define ZEXTERN extern __declspec(dllexport) -# else -# define ZEXTERN extern __declspec(dllimport) -# endif -# endif -# endif /* ZLIB_DLL */ - /* If building or using zlib with the WINAPI/WINAPIV calling convention, - * define ZLIB_WINAPI. - * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. - */ -# ifdef ZLIB_WINAPI -# ifdef FAR -# undef FAR -# endif -# include - /* No need for _export, use ZLIB.DEF instead. */ - /* For complete Windows compatibility, use WINAPI, not __stdcall. */ -# define ZEXPORT WINAPI -# ifdef WIN32 -# define ZEXPORTVA WINAPIV -# else -# define ZEXPORTVA FAR CDECL -# endif -# endif -#endif - -#if defined (__BEOS__) -# ifdef ZLIB_DLL -# ifdef ZLIB_INTERNAL -# define ZEXPORT __declspec(dllexport) -# define ZEXPORTVA __declspec(dllexport) -# else -# define ZEXPORT __declspec(dllimport) -# define ZEXPORTVA __declspec(dllimport) -# endif -# endif -#endif - -#ifndef ZEXTERN -# define ZEXTERN extern -#endif -#ifndef ZEXPORT -# define ZEXPORT -#endif -#ifndef ZEXPORTVA -# define ZEXPORTVA -#endif - -#ifndef FAR -# define FAR -#endif - -#if !defined(__MACTYPES__) -typedef unsigned char Byte; /* 8 bits */ -#endif -typedef unsigned int uInt; /* 16 bits or more */ -typedef unsigned long uLong; /* 32 bits or more */ - -#ifdef SMALL_MEDIUM - /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ -# define Bytef Byte FAR -#else - typedef Byte FAR Bytef; -#endif -typedef char FAR charf; -typedef int FAR intf; -typedef uInt FAR uIntf; -typedef uLong FAR uLongf; - -#ifdef STDC - typedef void const *voidpc; - typedef void FAR *voidpf; - typedef void *voidp; -#else - typedef Byte const *voidpc; - typedef Byte FAR *voidpf; - typedef Byte *voidp; -#endif - -#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ -# include /* for off_t */ -# include /* for SEEK_* and off_t */ -# ifdef VMS -# include /* for off_t */ -# endif -# define z_off_t off_t -#endif -#ifndef SEEK_SET -# define SEEK_SET 0 /* Seek from beginning of file. */ -# define SEEK_CUR 1 /* Seek from current position. */ -# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ -#endif -#ifndef z_off_t -# define z_off_t long -#endif - -#if defined(__OS400__) -# define NO_vsnprintf -#endif - -#if defined(__MVS__) -# define NO_vsnprintf -# ifdef FAR -# undef FAR -# endif -#endif - -/* MVS linker does not support external names larger than 8 bytes */ -#if defined(__MVS__) -# pragma map(deflateInit_,"DEIN") -# pragma map(deflateInit2_,"DEIN2") -# pragma map(deflateEnd,"DEEND") -# pragma map(deflateBound,"DEBND") -# pragma map(inflateInit_,"ININ") -# pragma map(inflateInit2_,"ININ2") -# pragma map(inflateEnd,"INEND") -# pragma map(inflateSync,"INSY") -# pragma map(inflateSetDictionary,"INSEDI") -# pragma map(compressBound,"CMBND") -# pragma map(inflate_table,"INTABL") -# pragma map(inflate_fast,"INFA") -# pragma map(inflate_copyright,"INCOPY") -#endif - -#endif /* ZCONF_H */ diff --git a/jni/physfs-2.0.3/zlib123/zlib.h b/jni/physfs-2.0.3/zlib123/zlib.h deleted file mode 100644 index 02281792..00000000 --- a/jni/physfs-2.0.3/zlib123/zlib.h +++ /dev/null @@ -1,1357 +0,0 @@ -/* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.3, July 18th, 2005 - - Copyright (C) 1995-2005 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 http://www.ietf.org/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.2.3" -#define ZLIB_VERNUM 0x1230 - -/* - 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 compressed data format used by default by the in-memory functions is - the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped - around a deflate stream, which is itself documented in RFC 1951. - - The library also supports reading and writing files in gzip (.gz) format - with an interface similar to that of stdio using the functions that start - with "gz". The gzip format is different from the zlib format. gzip is a - gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. - - This library can optionally read and write gzip streams in memory as well. - - The zlib format was designed to be compact and fast for use in memory - and on communications channels. The gzip format was designed for single- - file compression on file systems, has a larger header than zlib to maintain - directory information, and uses a different, slower check method than zlib. - - 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: binary or text */ - uLong adler; /* adler32 value of the uncompressed data */ - uLong reserved; /* reserved for future use */ -} z_stream; - -typedef z_stream FAR *z_streamp; - -/* - gzip header information passed to and from zlib routines. See RFC 1952 - for more details on the meanings of these fields. -*/ -typedef struct gz_header_s { - int text; /* true if compressed data believed to be text */ - uLong time; /* modification time */ - int xflags; /* extra flags (not used when writing a gzip file) */ - int os; /* operating system */ - Bytef *extra; /* pointer to extra field or Z_NULL if none */ - uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ - uInt extra_max; /* space at extra (only when reading header) */ - Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ - uInt name_max; /* space at name (only when reading header) */ - Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ - uInt comm_max; /* space at comment (only when reading header) */ - int hcrc; /* true if there was or will be a header crc */ - int done; /* true when done reading gzip header (not used - when writing a gzip file) */ -} gz_header; - -typedef gz_header FAR *gz_headerp; - -/* - 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 -#define Z_BLOCK 5 -/* Allowed flush values; see deflate() and inflate() 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_RLE 3 -#define Z_FIXED 4 -#define Z_DEFAULT_STRATEGY 0 -/* compression strategy; see deflateInit2() below for details */ - -#define Z_BINARY 0 -#define Z_TEXT 1 -#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ -#define Z_UNKNOWN 2 -/* Possible values of the data_type field (though see inflate()) */ - -#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. - - Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to - decide how much data to accumualte before producing output, in order to - maximize compression. - - 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 - 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). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that - avail_out is greater than six to avoid repeated flush markers due to - avail_out == 0 on return. - - 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 - the value returned by deflateBound (see below). 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 strm->data_type if it can make a good guess about - the input data type (Z_BINARY or Z_TEXT). 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). Note that Z_BUF_ERROR is not - fatal, and deflate() can be called again with more input and more output - space to continue compressing. -*/ - - -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 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. - - The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, - Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much - output as possible to the output buffer. Z_BLOCK requests that inflate() stop - if and when it gets to the next deflate block boundary. When decoding the - zlib or gzip format, this will cause inflate() to return immediately after - the header and before the first block. When doing a raw inflate, inflate() - will go ahead and process the first block, and will return when it gets to - the end of that block, or when it runs out of data. - - The Z_BLOCK option assists in appending to or combining deflate streams. - Also to assist in this, on return inflate() will set strm->data_type to the - number of unused bits in the last byte taken from strm->next_in, plus 64 - if inflate() is currently decoding the last block in the deflate stream, - plus 128 if inflate() returned immediately after decoding an end-of-block - code or decoding the complete header up to just before the first byte of the - deflate stream. The end-of-block will not be indicated until all of the - uncompressed data from that block has been written to strm->next_out. The - number of unused bits may in general be greater than seven, except when - bit 7 of data_type is set, in which case the number of unused bits will be - less than eight. - - 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 approach - may be used for the single inflate() call. - - In this implementation, inflate() always flushes as much output as - possible to the output buffer, and always uses the faster approach on the - first call. So the only effect of the flush parameter in this implementation - is on the return value of inflate(), as noted below, or when it returns early - because Z_BLOCK is used. - - If a preset dictionary is needed after this call (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() will decompress and check either zlib-wrapped or gzip-wrapped - deflate data. The header type is detected automatically. Any information - contained in the gzip header is not retained, so applications that need that - information should instead use raw inflate, see inflateInit2() below, or - inflateBack() and perform their own processing of the gzip header and - trailer. - - 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 check - value), 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. Note that Z_BUF_ERROR is not fatal, and - inflate() can be called again with more input and more output space to - continue decompressing. If Z_DATA_ERROR is returned, the application may then - call inflateSync() to look for a good compression block if a partial recovery - of the data is desired. -*/ - - -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. - - windowBits can also be -8..-15 for raw deflate. In this case, -windowBits - determines the window size. deflate() will then generate raw deflate data - with no zlib header or trailer, and will not compute an adler32 check value. - - windowBits can also be greater than 15 for optional gzip encoding. Add - 16 to windowBits to write a simple gzip header and trailer around the - compressed data instead of a zlib wrapper. The gzip header will have no - file name, no extra data, no comment, no modification time (set to zero), - no header crc, and the operating system will be set to 255 (unknown). If a - gzip stream is being written, strm->adler is a crc32 instead of an adler32. - - 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), Z_HUFFMAN_ONLY to force Huffman encoding only (no - string match), or Z_RLE to limit match distances to one (run-length - encoding). 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. Z_RLE is designed to be almost as fast as - Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy - parameter only affects the compression ratio but not the correctness of the - compressed output even if it is not set appropriately. Z_FIXED prevents the - use of dynamic Huffman codes, allowing for a simpler decoder for special - applications. - - 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. In addition, the - current implementation of deflate will use at most the window size minus - 262 bytes of the provided dictionary. - - 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.) If a raw deflate was requested, then the - adler32 value is not computed and strm->adler is not set. - - 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 deflateTune OF((z_streamp strm, - int good_length, - int max_lazy, - int nice_length, - int max_chain)); -/* - Fine tune deflate's internal compression parameters. This should only be - used by someone who understands the algorithm used by zlib's deflate for - searching for the best matching string, and even then only by the most - fanatic optimizer trying to squeeze out the last compressed bit for their - specific input data. Read the deflate.c source code for the meaning of the - max_lazy, good_length, nice_length, and max_chain parameters. - - deflateTune() can be called after deflateInit() or deflateInit2(), and - returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. - */ - -ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, - uLong sourceLen)); -/* - deflateBound() returns an upper bound on the compressed size after - deflation of sourceLen bytes. It must be called after deflateInit() - or deflateInit2(). This would be used to allocate an output buffer - for deflation in a single pass, and so would be called before deflate(). -*/ - -ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, - int bits, - int value)); -/* - deflatePrime() inserts bits in the deflate output stream. The intent - is that this function is used to start off the deflate output with the - bits leftover from a previous deflate stream when appending to it. As such, - this function can only be used for raw deflate, and must be used before the - first deflate() call after a deflateInit2() or deflateReset(). bits must be - less than or equal to 16, and that many of the least significant bits of - value will be inserted in the output. - - deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, - gz_headerp head)); -/* - deflateSetHeader() provides gzip header information for when a gzip - stream is requested by deflateInit2(). deflateSetHeader() may be called - after deflateInit2() or deflateReset() and before the first call of - deflate(). The text, time, os, extra field, name, and comment information - in the provided gz_header structure are written to the gzip header (xflag is - ignored -- the extra flags are set according to the compression level). The - caller must assure that, if not Z_NULL, name and comment are terminated with - a zero byte, and that if extra is not Z_NULL, that extra_len bytes are - available there. If hcrc is true, a gzip header crc is included. Note that - the current versions of the command-line version of gzip (up through version - 1.3.x) do not support header crc's, and will report that it is a "multi-part - gzip file" and give up. - - If deflateSetHeader is not used, the default gzip header has text false, - the time set to zero, and os set to 255, with no extra, name, or comment - fields. The gzip header is returned to the default state by deflateReset(). - - deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -/* -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. windowBits must be greater than or equal to the windowBits value - provided to deflateInit2() while compressing, or it must be equal to 15 if - deflateInit2() was not used. 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. - - windowBits can also be -8..-15 for raw inflate. In this case, -windowBits - determines the window size. inflate() will then process raw deflate data, - not looking for a zlib or gzip header, not generating a check value, and not - looking for any check values for comparison at the end of the stream. This - is for use with other formats that use the deflate compressed data format - such as zip. Those formats provide their own check values. If a custom - format is developed using the raw deflate format for compressed data, it is - recommended that a check value such as an adler32 or a crc32 be applied to - the uncompressed data as is done in the zlib, gzip, and zip formats. For - most applications, the zlib format should be used as is. Note that comments - above on the use in deflateInit2() applies to the magnitude of windowBits. - - windowBits can also be greater than 15 for optional gzip decoding. Add - 32 to windowBits to enable zlib and gzip decoding with automatic header - detection, or add 16 to decode only the gzip format (the zlib format will - return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is - a crc32 instead of an adler32. - - 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 null strm). 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 that call returned Z_NEED_DICT. The dictionary chosen by the compressor - can be determined from the adler32 value returned by that call of inflate. - The compressor and decompressor must use exactly the same dictionary (see - deflateSetDictionary). For raw inflate, this function can be called - immediately after inflateInit2() or inflateReset() and before any call of - inflate() to set the dictionary. The application must insure that the - dictionary that was used for compression is provided. - - 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 inflateCopy 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 randomly accessing a large stream. The - first pass through the stream can periodically record the inflate state, - allowing restarting inflate at those points when randomly accessing the - stream. - - inflateCopy 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 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). -*/ - -ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, - int bits, - int value)); -/* - This function inserts bits in the inflate input stream. The intent is - that this function is used to start inflating at a bit position in the - middle of a byte. The provided bits will be used before any bytes are used - from next_in. This function should only be used with raw inflate, and - should be used before the first inflate() call after inflateInit2() or - inflateReset(). bits must be less than or equal to 16, and that many of the - least significant bits of value will be inserted in the input. - - inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, - gz_headerp head)); -/* - inflateGetHeader() requests that gzip header information be stored in the - provided gz_header structure. inflateGetHeader() may be called after - inflateInit2() or inflateReset(), and before the first call of inflate(). - As inflate() processes the gzip stream, head->done is zero until the header - is completed, at which time head->done is set to one. If a zlib stream is - being decoded, then head->done is set to -1 to indicate that there will be - no gzip header information forthcoming. Note that Z_BLOCK can be used to - force inflate() to return immediately after header processing is complete - and before any actual data is decompressed. - - The text, time, xflags, and os fields are filled in with the gzip header - contents. hcrc is set to true if there is a header CRC. (The header CRC - was valid if done is set to one.) If extra is not Z_NULL, then extra_max - contains the maximum number of bytes to write to extra. Once done is true, - extra_len contains the actual extra field length, and extra contains the - extra field, or that field truncated if extra_max is less than extra_len. - If name is not Z_NULL, then up to name_max characters are written there, - terminated with a zero unless the length is greater than name_max. If - comment is not Z_NULL, then up to comm_max characters are written there, - terminated with a zero unless the length is greater than comm_max. When - any of extra, name, or comment are not Z_NULL and the respective field is - not present in the header, then that field is set to Z_NULL to signal its - absence. This allows the use of deflateSetHeader() with the returned - structure to duplicate the header. However if those fields are set to - allocated memory, then the application will need to save those pointers - elsewhere so that they can be eventually freed. - - If inflateGetHeader is not used, then the header information is simply - discarded. The header is always checked for validity, including the header - CRC if present. inflateReset() will reset the process to discard the header - information. The application would need to call inflateGetHeader() again to - retrieve the header from the next gzip stream. - - inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -/* -ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, - unsigned char FAR *window)); - - Initialize the internal stream state for decompression using inflateBack() - calls. The fields zalloc, zfree and opaque in strm must be initialized - before the call. If zalloc and zfree are Z_NULL, then the default library- - derived memory allocation routines are used. windowBits is the base two - logarithm of the window size, in the range 8..15. window is a caller - supplied buffer of that size. Except for special applications where it is - assured that deflate was used with small window sizes, windowBits must be 15 - and a 32K byte window must be supplied to be able to decompress general - deflate streams. - - See inflateBack() for the usage of these routines. - - inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of - the paramaters are invalid, Z_MEM_ERROR if the internal state could not - be allocated, or Z_VERSION_ERROR if the version of the library does not - match the version of the header file. -*/ - -typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); -typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); - -ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, - in_func in, void FAR *in_desc, - out_func out, void FAR *out_desc)); -/* - inflateBack() does a raw inflate with a single call using a call-back - interface for input and output. This is more efficient than inflate() for - file i/o applications in that it avoids copying between the output and the - sliding window by simply making the window itself the output buffer. This - function trusts the application to not change the output buffer passed by - the output function, at least until inflateBack() returns. - - inflateBackInit() must be called first to allocate the internal state - and to initialize the state with the user-provided window buffer. - inflateBack() may then be used multiple times to inflate a complete, raw - deflate stream with each call. inflateBackEnd() is then called to free - the allocated state. - - A raw deflate stream is one with no zlib or gzip header or trailer. - This routine would normally be used in a utility that reads zip or gzip - files and writes out uncompressed files. The utility would decode the - header and process the trailer on its own, hence this routine expects - only the raw deflate stream to decompress. This is different from the - normal behavior of inflate(), which expects either a zlib or gzip header and - trailer around the deflate stream. - - inflateBack() uses two subroutines supplied by the caller that are then - called by inflateBack() for input and output. inflateBack() calls those - routines until it reads a complete deflate stream and writes out all of the - uncompressed data, or until it encounters an error. The function's - parameters and return types are defined above in the in_func and out_func - typedefs. inflateBack() will call in(in_desc, &buf) which should return the - number of bytes of provided input, and a pointer to that input in buf. If - there is no input available, in() must return zero--buf is ignored in that - case--and inflateBack() will return a buffer error. inflateBack() will call - out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() - should return zero on success, or non-zero on failure. If out() returns - non-zero, inflateBack() will return with an error. Neither in() nor out() - are permitted to change the contents of the window provided to - inflateBackInit(), which is also the buffer that out() uses to write from. - The length written by out() will be at most the window size. Any non-zero - amount of input may be provided by in(). - - For convenience, inflateBack() can be provided input on the first call by - setting strm->next_in and strm->avail_in. If that input is exhausted, then - in() will be called. Therefore strm->next_in must be initialized before - calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called - immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in - must also be initialized, and then if strm->avail_in is not zero, input will - initially be taken from strm->next_in[0 .. strm->avail_in - 1]. - - The in_desc and out_desc parameters of inflateBack() is passed as the - first parameter of in() and out() respectively when they are called. These - descriptors can be optionally used to pass any information that the caller- - supplied in() and out() functions need to do their job. - - On return, inflateBack() will set strm->next_in and strm->avail_in to - pass back any unused input that was provided by the last in() call. The - return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR - if in() or out() returned an error, Z_DATA_ERROR if there was a format - error in the deflate stream (in which case strm->msg is set to indicate the - nature of the error), or Z_STREAM_ERROR if the stream was not properly - initialized. In the case of Z_BUF_ERROR, an input or output error can be - distinguished using strm->next_in which will be Z_NULL only if in() returned - an error. If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to - out() returning non-zero. (in() will always be called before out(), so - strm->next_in is assured to be defined if out() returns non-zero.) Note - that inflateBack() cannot return Z_OK. -*/ - -ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); -/* - All memory allocated by inflateBackInit() is freed. - - inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream - state was inconsistent. -*/ - -ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); -/* Return flags indicating compile-time options. - - Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: - 1.0: size of uInt - 3.2: size of uLong - 5.4: size of voidpf (pointer) - 7.6: size of z_off_t - - Compiler, assembler, and debug options: - 8: DEBUG - 9: ASMV or ASMINF -- use ASM code - 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention - 11: 0 (reserved) - - One-time table building (smaller code, but not thread-safe if true): - 12: BUILDFIXED -- build static block decoding tables when needed - 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed - 14,15: 0 (reserved) - - Library content (indicates missing functionality): - 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking - deflate code when not needed) - 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect - and decode gzip streams (to avoid linking crc code) - 18-19: 0 (reserved) - - Operation variations (changes in library functionality): - 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate - 21: FASTEST -- deflate algorithm with only one, lowest compression level - 22,23: 0 (reserved) - - The sprintf variant used by gzprintf (zero is best): - 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format - 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! - 26: 0 = returns value, 1 = void -- 1 means inferred string length returned - - Remainder: - 27-31: 0 (reserved) - */ - - - /* 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 the value returned - by compressBound(sourceLen). 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 the value returned by - compressBound(sourceLen). 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 uLong ZEXPORT compressBound OF((uLong sourceLen)); -/* - compressBound() returns an upper bound on the compressed size after - compress() or compress2() on sourceLen bytes. It would be used before - a compress() or compress2() call to allocate the destination buffer. -*/ - -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 or incomplete. -*/ - - -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", or 'R' for run-length encoding - as in "wb1R". (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, - voidpc 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). The number of - uncompressed bytes written is limited to 4095. The caller should assure that - this limit is not exceeded. If it is exceeded, then gzprintf() will return - return an error (0) with nothing written. In this case, there may also be a - buffer overflow with unpredictable consequences, which is possible only if - zlib was compiled with the insecure functions sprintf() or vsprintf() - because the secure snprintf() or vsnprintf() functions were not available. -*/ - -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 gzungetc OF((int c, gzFile file)); -/* - Push one character back onto the stream to be read again later. - Only one character of push-back is allowed. gzungetc() returns the - character pushed, or -1 on failure. gzungetc() will fail if a - character has been pushed but not read yet, or if c is -1. The pushed - character will be discarded if the stream is repositioned with gzseek() - or gzrewind(). -*/ - -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 gzdirect OF((gzFile file)); -/* - Returns 1 if file is being read directly without decompression, 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. -*/ - -ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); -/* - Clears the error and end-of-file flags for file. This is analogous to the - clearerr() function in stdio. This is useful for continuing to read a gzip - file that is being written concurrently. -*/ - - /* 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 adler32_combine OF((uLong adler1, uLong adler2, - z_off_t len2)); -/* - Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 - and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for - each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of - seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. -*/ - -ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -/* - Update a running CRC-32 with the bytes buf[0..len-1] and return the - updated CRC-32. If buf is NULL, this function returns the required initial - value for the 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(); -*/ - -ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); - -/* - Combine two CRC-32 check values into one. For two sequences of bytes, - seq1 and seq2 with lengths len1 and len2, CRC-32 check values were - calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 - check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and - len2. -*/ - - - /* 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)); -ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, - unsigned char FAR *window, - 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)) -#define inflateBackInit(strm, windowBits, window) \ - inflateBackInit_((strm), (windowBits), (window), \ - ZLIB_VERSION, sizeof(z_stream)) - - -#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; /* hack for buggy compilers */ -#endif - -ZEXTERN const char * ZEXPORT zError OF((int)); -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/jni/physfs-2.0.3/zlib123/zutil.c b/jni/physfs-2.0.3/zlib123/zutil.c deleted file mode 100644 index d55f5948..00000000 --- a/jni/physfs-2.0.3/zlib123/zutil.c +++ /dev/null @@ -1,318 +0,0 @@ -/* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2005 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zutil.h" - -#ifndef NO_DUMMY_DECL -struct internal_state {int dummy;}; /* for buggy compilers */ -#endif - -const char * const 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; -} - -uLong ZEXPORT zlibCompileFlags() -{ - uLong flags; - - flags = 0; - switch (sizeof(uInt)) { - case 2: break; - case 4: flags += 1; break; - case 8: flags += 2; break; - default: flags += 3; - } - switch (sizeof(uLong)) { - case 2: break; - case 4: flags += 1 << 2; break; - case 8: flags += 2 << 2; break; - default: flags += 3 << 2; - } - switch (sizeof(voidpf)) { - case 2: break; - case 4: flags += 1 << 4; break; - case 8: flags += 2 << 4; break; - default: flags += 3 << 4; - } - switch (sizeof(z_off_t)) { - case 2: break; - case 4: flags += 1 << 6; break; - case 8: flags += 2 << 6; break; - default: flags += 3 << 6; - } -#ifdef DEBUG - flags += 1 << 8; -#endif -#if defined(ASMV) || defined(ASMINF) - flags += 1 << 9; -#endif -#ifdef ZLIB_WINAPI - flags += 1 << 10; -#endif -#ifdef BUILDFIXED - flags += 1 << 12; -#endif -#ifdef DYNAMIC_CRC_TABLE - flags += 1 << 13; -#endif -#ifdef NO_GZCOMPRESS - flags += 1L << 16; -#endif -#ifdef NO_GZIP - flags += 1L << 17; -#endif -#ifdef PKZIP_BUG_WORKAROUND - flags += 1L << 20; -#endif -#ifdef FASTEST - flags += 1L << 21; -#endif -#ifdef STDC -# ifdef NO_vsnprintf - flags += 1L << 25; -# ifdef HAS_vsprintf_void - flags += 1L << 26; -# endif -# else -# ifdef HAS_vsnprintf_void - flags += 1L << 26; -# endif -# endif -#else - flags += 1L << 24; -# ifdef NO_snprintf - flags += 1L << 25; -# ifdef HAS_sprintf_void - flags += 1L << 26; -# endif -# else -# ifdef HAS_snprintf_void - flags += 1L << 26; -# endif -# endif -#endif - return flags; -} - -#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); -} - -#if defined(_WIN32_WCE) - /* The Microsoft C Run-Time Library for Windows CE doesn't have - * errno. We define it as a global variable to simplify porting. - * Its value is always 0 and should not be used. - */ - int errno = 0; -#endif - -#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 SYS16BIT - -#ifdef __TURBOC__ -/* Turbo C in 16-bit mode */ - -# 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 /* __TURBOC__ */ - - -#ifdef M_I86 -/* 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 /* M_I86 */ - -#endif /* SYS16BIT */ - - -#ifndef MY_ZCALLOC /* Any system without a special alloc function */ - -#ifndef STDC -extern voidp malloc OF((uInt size)); -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 sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : - (voidpf)calloc(items, size); -} - -void zcfree (opaque, ptr) - voidpf opaque; - voidpf ptr; -{ - free(ptr); - if (opaque) return; /* make compiler happy */ -} - -#endif /* MY_ZCALLOC */ diff --git a/jni/physfs-2.0.3/zlib123/zutil.h b/jni/physfs-2.0.3/zlib123/zutil.h deleted file mode 100644 index b7d5eff8..00000000 --- a/jni/physfs-2.0.3/zlib123/zutil.h +++ /dev/null @@ -1,269 +0,0 @@ -/* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2005 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 ZUTIL_H -#define ZUTIL_H - -#define ZLIB_INTERNAL -#include "zlib.h" - -#ifdef STDC -# ifndef _WIN32_WCE -# include -# endif -# include -# include -#endif -#ifdef NO_ERRNO_H -# ifdef _WIN32_WCE - /* The Microsoft C Run-Time Library for Windows CE doesn't have - * errno. We define it as a global variable to simplify porting. - * Its value is always 0 and should not be used. We rename it to - * avoid conflict with other libraries that use the same workaround. - */ -# define errno z_errno -# endif - extern int errno; -#else -# ifndef _WIN32_WCE -# include -# endif -#endif - -#ifndef local -# define local static -#endif -/* compile with -Dlocal if your debugger can't find static symbols */ - -typedef unsigned char uch; -typedef uch FAR uchf; -typedef unsigned short ush; -typedef ush FAR ushf; -typedef unsigned long ulg; - -extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ -/* (size given to avoid silly warnings with Visual C++) */ - -#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] - -#define ERR_RETURN(strm,err) \ - return (strm->msg = (char*)ERR_MSG(err), (err)) -/* To be used only when the state is known to be valid */ - - /* common constants */ - -#ifndef DEF_WBITS -# define DEF_WBITS MAX_WBITS -#endif -/* default windowBits for decompression. MAX_WBITS is for compression only */ - -#if MAX_MEM_LEVEL >= 8 -# define DEF_MEM_LEVEL 8 -#else -# define DEF_MEM_LEVEL MAX_MEM_LEVEL -#endif -/* default memLevel */ - -#define STORED_BLOCK 0 -#define STATIC_TREES 1 -#define DYN_TREES 2 -/* The three kinds of block type */ - -#define MIN_MATCH 3 -#define MAX_MATCH 258 -/* The minimum and maximum match lengths */ - -#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ - - /* target dependencies */ - -#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) -# define OS_CODE 0x00 -# if defined(__TURBOC__) || defined(__BORLANDC__) -# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) - /* Allow compilation with ANSI keywords only enabled */ - void _Cdecl farfree( void *block ); - void *_Cdecl farmalloc( unsigned long nbytes ); -# else -# include -# endif -# else /* MSC or DJGPP */ -# include -# endif -#endif - -#ifdef AMIGA -# define OS_CODE 0x01 -#endif - -#if defined(VAXC) || defined(VMS) -# define OS_CODE 0x02 -# define F_OPEN(name, mode) \ - fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") -#endif - -#if defined(ATARI) || defined(atarist) -# define OS_CODE 0x05 -#endif - -#ifdef OS2 -# define OS_CODE 0x06 -# ifdef M_I86 - #include -# endif -#endif - -#if defined(MACOS) || defined(TARGET_OS_MAC) -# define OS_CODE 0x07 -# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os -# include /* for fdopen */ -# else -# ifndef fdopen -# define fdopen(fd,mode) NULL /* No fdopen() */ -# endif -# endif -#endif - -#ifdef TOPS20 -# define OS_CODE 0x0a -#endif - -#ifdef WIN32 -# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ -# define OS_CODE 0x0b -# endif -#endif - -#ifdef __50SERIES /* Prime/PRIMOS */ -# define OS_CODE 0x0f -#endif - -#if defined(_BEOS_) || defined(RISCOS) -# define fdopen(fd,mode) NULL /* No fdopen() */ -#endif - -#if (defined(_MSC_VER) && (_MSC_VER > 600)) -# if defined(_WIN32_WCE) -# define fdopen(fd,mode) NULL /* No fdopen() */ -# ifndef _PTRDIFF_T_DEFINED - typedef int ptrdiff_t; -# define _PTRDIFF_T_DEFINED -# endif -# else -# define fdopen(fd,type) _fdopen(fd,type) -# endif -#endif - - /* common defaults */ - -#ifndef OS_CODE -# define OS_CODE 0x03 /* assume Unix */ -#endif - -#ifndef F_OPEN -# define F_OPEN(name, mode) fopen((name), (mode)) -#endif - - /* functions */ - -#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) -# ifndef HAVE_VSNPRINTF -# define HAVE_VSNPRINTF -# endif -#endif -#if defined(__CYGWIN__) -# ifndef HAVE_VSNPRINTF -# define HAVE_VSNPRINTF -# endif -#endif -#ifndef HAVE_VSNPRINTF -# ifdef MSDOS - /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), - but for now we just assume it doesn't. */ -# define NO_vsnprintf -# endif -# ifdef __TURBOC__ -# define NO_vsnprintf -# endif -# ifdef WIN32 - /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ -# if !defined(vsnprintf) && !defined(NO_vsnprintf) -# define vsnprintf _vsnprintf -# endif -# endif -# ifdef __SASC -# define NO_vsnprintf -# endif -#endif -#ifdef VMS -# define NO_vsnprintf -#endif - -#if defined(pyr) -# define NO_MEMCPY -#endif -#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) - /* Use our own functions for small and medium model with MSC <= 5.0. - * You may have to use the same strategy for Borland C (untested). - * The __SC__ check is for Symantec. - */ -# define NO_MEMCPY -#endif -#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) -# define HAVE_MEMCPY -#endif -#ifdef HAVE_MEMCPY -# ifdef SMALL_MEDIUM /* MSDOS small or medium model */ -# define zmemcpy _fmemcpy -# define zmemcmp _fmemcmp -# define zmemzero(dest, len) _fmemset(dest, 0, len) -# else -# define zmemcpy memcpy -# define zmemcmp memcmp -# define zmemzero(dest, len) memset(dest, 0, len) -# endif -#else - extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); - extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); - extern void zmemzero OF((Bytef* dest, uInt len)); -#endif - -/* Diagnostic functions */ -#ifdef DEBUG -# include - extern int z_verbose; - extern void z_error OF((char *m)); -# define Assert(cond,msg) {if(!(cond)) z_error(msg);} -# define Trace(x) {if (z_verbose>=0) fprintf x ;} -# define Tracev(x) {if (z_verbose>0) fprintf x ;} -# define Tracevv(x) {if (z_verbose>1) fprintf x ;} -# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} -# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} -#else -# define Assert(cond,msg) -# define Trace(x) -# define Tracev(x) -# define Tracevv(x) -# define Tracec(c,x) -# define Tracecv(c,x) -#endif - - -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 TRY_FREE(s, p) {if (p) ZFREE(s, p);} - -#endif /* ZUTIL_H */ diff --git a/jni/physfs-2.1.0/.hg_archival.txt b/jni/physfs-2.1.0/.hg_archival.txt new file mode 100644 index 00000000..481b2292 --- /dev/null +++ b/jni/physfs-2.1.0/.hg_archival.txt @@ -0,0 +1,5 @@ +repo: 7672c9962ce627edaaa67ff54fe4ad8f9a46dc2b +node: aae614cdd00544e929bef29249aef979b8a076b8 +branch: default +latesttag: release-2.0.0 +latesttagdistance: 291 diff --git a/jni/physfs-2.0.3/.hgignore b/jni/physfs-2.1.0/.hgignore similarity index 100% rename from jni/physfs-2.0.3/.hgignore rename to jni/physfs-2.1.0/.hgignore diff --git a/jni/physfs-2.0.3/.hgtags b/jni/physfs-2.1.0/.hgtags similarity index 82% rename from jni/physfs-2.0.3/.hgtags rename to jni/physfs-2.1.0/.hgtags index 252e4cbe..22b973a1 100644 --- a/jni/physfs-2.0.3/.hgtags +++ b/jni/physfs-2.1.0/.hgtags @@ -12,6 +12,3 @@ d94f1ccac8095509c57ad640d54796aea0d260f0 release-0.1.5 fe0c1d6f40afa6fca09a277a1ade59231f16c66f release-1.1.1 5d70fca3be361258edfb59c3edaba5abe75a1e88 release-2.0.0 df04959950eb3830c39adfa983789f70f86062d7 release-1.1.0 -94771621792f838aa4cacf9a1e1f4f86c1cb0711 release-2.0.1 -236afd18dd8cae34adb9897024bdcecc1dc8ca5d release-2.0.2 -bf155bd2127befa399105194e13737d7c3496be0 release-2.0.3 diff --git a/jni/physfs-2.0.3/Android.mk b/jni/physfs-2.1.0/Android.mk similarity index 60% rename from jni/physfs-2.0.3/Android.mk rename to jni/physfs-2.1.0/Android.mk index 5f47cd7d..3621d5a0 100644 --- a/jni/physfs-2.0.3/Android.mk +++ b/jni/physfs-2.1.0/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libphysfs LOCAL_CFLAGS := -fexceptions -g -Dlinux -Dunix \ - -DPHYSFS_NO_CDROM_SUPPORT=1 -DAL_ALEXT_PROTOTYPES=1 \ + -DPHYSFS_NO_CDROM_SUPPORT=1 \ -DHAVE_GCC_DESTRUCTOR=1 -DOPT_GENERIC -DREAL_IS_FLOAT \ -DPHYSFS_SUPPORTS_ZIP=1 -DPHYSFS_SUPPORTS_7Z=1 \ -DPHYSFS_SUPPORTS_GRP=1 -DPHYSFS_SUPPORTS_QPAK=1 \ @@ -15,19 +15,16 @@ LOCAL_CFLAGS := -fexceptions -g -Dlinux -Dunix \ LOCAL_CPPFLAGS := ${LOCAL_CFLAGS} LOCAL_C_INCLUDES := \ - ${LOCAL_PATH} + ${LOCAL_PATH}/src LOCAL_SRC_FILES := \ $(filter-out \ , $(subst $(LOCAL_PATH)/,,\ - ${LOCAL_PATH}/lzma/C/7zCrc.c \ - ${LOCAL_PATH}/lzma/C/Compress/Lzma/LzmaDecode.c \ - $(wildcard ${LOCAL_PATH}/*.c) \ - $(wildcard ${LOCAL_PATH}/lzma/C/Archive/7z/*.c) \ - $(wildcard ${LOCAL_PATH}/lzma/C/Compress/Branch/*.c) \ - $(wildcard ${LOCAL_PATH}/zlib123/*.c) \ - $(wildcard ${LOCAL_PATH}/archivers/*.c) \ - $(wildcard ${LOCAL_PATH}/platform/*.c) )) + ${LOCAL_PATH}/src/lzma/C/7zCrc.c \ + ${LOCAL_PATH}/src/lzma/C/Compress/Lzma/LzmaDecode.c \ + $(wildcard ${LOCAL_PATH}/src/*.c) \ + $(wildcard ${LOCAL_PATH}/src/lzma/C/Archive/7z/*.c) \ + $(wildcard ${LOCAL_PATH}/src/lzma/C/Compress/Branch/*.c))) # $(info libphysfs: include dirs $(LOCAL_C_INCLUDES)) # $(info libphysfs: src files $(LOCAL_SRC_FILES)) diff --git a/jni/physfs-2.1.0/CMakeLists.txt b/jni/physfs-2.1.0/CMakeLists.txt new file mode 100644 index 00000000..2a371af2 --- /dev/null +++ b/jni/physfs-2.1.0/CMakeLists.txt @@ -0,0 +1,400 @@ +# PhysicsFS; a portable, flexible file i/o abstraction. +# +# Please see the file LICENSE.txt in the source's root directory. + +cmake_minimum_required(VERSION 2.8.4) + +project(PhysicsFS) +set(PHYSFS_VERSION 2.1.0) + +# Increment this if/when we break backwards compatibility. +set(PHYSFS_SOVERSION 1) + +# I hate that they define "WIN32" ... we're about to move to Win64...I hope! +if(WIN32 AND NOT WINDOWS) + set(WINDOWS TRUE) +endif() + +# Bleh, let's do it for "APPLE" too. +if(APPLE AND NOT MACOSX) + set(MACOSX TRUE) +endif() + +# For now, Haiku and BeOS are the same, as far as the build system cares. +if(HAIKU AND NOT BEOS) + set(BEOS TRUE) +endif() + +if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") + set(SOLARIS TRUE) +endif() + +include(CheckIncludeFile) +include(CheckLibraryExists) +include(CheckCSourceCompiles) + +include_directories(./src) + +if(MACOSX) + # Fallback to older OS X on PowerPC to support wider range of systems... + if(CMAKE_OSX_ARCHITECTURES MATCHES ppc) + add_definitions(-DMAC_OS_X_VERSION_MIN_REQUIRED=1020) + set(OTHER_LDFLAGS ${OTHER_LDFLAGS} " -mmacosx-version-min=10.2") + endif() + + # Need these everywhere... + add_definitions(-fno-common) + set(OTHER_LDFLAGS ${OTHER_LDFLAGS} "-framework Carbon -framework IOKit") +endif() + +# Add some gcc-specific command lines. +if(CMAKE_COMPILER_IS_GNUCC) + # Always build with debug symbols...you can strip it later. + add_definitions(-g -pipe -Werror -fsigned-char) + + # Stupid BeOS generates warnings in the system headers. + if(NOT BEOS) + add_definitions(-Wall) + endif() + + check_c_source_compiles(" + #if ((defined(__GNUC__)) && (__GNUC__ >= 4)) + int main(int argc, char **argv) { int is_gcc4 = 1; return 0; } + #else + #error This is not gcc4. + #endif + " PHYSFS_IS_GCC4) + + if(PHYSFS_IS_GCC4) + # Not supported on several operating systems at this time. + if(NOT SOLARIS AND NOT WINDOWS) + add_definitions(-fvisibility=hidden) + endif() + endif() + + # Don't use -rpath. + set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "SunPro") + add_definitions(-erroff=E_EMPTY_TRANSLATION_UNIT) + add_definitions(-xldscope=hidden) +endif() + +if(MSVC) + # VS.NET 8.0 got really really anal about strcpy, etc, which even if we + # cleaned up our code, zlib, etc still use...so disable the warning. + add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) +endif() + +# Basic chunks of source code ... + +set(LZMA_SRCS + src/lzma/C/7zCrc.c + src/lzma/C/Archive/7z/7zBuffer.c + src/lzma/C/Archive/7z/7zDecode.c + src/lzma/C/Archive/7z/7zExtract.c + src/lzma/C/Archive/7z/7zHeader.c + src/lzma/C/Archive/7z/7zIn.c + src/lzma/C/Archive/7z/7zItem.c + src/lzma/C/Archive/7z/7zMethodID.c + src/lzma/C/Compress/Branch/BranchX86.c + src/lzma/C/Compress/Branch/BranchX86_2.c + src/lzma/C/Compress/Lzma/LzmaDecode.c +) + +if(BEOS) + # We add this explicitly, since we don't want CMake to think this + # is a C++ project unless we're on BeOS. + set(PHYSFS_BEOS_SRCS src/platform_beos.cpp) + find_library(BE_LIBRARY be) + find_library(ROOT_LIBRARY root) + set(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${BE_LIBRARY} ${ROOT_LIBRARY}) +endif() + +# Almost everything is "compiled" here, but things that don't apply to the +# build are #ifdef'd out. This is to make it easy to embed PhysicsFS into +# another project or bring up a new build system: just compile all the source +# code and #define the things you want. +set(PHYSFS_SRCS + src/physfs.c + src/physfs_byteorder.c + src/physfs_unicode.c + src/platform_posix.c + src/platform_unix.c + src/platform_macosx.c + src/platform_windows.c + src/archiver_dir.c + src/archiver_unpacked.c + src/archiver_grp.c + src/archiver_hog.c + src/archiver_lzma.c + src/archiver_mvl.c + src/archiver_qpak.c + src/archiver_wad.c + src/archiver_zip.c + src/archiver_slb.c + src/archiver_iso9660.c + ${PHYSFS_BEOS_SRCS} +) + + +# platform layers ... + +if(UNIX) + if(BEOS) + set(PHYSFS_HAVE_CDROM_SUPPORT TRUE) + set(PHYSFS_HAVE_THREAD_SUPPORT TRUE) + set(HAVE_PTHREAD_H TRUE) + else() + check_include_file(sys/ucred.h HAVE_UCRED_H) + if(HAVE_UCRED_H) + add_definitions(-DPHYSFS_HAVE_SYS_UCRED_H=1) + set(PHYSFS_HAVE_CDROM_SUPPORT TRUE) + endif() + + check_include_file(mntent.h HAVE_MNTENT_H) + if(HAVE_MNTENT_H) + add_definitions(-DPHYSFS_HAVE_MNTENT_H=1) + set(PHYSFS_HAVE_CDROM_SUPPORT TRUE) + endif() + + # !!! FIXME: Solaris fails this, because mnttab.h implicitly + # !!! FIXME: depends on other system headers. :( + #check_include_file(sys/mnttab.h HAVE_SYS_MNTTAB_H) + check_c_source_compiles(" + #include + #include + int main(int argc, char **argv) { return 0; } + " HAVE_SYS_MNTTAB_H) + + if(HAVE_SYS_MNTTAB_H) + add_definitions(-DPHYSFS_HAVE_SYS_MNTTAB_H=1) + set(PHYSFS_HAVE_CDROM_SUPPORT TRUE) + endif() + + check_include_file(pthread.h HAVE_PTHREAD_H) + if(HAVE_PTHREAD_H) + set(PHYSFS_HAVE_THREAD_SUPPORT TRUE) + find_library(PTHREAD_LIBRARY pthread) + if(PTHREAD_LIBRARY) + set(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${PTHREAD_LIBRARY}) + endif() + endif() + endif() +endif() + +if(WINDOWS) + set(PHYSFS_HAVE_CDROM_SUPPORT TRUE) + set(PHYSFS_HAVE_THREAD_SUPPORT TRUE) +endif() + +if(NOT PHYSFS_HAVE_CDROM_SUPPORT) + add_definitions(-DPHYSFS_NO_CDROM_SUPPORT=1) + message(WARNING " ***") + message(WARNING " *** There is no CD-ROM support in this build!") + message(WARNING " *** PhysicsFS will just pretend there are no discs.") + message(WARNING " *** This may be fine, depending on how PhysicsFS is used,") + message(WARNING " *** but is this what you REALLY wanted?") + message(WARNING " *** (Maybe fix CMakeLists.txt, or write a platform driver?)") + message(WARNING " ***") +endif() + +if(PHYSFS_HAVE_THREAD_SUPPORT) + add_definitions(-D_REENTRANT -D_THREAD_SAFE) +else() + add_definitions(-DPHYSFS_NO_THREAD_SUPPORT=1) + message(WARNING " ***") + message(WARNING " *** There is no thread support in this build!") + message(WARNING " *** PhysicsFS will NOT be reentrant!") + message(WARNING " *** This may be fine, depending on how PhysicsFS is used,") + message(WARNING " *** but is this what you REALLY wanted?") + message(WARNING " *** (Maybe fix CMakeLists.txt, or write a platform driver?)") + message(WARNING " ***") +endif() + + +# Archivers ... + +option(PHYSFS_ARCHIVE_ZIP "Enable ZIP support" TRUE) +if(PHYSFS_ARCHIVE_ZIP) + add_definitions(-DPHYSFS_SUPPORTS_ZIP=1) +endif() + +option(PHYSFS_ARCHIVE_7Z "Enable 7zip support" TRUE) +if(PHYSFS_ARCHIVE_7Z) + add_definitions(-DPHYSFS_SUPPORTS_7Z=1) + # !!! FIXME: rename to 7z.c? + set(PHYSFS_SRCS ${PHYSFS_SRCS} ${LZMA_SRCS}) +endif() + +option(PHYSFS_ARCHIVE_GRP "Enable Build Engine GRP support" TRUE) +if(PHYSFS_ARCHIVE_GRP) + add_definitions(-DPHYSFS_SUPPORTS_GRP=1) +endif() + +option(PHYSFS_ARCHIVE_WAD "Enable Doom WAD support" TRUE) +if(PHYSFS_ARCHIVE_WAD) + add_definitions(-DPHYSFS_SUPPORTS_WAD=1) +endif() + +option(PHYSFS_ARCHIVE_HOG "Enable Descent I/II HOG support" TRUE) +if(PHYSFS_ARCHIVE_HOG) + add_definitions(-DPHYSFS_SUPPORTS_HOG=1) +endif() + +option(PHYSFS_ARCHIVE_MVL "Enable Descent I/II MVL support" TRUE) +if(PHYSFS_ARCHIVE_MVL) + add_definitions(-DPHYSFS_SUPPORTS_MVL=1) +endif() + +option(PHYSFS_ARCHIVE_QPAK "Enable Quake I/II QPAK support" TRUE) +if(PHYSFS_ARCHIVE_QPAK) + add_definitions(-DPHYSFS_SUPPORTS_QPAK=1) +endif() + +option(PHYSFS_ARCHIVE_SLB "Enable I-War / Independence War SLB support" TRUE) +if(PHYSFS_ARCHIVE_SLB) + add_definitions(-DPHYSFS_SUPPORTS_SLB=1) +endif() + +option(PHYSFS_ARCHIVE_ISO9660 "Enable ISO9660 support" TRUE) +if(PHYSFS_ARCHIVE_ISO9660) + add_definitions(-DPHYSFS_SUPPORTS_ISO9660=1) +endif() + + +option(PHYSFS_BUILD_STATIC "Build static library" TRUE) +if(PHYSFS_BUILD_STATIC) + add_library(physfs-static STATIC ${PHYSFS_SRCS}) + set_target_properties(physfs-static PROPERTIES OUTPUT_NAME "physfs") + set(PHYSFS_LIB_TARGET physfs-static) + set(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs-static") +endif() + +option(PHYSFS_BUILD_SHARED "Build shared library" TRUE) +if(PHYSFS_BUILD_SHARED) + add_library(physfs SHARED ${PHYSFS_SRCS}) + set_target_properties(physfs PROPERTIES VERSION ${PHYSFS_VERSION}) + set_target_properties(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION}) + target_link_libraries(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS}) + set(PHYSFS_LIB_TARGET physfs) + set(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") +endif() + +if(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC) + message(FATAL "Both shared and static libraries are disabled!") +endif() + +# CMake FAQ says I need this... +if(PHYSFS_BUILD_SHARED AND PHYSFS_BUILD_STATIC) + set_target_properties(physfs PROPERTIES CLEAN_DIRECT_OUTPUT 1) + set_target_properties(physfs-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) +endif() + +option(PHYSFS_BUILD_TEST "Build stdio test program." TRUE) +mark_as_advanced(PHYSFS_BUILD_TEST) +if(PHYSFS_BUILD_TEST) + find_path(READLINE_H readline/readline.h) + find_path(HISTORY_H readline/history.h) + if(READLINE_H AND HISTORY_H) + find_library(CURSES_LIBRARY NAMES curses ncurses) + set(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY}) + find_library(READLINE_LIBRARY readline) + if(READLINE_LIBRARY) + set(HAVE_SYSTEM_READLINE TRUE) + set(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY} ${CURSES_LIBRARY}) + include_directories(${READLINE_H} ${HISTORY_H}) + add_definitions(-DPHYSFS_HAVE_READLINE=1) + endif() + endif() + add_executable(test_physfs test/test_physfs.c) + target_link_libraries(test_physfs ${PHYSFS_LIB_TARGET} ${TEST_PHYSFS_LIBS} ${OTHER_LDFLAGS}) + set(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";test_physfs") +endif() + +install(TARGETS ${PHYSFS_INSTALL_TARGETS} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +install(FILES src/physfs.h DESTINATION include) + +find_package(Doxygen) +if(DOXYGEN_FOUND) + set(PHYSFS_OUTPUT_DOXYFILE "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile") + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile" + "${PHYSFS_OUTPUT_DOXYFILE}" + COPYONLY + ) + file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "\n\n# Below auto-generated by cmake...\n\n") + file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "PROJECT_NUMBER = \"${PHYSFS_VERSION}\"\n") + file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "OUTPUT_DIRECTORY = \"${CMAKE_CURRENT_BINARY_DIR}/docs\"\n") + file(APPEND "${PHYSFS_OUTPUT_DOXYFILE}" "\n# End auto-generated section.\n\n") + + add_custom_target( + docs + ${DOXYGEN_EXECUTABLE} "${PHYSFS_OUTPUT_DOXYFILE}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + COMMENT "Building documentation in 'docs' directory..." + ) +else() + message(STATUS "Doxygen not found. You won't be able to build documentation.") +endif() + +if(UNIX) + set(PHYSFS_TARBALL "${CMAKE_CURRENT_SOURCE_DIR}/../physfs-${PHYSFS_VERSION}.tar.bz2") + add_custom_target( + dist + hg archive -t tbz2 "${PHYSFS_TARBALL}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + COMMENT "Building source tarball '${PHYSFS_TARBALL}'..." + ) + add_custom_target( + uninstall + "${CMAKE_CURRENT_SOURCE_DIR}/extras/uninstall.sh" + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + COMMENT "Uninstall the project..." + ) +endif() + +if(UNIX AND NOT APPLE) + configure_file( + "extras/physfs.pc.in" + "extras/physfs.pc" + @ONLY + ) + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/extras/physfs.pc" + DESTINATION "lib/pkgconfig" + ) +endif() + +macro(message_bool_option _NAME _VALUE) + if(${_VALUE}) + message(STATUS " ${_NAME}: enabled") + else() + message(STATUS " ${_NAME}: disabled") + endif() +endmacro() + +message(STATUS "PhysicsFS will build with the following options:") +message_bool_option("ZIP support" PHYSFS_ARCHIVE_ZIP) +message_bool_option("7zip support" PHYSFS_ARCHIVE_7Z) +message_bool_option("GRP support" PHYSFS_ARCHIVE_GRP) +message_bool_option("WAD support" PHYSFS_ARCHIVE_WAD) +message_bool_option("HOG support" PHYSFS_ARCHIVE_HOG) +message_bool_option("MVL support" PHYSFS_ARCHIVE_MVL) +message_bool_option("QPAK support" PHYSFS_ARCHIVE_QPAK) +message_bool_option("SLB support" PHYSFS_ARCHIVE_SLB) +message_bool_option("CD-ROM drive support" PHYSFS_HAVE_CDROM_SUPPORT) +message_bool_option("Thread safety" PHYSFS_HAVE_THREAD_SUPPORT) +message_bool_option("Build static library" PHYSFS_BUILD_STATIC) +message_bool_option("Build shared library" PHYSFS_BUILD_SHARED) +message_bool_option("Build stdio test program" PHYSFS_BUILD_TEST) +if(PHYSFS_BUILD_TEST) + message_bool_option(" Use readline in test program" HAVE_SYSTEM_READLINE) +endif() + +# end of CMakeLists.txt ... + diff --git a/jni/physfs-2.0.3/LICENSE.txt b/jni/physfs-2.1.0/LICENSE.txt similarity index 87% rename from jni/physfs-2.0.3/LICENSE.txt rename to jni/physfs-2.1.0/LICENSE.txt index 0828eb56..a3128711 100644 --- a/jni/physfs-2.0.3/LICENSE.txt +++ b/jni/physfs-2.1.0/LICENSE.txt @@ -1,5 +1,5 @@ - Copyright (c) 2001-2012 Ryan C. Gordon and others. + Copyright (c) 2001-2011 Ryan C. Gordon and others. 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 @@ -34,10 +34,6 @@ Versions of PhysicsFS prior to 0.1.9 are licensed under the GNU Lesser General Optional pieces of PhysicsFS may fall under other licenses, please consult your lawyer for legal advice, which this is not... - zlib: if you enable ZIP archive support, PhysicsFS uses zlib. Its license - requirements are identical to PhysicsFS. - Please see zlib123/README for details. - lzma: if you enable LZMA (7zip) support, PhysicsFS uses the lzma sdk. It uses the LGPL license, with exceptions for closed-source programs. Please see lzma/lzma.txt for details. diff --git a/jni/physfs-2.1.0/README.txt b/jni/physfs-2.1.0/README.txt new file mode 100644 index 00000000..b1225b73 --- /dev/null +++ b/jni/physfs-2.1.0/README.txt @@ -0,0 +1,7 @@ + +PhysicsFS; a portable, flexible file i/o abstraction. + + http://icculus.org/physfs/ + +Please see the docs directory for documentation, licensing, and information. + diff --git a/jni/physfs-2.0.3/CHANGELOG.txt b/jni/physfs-2.1.0/docs/CHANGELOG.txt similarity index 100% rename from jni/physfs-2.0.3/CHANGELOG.txt rename to jni/physfs-2.1.0/docs/CHANGELOG.txt diff --git a/jni/physfs-2.0.3/CREDITS.txt b/jni/physfs-2.1.0/docs/CREDITS.txt similarity index 80% rename from jni/physfs-2.0.3/CREDITS.txt rename to jni/physfs-2.1.0/docs/CREDITS.txt index 558e3590..514b3678 100644 --- a/jni/physfs-2.0.3/CREDITS.txt +++ b/jni/physfs-2.1.0/docs/CREDITS.txt @@ -27,7 +27,6 @@ Various support, fixes and suggestions: Alexander Pipelka Russian translation, -Ruby bindings, QPAK archiver: Ed Sinjiashvili @@ -106,8 +105,42 @@ OS/2 updates: Bug fixes: Patrice Mandin +PHYSFS_stat() API: + Christoph Nelles + Indy Sams + +ISO9660 archiver: + Christoph Nelles + Bug fixes: - Lauri Kasanen + Steven Fuller + +Bug fixes: + Tolga Dalman + +Bug fixes: + Frank Becker + +Bug fixes: + Norfanin + +Bug fixes: + Evgeny Podjachev + +Haiku fixes: + Chris Roberts + +SLB archiver: + Aleksi Nurmi + +Bug fixes: + Dmitry Marakasov + +Bug fixes: + Andreas Karlsson + +pkg-config support: + Jonas Kulla Other stuff: Your name here! Patches go to icculus@icculus.org ... diff --git a/jni/physfs-2.0.3/Doxyfile b/jni/physfs-2.1.0/docs/Doxyfile similarity index 99% rename from jni/physfs-2.0.3/Doxyfile rename to jni/physfs-2.1.0/docs/Doxyfile index b75bb2e0..23202cf0 100644 --- a/jni/physfs-2.0.3/Doxyfile +++ b/jni/physfs-2.1.0/docs/Doxyfile @@ -22,6 +22,7 @@ PROJECT_NAME = physfs # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or # if some version control system is used. + # (CMake will set this properly at build time. --ryan.) PROJECT_NUMBER = "unknown version (build with 'make docs' next time!)" @@ -361,7 +362,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = physfs.h +INPUT = src/physfs.h # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -876,7 +877,8 @@ INCLUDE_FILE_PATTERNS = # omitted =1 is assumed. PREDEFINED = DOXYGEN_SHOULD_IGNORE_THIS=1 \ - __EXPORT__= + PHYSFS_DECL= \ + PHYSFS_DEPRECATED= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/jni/physfs-2.0.3/INSTALL.txt b/jni/physfs-2.1.0/docs/INSTALL.txt similarity index 92% rename from jni/physfs-2.0.3/INSTALL.txt rename to jni/physfs-2.1.0/docs/INSTALL.txt index acbbcc01..fcc3e6cd 100644 --- a/jni/physfs-2.0.3/INSTALL.txt +++ b/jni/physfs-2.1.0/docs/INSTALL.txt @@ -78,21 +78,20 @@ PhysicsFS will only link directly against system libraries that have existed behaviour when we can't find it...this is used for Unicode support and locating user-specific directories, etc. -PhysicsFS has not been tested on 64-bit Windows, but probably works. There is - no 16-bit Windows support at all. Reports of success and problems can go to - Ryan at icculus@icculus.org ... +PhysicsFS works on 32-bit and 64-bit Windows. There is no 16-bit Windows + support at all. Reports of success and problems can go to Ryan at + icculus@icculus.org ... If someone is willing to maintain prebuilt PhysicsFS DLLs, I'd like to hear from you; send an email to icculus@icculus.org ... - PocketPC/WindowsCE: -Code exists for PocketPC support, and there are shipping titles that used - PhysicsFS 1.0 on PocketPC...but it isn't tested in 2.0, and is probably - broken with the new build system. Please send patches. - +Support for PocketPC was removed in PhysicsFS 2.1.0. This was known to work + in the 1.0 releases, but wasn't tested in 2.0 and later. PhysicsFS is not + known to work on Windows Phone 7 (the latest Microsoft mobile tech at the + time of this writing). MAC OS 8/9: diff --git a/jni/physfs-2.1.0/docs/TODO.txt b/jni/physfs-2.1.0/docs/TODO.txt new file mode 100644 index 00000000..e69f9d55 --- /dev/null +++ b/jni/physfs-2.1.0/docs/TODO.txt @@ -0,0 +1,81 @@ +Stuff that needs to be done and wishlist: + +These are in no particular order. +Some might be dupes, some might be done already, some might be bad ideas. + + +From http://icculus.org/pipermail/physfs/2009-March/000698.html ... + +- Archives formats provided by the implementation. +- Write support for various archives. I haven't decided how to do this yet, + but I'd like to. +- Add an API to expose a file's extended attributes to the application? +- Deprecate PHYSFS_setSaneConfig(). It really should have been in the extras + directory. +- Clean up the sources to match my ever-changing coding style. :) + + +From http://icculus.org/pipermail/physfs/2010-January/000821.html ... + +- Plugin system for the archive handlers + + +From http://icculus.org/pipermail/physfs/2010-January/000826.html ... + +- Lua bindings + + +From http://icculus.org/pipermail/physfs/2010-January/000833.html ... + +- SWIG bindings + + + +From old TODO.txt... + +- Other archivers: perhaps tar(.gz|.bz2), RPM, ARJ, etc. These are less + important, since streaming archives aren't of much value to games (which + is why zipfiles are king: random access), but it could have uses for, say, + an installer/updater. +- profile string list interpolation. +- We have two different ways to find dir entries in zip.c. +- Do symlinks in zip archiver work when they point to dirs? +- Enable more warnings? +- Use __cdecl in physfs.h? +- Look for FIXMEs (many marked with "!!!" in comments). +- Find some way to relax or remove the security model for external tools. +- fscanf and fprintf support in extras dir. +- Sanity check byte order at runtime. +- Memory locking? +- General code audit. +- Multiple write dirs with mount points? +- Replace code from SDL... +- Should file enumeration return an error or set error state? +- Write up a simple HOWTO on embedding physicsfs in another project. + + +Other stuff I thought of... +- moar asserts! +- constify! +- Does iPhone work? +- Fix CMake vs Doxygen. +- Doxygen replacement? (manpages suck.) +- Fix coding standards to match. +- See if we can ditch some #include lines... +- We lost Vista symlink support when removing isSymLink(). Pull it back from + revision control. +- PHYSFS_exists() fails if you mountIo with a NULL filename. We need to decide + how this API should work. +- ZIP64 support? +- LZMA support in zip archiver? +- bzip2 support in zip archiver? +- rewrite 7zip archiver. +- ryanify iso9660 code. +- Reduce the BAIL and GOTO macro use. A lot of these don't add anything. +- Modernize CMakeLists.txt +- Change the term "search path" to something less confusing. + +Probably other stuff. Requests and recommendations are welcome. + +// end of TODO.txt ... + diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/AssemblyInfo.cs b/jni/physfs-2.1.0/extras/PhysFS.NET/AssemblyInfo.cs similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/AssemblyInfo.cs rename to jni/physfs-2.1.0/extras/PhysFS.NET/AssemblyInfo.cs diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/PhysFS.NET.csproj b/jni/physfs-2.1.0/extras/PhysFS.NET/PhysFS.NET.csproj similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/PhysFS.NET.csproj rename to jni/physfs-2.1.0/extras/PhysFS.NET/PhysFS.NET.csproj diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/PhysFS.NET.sln b/jni/physfs-2.1.0/extras/PhysFS.NET/PhysFS.NET.sln similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/PhysFS.NET.sln rename to jni/physfs-2.1.0/extras/PhysFS.NET/PhysFS.NET.sln diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/PhysFS.cs b/jni/physfs-2.1.0/extras/PhysFS.NET/PhysFS.cs similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/PhysFS.cs rename to jni/physfs-2.1.0/extras/PhysFS.NET/PhysFS.cs diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/PhysFSFileStream.cs b/jni/physfs-2.1.0/extras/PhysFS.NET/PhysFSFileStream.cs similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/PhysFSFileStream.cs rename to jni/physfs-2.1.0/extras/PhysFS.NET/PhysFSFileStream.cs diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/PhysFS_DLL.cs b/jni/physfs-2.1.0/extras/PhysFS.NET/PhysFS_DLL.cs similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/PhysFS_DLL.cs rename to jni/physfs-2.1.0/extras/PhysFS.NET/PhysFS_DLL.cs diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/README.txt b/jni/physfs-2.1.0/extras/PhysFS.NET/README.txt similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/README.txt rename to jni/physfs-2.1.0/extras/PhysFS.NET/README.txt diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/App.ico b/jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/App.ico similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/App.ico rename to jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/App.ico diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/AssemblyInfo.cs b/jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/AssemblyInfo.cs similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/AssemblyInfo.cs rename to jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/AssemblyInfo.cs diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/TestApp.csproj b/jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/TestApp.csproj similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/TestApp.csproj rename to jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/TestApp.csproj diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/TestApp.sln b/jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/TestApp.sln similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/TestApp.sln rename to jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/TestApp.sln diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/TestAppForm.cs b/jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/TestAppForm.cs similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/TestAppForm.cs rename to jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/TestAppForm.cs diff --git a/jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/TestAppForm.resx b/jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/TestAppForm.resx similarity index 100% rename from jni/physfs-2.0.3/extras/PhysFS.NET/TestApp/TestAppForm.resx rename to jni/physfs-2.1.0/extras/PhysFS.NET/TestApp/TestAppForm.resx diff --git a/jni/physfs-2.0.3/extras/abs-file.h b/jni/physfs-2.1.0/extras/abs-file.h similarity index 100% rename from jni/physfs-2.0.3/extras/abs-file.h rename to jni/physfs-2.1.0/extras/abs-file.h diff --git a/jni/physfs-2.0.3/extras/casefolding.txt b/jni/physfs-2.1.0/extras/casefolding.txt similarity index 100% rename from jni/physfs-2.0.3/extras/casefolding.txt rename to jni/physfs-2.1.0/extras/casefolding.txt diff --git a/jni/physfs-2.1.0/extras/globbing.c b/jni/physfs-2.1.0/extras/globbing.c new file mode 100644 index 00000000..cac9c40d --- /dev/null +++ b/jni/physfs-2.1.0/extras/globbing.c @@ -0,0 +1,239 @@ +/** \file globbing.c */ + +#include +#include +#include +#include +#include + +#include "globbing.h" + +/** + * Please see globbing.h for details. + * + * License: this code is public domain. I make no warranty that it is useful, + * correct, harmless, or environmentally safe. + * + * This particular file may be used however you like, including copying it + * verbatim into a closed-source project, exploiting it commercially, and + * removing any trace of my name from the source (although I hope you won't + * do that). I welcome enhancements and corrections to this file, but I do + * not require you to send me patches if you make changes. This code has + * NO WARRANTY. + * + * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. + * Please see the file LICENSE.txt in the source's root directory. + * + * \author Ryan C. Gordon. + */ + + +static int matchesPattern(const char *fname, const char *wildcard, + int caseSensitive) +{ + char x, y; + const char *fnameptr = fname; + const char *wildptr = wildcard; + + while ((*wildptr) && (*fnameptr)) + { + y = *wildptr; + if (y == '*') + { + do + { + wildptr++; /* skip multiple '*' in a row... */ + } while (*wildptr == '*'); + + y = (caseSensitive) ? *wildptr : (char) tolower(*wildptr); + + while (1) + { + x = (caseSensitive) ? *fnameptr : (char) tolower(*fnameptr); + if ((!x) || (x == y)) + break; + else + fnameptr++; + } /* while */ + } /* if */ + + else if (y == '?') + { + wildptr++; + fnameptr++; + } /* else if */ + + else + { + if (caseSensitive) + x = *fnameptr; + else + { + x = tolower(*fnameptr); + y = tolower(y); + } /* if */ + + wildptr++; + fnameptr++; + + if (x != y) + return 0; + } /* else */ + } /* while */ + + while (*wildptr == '*') + wildptr++; + + return (*fnameptr == *wildptr); +} /* matchesPattern */ + +typedef struct +{ + const PHYSFS_Allocator *allocator; + const char *wildcard; + int caseSensitive; + PHYSFS_EnumFilesCallback callback; + void *origData; +} WildcardCallbackData; + + +/* + * This callback sits between the enumerator and the enduser callback, + * filtering out files that don't match the wildcard pattern. + */ +static void wildcardCallback(void *_d, const char *origdir, const char *fname) +{ + const WildcardCallbackData *data = (const WildcardCallbackData *) _d; + if (matchesPattern(fname, data->wildcard, data->caseSensitive)) + data->callback(data->origData, origdir, fname); +} /* wildcardCallback */ + + +void PHYSFSEXT_enumerateFilesCallbackWildcard(const char *dir, + const char *wildcard, + int caseSensitive, + PHYSFS_EnumFilesCallback c, + void *d) +{ + WildcardCallbackData data; + data.allocator = PHYSFS_getAllocator(); + data.wildcard = wildcard; + data.caseSensitive = caseSensitive; + data.callback = c; + data.origData = d; + PHYSFS_enumerateFilesCallback(dir, wildcardCallback, &data); +} /* PHYSFSEXT_enumerateFilesCallbackWildcard */ + + +void PHYSFSEXT_freeEnumeration(char **list) +{ + const PHYSFS_Allocator *allocator = PHYSFS_getAllocator(); + int i; + if (list != NULL) + { + for (i = 0; list[i] != NULL; i++) + allocator->Free(list[i]); + allocator->Free(list); + } /* if */ +} /* PHYSFSEXT_freeEnumeration */ + + +char **PHYSFSEXT_enumerateFilesWildcard(const char *dir, const char *wildcard, + int caseSensitive) +{ + const PHYSFS_Allocator *allocator = PHYSFS_getAllocator(); + char **list = PHYSFS_enumerateFiles(dir); + char **retval = NULL; + int totalmatches = 0; + int matches = 0; + char **i; + + for (i = list; *i != NULL; i++) + { + #if 0 + printf("matchesPattern: '%s' vs '%s' (%s) ... %s\n", *i, wildcard, + caseSensitive ? "case" : "nocase", + matchesPattern(*i, wildcard, caseSensitive) ? "true" : "false"); + #endif + if (matchesPattern(*i, wildcard, caseSensitive)) + totalmatches++; + } /* for */ + + retval = (char **) allocator->Malloc(sizeof (char *) * (totalmatches+1)); + if (retval != NULL) + { + for (i = list; ((matches < totalmatches) && (*i != NULL)); i++) + { + if (matchesPattern(*i, wildcard, caseSensitive)) + { + retval[matches] = (char *) allocator->Malloc(strlen(*i) + 1); + if (retval[matches] == NULL) + { + while (matches--) + allocator->Free(retval[matches]); + allocator->Free(retval); + retval = NULL; + break; + } /* if */ + strcpy(retval[matches], *i); + matches++; + } /* if */ + } /* for */ + + if (retval != NULL) + { + assert(totalmatches == matches); + retval[matches] = NULL; + } /* if */ + } /* if */ + + PHYSFS_freeList(list); + return retval; +} /* PHYSFSEXT_enumerateFilesWildcard */ + + +#ifdef TEST_PHYSFSEXT_ENUMERATEFILESWILDCARD +int main(int argc, char **argv) +{ + int rc; + char **flist; + char **i; + + if (argc != 3) + { + printf("USAGE: %s \n" + " where is 1 or 0.\n", argv[0]); + return 1; + } /* if */ + + if (!PHYSFS_init(argv[0])) + { + fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getLastError()); + return 1; + } /* if */ + + if (!PHYSFS_addToSearchPath(".", 1)) + { + fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError()); + PHYSFS_deinit(); + return 1; + } /* if */ + + flist = PHYSFSEXT_enumerateFilesWildcard("/", argv[1], atoi(argv[2])); + rc = 0; + for (i = flist; *i; i++) + { + printf("%s\n", *i); + rc++; + } /* for */ + printf("\n total %d files.\n\n", rc); + + PHYSFSEXT_freeEnumeration(flist); + PHYSFS_deinit(); + + return 0; +} /* main */ +#endif + +/* end of globbing.c ... */ + diff --git a/jni/physfs-2.1.0/extras/globbing.h b/jni/physfs-2.1.0/extras/globbing.h new file mode 100644 index 00000000..4cfe25de --- /dev/null +++ b/jni/physfs-2.1.0/extras/globbing.h @@ -0,0 +1,165 @@ +#ifndef INCL_PHYSFSEXT_GLOBBING_H +#define INCL_PHYSFSEXT_GLOBBING_H + +/** \file globbing.h */ + +#include "physfs.h" + +/** + * \mainpage PhysicsFS globbing + * + * This is an extension to PhysicsFS to let you search for files with basic + * wildcard matching, regardless of what sort of filesystem or archive they + * reside in. It does this by enumerating directories as needed and manually + * locating matching entries. + * + * Usage: Set up PhysicsFS as you normally would, then use + * PHYSFSEXT_enumerateFilesWildcard() when enumerating files. This is just + * like PHYSFS_enumerateFiles(), but it returns a subset that matches your + * wildcard pattern. You must call PHYSFSEXT_freeEnumeration() on the results, + * just PHYSFS_enumerateFiles() would do with PHYSFS_freeList(). + * + * License: this code is public domain. I make no warranty that it is useful, + * correct, harmless, or environmentally safe. + * + * This particular file may be used however you like, including copying it + * verbatim into a closed-source project, exploiting it commercially, and + * removing any trace of my name from the source (although I hope you won't + * do that). I welcome enhancements and corrections to this file, but I do + * not require you to send me patches if you make changes. This code has + * NO WARRANTY. + * + * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. + * Please see LICENSE.txt in the source's "docs" directory. + * + * \author Ryan C. Gordon. + */ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * \fn char **PHYSFS_enumerateFilesWildcard(const char *dir, const char *wildcard, int caseSensitive) + * \brief Get a file listing of a search path's directory, filtered with a wildcard pattern. + * + * Matching directories are interpolated. That is, if "C:\mydir" is in the + * search path and contains a directory "savegames" that contains "x.sav", + * "y.Sav", and "z.txt", and there is also a "C:\userdir" in the search path + * that has a "savegames" subdirectory with "w.sav", then the following code: + * + * \code + * char **rc = PHYSFS_enumerateFilesWildcard("savegames", "*.sav", 0); + * char **i; + * + * for (i = rc; *i != NULL; i++) + * printf(" * We've got [%s].\n", *i); + * + * PHYSFS_freeList(rc); + * \endcode + * + * ...will print: + * + * \verbatim + * We've got [x.sav]. + * We've got [y.Sav]. + * We've got [w.sav].\endverbatim + * + * Feel free to sort the list however you like. We only promise there will + * be no duplicates, but not what order the final list will come back in. + * + * Wildcard strings can use the '*' and '?' characters, currently. + * Matches can be case-insensitive if you pass a zero for argument 3. + * + * Don't forget to call PHYSFSEXT_freeEnumerator() with the return value from + * this function when you are done with it. As we use PhysicsFS's allocator + * for this list, you must free it before calling PHYSFS_deinit(). + * Do not use PHYSFS_freeList() on the returned value! + * + * \param dir directory in platform-independent notation to enumerate. + * \param wildcard Wildcard pattern to use for filtering. + * \param caseSensitive Zero for case-insensitive matching, + * non-zero for case-sensitive. + * \return Null-terminated array of null-terminated strings. + * + * \sa PHYSFSEXT_freeEnumeration + */ +PHYSFS_DECL char **PHYSFSEXT_enumerateFilesWildcard(const char *dir, + const char *wildcard, + int caseSensitive); + +/** + * \fn void PHYSFSEXT_freeEnumeration(char **list) + * \brief Free data returned by PHYSFSEXT_enumerateFilesWildcard + * + * Conceptually, this works like PHYSFS_freeList(), but is used with data + * returned by PHYSFSEXT_enumerateFilesWildcard() only. Be sure to call this + * on any returned data from that function before + * + * \param list Pointer previously returned by + * PHYSFSEXT_enumerateFilesWildcard(). It is safe to pass a + * NULL here. + * + * \sa PHYSFSEXT_enumerateFilesWildcard + */ +PHYSFS_DECL void PHYSFSEXT_freeEnumeration(char **list); + + +/** + * \fn void PHYSFSEXT_enumerateFilesCallbackWildcard(const char *dir, const char *wildcard, int caseSensitive, PHYSFS_EnumFilesCallback c, void *d); + * \brief Get a file listing of a search path's directory, filtered with a wildcard pattern, using an application-defined callback. + * + * This function is equivalent to PHYSFSEXT_enumerateFilesWildcard(). It + * reports file listings, filtered by a wildcard pattern. + * + * Unlike PHYSFS_enumerateFiles(), this function does not return an array. + * Rather, it calls a function specified by the application once per + * element of the search path: + * + * \code + * + * static void printDir(void *data, const char *origdir, const char *fname) + * { + * printf(" * We've got [%s] in [%s].\n", fname, origdir); + * } + * + * // ... + * PHYSFS_enumerateFilesCallbackWildcard("savegames","*.sav",0,printDir,NULL); + * \endcode + * + * Items sent to the callback are not guaranteed to be in any order whatsoever. + * There is no sorting done at this level, and if you need that, you should + * probably use PHYSFS_enumerateFilesWildcard() instead, which guarantees + * alphabetical sorting. This form reports whatever is discovered in each + * archive before moving on to the next. Even within one archive, we can't + * guarantee what order it will discover data. Any sorting you find in + * these callbacks is just pure luck. Do not rely on it. As this walks + * the entire list of archives, you may receive duplicate filenames. + * + * Wildcard strings can use the '*' and '?' characters, currently. + * Matches can be case-insensitive if you pass a zero for argument 3. + * + * \param dir Directory, in platform-independent notation, to enumerate. + * \param wildcard Wildcard pattern to use for filtering. + * \param caseSensitive Zero for case-insensitive matching, + * non-zero for case-sensitive. + * \param c Callback function to notify about search path elements. + * \param d Application-defined data passed to callback. Can be NULL. + * + * \sa PHYSFS_EnumFilesCallback + * \sa PHYSFS_enumerateFiles + */ +PHYSFS_DECL void PHYSFSEXT_enumerateFilesCallbackWildcard(const char *dir, + const char *wildcard, + int caseSensitive, + PHYSFS_EnumFilesCallback c, + void *d); + +#ifdef __cplusplus +} +#endif + +#endif /* include-once blocker. */ + +/* end of globbing.h ... */ + diff --git a/jni/physfs-2.0.3/extras/ignorecase.c b/jni/physfs-2.1.0/extras/ignorecase.c similarity index 91% rename from jni/physfs-2.0.3/extras/ignorecase.c rename to jni/physfs-2.1.0/extras/ignorecase.c index a6a83d96..afdd0023 100644 --- a/jni/physfs-2.0.3/extras/ignorecase.c +++ b/jni/physfs-2.1.0/extras/ignorecase.c @@ -37,12 +37,12 @@ static int caseInsensitiveStringCompare(const char *x, const char *y) ux = toupper((int) *x); uy = toupper((int) *y); if (ux != uy) - return((ux > uy) ? 1 : -1); + return ((ux > uy) ? 1 : -1); x++; y++; } while ((ux) && (uy)); - return(0); + return 0; } /* caseInsensitiveStringCompare */ @@ -53,7 +53,7 @@ static int locateOneElement(char *buf) char **i; if (PHYSFS_exists(buf)) - return(1); /* quick rejection: exists in current case. */ + return 1; /* quick rejection: exists in current case. */ ptr = strrchr(buf, '/'); /* find entry at end of path. */ if (ptr == NULL) @@ -75,13 +75,13 @@ static int locateOneElement(char *buf) { strcpy(ptr, *i); /* found a match. Overwrite with this case. */ PHYSFS_freeList(rc); - return(1); + return 1; } /* if */ } /* for */ /* no match at all... */ PHYSFS_freeList(rc); - return(0); + return 0; } /* locateOneElement */ @@ -96,7 +96,7 @@ int PHYSFSEXT_locateCorrectCase(char *buf) ptr = prevptr = buf; if (*ptr == '\0') - return(0); /* Uh...I guess that's success. */ + return 0; /* Uh...I guess that's success. */ while ( (ptr = strchr(ptr + 1, '/')) != NULL ) { @@ -104,11 +104,11 @@ int PHYSFSEXT_locateCorrectCase(char *buf) rc = locateOneElement(buf); *ptr = '/'; /* restore path separator */ if (!rc) - return(-2); /* missing element in path. */ + return -2; /* missing element in path. */ } /* while */ /* check final element... */ - return(locateOneElement(buf) ? 0 : -1); + return locateOneElement(buf) ? 0 : -1; } /* PHYSFSEXT_locateCorrectCase */ @@ -122,35 +122,35 @@ int main(int argc, char **argv) if (!PHYSFS_init(argv[0])) { fprintf(stderr, "PHYSFS_init(): %s\n", PHYSFS_getLastError()); - return(1); + return 1; } /* if */ if (!PHYSFS_addToSearchPath(".", 1)) { fprintf(stderr, "PHYSFS_addToSearchPath(): %s\n", PHYSFS_getLastError()); PHYSFS_deinit(); - return(1); + return 1; } /* if */ if (!PHYSFS_setWriteDir(".")) { fprintf(stderr, "PHYSFS_setWriteDir(): %s\n", PHYSFS_getLastError()); PHYSFS_deinit(); - return(1); + return 1; } /* if */ if (!PHYSFS_mkdir("/a/b/c")) { fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getLastError()); PHYSFS_deinit(); - return(1); + return 1; } /* if */ if (!PHYSFS_mkdir("/a/b/C")) { fprintf(stderr, "PHYSFS_mkdir(): %s\n", PHYSFS_getLastError()); PHYSFS_deinit(); - return(1); + return 1; } /* if */ f = PHYSFS_openWrite("/a/b/c/x.txt"); @@ -159,7 +159,7 @@ int main(int argc, char **argv) { fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError()); PHYSFS_deinit(); - return(1); + return 1; } /* if */ f = PHYSFS_openWrite("/a/b/C/X.txt"); @@ -168,7 +168,7 @@ int main(int argc, char **argv) { fprintf(stderr, "PHYSFS_openWrite(): %s\n", PHYSFS_getLastError()); PHYSFS_deinit(); - return(1); + return 1; } /* if */ strcpy(buf, "/a/b/c/x.txt"); @@ -211,7 +211,7 @@ int main(int argc, char **argv) PHYSFS_delete("/a/b"); PHYSFS_delete("/a"); PHYSFS_deinit(); - return(0); + return 0; } /* main */ #endif diff --git a/jni/physfs-2.0.3/extras/ignorecase.h b/jni/physfs-2.1.0/extras/ignorecase.h similarity index 100% rename from jni/physfs-2.0.3/extras/ignorecase.h rename to jni/physfs-2.1.0/extras/ignorecase.h diff --git a/jni/physfs-2.0.3/extras/makecasefoldhashtable.pl b/jni/physfs-2.1.0/extras/makecasefoldhashtable.pl similarity index 100% rename from jni/physfs-2.0.3/extras/makecasefoldhashtable.pl rename to jni/physfs-2.1.0/extras/makecasefoldhashtable.pl diff --git a/jni/physfs-2.1.0/extras/physfs-swig.i b/jni/physfs-2.1.0/extras/physfs-swig.i new file mode 100644 index 00000000..040039b3 --- /dev/null +++ b/jni/physfs-2.1.0/extras/physfs-swig.i @@ -0,0 +1,98 @@ +/* Metadata to generate the scripting language bindings. Please ignore. */ +%module physfs + +%{ +#include "physfs.h" +%} + +/* I _think_ this is safe for now. */ +%warnfilter(451) PHYSFS_ArchiveInfo; + +%ignore _INCLUDE_PHYSFS_H_; /* ignore the include-once blocker. */ +%ignore PHYSFS_DECL; /* ignore the export define. */ +%ignore PHYSFS_CALL; /* ignore the calling conventions define. */ +%ignore PHYSFS_DEPRECATED; /* ignore the deprecation define. */ +%ignore PHYSFS_file; /* legacy type define. */ + +/* Some bindings put everything in a namespace, so we don't need PHYSFS_ */ +#if defined(SWIGPERL) || defined(SWIGRUBY) +%rename(File) PHYSFS_File; +%rename(Version) PHYSFS_Version; +%rename(ArchiveInfo) PHYSFS_ArchiveInfo; +%rename(getLinkedVersion) PHYSFS_getLinkedVersion; +%rename(init) PHYSFS_init; +%rename(deinit) PHYSFS_deinit; +%rename(supportedArchiveTypes) PHYSFS_supportedArchiveTypes; +%rename(freeList) PHYSFS_freeList; +%rename(getLastError) PHYSFS_getLastError; +%rename(getDirSeparator) PHYSFS_getDirSeparator; +%rename(permitSymbolicLinks) PHYSFS_permitSymbolicLinks; +%rename(getCdRomDirs) PHYSFS_getCdRomDirs; +%rename(getBaseDir) PHYSFS_getBaseDir; +%rename(getUserDir) PHYSFS_getUserDir; +%rename(getWriteDir) PHYSFS_getWriteDir; +%rename(setWriteDir) PHYSFS_setWriteDir; +%rename(addToSearchPath) PHYSFS_addToSearchPath; +%rename(removeFromSearchPath) PHYSFS_removeFromSearchPath; +%rename(getSearchPath) PHYSFS_getSearchPath; +%rename(setSaneConfig) PHYSFS_setSaneConfig; +%rename(mkdir) PHYSFS_mkdir; +%rename(delete) PHYSFS_delete; +%rename(getRealDir) PHYSFS_getRealDir; +%rename(enumerateFiles) PHYSFS_enumerateFiles; +%rename(exists) PHYSFS_exists; +%rename(isDirectory) PHYSFS_isDirectory; +%rename(isSymbolicLink) PHYSFS_isSymbolicLink; +%rename(getLastModTime) PHYSFS_getLastModTime; +%rename(openWrite) PHYSFS_openWrite; +%rename(openAppend) PHYSFS_openAppend; +%rename(openRead) PHYSFS_openRead; +%rename(close) PHYSFS_close; +%rename(read) PHYSFS_read; +%rename(write) PHYSFS_write; +%rename(eof) PHYSFS_eof; +%rename(tell) PHYSFS_tell; +%rename(seek) PHYSFS_seek; +%rename(fileLength) PHYSFS_fileLength; +%rename(setBuffer) PHYSFS_setBuffer; +%rename(flush) PHYSFS_flush; +%rename(readSLE16) PHYSFS_readSLE16; +%rename(readULE16) PHYSFS_readULE16; +%rename(readSBE16) PHYSFS_readSBE16; +%rename(readUBE16) PHYSFS_readUBE16; +%rename(readSLE32) PHYSFS_readSLE32; +%rename(readULE32) PHYSFS_readULE32; +%rename(readSBE32) PHYSFS_readSBE32; +%rename(readUBE32) PHYSFS_readUBE32; +%rename(readSLE64) PHYSFS_readSLE64; +%rename(readULE64) PHYSFS_readULE64; +%rename(readSBE64) PHYSFS_readSBE64; +%rename(readUBE64) PHYSFS_readUBE64; +%rename(writeSLE16) PHYSFS_writeSLE16; +%rename(writeULE16) PHYSFS_writeULE16; +%rename(writeSBE16) PHYSFS_writeSBE16; +%rename(writeUBE16) PHYSFS_writeUBE16; +%rename(writeSLE32) PHYSFS_writeSLE32; +%rename(writeULE32) PHYSFS_writeULE32; +%rename(writeSBE32) PHYSFS_writeSBE32; +%rename(writeUBE32) PHYSFS_writeUBE32; +%rename(writeSLE64) PHYSFS_writeSLE64; +%rename(writeULE64) PHYSFS_writeULE64; +%rename(writeSBE64) PHYSFS_writeSBE64; +%rename(writeUBE64) PHYSFS_writeUBE64; +%rename(isInit) PHYSFS_isInit; +%rename(symbolicLinksPermitted) PHYSFS_symbolicLinksPermitted; +%rename(mount) PHYSFS_mount; +%rename(getMountPoint) PHYSFS_getMountPoint; +%rename(Stat) PHYSFS_Stat; /* !!! FIXME: case insensitive script languages? */ +%rename(stat) PHYSFS_stat; +%rename(readBytes) PHYSFS_readBytes; +%rename(writeBytes) PHYSFS_writeBytes; +%rename(unmount) PHYSFS_unmount; +%rename(mountMemory) PHYSFS_mountMemory; +%rename(mountHandle) PHYSFS_mountHandle; +%rename(getPrefDir) PHYSFS_getPrefDir; +#endif + +%include "../src/physfs.h" + diff --git a/jni/physfs-2.1.0/extras/physfs.pc.in b/jni/physfs-2.1.0/extras/physfs.pc.in new file mode 100644 index 00000000..6cd0972e --- /dev/null +++ b/jni/physfs-2.1.0/extras/physfs.pc.in @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: PhysicsFS +Description: PhysicsFS is a library to provide abstract access to various archives. +URL: https://icculus.org/physfs/ +Version: @PHYSFS_VERSION@ +Libs: -L${libdir} -lphysfs +Cflags: -I${includedir} diff --git a/jni/physfs-2.0.3/extras/physfshttpd.c b/jni/physfs-2.1.0/extras/physfshttpd.c similarity index 98% rename from jni/physfs-2.0.3/extras/physfshttpd.c rename to jni/physfs-2.1.0/extras/physfshttpd.c index e1dfb1cb..6680d095 100644 --- a/jni/physfs-2.0.3/extras/physfshttpd.c +++ b/jni/physfs-2.1.0/extras/physfshttpd.c @@ -144,7 +144,7 @@ static void *do_http(void *_args) close(args->sock); free(args->addr); free(args); - return(NULL); + return NULL; } /* do_http */ @@ -202,7 +202,7 @@ static int create_listen_socket(short portnum) } /* if */ } /* if */ - return(retval); + return retval; } /* create_listen_socket */ @@ -244,13 +244,13 @@ int main(int argc, char **argv) if (argc == 1) { printf("USAGE: %s [archive2 [... archiveN]]\n", argv[0]); - return(42); + return 42; } /* if */ if (!PHYSFS_init(argv[0])) { printf("PHYSFS_init() failed: %s\n", PHYSFS_getLastError()); - return(42); + return 42; } /* if */ /* normally, this is bad practice, but oh well. */ @@ -266,7 +266,7 @@ int main(int argc, char **argv) if (listensocket < 0) { printf("listen socket failed to create.\n"); - return(42); + return 42; } /* if */ while (1) /* infinite loop for now. */ @@ -278,13 +278,13 @@ int main(int argc, char **argv) { printf("accept() failed: %s\n", strerror(errno)); close(listensocket); - return(42); + return 42; } /* if */ serve_http_request(s, &addr, len); } /* while */ - return(0); + return 0; } /* main */ /* end of physfshttpd.c ... */ diff --git a/jni/physfs-2.0.3/extras/physfsrwops.c b/jni/physfs-2.1.0/extras/physfsrwops.c similarity index 65% rename from jni/physfs-2.0.3/extras/physfsrwops.c rename to jni/physfs-2.1.0/extras/physfsrwops.c index a6c88158..aff5f9bb 100644 --- a/jni/physfs-2.0.3/extras/physfsrwops.c +++ b/jni/physfs-2.1.0/extras/physfsrwops.c @@ -15,7 +15,8 @@ * Unless otherwise stated, the rest of PhysicsFS falls under the zlib license. * Please see LICENSE.txt in the root of the source tree. * - * SDL falls under the LGPL license. You can get SDL at http://www.libsdl.org/ + * SDL 1.2 falls under the LGPL license. SDL 1.3+ is zlib, like PhysicsFS. + * You can get SDL at http://www.libsdl.org/ * * This file was written by Ryan C. Gordon. (icculus@icculus.org). */ @@ -23,102 +24,127 @@ #include /* used for SEEK_SET, SEEK_CUR, SEEK_END ... */ #include "physfsrwops.h" +/* SDL's RWOPS interface changed a little in SDL 1.3... */ +#if defined(SDL_VERSION_ATLEAST) +#if SDL_VERSION_ATLEAST(1, 3, 0) +#define TARGET_SDL13 1 +#endif +#endif + +#if TARGET_SDL13 +static long SDLCALL physfsrwops_seek(struct SDL_RWops *rw, long offset, int whence) +#else static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence) +#endif { PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - int pos = 0; + PHYSFS_sint64 pos = 0; if (whence == SEEK_SET) - { - pos = offset; - } /* if */ + pos = (PHYSFS_sint64) offset; else if (whence == SEEK_CUR) { - PHYSFS_sint64 current = PHYSFS_tell(handle); + const PHYSFS_sint64 current = PHYSFS_tell(handle); if (current == -1) { SDL_SetError("Can't find position in file: %s", PHYSFS_getLastError()); - return(-1); - } /* if */ - - pos = (int) current; - if ( ((PHYSFS_sint64) pos) != current ) - { - SDL_SetError("Can't fit current file position in an int!"); - return(-1); + return -1; } /* if */ if (offset == 0) /* this is a "tell" call. We're done. */ - return(pos); + { + #if TARGET_SDL13 + return (long) current; + #else + return (int) current; + #endif + } /* if */ - pos += offset; + pos = current + ((PHYSFS_sint64) offset); } /* else if */ else if (whence == SEEK_END) { - PHYSFS_sint64 len = PHYSFS_fileLength(handle); + const PHYSFS_sint64 len = PHYSFS_fileLength(handle); if (len == -1) { SDL_SetError("Can't find end of file: %s", PHYSFS_getLastError()); - return(-1); + return -1; } /* if */ - pos = (int) len; - if ( ((PHYSFS_sint64) pos) != len ) - { - SDL_SetError("Can't fit end-of-file position in an int!"); - return(-1); - } /* if */ - - pos += offset; + pos = len + ((PHYSFS_sint64) offset); } /* else if */ else { SDL_SetError("Invalid 'whence' parameter."); - return(-1); + return -1; } /* else */ if ( pos < 0 ) { SDL_SetError("Attempt to seek past start of file."); - return(-1); + return -1; } /* if */ if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos)) { SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - return(-1); + return -1; } /* if */ - return(pos); + #if TARGET_SDL13 + return (long) pos; + #else + return (int) pos; + #endif } /* physfsrwops_seek */ +#if TARGET_SDL13 +static size_t SDLCALL physfsrwops_read(struct SDL_RWops *rw, void *ptr, + size_t size, size_t maxnum) +#else static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum) +#endif { PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - PHYSFS_sint64 rc = PHYSFS_read(handle, ptr, size, maxnum); - if (rc != maxnum) + const PHYSFS_uint64 readlen = (PHYSFS_uint64) (maxnum * size); + const PHYSFS_sint64 rc = PHYSFS_readBytes(handle, ptr, readlen); + if (rc != ((PHYSFS_sint64) readlen)) { if (!PHYSFS_eof(handle)) /* not EOF? Must be an error. */ SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); } /* if */ - return((int) rc); + #if TARGET_SDL13 + return (size_t) rc; + #else + return (int) rc; + #endif } /* physfsrwops_read */ +#if TARGET_SDL13 +static size_t SDLCALL physfsrwops_write(struct SDL_RWops *rw, const void *ptr, + size_t size, size_t num) +#else static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num) +#endif { PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1; - PHYSFS_sint64 rc = PHYSFS_write(handle, ptr, size, num); - if (rc != num) + const PHYSFS_uint64 writelen = (PHYSFS_uint64) (num * size); + const PHYSFS_sint64 rc = PHYSFS_writeBytes(handle, ptr, writelen); + if (rc != ((PHYSFS_sint64) writelen)) SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - return((int) rc); + #if TARGET_SDL13 + return (size_t) rc; + #else + return (int) rc; + #endif } /* physfsrwops_write */ @@ -128,11 +154,11 @@ static int physfsrwops_close(SDL_RWops *rw) if (!PHYSFS_close(handle)) { SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError()); - return(-1); + return -1; } /* if */ SDL_FreeRW(rw); - return(0); + return 0; } /* physfsrwops_close */ @@ -155,7 +181,7 @@ static SDL_RWops *create_rwops(PHYSFS_File *handle) } /* if */ } /* else */ - return(retval); + return retval; } /* create_rwops */ @@ -167,25 +193,25 @@ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_File *handle) else retval = create_rwops(handle); - return(retval); + return retval; } /* PHYSFSRWOPS_makeRWops */ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname) { - return(create_rwops(PHYSFS_openRead(fname))); + return create_rwops(PHYSFS_openRead(fname)); } /* PHYSFSRWOPS_openRead */ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname) { - return(create_rwops(PHYSFS_openWrite(fname))); + return create_rwops(PHYSFS_openWrite(fname)); } /* PHYSFSRWOPS_openWrite */ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname) { - return(create_rwops(PHYSFS_openAppend(fname))); + return create_rwops(PHYSFS_openAppend(fname)); } /* PHYSFSRWOPS_openAppend */ diff --git a/jni/physfs-2.0.3/extras/physfsrwops.h b/jni/physfs-2.1.0/extras/physfsrwops.h similarity index 92% rename from jni/physfs-2.0.3/extras/physfsrwops.h rename to jni/physfs-2.1.0/extras/physfsrwops.h index 406fba6f..e44ec83d 100644 --- a/jni/physfs-2.0.3/extras/physfsrwops.h +++ b/jni/physfs-2.1.0/extras/physfsrwops.h @@ -40,7 +40,7 @@ extern "C" { * @return A valid SDL_RWops structure on success, NULL on error. Specifics * of the error can be gleaned from PHYSFS_getLastError(). */ -__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); +PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); /** * Open a platform-independent filename for writing, and make it accessible @@ -52,7 +52,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); * @return A valid SDL_RWops structure on success, NULL on error. Specifics * of the error can be gleaned from PHYSFS_getLastError(). */ -__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); +PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); /** * Open a platform-independent filename for appending, and make it accessible @@ -64,7 +64,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); * @return A valid SDL_RWops structure on success, NULL on error. Specifics * of the error can be gleaned from PHYSFS_getLastError(). */ -__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); +PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); /** * Make a SDL_RWops from an existing PhysicsFS file handle. You should @@ -76,7 +76,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); * @return A valid SDL_RWops structure on success, NULL on error. Specifics * of the error can be gleaned from PHYSFS_getLastError(). */ -__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_File *handle); +PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_File *handle); #ifdef __cplusplus } diff --git a/jni/physfs-2.0.3/extras/physfsunpack.c b/jni/physfs-2.1.0/extras/physfsunpack.c similarity index 100% rename from jni/physfs-2.0.3/extras/physfsunpack.c rename to jni/physfs-2.1.0/extras/physfsunpack.c diff --git a/jni/physfs-2.0.3/extras/selfextract.c b/jni/physfs-2.1.0/extras/selfextract.c similarity index 97% rename from jni/physfs-2.0.3/extras/selfextract.c rename to jni/physfs-2.1.0/extras/selfextract.c index 3568d013..2e8bba31 100644 --- a/jni/physfs-2.0.3/extras/selfextract.c +++ b/jni/physfs-2.1.0/extras/selfextract.c @@ -41,7 +41,7 @@ int main(int argc, char **argv) if (!PHYSFS_init(argv[0])) { printf("PHYSFS_init() failed: %s\n", PHYSFS_getLastError()); - return(42); + return 42; } /* if */ rc = PHYSFS_addToSearchPath(argv[0], 0); @@ -49,7 +49,7 @@ int main(int argc, char **argv) { printf("Couldn't find self-extract data: %s\n", PHYSFS_getLastError()); printf("This might mean you didn't append a zipfile to the binary.\n"); - return(42); + return 42; } /* if */ char **files = PHYSFS_enumerateFiles("/"); @@ -61,6 +61,6 @@ int main(int argc, char **argv) } /* for */ PHYSFS_freeList(files); - return(0); + return 0; } /* main */ diff --git a/jni/physfs-2.1.0/extras/uninstall.sh b/jni/physfs-2.1.0/extras/uninstall.sh new file mode 100755 index 00000000..69e01111 --- /dev/null +++ b/jni/physfs-2.1.0/extras/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ ! -f "./install_manifest.txt" ]; then + echo "ERROR: This needs to be run from your CMake build directory after installing." 1>&2 + exit 1 +fi + +xargs rm -vf < install_manifest.txt +exit 0 + diff --git a/jni/physfs-2.1.0/src/archiver_dir.c b/jni/physfs-2.1.0/src/archiver_dir.c new file mode 100644 index 00000000..ae52921e --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_dir.c @@ -0,0 +1,191 @@ +/* + * Standard directory I/O support routines for PhysicsFS. + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +/* There's no PHYSFS_Io interface here. Use __PHYSFS_createNativeIo(). */ + + + +static char *cvtToDependent(const char *prepend, const char *path, char *buf) +{ + BAIL_IF_MACRO(buf == NULL, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + sprintf(buf, "%s%s", prepend ? prepend : "", path); + + if (__PHYSFS_platformDirSeparator != '/') + { + char *p; + for (p = strchr(buf, '/'); p != NULL; p = strchr(p + 1, '/')) + *p = __PHYSFS_platformDirSeparator; + } /* if */ + + return buf; +} /* cvtToDependent */ + + +#define CVT_TO_DEPENDENT(buf, pre, dir) { \ + const size_t len = ((pre) ? strlen((char *) pre) : 0) + strlen(dir) + 1; \ + buf = cvtToDependent((char*)pre,dir,(char*)__PHYSFS_smallAlloc(len)); \ +} + + + +static void *DIR_openArchive(PHYSFS_Io *io, const char *name, int forWriting) +{ + PHYSFS_Stat st; + const char dirsep = __PHYSFS_platformDirSeparator; + char *retval = NULL; + const size_t namelen = strlen(name); + const size_t seplen = 1; + + assert(io == NULL); /* shouldn't create an Io for these. */ + BAIL_IF_MACRO(!__PHYSFS_platformStat(name, &st), ERRPASS, NULL); + if (st.filetype != PHYSFS_FILETYPE_DIRECTORY) + BAIL_MACRO(PHYSFS_ERR_UNSUPPORTED, NULL); + + retval = allocator.Malloc(namelen + seplen + 1); + BAIL_IF_MACRO(retval == NULL, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + + strcpy(retval, name); + + /* make sure there's a dir separator at the end of the string */ + if (retval[namelen - 1] != dirsep) + { + retval[namelen] = dirsep; + retval[namelen + 1] = '\0'; + } /* if */ + + return retval; +} /* DIR_openArchive */ + + +static void DIR_enumerateFiles(void *opaque, const char *dname, + PHYSFS_EnumFilesCallback cb, + const char *origdir, void *callbackdata) +{ + char *d; + + CVT_TO_DEPENDENT(d, opaque, dname); + if (d != NULL) + { + __PHYSFS_platformEnumerateFiles(d, cb, origdir, callbackdata); + __PHYSFS_smallFree(d); + } /* if */ +} /* DIR_enumerateFiles */ + + +static PHYSFS_Io *doOpen(void *opaque, const char *name, const int mode) +{ + PHYSFS_Io *io = NULL; + char *f = NULL; + + CVT_TO_DEPENDENT(f, opaque, name); + BAIL_IF_MACRO(!f, ERRPASS, NULL); + + io = __PHYSFS_createNativeIo(f, mode); + if (io == NULL) + { + const PHYSFS_ErrorCode err = PHYSFS_getLastErrorCode(); + PHYSFS_Stat statbuf; + __PHYSFS_platformStat(f, &statbuf); + PHYSFS_setErrorCode(err); + } /* if */ + + __PHYSFS_smallFree(f); + + return io; +} /* doOpen */ + + +static PHYSFS_Io *DIR_openRead(void *opaque, const char *filename) +{ + return doOpen(opaque, filename, 'r'); +} /* DIR_openRead */ + + +static PHYSFS_Io *DIR_openWrite(void *opaque, const char *filename) +{ + return doOpen(opaque, filename, 'w'); +} /* DIR_openWrite */ + + +static PHYSFS_Io *DIR_openAppend(void *opaque, const char *filename) +{ + return doOpen(opaque, filename, 'a'); +} /* DIR_openAppend */ + + +static int DIR_remove(void *opaque, const char *name) +{ + int retval; + char *f; + + CVT_TO_DEPENDENT(f, opaque, name); + BAIL_IF_MACRO(!f, ERRPASS, 0); + retval = __PHYSFS_platformDelete(f); + __PHYSFS_smallFree(f); + return retval; +} /* DIR_remove */ + + +static int DIR_mkdir(void *opaque, const char *name) +{ + int retval; + char *f; + + CVT_TO_DEPENDENT(f, opaque, name); + BAIL_IF_MACRO(!f, ERRPASS, 0); + retval = __PHYSFS_platformMkDir(f); + __PHYSFS_smallFree(f); + return retval; +} /* DIR_mkdir */ + + +static void DIR_closeArchive(void *opaque) +{ + allocator.Free(opaque); +} /* DIR_closeArchive */ + + +static int DIR_stat(void *opaque, const char *name, PHYSFS_Stat *stat) +{ + int retval = 0; + char *d; + + CVT_TO_DEPENDENT(d, opaque, name); + BAIL_IF_MACRO(!d, ERRPASS, 0); + retval = __PHYSFS_platformStat(d, stat); + __PHYSFS_smallFree(d); + return retval; +} /* DIR_stat */ + + +const PHYSFS_Archiver __PHYSFS_Archiver_DIR = +{ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "", + "Non-archive, direct filesystem I/O", + "Ryan C. Gordon ", + "http://icculus.org/physfs/", + 1, /* supportsSymlinks */ + }, + DIR_openArchive, + DIR_enumerateFiles, + DIR_openRead, + DIR_openWrite, + DIR_openAppend, + DIR_remove, + DIR_mkdir, + DIR_stat, + DIR_closeArchive +}; + +/* end of archiver_dir.c ... */ + diff --git a/jni/physfs-2.1.0/src/archiver_grp.c b/jni/physfs-2.1.0/src/archiver_grp.c new file mode 100644 index 00000000..1beb6d4c --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_grp.c @@ -0,0 +1,112 @@ +/* + * GRP support routines for PhysicsFS. + * + * This driver handles BUILD engine archives ("groupfiles"). This format + * (but not this driver) was put together by Ken Silverman. + * + * The format is simple enough. In Ken's words: + * + * What's the .GRP file format? + * + * The ".grp" file format is just a collection of a lot of files stored + * into 1 big one. I tried to make the format as simple as possible: The + * first 12 bytes contains my name, "KenSilverman". The next 4 bytes is + * the number of files that were compacted into the group file. Then for + * each file, there is a 16 byte structure, where the first 12 bytes are + * the filename, and the last 4 bytes are the file's size. The rest of + * the group file is just the raw data packed one after the other in the + * same order as the list of files. + * + * (That info is from http://www.advsys.net/ken/build.htm ...) + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +#if PHYSFS_SUPPORTS_GRP + +static UNPKentry *grpLoadEntries(PHYSFS_Io *io, PHYSFS_uint32 fileCount) +{ + PHYSFS_uint32 location = 16; /* sizeof sig. */ + UNPKentry *entries = NULL; + UNPKentry *entry = NULL; + char *ptr = NULL; + + entries = (UNPKentry *) allocator.Malloc(sizeof (UNPKentry) * fileCount); + BAIL_IF_MACRO(entries == NULL, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + + location += (16 * fileCount); + + for (entry = entries; fileCount > 0; fileCount--, entry++) + { + GOTO_IF_MACRO(!__PHYSFS_readAll(io, &entry->name, 12), ERRPASS, failed); + GOTO_IF_MACRO(!__PHYSFS_readAll(io, &entry->size, 4), ERRPASS, failed); + entry->name[12] = '\0'; /* name isn't null-terminated in file. */ + if ((ptr = strchr(entry->name, ' ')) != NULL) + *ptr = '\0'; /* trim extra spaces. */ + + entry->size = PHYSFS_swapULE32(entry->size); + entry->startPos = location; + location += entry->size; + } /* for */ + + return entries; + +failed: + allocator.Free(entries); + return NULL; +} /* grpLoadEntries */ + + +static void *GRP_openArchive(PHYSFS_Io *io, const char *name, int forWriting) +{ + PHYSFS_uint8 buf[12]; + PHYSFS_uint32 count = 0; + UNPKentry *entries = NULL; + + assert(io != NULL); /* shouldn't ever happen. */ + + BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL); + + BAIL_IF_MACRO(!__PHYSFS_readAll(io, buf, sizeof (buf)), ERRPASS, NULL); + if (memcmp(buf, "KenSilverman", sizeof (buf)) != 0) + BAIL_MACRO(PHYSFS_ERR_UNSUPPORTED, NULL); + + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &count, sizeof(count)), ERRPASS, NULL); + count = PHYSFS_swapULE32(count); + + entries = grpLoadEntries(io, count); + BAIL_IF_MACRO(!entries, ERRPASS, NULL); + return UNPK_openArchive(io, entries, count); +} /* GRP_openArchive */ + + +const PHYSFS_Archiver __PHYSFS_Archiver_GRP = +{ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "GRP", + "Build engine Groupfile format", + "Ryan C. Gordon ", + "http://icculus.org/physfs/", + 0, /* supportsSymlinks */ + }, + GRP_openArchive, + UNPK_enumerateFiles, + UNPK_openRead, + UNPK_openWrite, + UNPK_openAppend, + UNPK_remove, + UNPK_mkdir, + UNPK_stat, + UNPK_closeArchive +}; + +#endif /* defined PHYSFS_SUPPORTS_GRP */ + +/* end of archiver_grp.c ... */ + diff --git a/jni/physfs-2.1.0/src/archiver_hog.c b/jni/physfs-2.1.0/src/archiver_hog.c new file mode 100644 index 00000000..0ec25998 --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_hog.c @@ -0,0 +1,118 @@ +/* + * HOG support routines for PhysicsFS. + * + * This driver handles Descent I/II HOG archives. + * + * The format is very simple: + * + * The file always starts with the 3-byte signature "DHF" (Descent + * HOG file). After that the files of a HOG are just attached after + * another, divided by a 17 bytes header, which specifies the name + * and length (in bytes) of the forthcoming file! So you just read + * the header with its information of how big the following file is, + * and then skip exact that number of bytes to get to the next file + * in that HOG. + * + * char sig[3] = {'D', 'H', 'F'}; // "DHF"=Descent HOG File + * + * struct { + * char file_name[13]; // Filename, padded to 13 bytes with 0s + * int file_size; // filesize in bytes + * char data[file_size]; // The file data + * } FILE_STRUCT; // Repeated until the end of the file. + * + * (That info is from http://www.descent2.com/ddn/specs/hog/) + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Bradley Bell. + * Based on grp.c by Ryan C. Gordon. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +#if PHYSFS_SUPPORTS_HOG + +static UNPKentry *hogLoadEntries(PHYSFS_Io *io, PHYSFS_uint32 *_entCount) +{ + const PHYSFS_uint64 iolen = io->length(io); + PHYSFS_uint32 entCount = 0; + void *ptr = NULL; + UNPKentry *entries = NULL; + UNPKentry *entry = NULL; + PHYSFS_uint32 size = 0; + PHYSFS_uint32 pos = 3; + + while (pos < iolen) + { + entCount++; + ptr = allocator.Realloc(ptr, sizeof (UNPKentry) * entCount); + GOTO_IF_MACRO(ptr == NULL, PHYSFS_ERR_OUT_OF_MEMORY, failed); + entries = (UNPKentry *) ptr; + entry = &entries[entCount-1]; + + GOTO_IF_MACRO(!__PHYSFS_readAll(io, &entry->name, 13), ERRPASS, failed); + pos += 13; + GOTO_IF_MACRO(!__PHYSFS_readAll(io, &size, 4), ERRPASS, failed); + pos += 4; + + entry->size = PHYSFS_swapULE32(size); + entry->startPos = pos; + pos += size; + + /* skip over entry */ + GOTO_IF_MACRO(!io->seek(io, pos), ERRPASS, failed); + } /* while */ + + *_entCount = entCount; + return entries; + +failed: + allocator.Free(entries); + return NULL; +} /* hogLoadEntries */ + + +static void *HOG_openArchive(PHYSFS_Io *io, const char *name, int forWriting) +{ + PHYSFS_uint8 buf[3]; + PHYSFS_uint32 count = 0; + UNPKentry *entries = NULL; + + assert(io != NULL); /* shouldn't ever happen. */ + BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL); + BAIL_IF_MACRO(!__PHYSFS_readAll(io, buf, 3), ERRPASS, NULL); + BAIL_IF_MACRO(memcmp(buf, "DHF", 3) != 0, PHYSFS_ERR_UNSUPPORTED, NULL); + + entries = hogLoadEntries(io, &count); + BAIL_IF_MACRO(!entries, ERRPASS, NULL); + return UNPK_openArchive(io, entries, count); +} /* HOG_openArchive */ + + +const PHYSFS_Archiver __PHYSFS_Archiver_HOG = +{ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "HOG", + "Descent I/II HOG file format", + "Bradley Bell ", + "http://icculus.org/physfs/", + 0, /* supportsSymlinks */ + }, + HOG_openArchive, + UNPK_enumerateFiles, + UNPK_openRead, + UNPK_openWrite, + UNPK_openAppend, + UNPK_remove, + UNPK_mkdir, + UNPK_stat, + UNPK_closeArchive +}; + +#endif /* defined PHYSFS_SUPPORTS_HOG */ + +/* end of archiver_hog.c ... */ + diff --git a/jni/physfs-2.1.0/src/archiver_iso9660.c b/jni/physfs-2.1.0/src/archiver_iso9660.c new file mode 100644 index 00000000..0f0895fb --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_iso9660.c @@ -0,0 +1,961 @@ +/* + * ISO9660 support routines for PhysicsFS. + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Christoph Nelles. + */ + +/* !!! FIXME: this file needs Ryanification. */ + +/* + * Handles CD-ROM disk images (and raw CD-ROM devices). + * + * Not supported: + * - RockRidge + * - Non 2048 Sectors + * - UDF + * + * Deviations from the standard + * - Ignores mandatory sort order + * - Allows various invalid file names + * + * Problems + * - Ambiguities in the standard + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +#if PHYSFS_SUPPORTS_ISO9660 + +#include + +/* cache files smaller than this completely in memory */ +#define ISO9660_FULLCACHEMAXSIZE 2048 + +/* !!! FIXME: this is going to cause trouble. */ +#pragma pack(push) /* push current alignment to stack */ +#pragma pack(1) /* set alignment to 1 byte boundary */ + +/* This is the format as defined by the standard +typedef struct +{ + PHYSFS_uint32 lsb; + PHYSFS_uint32 msb; +} ISOBB32bit; // 32byte Both Byte type, means the value first in LSB then in MSB + +typedef struct +{ + PHYSFS_uint16 lsb; + PHYSFS_uint16 msb; +} ISOBB16bit; // 16byte Both Byte type, means the value first in LSB then in MSB +*/ + +/* define better ones to simplify coding (less if's) */ +#if PHYSFS_BYTEORDER == PHYSFS_LIL_ENDIAN +#define ISOBB32bit(name) PHYSFS_uint32 name; PHYSFS_uint32 __dummy_##name; +#define ISOBB16bit(name) PHYSFS_uint16 name; PHYSFS_uint16 __dummy_##name; +#else +#define ISOBB32bit(name) PHYSFS_uint32 __dummy_##name; PHYSFS_uint32 name; +#define ISOBB16bit(name) PHYSFS_uint16 __dummy_##name; PHYSFS_uint16 name; +#endif + +typedef struct +{ + char year[4]; + char month[2]; + char day[2]; + char hour[2]; + char minute[2]; + char second[2]; + char centisec[2]; + PHYSFS_sint8 offset; /* in 15min from GMT */ +} ISO9660VolumeTimestamp; + +typedef struct +{ + PHYSFS_uint8 year; + PHYSFS_uint8 month; + PHYSFS_uint8 day; + PHYSFS_uint8 hour; + PHYSFS_uint8 minute; + PHYSFS_uint8 second; + PHYSFS_sint8 offset; +} ISO9660FileTimestamp; + +typedef struct +{ + unsigned existence:1; + unsigned directory:1; + unsigned associated_file:1; + unsigned record:1; + unsigned protection:1; + unsigned reserved:2; + unsigned multiextent:1; +} ISO9660FileFlags; + +typedef struct +{ + PHYSFS_uint8 length; + PHYSFS_uint8 attribute_length; + ISOBB32bit(extent_location) + ISOBB32bit(data_length) + ISO9660FileTimestamp timestamp; + ISO9660FileFlags file_flags; + PHYSFS_uint8 file_unit_size; + PHYSFS_uint8 gap_size; + ISOBB16bit(vol_seq_no) + PHYSFS_uint8 len_fi; + char unused; +} ISO9660RootDirectoryRecord; + +/* this structure is combined for all Volume descriptor types */ +typedef struct +{ + PHYSFS_uint8 type; + char identifier[5]; + PHYSFS_uint8 version; + PHYSFS_uint8 flags; + char system_identifier[32]; + char volume_identifier[32]; + char unused2[8]; + ISOBB32bit(space_size) + PHYSFS_uint8 escape_sequences[32]; + ISOBB16bit(vol_set_size) + ISOBB16bit(vol_seq_no) + ISOBB16bit(block_size) + ISOBB32bit(path_table_size) +/* PHYSFS_uint32 path_table_start_lsb; // why didn't they use both byte type? + PHYSFS_uint32 opt_path_table_start_lsb; + PHYSFS_uint32 path_table_start_msb; + PHYSFS_uint32 opt_path_table_start_msb;*/ +#if PHYSFS_BYTEORDER == PHYSFS_LIL_ENDIAN + PHYSFS_uint32 path_table_start; + PHYSFS_uint32 opt_path_table_start; + PHYSFS_uint32 unused6; + PHYSFS_uint32 unused7; +#else + PHYSFS_uint32 unused6; + PHYSFS_uint32 unused7; + PHYSFS_uint32 path_table_start; + PHYSFS_uint32 opt_path_table_start; +#endif + ISO9660RootDirectoryRecord rootdirectory; + char set_identifier[128]; + char publisher_identifier[128]; + char preparer_identifer[128]; + char application_identifier[128]; + char copyright_file_identifier[37]; + char abstract_file_identifier[37]; + char bibliographic_file_identifier[37]; + ISO9660VolumeTimestamp creation_timestamp; + ISO9660VolumeTimestamp modification_timestamp; + ISO9660VolumeTimestamp expiration_timestamp; + ISO9660VolumeTimestamp effective_timestamp; + PHYSFS_uint8 file_structure_version; + char unused4; + char application_use[512]; + char unused5[653]; +} ISO9660VolumeDescriptor; + +typedef struct +{ + PHYSFS_uint8 recordlen; + PHYSFS_uint8 extattributelen; + ISOBB32bit(extentpos) + ISOBB32bit(datalen) + ISO9660FileTimestamp recordtime; + ISO9660FileFlags flags; + PHYSFS_uint8 file_unit_size; + PHYSFS_uint8 interleave_gap; + ISOBB16bit(volseqno) + PHYSFS_uint8 filenamelen; + char filename[222]; /* This is not exact, but makes reading easier */ +} ISO9660FileDescriptor; + +typedef struct +{ + ISOBB16bit(owner) + ISOBB16bit(group) + PHYSFS_uint16 flags; /* not implemented*/ + ISO9660VolumeTimestamp create_time; /* yes, not file timestamp */ + ISO9660VolumeTimestamp mod_time; + ISO9660VolumeTimestamp expire_time; + ISO9660VolumeTimestamp effective_time; + PHYSFS_uint8 record_format; + PHYSFS_uint8 record_attributes; + ISOBB16bit(record_len) + char system_identifier[32]; + char system_use[64]; + PHYSFS_uint8 version; + ISOBB16bit(escape_len) + char reserved[64]; + /** further fields not implemented */ +} ISO9660ExtAttributeRec; + +#pragma pack(pop) /* restore original alignment from stack */ + +typedef struct +{ + PHYSFS_Io *io; + PHYSFS_uint32 rootdirstart; + PHYSFS_uint32 rootdirsize; + PHYSFS_uint64 currpos; + int isjoliet; + char *path; + void *mutex; +} ISO9660Handle; + + +typedef struct __ISO9660FileHandle +{ + PHYSFS_sint64 filesize; + PHYSFS_uint64 currpos; + PHYSFS_uint64 startblock; + ISO9660Handle *isohandle; + PHYSFS_uint32 (*read) (struct __ISO9660FileHandle *filehandle, void *buffer, + PHYSFS_uint64 len); + int (*seek)(struct __ISO9660FileHandle *filehandle, PHYSFS_sint64 offset); + void (*close)(struct __ISO9660FileHandle *filehandle); + /* !!! FIXME: anonymouse union is going to cause problems. */ + union + { + /* !!! FIXME: just use a memory PHYSFS_Io here, unify all this code. */ + char *cacheddata; /* data of file when cached */ + PHYSFS_Io *io; /* handle to separate opened file */ + }; +} ISO9660FileHandle; + +/******************************************************************************* + * Time conversion functions + ******************************************************************************/ + +static PHYSFS_sint64 iso_mktime(ISO9660FileTimestamp *timestamp) +{ + struct tm tm; + tm.tm_year = timestamp->year; + tm.tm_mon = timestamp->month - 1; + tm.tm_mday = timestamp->day; + tm.tm_hour = timestamp->hour; + tm.tm_min = timestamp->minute; + tm.tm_sec = timestamp->second; + /* Ignore GMT offset for now... */ + return mktime(&tm); +} /* iso_mktime */ + +static int iso_atoi2(char *text) +{ + return ((text[0] - 40) * 10) + (text[1] - 40); +} /* iso_atoi2 */ + +static int iso_atoi4(char *text) +{ + return ((text[0] - 40) * 1000) + ((text[1] - 40) * 100) + + ((text[2] - 40) * 10) + (text[3] - 40); +} /* iso_atoi4 */ + +static PHYSFS_sint64 iso_volume_mktime(ISO9660VolumeTimestamp *timestamp) +{ + struct tm tm; + tm.tm_year = iso_atoi4(timestamp->year); + tm.tm_mon = iso_atoi2(timestamp->month) - 1; + tm.tm_mday = iso_atoi2(timestamp->day); + tm.tm_hour = iso_atoi2(timestamp->hour); + tm.tm_min = iso_atoi2(timestamp->minute); + tm.tm_sec = iso_atoi2(timestamp->second); + /* this allows values outside the range of a unix timestamp... sanitize them */ + PHYSFS_sint64 value = mktime(&tm); + return value == -1 ? 0 : value; +} /* iso_volume_mktime */ + +/******************************************************************************* + * Filename extraction + ******************************************************************************/ + +static int iso_extractfilenameISO(ISO9660FileDescriptor *descriptor, + char *filename, int *version) +{ + *filename = '\0'; + if (descriptor->flags.directory) + { + strncpy(filename, descriptor->filename, descriptor->filenamelen); + filename[descriptor->filenamelen] = '\0'; + *version = 0; + } /* if */ + else + { + /* find last SEPARATOR2 */ + int pos = 0; + int lastfound = -1; + for(;pos < descriptor->filenamelen; pos++) + if (descriptor->filename[pos] == ';') + lastfound = pos; + BAIL_IF_MACRO(lastfound < 1, PHYSFS_ERR_NOT_FOUND /* !!! FIXME: PHYSFS_ERR_BAD_FILENAME */, -1); + BAIL_IF_MACRO(lastfound == (descriptor->filenamelen -1), PHYSFS_ERR_NOT_FOUND /* !!! PHYSFS_ERR_BAD_FILENAME */, -1); + strncpy(filename, descriptor->filename, lastfound); + if (filename[lastfound - 1] == '.') + filename[lastfound - 1] = '\0'; /* consume trailing ., as done in all implementations */ + else + filename[lastfound] = '\0'; + *version = atoi(descriptor->filename + lastfound); + } /* else */ + + return 0; +} /* iso_extractfilenameISO */ + + +static int iso_extractfilenameUCS2(ISO9660FileDescriptor *descriptor, + char *filename, int *version) +{ + PHYSFS_uint16 tmp[128]; + PHYSFS_uint16 *src; + int len; + + *filename = '\0'; + *version = 1; /* Joliet does not have versions.. at least not on my images */ + + src = (PHYSFS_uint16*) descriptor->filename; + len = descriptor->filenamelen / 2; + tmp[len] = 0; + + while(len--) + tmp[len] = PHYSFS_swapUBE16(src[len]); + + PHYSFS_utf8FromUcs2(tmp, filename, 255); + + return 0; +} /* iso_extractfilenameUCS2 */ + + +static int iso_extractfilename(ISO9660Handle *handle, + ISO9660FileDescriptor *descriptor, char *filename,int *version) +{ + if (handle->isjoliet) + return iso_extractfilenameUCS2(descriptor, filename, version); + else + return iso_extractfilenameISO(descriptor, filename, version); +} /* iso_extractfilename */ + +/******************************************************************************* + * Basic image read functions + ******************************************************************************/ + +static int iso_readimage(ISO9660Handle *handle, PHYSFS_uint64 where, + void *buffer, PHYSFS_uint64 len) +{ + BAIL_IF_MACRO(!__PHYSFS_platformGrabMutex(handle->mutex), ERRPASS, -1); + int rc = -1; + if (where != handle->currpos) + GOTO_IF_MACRO(!handle->io->seek(handle->io,where), ERRPASS, unlockme); + rc = handle->io->read(handle->io, buffer, len); + if (rc == -1) + { + handle->currpos = (PHYSFS_uint64) -1; + goto unlockme; + } /* if */ + handle->currpos += rc; + + unlockme: + __PHYSFS_platformReleaseMutex(handle->mutex); + return rc; +} /* iso_readimage */ + + +static PHYSFS_sint64 iso_readfiledescriptor(ISO9660Handle *handle, + PHYSFS_uint64 where, + ISO9660FileDescriptor *descriptor) +{ + PHYSFS_sint64 rc = iso_readimage(handle, where, descriptor, + sizeof (descriptor->recordlen)); + BAIL_IF_MACRO(rc == -1, ERRPASS, -1); + BAIL_IF_MACRO(rc != 1, PHYSFS_ERR_CORRUPT, -1); + + if (descriptor->recordlen == 0) + return 0; /* fill bytes at the end of a sector */ + + rc = iso_readimage(handle, where + 1, &descriptor->extattributelen, + descriptor->recordlen - sizeof(descriptor->recordlen)); + BAIL_IF_MACRO(rc == -1, ERRPASS, -1); + BAIL_IF_MACRO(rc != 1, PHYSFS_ERR_CORRUPT, -1); + + return 0; +} /* iso_readfiledescriptor */ + +static void iso_extractsubpath(char *path, char **subpath) +{ + *subpath = strchr(path,'/'); + if (*subpath != 0) + { + **subpath = 0; + *subpath +=1; + } /* if */ +} /* iso_extractsubpath */ + +/* + * Don't use path tables, they are not necessarily faster, but more complicated + * to implement as they store only directories and not files, so searching for + * a file needs to branch to the directory extent sooner or later. + */ +static int iso_find_dir_entry(ISO9660Handle *handle,const char *path, + ISO9660FileDescriptor *descriptor) +{ + char *subpath = 0; + PHYSFS_uint64 readpos, end_of_dir; + char filename[255]; + char pathcopy[256]; + char *mypath; + int version = 0; + + strcpy(pathcopy, path); + mypath = pathcopy; + + readpos = handle->rootdirstart; + end_of_dir = handle->rootdirstart + handle->rootdirsize; + iso_extractsubpath(mypath, &subpath); + while (1) + { + BAIL_IF_MACRO(iso_readfiledescriptor(handle, readpos, descriptor), ERRPASS, -1); + + /* recordlen = 0 -> no more entries or fill entry */ + if (!descriptor->recordlen) + { + /* if we are in the last sector of the directory & it's 0 -> end */ + if ((end_of_dir - 2048) <= (readpos -1)) + break; /* finished */ + + /* else skip to the next sector & continue; */ + readpos = (((readpos - 1) / 2048) + 1) * 2048; + continue; + } /* if */ + + readpos += descriptor->recordlen; + if (descriptor->filenamelen == 1 && (descriptor->filename[0] == 0 + || descriptor->filename[0] == 1)) + continue; /* special ones, ignore */ + + BAIL_IF_MACRO( + iso_extractfilename(handle, descriptor, filename, &version), + ERRPASS, -1); + + if (strcmp(filename, mypath) == 0) + { + if ( (subpath == 0) || (subpath[0] == 0) ) + return 0; /* no subpaths left and we found the entry */ + + if (descriptor->flags.directory) + { + /* shorten the path to the subpath */ + mypath = subpath; + iso_extractsubpath(mypath, &subpath); + /* gosub to the new directory extent */ + readpos = descriptor->extentpos * 2048; + end_of_dir = readpos + descriptor->datalen; + } /* if */ + else + { + /* !!! FIXME: set PHYSFS_ERR_NOT_FOUND? */ + /* we're at a file but have a remaining subpath -> no match */ + return 0; + } /* else */ + } /* if */ + } /* while */ + + /* !!! FIXME: set PHYSFS_ERR_NOT_FOUND? */ + return 0; +} /* iso_find_dir_entry */ + + +static int iso_read_ext_attributes(ISO9660Handle *handle, int block, + ISO9660ExtAttributeRec *attributes) +{ + return iso_readimage(handle, block * 2048, attributes, + sizeof(ISO9660ExtAttributeRec)); +} /* iso_read_ext_attributes */ + + +static int ISO9660_flush(PHYSFS_Io *io) { return 1; /* no write support. */ } + +static PHYSFS_Io *ISO9660_duplicate(PHYSFS_Io *_io) +{ + BAIL_MACRO(PHYSFS_ERR_UNSUPPORTED, NULL); /* !!! FIXME: write me. */ +} /* ISO9660_duplicate */ + + +static void ISO9660_destroy(PHYSFS_Io *io) +{ + ISO9660FileHandle *fhandle = (ISO9660FileHandle*) io->opaque; + fhandle->close(fhandle); + allocator.Free(io); +} /* ISO9660_destroy */ + + +static PHYSFS_sint64 ISO9660_read(PHYSFS_Io *io, void *buf, PHYSFS_uint64 len) +{ + ISO9660FileHandle *fhandle = (ISO9660FileHandle*) io->opaque; + return fhandle->read(fhandle, buf, len); +} /* ISO9660_read */ + + +static PHYSFS_sint64 ISO9660_write(PHYSFS_Io *io, const void *b, PHYSFS_uint64 l) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, -1); +} /* ISO9660_write */ + + +static PHYSFS_sint64 ISO9660_tell(PHYSFS_Io *io) +{ + return ((ISO9660FileHandle*) io->opaque)->currpos; +} /* ISO9660_tell */ + + +static int ISO9660_seek(PHYSFS_Io *io, PHYSFS_uint64 offset) +{ + ISO9660FileHandle *fhandle = (ISO9660FileHandle*) io->opaque; + return fhandle->seek(fhandle, offset); +} /* ISO9660_seek */ + + +static PHYSFS_sint64 ISO9660_length(PHYSFS_Io *io) +{ + return ((ISO9660FileHandle*) io->opaque)->filesize; +} /* ISO9660_length */ + + +static const PHYSFS_Io ISO9660_Io = +{ + CURRENT_PHYSFS_IO_API_VERSION, NULL, + ISO9660_read, + ISO9660_write, + ISO9660_seek, + ISO9660_tell, + ISO9660_length, + ISO9660_duplicate, + ISO9660_flush, + ISO9660_destroy +}; + + +/******************************************************************************* + * Archive management functions + ******************************************************************************/ + +static void *ISO9660_openArchive(PHYSFS_Io *io, const char *filename, int forWriting) +{ + char magicnumber[6]; + ISO9660Handle *handle; + int founddescriptor = 0; + int foundjoliet = 0; + + assert(io != NULL); /* shouldn't ever happen. */ + + BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL); + + /* Skip system area to magic number in Volume descriptor */ + BAIL_IF_MACRO(!io->seek(io, 32769), ERRPASS, NULL); + BAIL_IF_MACRO(!io->read(io, magicnumber, 5) != 5, ERRPASS, NULL); + if (memcmp(magicnumber, "CD001", 6) != 0) + BAIL_MACRO(PHYSFS_ERR_UNSUPPORTED, NULL); + + handle = allocator.Malloc(sizeof(ISO9660Handle)); + GOTO_IF_MACRO(!handle, PHYSFS_ERR_OUT_OF_MEMORY, errorcleanup); + handle->path = 0; + handle->mutex= 0; + handle->io = NULL; + + handle->path = allocator.Malloc(strlen(filename) + 1); + GOTO_IF_MACRO(!handle->path, PHYSFS_ERR_OUT_OF_MEMORY, errorcleanup); + strcpy(handle->path, filename); + + handle->mutex = __PHYSFS_platformCreateMutex(); + GOTO_IF_MACRO(!handle->mutex, ERRPASS, errorcleanup); + + handle->io = io; + + /* seek Primary Volume Descriptor */ + GOTO_IF_MACRO(!io->seek(io, 32768), PHYSFS_ERR_IO, errorcleanup); + + while (1) + { + ISO9660VolumeDescriptor descriptor; + GOTO_IF_MACRO(io->read(io, &descriptor, sizeof(ISO9660VolumeDescriptor)) != sizeof(ISO9660VolumeDescriptor), PHYSFS_ERR_IO, errorcleanup); + GOTO_IF_MACRO(strncmp(descriptor.identifier, "CD001", 5) != 0, PHYSFS_ERR_UNSUPPORTED, errorcleanup); + + if (descriptor.type == 255) + { + /* type 255 terminates the volume descriptor list */ + if (founddescriptor) + return handle; /* ok, we've found one volume descriptor */ + else + GOTO_MACRO(PHYSFS_ERR_CORRUPT, errorcleanup); + } /* if */ + if (descriptor.type == 1 && !founddescriptor) + { + handle->currpos = io->tell(io); + handle->rootdirstart = + descriptor.rootdirectory.extent_location * 2048; + handle->rootdirsize = + descriptor.rootdirectory.data_length; + handle->isjoliet = 0; + founddescriptor = 1; /* continue search for joliet */ + } /* if */ + if (descriptor.type == 2 && !foundjoliet) + { + /* check if is joliet */ + PHYSFS_uint8 *s = descriptor.escape_sequences; + int joliet = !(descriptor.flags & 1) + && (s[0] == 0x25) + && (s[1] == 0x2F) + && ((s[2] == 0x40) || (s[2] == 0x43) || (s[2] == 0x45)); + if (!joliet) + continue; + + handle->currpos = io->tell(io); + handle->rootdirstart = + descriptor.rootdirectory.extent_location * 2048; + handle->rootdirsize = + descriptor.rootdirectory.data_length; + handle->isjoliet = 1; + founddescriptor = 1; + foundjoliet = 1; + } /* if */ + } /* while */ + + GOTO_MACRO(PHYSFS_ERR_CORRUPT, errorcleanup); /* not found. */ + +errorcleanup: + if (handle) + { + if (handle->path) + allocator.Free(handle->path); + if (handle->mutex) + __PHYSFS_platformDestroyMutex(handle->mutex); + allocator.Free(handle); + } /* if */ + return NULL; +} /* ISO9660_openArchive */ + + +static void ISO9660_closeArchive(void *opaque) +{ + ISO9660Handle *handle = (ISO9660Handle*) opaque; + handle->io->destroy(handle->io); + __PHYSFS_platformDestroyMutex(handle->mutex); + allocator.Free(handle->path); + allocator.Free(handle); +} /* ISO9660_closeArchive */ + + +/******************************************************************************* + * Read functions + ******************************************************************************/ + + +static PHYSFS_uint32 iso_file_read_mem(ISO9660FileHandle *filehandle, + void *buffer, PHYSFS_uint64 len) +{ + /* check remaining bytes & max obj which can be fetched */ + const PHYSFS_sint64 bytesleft = filehandle->filesize - filehandle->currpos; + if (bytesleft < len) + len = bytesleft; + + if (len == 0) + return 0; + + memcpy(buffer, filehandle->cacheddata + filehandle->currpos, (size_t) len); + + filehandle->currpos += len; + return (PHYSFS_uint32) len; +} /* iso_file_read_mem */ + + +static int iso_file_seek_mem(ISO9660FileHandle *fhandle, PHYSFS_sint64 offset) +{ + BAIL_IF_MACRO(offset < 0, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(offset >= fhandle->filesize, PHYSFS_ERR_PAST_EOF, 0); + + fhandle->currpos = offset; + return 0; +} /* iso_file_seek_mem */ + + +static void iso_file_close_mem(ISO9660FileHandle *fhandle) +{ + allocator.Free(fhandle->cacheddata); + allocator.Free(fhandle); +} /* iso_file_close_mem */ + + +static PHYSFS_uint32 iso_file_read_foreign(ISO9660FileHandle *filehandle, + void *buffer, PHYSFS_uint64 len) +{ + /* check remaining bytes & max obj which can be fetched */ + const PHYSFS_sint64 bytesleft = filehandle->filesize - filehandle->currpos; + if (bytesleft < len) + len = bytesleft; + + const PHYSFS_sint64 rc = filehandle->io->read(filehandle->io, buffer, len); + BAIL_IF_MACRO(rc == -1, ERRPASS, -1); + + filehandle->currpos += rc; /* i trust my internal book keeping */ + BAIL_IF_MACRO(rc < len, PHYSFS_ERR_CORRUPT, -1); + return rc; +} /* iso_file_read_foreign */ + + +static int iso_file_seek_foreign(ISO9660FileHandle *fhandle, + PHYSFS_sint64 offset) +{ + BAIL_IF_MACRO(offset < 0, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(offset >= fhandle->filesize, PHYSFS_ERR_PAST_EOF, 0); + + PHYSFS_sint64 pos = fhandle->startblock * 2048 + offset; + BAIL_IF_MACRO(!fhandle->io->seek(fhandle->io, pos), ERRPASS, -1); + + fhandle->currpos = offset; + return 0; +} /* iso_file_seek_foreign */ + + +static void iso_file_close_foreign(ISO9660FileHandle *fhandle) +{ + fhandle->io->destroy(fhandle->io); + allocator.Free(fhandle); +} /* iso_file_close_foreign */ + + +static int iso_file_open_mem(ISO9660Handle *handle, ISO9660FileHandle *fhandle) +{ + fhandle->cacheddata = allocator.Malloc(fhandle->filesize); + BAIL_IF_MACRO(!fhandle->cacheddata, PHYSFS_ERR_OUT_OF_MEMORY, -1); + int rc = iso_readimage(handle, fhandle->startblock * 2048, + fhandle->cacheddata, fhandle->filesize); + GOTO_IF_MACRO(rc < 0, ERRPASS, freemem); + GOTO_IF_MACRO(rc == 0, PHYSFS_ERR_CORRUPT, freemem); + + fhandle->read = iso_file_read_mem; + fhandle->seek = iso_file_seek_mem; + fhandle->close = iso_file_close_mem; + return 0; + +freemem: + allocator.Free(fhandle->cacheddata); + return -1; +} /* iso_file_open_mem */ + + +static int iso_file_open_foreign(ISO9660Handle *handle, + ISO9660FileHandle *fhandle) +{ + int rc; + fhandle->io = __PHYSFS_createNativeIo(handle->path, 'r'); + BAIL_IF_MACRO(!fhandle->io, ERRPASS, -1); + rc = fhandle->io->seek(fhandle->io, fhandle->startblock * 2048); + GOTO_IF_MACRO(!rc, ERRPASS, closefile); + + fhandle->read = iso_file_read_foreign; + fhandle->seek = iso_file_seek_foreign; + fhandle->close = iso_file_close_foreign; + return 0; + +closefile: + fhandle->io->destroy(fhandle->io); + return -1; +} /* iso_file_open_foreign */ + + +static PHYSFS_Io *ISO9660_openRead(void *opaque, const char *filename) +{ + PHYSFS_Io *retval = NULL; + ISO9660Handle *handle = (ISO9660Handle*) opaque; + ISO9660FileHandle *fhandle; + ISO9660FileDescriptor descriptor; + int rc; + + fhandle = allocator.Malloc(sizeof(ISO9660FileHandle)); + BAIL_IF_MACRO(fhandle == 0, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + fhandle->cacheddata = 0; + + retval = allocator.Malloc(sizeof(PHYSFS_Io)); + GOTO_IF_MACRO(retval == 0, PHYSFS_ERR_OUT_OF_MEMORY, errorhandling); + + /* find file descriptor */ + rc = iso_find_dir_entry(handle, filename, &descriptor); + GOTO_IF_MACRO(rc, ERRPASS, errorhandling); + + fhandle->startblock = descriptor.extentpos + descriptor.extattributelen; + fhandle->filesize = descriptor.datalen; + fhandle->currpos = 0; + fhandle->isohandle = handle; + fhandle->cacheddata = NULL; + fhandle->io = NULL; + + if (descriptor.datalen <= ISO9660_FULLCACHEMAXSIZE) + rc = iso_file_open_mem(handle, fhandle); + else + rc = iso_file_open_foreign(handle, fhandle); + GOTO_IF_MACRO(rc, ERRPASS, errorhandling); + + memcpy(retval, &ISO9660_Io, sizeof (PHYSFS_Io)); + retval->opaque = fhandle; + return retval; + +errorhandling: + if (retval) allocator.Free(retval); + if (fhandle) allocator.Free(fhandle); + return NULL; +} /* ISO9660_openRead */ + + + +/******************************************************************************* + * Information gathering functions + ******************************************************************************/ + +static void ISO9660_enumerateFiles(void *opaque, const char *dname, + PHYSFS_EnumFilesCallback cb, + const char *origdir, void *callbackdata) +{ + ISO9660Handle *handle = (ISO9660Handle*) opaque; + ISO9660FileDescriptor descriptor; + PHYSFS_uint64 readpos; + PHYSFS_uint64 end_of_dir; + char filename[130]; /* ISO allows 31, Joliet 128 -> 128 + 2 eol bytes */ + int version = 0; + + if (*dname == '\0') + { + readpos = handle->rootdirstart; + end_of_dir = readpos + handle->rootdirsize; + } /* if */ + else + { + printf("pfad %s\n",dname); + BAIL_IF_MACRO(iso_find_dir_entry(handle,dname, &descriptor), ERRPASS,); + BAIL_IF_MACRO(!descriptor.flags.directory, ERRPASS,); + + readpos = descriptor.extentpos * 2048; + end_of_dir = readpos + descriptor.datalen; + } /* else */ + + while (1) + { + BAIL_IF_MACRO(iso_readfiledescriptor(handle, readpos, &descriptor), ERRPASS, ); + + /* recordlen = 0 -> no more entries or fill entry */ + if (!descriptor.recordlen) + { + /* if we are in the last sector of the directory & it's 0 -> end */ + if ((end_of_dir - 2048) <= (readpos -1)) + break; /* finished */ + + /* else skip to the next sector & continue; */ + readpos = (((readpos - 1) / 2048) + 1) * 2048; + continue; + } /* if */ + + readpos += descriptor.recordlen; + if (descriptor.filenamelen == 1 && (descriptor.filename[0] == 0 + || descriptor.filename[0] == 1)) + continue; /* special ones, ignore */ + + strncpy(filename,descriptor.filename,descriptor.filenamelen); + iso_extractfilename(handle, &descriptor, filename, &version); + cb(callbackdata, origdir,filename); + } /* while */ +} /* ISO9660_enumerateFiles */ + + +static int ISO9660_stat(void *opaque, const char *name, PHYSFS_Stat *stat) +{ + ISO9660Handle *handle = (ISO9660Handle*) opaque; + ISO9660FileDescriptor descriptor; + ISO9660ExtAttributeRec extattr; + BAIL_IF_MACRO(iso_find_dir_entry(handle, name, &descriptor), ERRPASS, -1); + + stat->readonly = 1; + + /* try to get extended info */ + if (descriptor.extattributelen) + { + BAIL_IF_MACRO(iso_read_ext_attributes(handle, + descriptor.extentpos, &extattr), ERRPASS, -1); + stat->createtime = iso_volume_mktime(&extattr.create_time); + stat->modtime = iso_volume_mktime(&extattr.mod_time); + stat->accesstime = iso_volume_mktime(&extattr.mod_time); + } /* if */ + else + { + stat->createtime = iso_mktime(&descriptor.recordtime); + stat->modtime = iso_mktime(&descriptor.recordtime); + stat->accesstime = iso_mktime(&descriptor.recordtime); + } /* else */ + + if (descriptor.flags.directory) + { + stat->filesize = 0; + stat->filetype = PHYSFS_FILETYPE_DIRECTORY; + } /* if */ + else + { + stat->filesize = descriptor.datalen; + stat->filetype = PHYSFS_FILETYPE_REGULAR; + } /* else */ + + return 1; +} /* ISO9660_stat */ + + +/******************************************************************************* + * Not supported functions + ******************************************************************************/ + +static PHYSFS_Io *ISO9660_openWrite(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL); +} /* ISO9660_openWrite */ + + +static PHYSFS_Io *ISO9660_openAppend(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL); +} /* ISO9660_openAppend */ + + +static int ISO9660_remove(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0); +} /* ISO9660_remove */ + + +static int ISO9660_mkdir(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0); +} /* ISO9660_mkdir */ + + +const PHYSFS_Archiver __PHYSFS_Archiver_ISO9660 = +{ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "ISO", + "ISO9660 image file", + "Christoph Nelles ", + "http://www.evilazrael.de/", + 0, /* supportsSymlinks */ + }, + ISO9660_openArchive, + ISO9660_enumerateFiles, + ISO9660_openRead, + ISO9660_openWrite, + ISO9660_openAppend, + ISO9660_remove, + ISO9660_mkdir, + ISO9660_stat, + ISO9660_closeArchive +}; + +#endif /* defined PHYSFS_SUPPORTS_ISO9660 */ + +/* end of archiver_iso9660.c ... */ + diff --git a/jni/physfs-2.0.3/archivers/lzma.c b/jni/physfs-2.1.0/src/archiver_lzma.c similarity index 60% rename from jni/physfs-2.0.3/archivers/lzma.c rename to jni/physfs-2.1.0/src/archiver_lzma.c index dfdefc18..064a4b25 100644 --- a/jni/physfs-2.0.3/archivers/lzma.c +++ b/jni/physfs-2.1.0/src/archiver_lzma.c @@ -7,17 +7,11 @@ * by Igor Pavlov. */ -#if (defined PHYSFS_SUPPORTS_7Z) - -#include -#include -#include - -#include "physfs.h" - #define __PHYSICSFS_INTERNAL__ #include "physfs_internal.h" +#if PHYSFS_SUPPORTS_7Z + #include "lzma/C/7zCrc.h" #include "lzma/C/Archive/7z/7zIn.h" #include "lzma/C/Archive/7z/7zExtract.h" @@ -40,7 +34,7 @@ typedef struct _FileInputStream ISzAlloc allocImp; /* Allocation implementation, used by 7z */ ISzAlloc allocTempImp; /* Temporary allocation implementation, used by 7z */ ISzInStream inStream; /* Input stream with read callbacks, used by 7z */ - void *file; /* Filehandle, used by read implementation */ + PHYSFS_Io *io; /* Filehandle, used by read implementation */ #ifdef _LZMA_IN_CB Byte buffer[BUFFER_SIZE]; /* Buffer, used by read implementation */ #endif /* _LZMA_IN_CB */ @@ -113,7 +107,7 @@ SZ_RESULT SzFileReadImp(void *object, void **buffer, size_t maxReqSize, if (maxReqSize > BUFFER_SIZE) maxReqSize = BUFFER_SIZE; - processedSizeLoc = __PHYSFS_platformRead(s->file, s->buffer, 1, maxReqSize); + processedSizeLoc = s->io->read(s->io, s->buffer, maxReqSize); *buffer = s->buffer; if (processedSize != NULL) *processedSize = (size_t) processedSizeLoc; @@ -131,8 +125,8 @@ SZ_RESULT SzFileReadImp(void *object, void *buffer, size_t size, size_t *processedSize) { FileInputStream *s = (FileInputStream *)((unsigned long)object - offsetof(FileInputStream, inStream)); /* HACK! */ - size_t processedSizeLoc = __PHYSFS_platformRead(s->file, buffer, 1, size); - if (processedSize != 0) + const size_t processedSizeLoc = s->io->read(s->io, buffer, size); + if (processedSize != NULL) *processedSize = processedSizeLoc; return SZ_OK; } /* SzFileReadImp */ @@ -146,7 +140,7 @@ SZ_RESULT SzFileReadImp(void *object, void *buffer, size_t size, SZ_RESULT SzFileSeekImp(void *object, CFileSize pos) { FileInputStream *s = (FileInputStream *)((unsigned long)object - offsetof(FileInputStream, inStream)); /* HACK! */ - if (__PHYSFS_platformSeek(s->file, (PHYSFS_uint64) pos)) + if (s->io->seek(s->io, (PHYSFS_uint64) pos)) return SZ_OK; return SZE_FAIL; } /* SzFileSeekImp */ @@ -175,7 +169,7 @@ static int lzma_file_cmp_stdlib(const void *key, const void *object) { const char *name = (const char *) key; LZMAfile *file = (LZMAfile *) object; - return(strcmp(name, file->item->Name)); + return strcmp(name, file->item->Name); } /* lzma_file_cmp_posix */ @@ -183,17 +177,17 @@ static int lzma_file_cmp_stdlib(const void *key, const void *object) * Compare two files with each other based on the name * Used for sorting */ -static int lzma_file_cmp(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) +static int lzma_file_cmp(void *_a, size_t one, size_t two) { LZMAfile *files = (LZMAfile *) _a; - return(strcmp(files[one].item->Name, files[two].item->Name)); + return strcmp(files[one].item->Name, files[two].item->Name); } /* lzma_file_cmp */ /* * Swap two entries in the file array */ -static void lzma_file_swap(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) +static void lzma_file_swap(void *_a, size_t one, size_t two) { LZMAfile tmp; LZMAfile *first = &(((LZMAfile *) _a)[one]); @@ -207,13 +201,13 @@ static void lzma_file_swap(void *_a, PHYSFS_uint32 one, PHYSFS_uint32 two) /* * Find entry 'name' in 'archive' */ -static LZMAfile * lzma_find_file(LZMAarchive *archive, const char *name) +static LZMAfile * lzma_find_file(const LZMAarchive *archive, const char *name) { LZMAfile *file = bsearch(name, archive->files, archive->db.Database.NumFiles, sizeof(*archive->files), lzma_file_cmp_stdlib); /* FIXME: Should become __PHYSFS_search!!! */ - BAIL_IF_MACRO(file == NULL, ERR_NO_SUCH_FILE, NULL); + BAIL_IF_MACRO(file == NULL, PHYSFS_ERR_NOT_FOUND, NULL); - return(file); + return file; } /* lzma_find_file */ @@ -232,7 +226,7 @@ static int lzma_file_init(LZMAarchive *archive, PHYSFS_uint32 fileIndex) file->position = 0; file->offset = 0; /* Offset will be set by LZMA_read() */ - return(1); + return 1; } /* lzma_load_file */ @@ -247,13 +241,13 @@ static int lzma_files_init(LZMAarchive *archive) { if (!lzma_file_init(archive, fileIndex)) { - return(0); /* FALSE on failure */ + return 0; /* FALSE on failure */ } } /* for */ - __PHYSFS_sort(archive->files, numFiles, lzma_file_cmp, lzma_file_swap); + __PHYSFS_sort(archive->files, (size_t) numFiles, lzma_file_cmp, lzma_file_swap); - return(1); + return 1; } /* lzma_load_files */ @@ -297,55 +291,49 @@ static int lzma_err(SZ_RESULT rc) case SZ_OK: /* Same as LZMA_RESULT_OK */ break; case SZE_DATA_ERROR: /* Same as LZMA_RESULT_DATA_ERROR */ - __PHYSFS_setError(ERR_DATA_ERROR); + PHYSFS_setErrorCode(PHYSFS_ERR_CORRUPT); /*!!!FIXME: was "PHYSFS_ERR_DATA_ERROR" */ break; case SZE_OUTOFMEMORY: - __PHYSFS_setError(ERR_OUT_OF_MEMORY); + PHYSFS_setErrorCode(PHYSFS_ERR_OUT_OF_MEMORY); break; case SZE_CRC_ERROR: - __PHYSFS_setError(ERR_CORRUPTED); + PHYSFS_setErrorCode(PHYSFS_ERR_CORRUPT); break; case SZE_NOTIMPL: - __PHYSFS_setError(ERR_NOT_IMPLEMENTED); + PHYSFS_setErrorCode(PHYSFS_ERR_UNSUPPORTED); break; case SZE_FAIL: - __PHYSFS_setError(ERR_UNKNOWN_ERROR); /* !!! FIXME: right? */ + PHYSFS_setErrorCode(PHYSFS_ERR_OTHER_ERROR); /* !!! FIXME: right? */ break; case SZE_ARCHIVE_ERROR: - __PHYSFS_setError(ERR_CORRUPTED); /* !!! FIXME: right? */ + PHYSFS_setErrorCode(PHYSFS_ERR_CORRUPT); /* !!! FIXME: right? */ break; default: - __PHYSFS_setError(ERR_UNKNOWN_ERROR); + PHYSFS_setErrorCode(PHYSFS_ERR_OTHER_ERROR); } /* switch */ - return(rc); + return rc; } /* lzma_err */ -static PHYSFS_sint64 LZMA_read(fvoid *opaque, void *outBuffer, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) +static PHYSFS_sint64 LZMA_read(PHYSFS_Io *io, void *outBuf, PHYSFS_uint64 len) { - LZMAfile *file = (LZMAfile *) opaque; + LZMAfile *file = (LZMAfile *) io->opaque; - size_t wantedSize = objSize*objCount; - size_t remainingSize = file->item->Size - file->position; + size_t wantedSize = (size_t) len; + const size_t remainingSize = file->item->Size - file->position; size_t fileSize = 0; - BAIL_IF_MACRO(wantedSize == 0, NULL, 0); /* quick rejection. */ - BAIL_IF_MACRO(remainingSize == 0, ERR_PAST_EOF, 0); + BAIL_IF_MACRO(wantedSize == 0, ERRPASS, 0); /* quick rejection. */ + BAIL_IF_MACRO(remainingSize == 0, PHYSFS_ERR_PAST_EOF, 0); - if (remainingSize < wantedSize) - { - wantedSize = remainingSize - (remainingSize % objSize); - objCount = (PHYSFS_uint32) (remainingSize / objSize); - BAIL_IF_MACRO(objCount == 0, ERR_PAST_EOF, 0); /* quick rejection. */ - __PHYSFS_setError(ERR_PAST_EOF); /* this is always true here. */ - } /* if */ + if (wantedSize > remainingSize) + wantedSize = remainingSize; - /* Only decompress the folder if it is not allready cached */ + /* Only decompress the folder if it is not already cached */ if (file->folder->cache == NULL) { - int rc = lzma_err(SzExtract( + const int rc = lzma_err(SzExtract( &file->archive->stream.inStream, /* compressed data */ &file->archive->db, /* 7z's database, containing everything */ file->index, /* Index into database arrays */ @@ -365,44 +353,33 @@ static PHYSFS_sint64 LZMA_read(fvoid *opaque, void *outBuffer, return -1; } /* if */ - /* Copy wanted bytes over from cache to outBuffer */ - memcpy(outBuffer, - (file->folder->cache + - file->offset + file->position), + /* Copy wanted bytes over from cache to outBuf */ + memcpy(outBuf, (file->folder->cache + file->offset + file->position), wantedSize); file->position += wantedSize; /* Increase virtual position */ - return objCount; + return wantedSize; } /* LZMA_read */ -static PHYSFS_sint64 LZMA_write(fvoid *opaque, const void *buf, - PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) +static PHYSFS_sint64 LZMA_write(PHYSFS_Io *io, const void *b, PHYSFS_uint64 len) { - BAIL_MACRO(ERR_NOT_SUPPORTED, -1); + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, -1); } /* LZMA_write */ -static int LZMA_eof(fvoid *opaque) +static PHYSFS_sint64 LZMA_tell(PHYSFS_Io *io) { - LZMAfile *file = (LZMAfile *) opaque; - return (file->position >= file->item->Size); -} /* LZMA_eof */ - - -static PHYSFS_sint64 LZMA_tell(fvoid *opaque) -{ - LZMAfile *file = (LZMAfile *) opaque; - return (file->position); + LZMAfile *file = (LZMAfile *) io->opaque; + return file->position; } /* LZMA_tell */ -static int LZMA_seek(fvoid *opaque, PHYSFS_uint64 offset) +static int LZMA_seek(PHYSFS_Io *io, PHYSFS_uint64 offset) { - LZMAfile *file = (LZMAfile *) opaque; + LZMAfile *file = (LZMAfile *) io->opaque; - BAIL_IF_MACRO(offset < 0, ERR_SEEK_OUT_OF_RANGE, 0); - BAIL_IF_MACRO(offset > file->item->Size, ERR_PAST_EOF, 0); + BAIL_IF_MACRO(offset > file->item->Size, PHYSFS_ERR_PAST_EOF, 0); file->position = offset; /* We only use a virtual position... */ @@ -410,76 +387,78 @@ static int LZMA_seek(fvoid *opaque, PHYSFS_uint64 offset) } /* LZMA_seek */ -static PHYSFS_sint64 LZMA_fileLength(fvoid *opaque) +static PHYSFS_sint64 LZMA_length(PHYSFS_Io *io) { - LZMAfile *file = (LZMAfile *) opaque; + const LZMAfile *file = (LZMAfile *) io->opaque; return (file->item->Size); -} /* LZMA_fileLength */ +} /* LZMA_length */ -static int LZMA_fileClose(fvoid *opaque) +static PHYSFS_Io *LZMA_duplicate(PHYSFS_Io *_io) { - LZMAfile *file = (LZMAfile *) opaque; + /* !!! FIXME: this archiver needs to be reworked to allow multiple + * !!! FIXME: opens before we worry about duplication. */ + BAIL_MACRO(PHYSFS_ERR_UNSUPPORTED, NULL); +} /* LZMA_duplicate */ - BAIL_IF_MACRO(file->folder == NULL, ERR_NOT_A_FILE, 0); - /* Only decrease refcount if someone actually requested this file... Prevents from overflows and close-on-open... */ - if (file->folder->references > 0) - file->folder->references--; - if (file->folder->references == 0) +static int LZMA_flush(PHYSFS_Io *io) { return 1; /* no write support. */ } + + +static void LZMA_destroy(PHYSFS_Io *io) +{ + LZMAfile *file = (LZMAfile *) io->opaque; + + if (file->folder != NULL) { - /* Free the cache which might have been allocated by LZMA_read() */ - allocator.Free(file->folder->cache); - file->folder->cache = NULL; - } - - return(1); -} /* LZMA_fileClose */ + /* Only decrease refcount if someone actually requested this file... Prevents from overflows and close-on-open... */ + if (file->folder->references > 0) + file->folder->references--; + if (file->folder->references == 0) + { + /* Free the cache which might have been allocated by LZMA_read() */ + allocator.Free(file->folder->cache); + file->folder->cache = NULL; + } + /* !!! FIXME: we don't free (file) or (file->folder)?! */ + } /* if */ +} /* LZMA_destroy */ -static int LZMA_isArchive(const char *filename, int forWriting) +static const PHYSFS_Io LZMA_Io = +{ + CURRENT_PHYSFS_IO_API_VERSION, NULL, + LZMA_read, + LZMA_write, + LZMA_seek, + LZMA_tell, + LZMA_length, + LZMA_duplicate, + LZMA_flush, + LZMA_destroy +}; + + +static void *LZMA_openArchive(PHYSFS_Io *io, const char *name, int forWriting) { PHYSFS_uint8 sig[k7zSignatureSize]; - void *in; - - BAIL_IF_MACRO(forWriting, ERR_ARC_IS_READ_ONLY, 0); - - in = __PHYSFS_platformOpenRead(filename); - BAIL_IF_MACRO(in == NULL, NULL, 0); - - /* Read signature bytes */ - if (__PHYSFS_platformRead(in, sig, k7zSignatureSize, 1) != 1) - { - __PHYSFS_platformClose(in); /* Don't forget to close the file before returning... */ - BAIL_MACRO(NULL, 0); - } - - __PHYSFS_platformClose(in); - - /* Test whether sig is the 7z signature */ - return(TestSignatureCandidate(sig)); -} /* LZMA_isArchive */ - - -static void *LZMA_openArchive(const char *name, int forWriting) -{ size_t len = 0; LZMAarchive *archive = NULL; - BAIL_IF_MACRO(forWriting, ERR_ARC_IS_READ_ONLY, NULL); - BAIL_IF_MACRO(!LZMA_isArchive(name,forWriting), ERR_UNSUPPORTED_ARCHIVE, 0); + assert(io != NULL); /* shouldn't ever happen. */ + + BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL); + + if (io->read(io, sig, k7zSignatureSize) != k7zSignatureSize) + return 0; + BAIL_IF_MACRO(!TestSignatureCandidate(sig), PHYSFS_ERR_UNSUPPORTED, NULL); + BAIL_IF_MACRO(!io->seek(io, 0), ERRPASS, NULL); archive = (LZMAarchive *) allocator.Malloc(sizeof (LZMAarchive)); - BAIL_IF_MACRO(archive == NULL, ERR_OUT_OF_MEMORY, NULL); + BAIL_IF_MACRO(archive == NULL, PHYSFS_ERR_OUT_OF_MEMORY, NULL); lzma_archive_init(archive); - - if ( (archive->stream.file = __PHYSFS_platformOpenRead(name)) == NULL ) - { - __PHYSFS_platformClose(archive->stream.file); - lzma_archive_exit(archive); - return(NULL); /* Error is set by platformOpenRead! */ - } + archive->stream.io = io; CrcGenerateTable(); SzArDbExInit(&archive->db); @@ -489,7 +468,6 @@ static void *LZMA_openArchive(const char *name, int forWriting) &archive->stream.allocTempImp)) != SZ_OK) { SzArDbExFree(&archive->db, SzFreePhysicsFS); - __PHYSFS_platformClose(archive->stream.file); lzma_archive_exit(archive); return NULL; /* Error is set by lzma_err! */ } /* if */ @@ -499,9 +477,8 @@ static void *LZMA_openArchive(const char *name, int forWriting) if (archive->files == NULL) { SzArDbExFree(&archive->db, SzFreePhysicsFS); - __PHYSFS_platformClose(archive->stream.file); lzma_archive_exit(archive); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); } /* @@ -515,9 +492,8 @@ static void *LZMA_openArchive(const char *name, int forWriting) if (archive->folders == NULL) { SzArDbExFree(&archive->db, SzFreePhysicsFS); - __PHYSFS_platformClose(archive->stream.file); lzma_archive_exit(archive); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); } /* @@ -529,12 +505,11 @@ static void *LZMA_openArchive(const char *name, int forWriting) if(!lzma_files_init(archive)) { SzArDbExFree(&archive->db, SzFreePhysicsFS); - __PHYSFS_platformClose(archive->stream.file); lzma_archive_exit(archive); - BAIL_MACRO(ERR_UNKNOWN_ERROR, NULL); + BAIL_MACRO(PHYSFS_ERR_OTHER_ERROR, NULL); } - return(archive); + return archive; } /* LZMA_openArchive */ @@ -556,8 +531,8 @@ static void doEnumCallback(PHYSFS_EnumFilesCallback cb, void *callbackdata, } /* doEnumCallback */ -static void LZMA_enumerateFiles(dvoid *opaque, const char *dname, - int omitSymLinks, PHYSFS_EnumFilesCallback cb, +static void LZMA_enumerateFiles(void *opaque, const char *dname, + PHYSFS_EnumFilesCallback cb, const char *origdir, void *callbackdata) { size_t dlen = strlen(dname), @@ -576,7 +551,7 @@ static void LZMA_enumerateFiles(dvoid *opaque, const char *dname, file = archive->files; } - BAIL_IF_MACRO(file == NULL, ERR_NO_SUCH_FILE, ); + BAIL_IF_MACRO(file == NULL, PHYSFS_ERR_NOT_FOUND, ); while (file < lastFile) { @@ -600,137 +575,125 @@ static void LZMA_enumerateFiles(dvoid *opaque, const char *dname, } /* LZMA_enumerateFiles */ -static int LZMA_exists(dvoid *opaque, const char *name) -{ - LZMAarchive *archive = (LZMAarchive *) opaque; - return(lzma_find_file(archive, name) != NULL); -} /* LZMA_exists */ - - -static PHYSFS_sint64 LZMA_getLastModTime(dvoid *opaque, - const char *name, - int *fileExists) +static PHYSFS_Io *LZMA_openRead(void *opaque, const char *name) { LZMAarchive *archive = (LZMAarchive *) opaque; LZMAfile *file = lzma_find_file(archive, name); + PHYSFS_Io *io = NULL; - *fileExists = (file != NULL); - - BAIL_IF_MACRO(file == NULL, NULL, -1); - BAIL_IF_MACRO(!file->item->IsLastWriteTimeDefined, NULL, -1); /* write-time may not be defined for every file */ - - return(lzma_filetime_to_unix_timestamp(&file->item->LastWriteTime)); -} /* LZMA_getLastModTime */ - - -static int LZMA_isDirectory(dvoid *opaque, const char *name, int *fileExists) -{ - LZMAarchive *archive = (LZMAarchive *) opaque; - LZMAfile *file = lzma_find_file(archive, name); - - *fileExists = (file != NULL); - - return(file == NULL ? 0 : file->item->IsDirectory); -} /* LZMA_isDirectory */ - - -static int LZMA_isSymLink(dvoid *opaque, const char *name, int *fileExists) -{ - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); -} /* LZMA_isSymLink */ - - -static fvoid *LZMA_openRead(dvoid *opaque, const char *name, int *fileExists) -{ - LZMAarchive *archive = (LZMAarchive *) opaque; - LZMAfile *file = lzma_find_file(archive, name); - - *fileExists = (file != NULL); - BAIL_IF_MACRO(file == NULL, ERR_NO_SUCH_FILE, NULL); - BAIL_IF_MACRO(file->folder == NULL, ERR_NOT_A_FILE, NULL); + BAIL_IF_MACRO(file == NULL, PHYSFS_ERR_NOT_FOUND, NULL); + BAIL_IF_MACRO(file->folder == NULL, PHYSFS_ERR_NOT_A_FILE, NULL); file->position = 0; file->folder->references++; /* Increase refcount for automatic cleanup... */ - return(file); + io = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + BAIL_IF_MACRO(io == NULL, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + memcpy(io, &LZMA_Io, sizeof (*io)); + io->opaque = file; + + return io; } /* LZMA_openRead */ -static fvoid *LZMA_openWrite(dvoid *opaque, const char *filename) +static PHYSFS_Io *LZMA_openWrite(void *opaque, const char *filename) { - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL); } /* LZMA_openWrite */ -static fvoid *LZMA_openAppend(dvoid *opaque, const char *filename) +static PHYSFS_Io *LZMA_openAppend(void *opaque, const char *filename) { - BAIL_MACRO(ERR_NOT_SUPPORTED, NULL); + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL); } /* LZMA_openAppend */ -static void LZMA_dirClose(dvoid *opaque) +static void LZMA_closeArchive(void *opaque) { LZMAarchive *archive = (LZMAarchive *) opaque; - PHYSFS_uint32 fileIndex = 0, numFiles = archive->db.Database.NumFiles; +#if 0 /* !!! FIXME: you shouldn't have to do this. */ + PHYSFS_uint32 fileIndex = 0, numFiles = archive->db.Database.NumFiles; for (fileIndex = 0; fileIndex < numFiles; fileIndex++) { LZMA_fileClose(&archive->files[fileIndex]); } /* for */ +#endif SzArDbExFree(&archive->db, SzFreePhysicsFS); - __PHYSFS_platformClose(archive->stream.file); + archive->stream.io->destroy(archive->stream.io); lzma_archive_exit(archive); -} /* LZMA_dirClose */ +} /* LZMA_closeArchive */ -static int LZMA_remove(dvoid *opaque, const char *name) +static int LZMA_remove(void *opaque, const char *name) { - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0); } /* LZMA_remove */ -static int LZMA_mkdir(dvoid *opaque, const char *name) +static int LZMA_mkdir(void *opaque, const char *name) { - BAIL_MACRO(ERR_NOT_SUPPORTED, 0); + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0); } /* LZMA_mkdir */ - -const PHYSFS_ArchiveInfo __PHYSFS_ArchiveInfo_LZMA = +static int LZMA_stat(void *opaque, const char *filename, PHYSFS_Stat *stat) { - "7Z", - LZMA_ARCHIVE_DESCRIPTION, - "Dennis Schridde ", - "http://icculus.org/physfs/", -}; + const LZMAarchive *archive = (const LZMAarchive *) opaque; + const LZMAfile *file = lzma_find_file(archive, filename); + + if (!file) + return 0; + + if(file->item->IsDirectory) + { + stat->filesize = 0; + stat->filetype = PHYSFS_FILETYPE_DIRECTORY; + } /* if */ + else + { + stat->filesize = (PHYSFS_sint64) file->item->Size; + stat->filetype = PHYSFS_FILETYPE_REGULAR; + } /* else */ + + /* !!! FIXME: the 0's should be -1's? */ + if (file->item->IsLastWriteTimeDefined) + stat->modtime = lzma_filetime_to_unix_timestamp(&file->item->LastWriteTime); + else + stat->modtime = 0; + + /* real create and accesstype are currently not in the lzma SDK */ + stat->createtime = stat->modtime; + stat->accesstime = 0; + + stat->readonly = 1; /* 7zips are always read only */ + + return 1; +} /* LZMA_stat */ const PHYSFS_Archiver __PHYSFS_Archiver_LZMA = { - &__PHYSFS_ArchiveInfo_LZMA, - LZMA_isArchive, /* isArchive() method */ - LZMA_openArchive, /* openArchive() method */ - LZMA_enumerateFiles, /* enumerateFiles() method */ - LZMA_exists, /* exists() method */ - LZMA_isDirectory, /* isDirectory() method */ - LZMA_isSymLink, /* isSymLink() method */ - LZMA_getLastModTime, /* getLastModTime() method */ - LZMA_openRead, /* openRead() method */ - LZMA_openWrite, /* openWrite() method */ - LZMA_openAppend, /* openAppend() method */ - LZMA_remove, /* remove() method */ - LZMA_mkdir, /* mkdir() method */ - LZMA_dirClose, /* dirClose() method */ - LZMA_read, /* read() method */ - LZMA_write, /* write() method */ - LZMA_eof, /* eof() method */ - LZMA_tell, /* tell() method */ - LZMA_seek, /* seek() method */ - LZMA_fileLength, /* fileLength() method */ - LZMA_fileClose /* fileClose() method */ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "7Z", + "LZMA (7zip) format", + "Dennis Schridde ", + "http://icculus.org/physfs/", + 0, /* supportsSymlinks */ + }, + LZMA_openArchive, + LZMA_enumerateFiles, + LZMA_openRead, + LZMA_openWrite, + LZMA_openAppend, + LZMA_remove, + LZMA_mkdir, + LZMA_stat, + LZMA_closeArchive }; #endif /* defined PHYSFS_SUPPORTS_7Z */ -/* end of lzma.c ... */ +/* end of archiver_lzma.c ... */ diff --git a/jni/physfs-2.1.0/src/archiver_mvl.c b/jni/physfs-2.1.0/src/archiver_mvl.c new file mode 100644 index 00000000..835381a2 --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_mvl.c @@ -0,0 +1,105 @@ +/* + * MVL support routines for PhysicsFS. + * + * This driver handles Descent II Movielib archives. + * + * The file format of MVL is quite easy... + * + * //MVL File format - Written by Heiko Herrmann + * char sig[4] = {'D','M', 'V', 'L'}; // "DMVL"=Descent MoVie Library + * + * int num_files; // the number of files in this MVL + * + * struct { + * char file_name[13]; // Filename, padded to 13 bytes with 0s + * int file_size; // filesize in bytes + * }DIR_STRUCT[num_files]; + * + * struct { + * char data[file_size]; // The file data + * }FILE_STRUCT[num_files]; + * + * (That info is from http://www.descent2.com/ddn/specs/mvl/) + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Bradley Bell. + * Based on grp.c by Ryan C. Gordon. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +#if PHYSFS_SUPPORTS_MVL + +static UNPKentry *mvlLoadEntries(PHYSFS_Io *io, PHYSFS_uint32 fileCount) +{ + PHYSFS_uint32 location = 8; /* sizeof sig. */ + UNPKentry *entries = NULL; + UNPKentry *entry = NULL; + + entries = (UNPKentry *) allocator.Malloc(sizeof (UNPKentry) * fileCount); + BAIL_IF_MACRO(entries == NULL, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + + location += (17 * fileCount); + + for (entry = entries; fileCount > 0; fileCount--, entry++) + { + if (!__PHYSFS_readAll(io, &entry->name, 13)) goto failed; + if (!__PHYSFS_readAll(io, &entry->size, 4)) goto failed; + entry->size = PHYSFS_swapULE32(entry->size); + entry->startPos = location; + location += entry->size; + } /* for */ + + return entries; + +failed: + allocator.Free(entries); + return NULL; +} /* mvlLoadEntries */ + + +static void *MVL_openArchive(PHYSFS_Io *io, const char *name, int forWriting) +{ + PHYSFS_uint8 buf[4]; + PHYSFS_uint32 count = 0; + UNPKentry *entries = NULL; + + assert(io != NULL); /* shouldn't ever happen. */ + BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL); + BAIL_IF_MACRO(!__PHYSFS_readAll(io, buf, 4), ERRPASS, NULL); + BAIL_IF_MACRO(memcmp(buf, "DMVL", 4) != 0, PHYSFS_ERR_UNSUPPORTED, NULL); + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &count, sizeof(count)), ERRPASS, NULL); + + count = PHYSFS_swapULE32(count); + entries = mvlLoadEntries(io, count); + return (!entries) ? NULL : UNPK_openArchive(io, entries, count); +} /* MVL_openArchive */ + + +const PHYSFS_Archiver __PHYSFS_Archiver_MVL = +{ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "MVL", + "Descent II Movielib format", + "Bradley Bell ", + "http://icculus.org/physfs/", + 0, /* supportsSymlinks */ + }, + MVL_openArchive, + UNPK_enumerateFiles, + UNPK_openRead, + UNPK_openWrite, + UNPK_openAppend, + UNPK_remove, + UNPK_mkdir, + UNPK_stat, + UNPK_closeArchive +}; + +#endif /* defined PHYSFS_SUPPORTS_MVL */ + +/* end of archiver_mvl.c ... */ + diff --git a/jni/physfs-2.1.0/src/archiver_qpak.c b/jni/physfs-2.1.0/src/archiver_qpak.c new file mode 100644 index 00000000..14758372 --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_qpak.c @@ -0,0 +1,121 @@ +/* + * QPAK support routines for PhysicsFS. + * + * This archiver handles the archive format utilized by Quake 1 and 2. + * Quake3-based games use the PkZip/Info-Zip format (which our zip.c + * archiver handles). + * + * ======================================================================== + * + * This format info (in more detail) comes from: + * http://debian.fmi.uni-sofia.bg/~sergei/cgsr/docs/pak.txt + * + * Quake PAK Format + * + * Header + * (4 bytes) signature = 'PACK' + * (4 bytes) directory offset + * (4 bytes) directory length + * + * Directory + * (56 bytes) file name + * (4 bytes) file position + * (4 bytes) file length + * + * ======================================================================== + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +#if PHYSFS_SUPPORTS_QPAK + +#define QPAK_SIG 0x4B434150 /* "PACK" in ASCII. */ + +static UNPKentry *qpakLoadEntries(PHYSFS_Io *io, PHYSFS_uint32 fileCount) +{ + UNPKentry *entries = NULL; + UNPKentry *entry = NULL; + + entries = (UNPKentry *) allocator.Malloc(sizeof (UNPKentry) * fileCount); + BAIL_IF_MACRO(entries == NULL, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + + for (entry = entries; fileCount > 0; fileCount--, entry++) + { + if (!__PHYSFS_readAll(io, &entry->name, 56)) goto failed; + if (!__PHYSFS_readAll(io, &entry->startPos, 4)) goto failed; + if (!__PHYSFS_readAll(io, &entry->size, 4)) goto failed; + entry->size = PHYSFS_swapULE32(entry->size); + entry->startPos = PHYSFS_swapULE32(entry->startPos); + } /* for */ + + return entries; + +failed: + allocator.Free(entries); + return NULL; +} /* qpakLoadEntries */ + + +static void *QPAK_openArchive(PHYSFS_Io *io, const char *name, int forWriting) +{ + UNPKentry *entries = NULL; + PHYSFS_uint32 val = 0; + PHYSFS_uint32 pos = 0; + PHYSFS_uint32 count = 0; + + assert(io != NULL); /* shouldn't ever happen. */ + + BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL); + + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &val, 4), ERRPASS, NULL); + if (PHYSFS_swapULE32(val) != QPAK_SIG) + BAIL_MACRO(PHYSFS_ERR_UNSUPPORTED, NULL); + + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &val, 4), ERRPASS, NULL); + pos = PHYSFS_swapULE32(val); /* directory table offset. */ + + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &val, 4), ERRPASS, NULL); + count = PHYSFS_swapULE32(val); + + /* corrupted archive? */ + BAIL_IF_MACRO((count % 64) != 0, PHYSFS_ERR_CORRUPT, NULL); + count /= 64; + + BAIL_IF_MACRO(!io->seek(io, pos), ERRPASS, NULL); + + entries = qpakLoadEntries(io, count); + BAIL_IF_MACRO(!entries, ERRPASS, NULL); + return UNPK_openArchive(io, entries, count); +} /* QPAK_openArchive */ + + +const PHYSFS_Archiver __PHYSFS_Archiver_QPAK = +{ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "PAK", + "Quake I/II format", + "Ryan C. Gordon ", + "http://icculus.org/physfs/", + 0, /* supportsSymlinks */ + }, + QPAK_openArchive, + UNPK_enumerateFiles, + UNPK_openRead, + UNPK_openWrite, + UNPK_openAppend, + UNPK_remove, + UNPK_mkdir, + UNPK_stat, + UNPK_closeArchive +}; + +#endif /* defined PHYSFS_SUPPORTS_QPAK */ + +/* end of archiver_qpak.c ... */ + diff --git a/jni/physfs-2.1.0/src/archiver_slb.c b/jni/physfs-2.1.0/src/archiver_slb.c new file mode 100644 index 00000000..befd2051 --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_slb.c @@ -0,0 +1,126 @@ +/* + * SLB support routines for PhysicsFS. + * + * This driver handles SLB archives ("slab files"). This uncompressed format + * is used in I-War / Independence War and Independence War: Defiance. + * + * The format begins with four zero bytes (version?), the file count and the + * location of the table of contents. Each ToC entry contains a 64-byte buffer + * containing a zero-terminated filename, the offset of the data, and its size. + * All the filenames begin with the separator character '\'. + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Aleksi Nurmi, based on the GRP archiver by + * Ryan C. Gordon. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +#if PHYSFS_SUPPORTS_SLB + +static UNPKentry *slbLoadEntries(PHYSFS_Io *io, PHYSFS_uint32 fileCount) +{ + UNPKentry *entries = NULL; + UNPKentry *entry = NULL; + + entries = (UNPKentry *) allocator.Malloc(sizeof (UNPKentry) * fileCount); + BAIL_IF_MACRO(entries == NULL, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + + for (entry = entries; fileCount > 0; fileCount--, entry++) + { + char *ptr; + + /* don't include the '\' in the beginning */ + char backslash; + GOTO_IF_MACRO(!__PHYSFS_readAll(io, &backslash, 1), ERRPASS, failed); + GOTO_IF_MACRO(backslash != '\\', ERRPASS, failed); + + /* read the rest of the buffer, 63 bytes */ + GOTO_IF_MACRO(!__PHYSFS_readAll(io, &entry->name, 63), ERRPASS, failed); + entry->name[63] = '\0'; /* in case the name lacks the null terminator */ + + /* convert backslashes */ + for (ptr = entry->name; *ptr; ptr++) + { + if (*ptr == '\\') + *ptr = '/'; + } /* for */ + + GOTO_IF_MACRO(!__PHYSFS_readAll(io, &entry->startPos, 4), + ERRPASS, failed); + entry->startPos = PHYSFS_swapULE32(entry->startPos); + + GOTO_IF_MACRO(!__PHYSFS_readAll(io, &entry->size, 4), ERRPASS, failed); + entry->size = PHYSFS_swapULE32(entry->size); + } /* for */ + + return entries; + +failed: + allocator.Free(entries); + return NULL; + +} /* slbLoadEntries */ + + +static void *SLB_openArchive(PHYSFS_Io *io, const char *name, int forWriting) +{ + PHYSFS_uint32 version; + PHYSFS_uint32 count = 0; + PHYSFS_uint32 tocPos = 0; + UNPKentry *entries = NULL; + + assert(io != NULL); /* shouldn't ever happen. */ + + BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL); + + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &version, sizeof(version)), + ERRPASS, NULL); + version = PHYSFS_swapULE32(version); + BAIL_IF_MACRO(version != 0, ERRPASS, NULL); + + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &count, sizeof(count)), ERRPASS, NULL); + count = PHYSFS_swapULE32(count); + + /* offset of the table of contents */ + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &tocPos, sizeof(tocPos)), + ERRPASS, NULL); + tocPos = PHYSFS_swapULE32(tocPos); + + /* seek to the table of contents */ + BAIL_IF_MACRO(!io->seek(io, tocPos), ERRPASS, NULL); + + entries = slbLoadEntries(io, count); + BAIL_IF_MACRO(!entries, ERRPASS, NULL); + + return UNPK_openArchive(io, entries, count); +} /* SLB_openArchive */ + + +const PHYSFS_Archiver __PHYSFS_Archiver_SLB = +{ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "SLB", + "I-War / Independence War Slab file", + "Aleksi Nurmi ", + "http://bitbucket.org/ahnurmi/", + 0, /* supportsSymlinks */ + }, + SLB_openArchive, + UNPK_enumerateFiles, + UNPK_openRead, + UNPK_openWrite, + UNPK_openAppend, + UNPK_remove, + UNPK_mkdir, + UNPK_stat, + UNPK_closeArchive +}; + +#endif /* defined PHYSFS_SUPPORTS_SLB */ + +/* end of archiver_slb.c ... */ + diff --git a/jni/physfs-2.1.0/src/archiver_unpacked.c b/jni/physfs-2.1.0/src/archiver_unpacked.c new file mode 100644 index 00000000..bb0dab6e --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_unpacked.c @@ -0,0 +1,464 @@ +/* + * High-level PhysicsFS archiver for simple unpacked file formats. + * + * This is a framework that basic archivers build on top of. It's for simple + * formats that can just hand back a list of files and the offsets of their + * uncompressed data. There are an alarming number of formats like this. + * + * RULES: Archive entries must be uncompressed, must not have separate subdir + * entries (but can have subdirs), must be case insensitive LOW ASCII + * filenames <= 64 bytes. No symlinks, etc. We can relax some of these rules + * as necessary. + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +typedef struct +{ + PHYSFS_Io *io; + PHYSFS_uint32 entryCount; + UNPKentry *entries; +} UNPKinfo; + + +typedef struct +{ + PHYSFS_Io *io; + UNPKentry *entry; + PHYSFS_uint32 curPos; +} UNPKfileinfo; + + +void UNPK_closeArchive(void *opaque) +{ + UNPKinfo *info = ((UNPKinfo *) opaque); + info->io->destroy(info->io); + allocator.Free(info->entries); + allocator.Free(info); +} /* UNPK_closeArchive */ + + +static PHYSFS_sint64 UNPK_read(PHYSFS_Io *io, void *buffer, PHYSFS_uint64 len) +{ + UNPKfileinfo *finfo = (UNPKfileinfo *) io->opaque; + const UNPKentry *entry = finfo->entry; + const PHYSFS_uint64 bytesLeft = (PHYSFS_uint64)(entry->size-finfo->curPos); + PHYSFS_sint64 rc; + + if (bytesLeft < len) + len = bytesLeft; + + rc = finfo->io->read(finfo->io, buffer, len); + if (rc > 0) + finfo->curPos += (PHYSFS_uint32) rc; + + return rc; +} /* UNPK_read */ + + +static PHYSFS_sint64 UNPK_write(PHYSFS_Io *io, const void *b, PHYSFS_uint64 len) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, -1); +} /* UNPK_write */ + + +static PHYSFS_sint64 UNPK_tell(PHYSFS_Io *io) +{ + return ((UNPKfileinfo *) io->opaque)->curPos; +} /* UNPK_tell */ + + +static int UNPK_seek(PHYSFS_Io *io, PHYSFS_uint64 offset) +{ + UNPKfileinfo *finfo = (UNPKfileinfo *) io->opaque; + const UNPKentry *entry = finfo->entry; + int rc; + + BAIL_IF_MACRO(offset >= entry->size, PHYSFS_ERR_PAST_EOF, 0); + rc = finfo->io->seek(finfo->io, entry->startPos + offset); + if (rc) + finfo->curPos = (PHYSFS_uint32) offset; + + return rc; +} /* UNPK_seek */ + + +static PHYSFS_sint64 UNPK_length(PHYSFS_Io *io) +{ + const UNPKfileinfo *finfo = (UNPKfileinfo *) io->opaque; + return ((PHYSFS_sint64) finfo->entry->size); +} /* UNPK_length */ + + +static PHYSFS_Io *UNPK_duplicate(PHYSFS_Io *_io) +{ + UNPKfileinfo *origfinfo = (UNPKfileinfo *) _io->opaque; + PHYSFS_Io *io = NULL; + PHYSFS_Io *retval = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + UNPKfileinfo *finfo = (UNPKfileinfo *) allocator.Malloc(sizeof (UNPKfileinfo)); + GOTO_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, UNPK_duplicate_failed); + GOTO_IF_MACRO(!finfo, PHYSFS_ERR_OUT_OF_MEMORY, UNPK_duplicate_failed); + + io = origfinfo->io->duplicate(origfinfo->io); + if (!io) goto UNPK_duplicate_failed; + finfo->io = io; + finfo->entry = origfinfo->entry; + finfo->curPos = 0; + memcpy(retval, _io, sizeof (PHYSFS_Io)); + retval->opaque = finfo; + return retval; + +UNPK_duplicate_failed: + if (finfo != NULL) allocator.Free(finfo); + if (retval != NULL) allocator.Free(retval); + if (io != NULL) io->destroy(io); + return NULL; +} /* UNPK_duplicate */ + +static int UNPK_flush(PHYSFS_Io *io) { return 1; /* no write support. */ } + +static void UNPK_destroy(PHYSFS_Io *io) +{ + UNPKfileinfo *finfo = (UNPKfileinfo *) io->opaque; + finfo->io->destroy(finfo->io); + allocator.Free(finfo); + allocator.Free(io); +} /* UNPK_destroy */ + + +static const PHYSFS_Io UNPK_Io = +{ + CURRENT_PHYSFS_IO_API_VERSION, NULL, + UNPK_read, + UNPK_write, + UNPK_seek, + UNPK_tell, + UNPK_length, + UNPK_duplicate, + UNPK_flush, + UNPK_destroy +}; + + +static int entryCmp(void *_a, size_t one, size_t two) +{ + if (one != two) + { + const UNPKentry *a = (const UNPKentry *) _a; + return __PHYSFS_stricmpASCII(a[one].name, a[two].name); + } /* if */ + + return 0; +} /* entryCmp */ + + +static void entrySwap(void *_a, size_t one, size_t two) +{ + if (one != two) + { + UNPKentry tmp; + UNPKentry *first = &(((UNPKentry *) _a)[one]); + UNPKentry *second = &(((UNPKentry *) _a)[two]); + memcpy(&tmp, first, sizeof (UNPKentry)); + memcpy(first, second, sizeof (UNPKentry)); + memcpy(second, &tmp, sizeof (UNPKentry)); + } /* if */ +} /* entrySwap */ + + +static PHYSFS_sint32 findStartOfDir(UNPKinfo *info, const char *path, + int stop_on_first_find) +{ + PHYSFS_sint32 lo = 0; + PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); + PHYSFS_sint32 middle; + PHYSFS_uint32 dlen = (PHYSFS_uint32) strlen(path); + PHYSFS_sint32 retval = -1; + const char *name; + int rc; + + if (*path == '\0') /* root dir? */ + return 0; + + if ((dlen > 0) && (path[dlen - 1] == '/')) /* ignore trailing slash. */ + dlen--; + + while (lo <= hi) + { + middle = lo + ((hi - lo) / 2); + name = info->entries[middle].name; + rc = __PHYSFS_strnicmpASCII(path, name, dlen); + if (rc == 0) + { + char ch = name[dlen]; + if (ch < '/') /* make sure this isn't just a substr match. */ + rc = -1; + else if (ch > '/') + rc = 1; + else + { + if (stop_on_first_find) /* Just checking dir's existance? */ + return middle; + + if (name[dlen + 1] == '\0') /* Skip initial dir entry. */ + return (middle + 1); + + /* there might be more entries earlier in the list. */ + retval = middle; + hi = middle - 1; + } /* else */ + } /* if */ + + if (rc > 0) + lo = middle + 1; + else + hi = middle - 1; + } /* while */ + + return retval; +} /* findStartOfDir */ + + +/* + * Moved to seperate function so we can use alloca then immediately throw + * away the allocated stack space... + */ +static void doEnumCallback(PHYSFS_EnumFilesCallback cb, void *callbackdata, + const char *odir, const char *str, PHYSFS_sint32 ln) +{ + char *newstr = __PHYSFS_smallAlloc(ln + 1); + if (newstr == NULL) + return; + + memcpy(newstr, str, ln); + newstr[ln] = '\0'; + cb(callbackdata, odir, newstr); + __PHYSFS_smallFree(newstr); +} /* doEnumCallback */ + + +void UNPK_enumerateFiles(void *opaque, const char *dname, + PHYSFS_EnumFilesCallback cb, + const char *origdir, void *callbackdata) +{ + UNPKinfo *info = ((UNPKinfo *) opaque); + PHYSFS_sint32 dlen, dlen_inc, max, i; + + i = findStartOfDir(info, dname, 0); + if (i == -1) /* no such directory. */ + return; + + dlen = (PHYSFS_sint32) strlen(dname); + if ((dlen > 0) && (dname[dlen - 1] == '/')) /* ignore trailing slash. */ + dlen--; + + dlen_inc = ((dlen > 0) ? 1 : 0) + dlen; + max = (PHYSFS_sint32) info->entryCount; + while (i < max) + { + char *add; + char *ptr; + PHYSFS_sint32 ln; + char *e = info->entries[i].name; + if ((dlen) && + ((__PHYSFS_strnicmpASCII(e, dname, dlen)) || (e[dlen] != '/'))) + { + break; /* past end of this dir; we're done. */ + } /* if */ + + add = e + dlen_inc; + ptr = strchr(add, '/'); + ln = (PHYSFS_sint32) ((ptr) ? ptr-add : strlen(add)); + doEnumCallback(cb, callbackdata, origdir, add, ln); + ln += dlen_inc; /* point past entry to children... */ + + /* increment counter and skip children of subdirs... */ + while ((++i < max) && (ptr != NULL)) + { + char *e_new = info->entries[i].name; + if ((__PHYSFS_strnicmpASCII(e, e_new, ln) != 0) || + (e_new[ln] != '/')) + { + break; + } /* if */ + } /* while */ + } /* while */ +} /* UNPK_enumerateFiles */ + + +/* + * This will find the UNPKentry associated with a path in platform-independent + * notation. Directories don't have UNPKentries associated with them, but + * (*isDir) will be set to non-zero if a dir was hit. + */ +static UNPKentry *findEntry(const UNPKinfo *info, const char *path, int *isDir) +{ + UNPKentry *a = info->entries; + PHYSFS_sint32 pathlen = (PHYSFS_sint32) strlen(path); + PHYSFS_sint32 lo = 0; + PHYSFS_sint32 hi = (PHYSFS_sint32) (info->entryCount - 1); + PHYSFS_sint32 middle; + const char *thispath = NULL; + int rc; + + while (lo <= hi) + { + middle = lo + ((hi - lo) / 2); + thispath = a[middle].name; + rc = __PHYSFS_strnicmpASCII(path, thispath, pathlen); + + if (rc > 0) + lo = middle + 1; + + else if (rc < 0) + hi = middle - 1; + + else /* substring match...might be dir or entry or nothing. */ + { + if (isDir != NULL) + { + *isDir = (thispath[pathlen] == '/'); + if (*isDir) + return NULL; + } /* if */ + + if (thispath[pathlen] == '\0') /* found entry? */ + return &a[middle]; + /* adjust search params, try again. */ + else if (thispath[pathlen] > '/') + hi = middle - 1; + else + lo = middle + 1; + } /* if */ + } /* while */ + + if (isDir != NULL) + *isDir = 0; + + BAIL_MACRO(PHYSFS_ERR_NOT_FOUND, NULL); +} /* findEntry */ + + +PHYSFS_Io *UNPK_openRead(void *opaque, const char *name) +{ + PHYSFS_Io *retval = NULL; + UNPKinfo *info = (UNPKinfo *) opaque; + UNPKfileinfo *finfo = NULL; + int isdir = 0; + UNPKentry *entry = findEntry(info, name, &isdir); + + GOTO_IF_MACRO(isdir, PHYSFS_ERR_NOT_A_FILE, UNPK_openRead_failed); + GOTO_IF_MACRO(!entry, ERRPASS, UNPK_openRead_failed); + + retval = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + GOTO_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, UNPK_openRead_failed); + + finfo = (UNPKfileinfo *) allocator.Malloc(sizeof (UNPKfileinfo)); + GOTO_IF_MACRO(!finfo, PHYSFS_ERR_OUT_OF_MEMORY, UNPK_openRead_failed); + + finfo->io = info->io->duplicate(info->io); + GOTO_IF_MACRO(!finfo->io, ERRPASS, UNPK_openRead_failed); + + if (!finfo->io->seek(finfo->io, entry->startPos)) + goto UNPK_openRead_failed; + + finfo->curPos = 0; + finfo->entry = entry; + + memcpy(retval, &UNPK_Io, sizeof (*retval)); + retval->opaque = finfo; + return retval; + +UNPK_openRead_failed: + if (finfo != NULL) + { + if (finfo->io != NULL) + finfo->io->destroy(finfo->io); + allocator.Free(finfo); + } /* if */ + + if (retval != NULL) + allocator.Free(retval); + + return NULL; +} /* UNPK_openRead */ + + +PHYSFS_Io *UNPK_openWrite(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL); +} /* UNPK_openWrite */ + + +PHYSFS_Io *UNPK_openAppend(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL); +} /* UNPK_openAppend */ + + +int UNPK_remove(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0); +} /* UNPK_remove */ + + +int UNPK_mkdir(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0); +} /* UNPK_mkdir */ + + +int UNPK_stat(void *opaque, const char *filename, PHYSFS_Stat *stat) +{ + int isDir = 0; + const UNPKinfo *info = (const UNPKinfo *) opaque; + const UNPKentry *entry = findEntry(info, filename, &isDir); + + if (isDir) + { + stat->filetype = PHYSFS_FILETYPE_DIRECTORY; + stat->filesize = 0; + } /* if */ + else if (entry != NULL) + { + stat->filetype = PHYSFS_FILETYPE_REGULAR; + stat->filesize = entry->size; + } /* else if */ + else + { + return 0; + } /* else */ + + stat->modtime = -1; + stat->createtime = -1; + stat->accesstime = -1; + stat->readonly = 1; + + return 1; +} /* UNPK_stat */ + + +void *UNPK_openArchive(PHYSFS_Io *io, UNPKentry *e, const PHYSFS_uint32 num) +{ + UNPKinfo *info = (UNPKinfo *) allocator.Malloc(sizeof (UNPKinfo)); + if (info == NULL) + { + allocator.Free(e); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + } /* if */ + + __PHYSFS_sort(e, (size_t) num, entryCmp, entrySwap); + info->io = io; + info->entryCount = num; + info->entries = e; + + return info; +} /* UNPK_openArchive */ + +/* end of archiver_unpacked.c ... */ + diff --git a/jni/physfs-2.1.0/src/archiver_wad.c b/jni/physfs-2.1.0/src/archiver_wad.c new file mode 100644 index 00000000..2fe22f97 --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_wad.c @@ -0,0 +1,129 @@ +/* + * WAD support routines for PhysicsFS. + * + * This driver handles DOOM engine archives ("wads"). + * This format (but not this driver) was designed by id Software for use + * with the DOOM engine. + * The specs of the format are from the unofficial doom specs v1.666 + * found here: http://www.gamers.org/dhs/helpdocs/dmsp1666.html + * The format of the archive: (from the specs) + * + * A WAD file has three parts: + * (1) a twelve-byte header + * (2) one or more "lumps" + * (3) a directory or "info table" that contains the names, offsets, and + * sizes of all the lumps in the WAD + * + * The header consists of three four-byte parts: + * (a) an ASCII string which must be either "IWAD" or "PWAD" + * (b) a 4-byte (long) integer which is the number of lumps in the wad + * (c) a long integer which is the file offset to the start of + * the directory + * + * The directory has one 16-byte entry for every lump. Each entry consists + * of three parts: + * + * (a) a long integer, the file offset to the start of the lump + * (b) a long integer, the size of the lump in bytes + * (c) an 8-byte ASCII string, the name of the lump, padded with zeros. + * For example, the "DEMO1" entry in hexadecimal would be + * (44 45 4D 4F 31 00 00 00) + * + * Note that there is no way to tell if an opened WAD archive is a + * IWAD or PWAD with this archiver. + * I couldn't think of a way to provide that information, without being too + * hacky. + * I don't think it's really that important though. + * + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Travis Wells, based on the GRP archiver by + * Ryan C. Gordon. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +#if PHYSFS_SUPPORTS_WAD + +static UNPKentry *wadLoadEntries(PHYSFS_Io *io, PHYSFS_uint32 fileCount) +{ + PHYSFS_uint32 directoryOffset; + UNPKentry *entries = NULL; + UNPKentry *entry = NULL; + + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &directoryOffset, 4), ERRPASS, 0); + directoryOffset = PHYSFS_swapULE32(directoryOffset); + + BAIL_IF_MACRO(!io->seek(io, directoryOffset), ERRPASS, 0); + + entries = (UNPKentry *) allocator.Malloc(sizeof (UNPKentry) * fileCount); + BAIL_IF_MACRO(!entries, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + + for (entry = entries; fileCount > 0; fileCount--, entry++) + { + if (!__PHYSFS_readAll(io, &entry->startPos, 4)) goto failed; + if (!__PHYSFS_readAll(io, &entry->size, 4)) goto failed; + if (!__PHYSFS_readAll(io, &entry->name, 8)) goto failed; + + entry->name[8] = '\0'; /* name might not be null-terminated in file. */ + entry->size = PHYSFS_swapULE32(entry->size); + entry->startPos = PHYSFS_swapULE32(entry->startPos); + } /* for */ + + return entries; + +failed: + allocator.Free(entries); + return NULL; +} /* wadLoadEntries */ + + +static void *WAD_openArchive(PHYSFS_Io *io, const char *name, int forWriting) +{ + PHYSFS_uint8 buf[4]; + UNPKentry *entries = NULL; + PHYSFS_uint32 count = 0; + + assert(io != NULL); /* shouldn't ever happen. */ + + BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL); + BAIL_IF_MACRO(!__PHYSFS_readAll(io, buf, sizeof (buf)), ERRPASS, NULL); + if ((memcmp(buf, "IWAD", 4) != 0) && (memcmp(buf, "PWAD", 4) != 0)) + BAIL_MACRO(PHYSFS_ERR_UNSUPPORTED, NULL); + + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &count, sizeof (count)), ERRPASS, NULL); + count = PHYSFS_swapULE32(count); + + entries = wadLoadEntries(io, count); + BAIL_IF_MACRO(!entries, ERRPASS, NULL); + return UNPK_openArchive(io, entries, count); +} /* WAD_openArchive */ + + +const PHYSFS_Archiver __PHYSFS_Archiver_WAD = +{ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "WAD", + "DOOM engine format", + "Travis Wells ", + "http://www.3dmm2.com/doom/", + 0, /* supportsSymlinks */ + }, + WAD_openArchive, + UNPK_enumerateFiles, + UNPK_openRead, + UNPK_openWrite, + UNPK_openAppend, + UNPK_remove, + UNPK_mkdir, + UNPK_stat, + UNPK_closeArchive +}; + +#endif /* defined PHYSFS_SUPPORTS_WAD */ + +/* end of archiver_wad.c ... */ + diff --git a/jni/physfs-2.1.0/src/archiver_zip.c b/jni/physfs-2.1.0/src/archiver_zip.c new file mode 100644 index 00000000..399677e1 --- /dev/null +++ b/jni/physfs-2.1.0/src/archiver_zip.c @@ -0,0 +1,1712 @@ +/* + * ZIP support routines for PhysicsFS. + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon, with some peeking at "unzip.c" + * by Gilles Vollant. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +#if PHYSFS_SUPPORTS_ZIP + +#include +#include + +#define USE_MINIZ 1 +#if USE_MINIZ +#include "physfs_miniz.h" +#else +#include +#endif + +/* + * A buffer of ZIP_READBUFSIZE is allocated for each compressed file opened, + * and is freed when you close the file; compressed data is read into + * this buffer, and then is decompressed into the buffer passed to + * PHYSFS_read(). + * + * Uncompressed entries in a zipfile do not allocate this buffer; they just + * read data directly into the buffer passed to PHYSFS_read(). + * + * Depending on your speed and memory requirements, you should tweak this + * value. + */ +#define ZIP_READBUFSIZE (16 * 1024) + + +/* + * Entries are "unresolved" until they are first opened. At that time, + * local file headers parsed/validated, data offsets will be updated to look + * at the actual file data instead of the header, and symlinks will be + * followed and optimized. This means that we don't seek and read around the + * archive until forced to do so, and after the first time, we had to do + * less reading and parsing, which is very CD-ROM friendly. + */ +typedef enum +{ + ZIP_UNRESOLVED_FILE, + ZIP_UNRESOLVED_SYMLINK, + ZIP_RESOLVING, + ZIP_RESOLVED, + ZIP_BROKEN_FILE, + ZIP_BROKEN_SYMLINK +} ZipResolveType; + + +/* + * One ZIPentry is kept for each file in an open ZIP archive. + */ +typedef struct _ZIPentry +{ + char *name; /* Name of file in archive */ + struct _ZIPentry *symlink; /* NULL or file we symlink to */ + ZipResolveType resolved; /* Have we resolved file/symlink? */ + PHYSFS_uint64 offset; /* offset of data in archive */ + PHYSFS_uint16 version; /* version made by */ + PHYSFS_uint16 version_needed; /* version needed to extract */ + PHYSFS_uint16 compression_method; /* compression method */ + PHYSFS_uint32 crc; /* crc-32 */ + PHYSFS_uint64 compressed_size; /* compressed size */ + PHYSFS_uint64 uncompressed_size; /* uncompressed size */ + PHYSFS_sint64 last_mod_time; /* last file mod time */ +} ZIPentry; + +/* + * One ZIPinfo is kept for each open ZIP archive. + */ +typedef struct +{ + PHYSFS_Io *io; + int zip64; /* non-zero if this is a Zip64 archive. */ + PHYSFS_uint64 entryCount; /* Number of files in ZIP. */ + ZIPentry *entries; /* info on all files in ZIP. */ +} ZIPinfo; + +/* + * One ZIPfileinfo is kept for each open file in a ZIP archive. + */ +typedef struct +{ + ZIPentry *entry; /* Info on file. */ + PHYSFS_Io *io; /* physical file handle. */ + PHYSFS_uint32 compressed_position; /* offset in compressed data. */ + PHYSFS_uint32 uncompressed_position; /* tell() position. */ + PHYSFS_uint8 *buffer; /* decompression buffer. */ + z_stream stream; /* zlib stream state. */ +} ZIPfileinfo; + + +/* Magic numbers... */ +#define ZIP_LOCAL_FILE_SIG 0x04034b50 +#define ZIP_CENTRAL_DIR_SIG 0x02014b50 +#define ZIP_END_OF_CENTRAL_DIR_SIG 0x06054b50 +#define ZIP64_END_OF_CENTRAL_DIR_SIG 0x06064b50 +#define ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIG 0x07064b50 +#define ZIP64_EXTENDED_INFO_EXTRA_FIELD_SIG 0x0001 + +/* compression methods... */ +#define COMPMETH_NONE 0 +/* ...and others... */ + + +#define UNIX_FILETYPE_MASK 0170000 +#define UNIX_FILETYPE_SYMLINK 0120000 + + +/* + * Bridge physfs allocation functions to zlib's format... + */ +static voidpf zlibPhysfsAlloc(voidpf opaque, uInt items, uInt size) +{ + return ((PHYSFS_Allocator *) opaque)->Malloc(items * size); +} /* zlibPhysfsAlloc */ + +/* + * Bridge physfs allocation functions to zlib's format... + */ +static void zlibPhysfsFree(voidpf opaque, voidpf address) +{ + ((PHYSFS_Allocator *) opaque)->Free(address); +} /* zlibPhysfsFree */ + + +/* + * Construct a new z_stream to a sane state. + */ +static void initializeZStream(z_stream *pstr) +{ + memset(pstr, '\0', sizeof (z_stream)); + pstr->zalloc = zlibPhysfsAlloc; + pstr->zfree = zlibPhysfsFree; + pstr->opaque = &allocator; +} /* initializeZStream */ + + +static PHYSFS_ErrorCode zlib_error_code(int rc) +{ + switch (rc) + { + case Z_OK: return PHYSFS_ERR_OK; /* not an error. */ + case Z_STREAM_END: return PHYSFS_ERR_OK; /* not an error. */ + case Z_ERRNO: return PHYSFS_ERR_IO; + case Z_MEM_ERROR: return PHYSFS_ERR_OUT_OF_MEMORY; + default: return PHYSFS_ERR_CORRUPT; + } /* switch */ +} /* zlib_error_string */ + + +/* + * Wrap all zlib calls in this, so the physfs error state is set appropriately. + */ +static int zlib_err(const int rc) +{ + PHYSFS_setErrorCode(zlib_error_code(rc)); + return rc; +} /* zlib_err */ + + +/* + * Read an unsigned 64-bit int and swap to native byte order. + */ +static int readui64(PHYSFS_Io *io, PHYSFS_uint64 *val) +{ + PHYSFS_uint64 v; + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &v, sizeof (v)), ERRPASS, 0); + *val = PHYSFS_swapULE64(v); + return 1; +} /* readui64 */ + +/* + * Read an unsigned 32-bit int and swap to native byte order. + */ +static int readui32(PHYSFS_Io *io, PHYSFS_uint32 *val) +{ + PHYSFS_uint32 v; + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &v, sizeof (v)), ERRPASS, 0); + *val = PHYSFS_swapULE32(v); + return 1; +} /* readui32 */ + + +/* + * Read an unsigned 16-bit int and swap to native byte order. + */ +static int readui16(PHYSFS_Io *io, PHYSFS_uint16 *val) +{ + PHYSFS_uint16 v; + BAIL_IF_MACRO(!__PHYSFS_readAll(io, &v, sizeof (v)), ERRPASS, 0); + *val = PHYSFS_swapULE16(v); + return 1; +} /* readui16 */ + + +static PHYSFS_sint64 ZIP_read(PHYSFS_Io *_io, void *buf, PHYSFS_uint64 len) +{ + ZIPfileinfo *finfo = (ZIPfileinfo *) _io->opaque; + PHYSFS_Io *io = finfo->io; + ZIPentry *entry = finfo->entry; + PHYSFS_sint64 retval = 0; + PHYSFS_sint64 maxread = (PHYSFS_sint64) len; + PHYSFS_sint64 avail = entry->uncompressed_size - + finfo->uncompressed_position; + + if (avail < maxread) + maxread = avail; + + BAIL_IF_MACRO(maxread == 0, ERRPASS, 0); /* quick rejection. */ + + if (entry->compression_method == COMPMETH_NONE) + retval = io->read(io, buf, maxread); + else + { + finfo->stream.next_out = buf; + finfo->stream.avail_out = (uInt) maxread; + + while (retval < maxread) + { + PHYSFS_uint32 before = finfo->stream.total_out; + int rc; + + if (finfo->stream.avail_in == 0) + { + PHYSFS_sint64 br; + + br = entry->compressed_size - finfo->compressed_position; + if (br > 0) + { + if (br > ZIP_READBUFSIZE) + br = ZIP_READBUFSIZE; + + br = io->read(io, finfo->buffer, (PHYSFS_uint64) br); + if (br <= 0) + break; + + finfo->compressed_position += (PHYSFS_uint32) br; + finfo->stream.next_in = finfo->buffer; + finfo->stream.avail_in = (PHYSFS_uint32) br; + } /* if */ + } /* if */ + + rc = zlib_err(inflate(&finfo->stream, Z_SYNC_FLUSH)); + retval += (finfo->stream.total_out - before); + + if (rc != Z_OK) + break; + } /* while */ + } /* else */ + + if (retval > 0) + finfo->uncompressed_position += (PHYSFS_uint32) retval; + + return retval; +} /* ZIP_read */ + + +static PHYSFS_sint64 ZIP_write(PHYSFS_Io *io, const void *b, PHYSFS_uint64 len) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, -1); +} /* ZIP_write */ + + +static PHYSFS_sint64 ZIP_tell(PHYSFS_Io *io) +{ + return ((ZIPfileinfo *) io->opaque)->uncompressed_position; +} /* ZIP_tell */ + + +static int ZIP_seek(PHYSFS_Io *_io, PHYSFS_uint64 offset) +{ + ZIPfileinfo *finfo = (ZIPfileinfo *) _io->opaque; + ZIPentry *entry = finfo->entry; + PHYSFS_Io *io = finfo->io; + + BAIL_IF_MACRO(offset > entry->uncompressed_size, PHYSFS_ERR_PAST_EOF, 0); + + if (entry->compression_method == COMPMETH_NONE) + { + const PHYSFS_sint64 newpos = offset + entry->offset; + BAIL_IF_MACRO(!io->seek(io, newpos), ERRPASS, 0); + finfo->uncompressed_position = (PHYSFS_uint32) offset; + } /* if */ + + else + { + /* + * If seeking backwards, we need to redecode the file + * from the start and throw away the compressed bits until we hit + * the offset we need. If seeking forward, we still need to + * decode, but we don't rewind first. + */ + if (offset < finfo->uncompressed_position) + { + /* we do a copy so state is sane if inflateInit2() fails. */ + z_stream str; + initializeZStream(&str); + if (zlib_err(inflateInit2(&str, -MAX_WBITS)) != Z_OK) + return 0; + + if (!io->seek(io, entry->offset)) + return 0; + + inflateEnd(&finfo->stream); + memcpy(&finfo->stream, &str, sizeof (z_stream)); + finfo->uncompressed_position = finfo->compressed_position = 0; + } /* if */ + + while (finfo->uncompressed_position != offset) + { + PHYSFS_uint8 buf[512]; + PHYSFS_uint32 maxread; + + maxread = (PHYSFS_uint32) (offset - finfo->uncompressed_position); + if (maxread > sizeof (buf)) + maxread = sizeof (buf); + + if (ZIP_read(_io, buf, maxread) != maxread) + return 0; + } /* while */ + } /* else */ + + return 1; +} /* ZIP_seek */ + + +static PHYSFS_sint64 ZIP_length(PHYSFS_Io *io) +{ + const ZIPfileinfo *finfo = (ZIPfileinfo *) io->opaque; + return (PHYSFS_sint64) finfo->entry->uncompressed_size; +} /* ZIP_length */ + + +static PHYSFS_Io *zip_get_io(PHYSFS_Io *io, ZIPinfo *inf, ZIPentry *entry); + +static PHYSFS_Io *ZIP_duplicate(PHYSFS_Io *io) +{ + ZIPfileinfo *origfinfo = (ZIPfileinfo *) io->opaque; + PHYSFS_Io *retval = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + ZIPfileinfo *finfo = (ZIPfileinfo *) allocator.Malloc(sizeof (ZIPfileinfo)); + GOTO_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, failed); + GOTO_IF_MACRO(!finfo, PHYSFS_ERR_OUT_OF_MEMORY, failed); + memset(finfo, '\0', sizeof (*finfo)); + + finfo->entry = origfinfo->entry; + finfo->io = zip_get_io(origfinfo->io, NULL, finfo->entry); + GOTO_IF_MACRO(!finfo->io, ERRPASS, failed); + + if (finfo->entry->compression_method != COMPMETH_NONE) + { + finfo->buffer = (PHYSFS_uint8 *) allocator.Malloc(ZIP_READBUFSIZE); + GOTO_IF_MACRO(!finfo->buffer, PHYSFS_ERR_OUT_OF_MEMORY, failed); + if (zlib_err(inflateInit2(&finfo->stream, -MAX_WBITS)) != Z_OK) + goto failed; + } /* if */ + + memcpy(retval, io, sizeof (PHYSFS_Io)); + retval->opaque = finfo; + return retval; + +failed: + if (finfo != NULL) + { + if (finfo->io != NULL) + finfo->io->destroy(finfo->io); + + if (finfo->buffer != NULL) + { + allocator.Free(finfo->buffer); + inflateEnd(&finfo->stream); + } /* if */ + + allocator.Free(finfo); + } /* if */ + + if (retval != NULL) + allocator.Free(retval); + + return NULL; +} /* ZIP_duplicate */ + +static int ZIP_flush(PHYSFS_Io *io) { return 1; /* no write support. */ } + +static void ZIP_destroy(PHYSFS_Io *io) +{ + ZIPfileinfo *finfo = (ZIPfileinfo *) io->opaque; + finfo->io->destroy(finfo->io); + + if (finfo->entry->compression_method != COMPMETH_NONE) + inflateEnd(&finfo->stream); + + if (finfo->buffer != NULL) + allocator.Free(finfo->buffer); + + allocator.Free(finfo); + allocator.Free(io); +} /* ZIP_destroy */ + + +static const PHYSFS_Io ZIP_Io = +{ + CURRENT_PHYSFS_IO_API_VERSION, NULL, + ZIP_read, + ZIP_write, + ZIP_seek, + ZIP_tell, + ZIP_length, + ZIP_duplicate, + ZIP_flush, + ZIP_destroy +}; + + + +static PHYSFS_sint64 zip_find_end_of_central_dir(PHYSFS_Io *io, PHYSFS_sint64 *len) +{ + PHYSFS_uint8 buf[256]; + PHYSFS_uint8 extra[4] = { 0, 0, 0, 0 }; + PHYSFS_sint32 i = 0; + PHYSFS_sint64 filelen; + PHYSFS_sint64 filepos; + PHYSFS_sint32 maxread; + PHYSFS_sint32 totalread = 0; + int found = 0; + + filelen = io->length(io); + BAIL_IF_MACRO(filelen == -1, ERRPASS, 0); + + /* + * Jump to the end of the file and start reading backwards. + * The last thing in the file is the zipfile comment, which is variable + * length, and the field that specifies its size is before it in the + * file (argh!)...this means that we need to scan backwards until we + * hit the end-of-central-dir signature. We can then sanity check that + * the comment was as big as it should be to make sure we're in the + * right place. The comment length field is 16 bits, so we can stop + * searching for that signature after a little more than 64k at most, + * and call it a corrupted zipfile. + */ + + if (sizeof (buf) < filelen) + { + filepos = filelen - sizeof (buf); + maxread = sizeof (buf); + } /* if */ + else + { + filepos = 0; + maxread = (PHYSFS_uint32) filelen; + } /* else */ + + while ((totalread < filelen) && (totalread < 65557)) + { + BAIL_IF_MACRO(!io->seek(io, filepos), ERRPASS, -1); + + /* make sure we catch a signature between buffers. */ + if (totalread != 0) + { + if (!__PHYSFS_readAll(io, buf, maxread - 4)) + return -1; + memcpy(&buf[maxread - 4], &extra, sizeof (extra)); + totalread += maxread - 4; + } /* if */ + else + { + if (!__PHYSFS_readAll(io, buf, maxread)) + return -1; + totalread += maxread; + } /* else */ + + memcpy(&extra, buf, sizeof (extra)); + + for (i = maxread - 4; i > 0; i--) + { + if ((buf[i + 0] == 0x50) && + (buf[i + 1] == 0x4B) && + (buf[i + 2] == 0x05) && + (buf[i + 3] == 0x06) ) + { + found = 1; /* that's the signature! */ + break; + } /* if */ + } /* for */ + + if (found) + break; + + filepos -= (maxread - 4); + if (filepos < 0) + filepos = 0; + } /* while */ + + BAIL_IF_MACRO(!found, PHYSFS_ERR_UNSUPPORTED, -1); + + if (len != NULL) + *len = filelen; + + return (filepos + i); +} /* zip_find_end_of_central_dir */ + + +static int isZip(PHYSFS_Io *io) +{ + PHYSFS_uint32 sig = 0; + int retval = 0; + + /* + * The first thing in a zip file might be the signature of the + * first local file record, so it makes for a quick determination. + */ + if (readui32(io, &sig)) + { + retval = (sig == ZIP_LOCAL_FILE_SIG); + if (!retval) + { + /* + * No sig...might be a ZIP with data at the start + * (a self-extracting executable, etc), so we'll have to do + * it the hard way... + */ + retval = (zip_find_end_of_central_dir(io, NULL) != -1); + } /* if */ + } /* if */ + + return retval; +} /* isZip */ + + +static void zip_free_entries(ZIPentry *entries, PHYSFS_uint64 max) +{ + PHYSFS_uint64 i; + for (i = 0; i < max; i++) + { + ZIPentry *entry = &entries[i]; + if (entry->name != NULL) + allocator.Free(entry->name); + } /* for */ + + allocator.Free(entries); +} /* zip_free_entries */ + + +/* + * This will find the ZIPentry associated with a path in platform-independent + * notation. Directories don't have ZIPentries associated with them, but + * (*isDir) will be set to non-zero if a dir was hit. + */ +static ZIPentry *zip_find_entry(const ZIPinfo *info, const char *path, + int *isDir) +{ + ZIPentry *a = info->entries; + PHYSFS_sint32 pathlen = (PHYSFS_sint32) strlen(path); + PHYSFS_sint64 lo = 0; + PHYSFS_sint64 hi = (PHYSFS_sint64) (info->entryCount - 1); + PHYSFS_sint64 middle; + const char *thispath = NULL; + int rc; + + while (lo <= hi) + { + middle = lo + ((hi - lo) / 2); + thispath = a[middle].name; + rc = strncmp(path, thispath, pathlen); + + if (rc > 0) + lo = middle + 1; + + else if (rc < 0) + hi = middle - 1; + + else /* substring match...might be dir or entry or nothing. */ + { + if (isDir != NULL) + { + *isDir = (thispath[pathlen] == '/'); + if (*isDir) + return NULL; + } /* if */ + + if (thispath[pathlen] == '\0') /* found entry? */ + return &a[middle]; + /* adjust search params, try again. */ + else if (thispath[pathlen] > '/') + hi = middle - 1; + else + lo = middle + 1; + } /* if */ + } /* while */ + + if (isDir != NULL) + *isDir = 0; + + BAIL_MACRO(PHYSFS_ERR_NOT_FOUND, NULL); +} /* zip_find_entry */ + + +/* Convert paths from old, buggy DOS zippers... */ +static void zip_convert_dos_path(ZIPentry *entry, char *path) +{ + PHYSFS_uint8 hosttype = (PHYSFS_uint8) ((entry->version >> 8) & 0xFF); + if (hosttype == 0) /* FS_FAT_ */ + { + while (*path) + { + if (*path == '\\') + *path = '/'; + path++; + } /* while */ + } /* if */ +} /* zip_convert_dos_path */ + + +static void zip_expand_symlink_path(char *path) +{ + char *ptr = path; + char *prevptr = path; + + while (1) + { + ptr = strchr(ptr, '/'); + if (ptr == NULL) + break; + + if (*(ptr + 1) == '.') + { + if (*(ptr + 2) == '/') + { + /* current dir in middle of string: ditch it. */ + memmove(ptr, ptr + 2, strlen(ptr + 2) + 1); + } /* else if */ + + else if (*(ptr + 2) == '\0') + { + /* current dir at end of string: ditch it. */ + *ptr = '\0'; + } /* else if */ + + else if (*(ptr + 2) == '.') + { + if (*(ptr + 3) == '/') + { + /* parent dir in middle: move back one, if possible. */ + memmove(prevptr, ptr + 4, strlen(ptr + 4) + 1); + ptr = prevptr; + while (prevptr != path) + { + prevptr--; + if (*prevptr == '/') + { + prevptr++; + break; + } /* if */ + } /* while */ + } /* if */ + + if (*(ptr + 3) == '\0') + { + /* parent dir at end: move back one, if possible. */ + *prevptr = '\0'; + } /* if */ + } /* if */ + } /* if */ + else + { + prevptr = ptr; + ptr++; + } /* else */ + } /* while */ +} /* zip_expand_symlink_path */ + +/* (forward reference: zip_follow_symlink and zip_resolve call each other.) */ +static int zip_resolve(PHYSFS_Io *io, ZIPinfo *info, ZIPentry *entry); + +/* + * Look for the entry named by (path). If it exists, resolve it, and return + * a pointer to that entry. If it's another symlink, keep resolving until you + * hit a real file and then return a pointer to the final non-symlink entry. + * If there's a problem, return NULL. + */ +static ZIPentry *zip_follow_symlink(PHYSFS_Io *io, ZIPinfo *info, char *path) +{ + ZIPentry *entry; + + zip_expand_symlink_path(path); + entry = zip_find_entry(info, path, NULL); + if (entry != NULL) + { + if (!zip_resolve(io, info, entry)) /* recursive! */ + entry = NULL; + else + { + if (entry->symlink != NULL) + entry = entry->symlink; + } /* else */ + } /* if */ + + return entry; +} /* zip_follow_symlink */ + + +static int zip_resolve_symlink(PHYSFS_Io *io, ZIPinfo *info, ZIPentry *entry) +{ + const PHYSFS_uint64 size = entry->uncompressed_size; + char *path = NULL; + int rc = 0; + + /* + * We've already parsed the local file header of the symlink at this + * point. Now we need to read the actual link from the file data and + * follow it. + */ + + BAIL_IF_MACRO(!io->seek(io, entry->offset), ERRPASS, 0); + + path = (char *) __PHYSFS_smallAlloc(size + 1); + BAIL_IF_MACRO(!path, PHYSFS_ERR_OUT_OF_MEMORY, 0); + + if (entry->compression_method == COMPMETH_NONE) + rc = __PHYSFS_readAll(io, path, size); + + else /* symlink target path is compressed... */ + { + z_stream stream; + const PHYSFS_uint64 complen = entry->compressed_size; + PHYSFS_uint8 *compressed = (PHYSFS_uint8*) __PHYSFS_smallAlloc(complen); + if (compressed != NULL) + { + if (__PHYSFS_readAll(io, compressed, complen)) + { + initializeZStream(&stream); + stream.next_in = compressed; + stream.avail_in = complen; + stream.next_out = (unsigned char *) path; + stream.avail_out = size; + if (zlib_err(inflateInit2(&stream, -MAX_WBITS)) == Z_OK) + { + rc = zlib_err(inflate(&stream, Z_FINISH)); + inflateEnd(&stream); + + /* both are acceptable outcomes... */ + rc = ((rc == Z_OK) || (rc == Z_STREAM_END)); + } /* if */ + } /* if */ + __PHYSFS_smallFree(compressed); + } /* if */ + } /* else */ + + if (rc) + { + path[entry->uncompressed_size] = '\0'; /* null-terminate it. */ + zip_convert_dos_path(entry, path); + entry->symlink = zip_follow_symlink(io, info, path); + } /* else */ + + __PHYSFS_smallFree(path); + + return (entry->symlink != NULL); +} /* zip_resolve_symlink */ + + +/* + * Parse the local file header of an entry, and update entry->offset. + */ +static int zip_parse_local(PHYSFS_Io *io, ZIPentry *entry) +{ + PHYSFS_uint32 ui32; + PHYSFS_uint16 ui16; + PHYSFS_uint16 fnamelen; + PHYSFS_uint16 extralen; + + /* + * crc and (un)compressed_size are always zero if this is a "JAR" + * archive created with Sun's Java tools, apparently. We only + * consider this archive corrupted if those entries don't match and + * aren't zero. That seems to work well. + * We also ignore a mismatch if the value is 0xFFFFFFFF here, since it's + * possible that's a Zip64 thing. + */ + + BAIL_IF_MACRO(!io->seek(io, entry->offset), ERRPASS, 0); + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 != ZIP_LOCAL_FILE_SIG, PHYSFS_ERR_CORRUPT, 0); + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); + BAIL_IF_MACRO(ui16 != entry->version_needed, PHYSFS_ERR_CORRUPT, 0); + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); /* general bits. */ + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); + BAIL_IF_MACRO(ui16 != entry->compression_method, PHYSFS_ERR_CORRUPT, 0); + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); /* date/time */ + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 && (ui32 != entry->crc), PHYSFS_ERR_CORRUPT, 0); + + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 && (ui32 != 0xFFFFFFFF) && + (ui32 != entry->compressed_size), PHYSFS_ERR_CORRUPT, 0); + + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 && (ui32 != 0xFFFFFFFF) && + (ui32 != entry->uncompressed_size), PHYSFS_ERR_CORRUPT, 0); + + BAIL_IF_MACRO(!readui16(io, &fnamelen), ERRPASS, 0); + BAIL_IF_MACRO(!readui16(io, &extralen), ERRPASS, 0); + + entry->offset += fnamelen + extralen + 30; + return 1; +} /* zip_parse_local */ + + +static int zip_resolve(PHYSFS_Io *io, ZIPinfo *info, ZIPentry *entry) +{ + int retval = 1; + ZipResolveType resolve_type = entry->resolved; + + /* Don't bother if we've failed to resolve this entry before. */ + BAIL_IF_MACRO(resolve_type == ZIP_BROKEN_FILE, PHYSFS_ERR_CORRUPT, 0); + BAIL_IF_MACRO(resolve_type == ZIP_BROKEN_SYMLINK, PHYSFS_ERR_CORRUPT, 0); + + /* uhoh...infinite symlink loop! */ + BAIL_IF_MACRO(resolve_type == ZIP_RESOLVING, PHYSFS_ERR_SYMLINK_LOOP, 0); + + /* + * We fix up the offset to point to the actual data on the + * first open, since we don't want to seek across the whole file on + * archive open (can be SLOW on large, CD-stored files), but we + * need to check the local file header...not just for corruption, + * but since it stores offset info the central directory does not. + */ + if (resolve_type != ZIP_RESOLVED) + { + entry->resolved = ZIP_RESOLVING; + + retval = zip_parse_local(io, entry); + if (retval) + { + /* + * If it's a symlink, find the original file. This will cause + * resolution of other entries (other symlinks and, eventually, + * the real file) if all goes well. + */ + if (resolve_type == ZIP_UNRESOLVED_SYMLINK) + retval = zip_resolve_symlink(io, info, entry); + } /* if */ + + if (resolve_type == ZIP_UNRESOLVED_SYMLINK) + entry->resolved = ((retval) ? ZIP_RESOLVED : ZIP_BROKEN_SYMLINK); + else if (resolve_type == ZIP_UNRESOLVED_FILE) + entry->resolved = ((retval) ? ZIP_RESOLVED : ZIP_BROKEN_FILE); + } /* if */ + + return retval; +} /* zip_resolve */ + + +static int zip_version_does_symlinks(PHYSFS_uint32 version) +{ + int retval = 0; + PHYSFS_uint8 hosttype = (PHYSFS_uint8) ((version >> 8) & 0xFF); + + switch (hosttype) + { + /* + * These are the platforms that can NOT build an archive with + * symlinks, according to the Info-ZIP project. + */ + case 0: /* FS_FAT_ */ + case 1: /* AMIGA_ */ + case 2: /* VMS_ */ + case 4: /* VM_CSM_ */ + case 6: /* FS_HPFS_ */ + case 11: /* FS_NTFS_ */ + case 14: /* FS_VFAT_ */ + case 13: /* ACORN_ */ + case 15: /* MVS_ */ + case 18: /* THEOS_ */ + break; /* do nothing. */ + + default: /* assume the rest to be unix-like. */ + retval = 1; + break; + } /* switch */ + + return retval; +} /* zip_version_does_symlinks */ + + +static int zip_entry_is_symlink(const ZIPentry *entry) +{ + return ((entry->resolved == ZIP_UNRESOLVED_SYMLINK) || + (entry->resolved == ZIP_BROKEN_SYMLINK) || + (entry->symlink)); +} /* zip_entry_is_symlink */ + + +static int zip_has_symlink_attr(ZIPentry *entry, PHYSFS_uint32 extern_attr) +{ + PHYSFS_uint16 xattr = ((extern_attr >> 16) & 0xFFFF); + return ( (zip_version_does_symlinks(entry->version)) && + (entry->uncompressed_size > 0) && + ((xattr & UNIX_FILETYPE_MASK) == UNIX_FILETYPE_SYMLINK) ); +} /* zip_has_symlink_attr */ + + +static PHYSFS_sint64 zip_dos_time_to_physfs_time(PHYSFS_uint32 dostime) +{ + PHYSFS_uint32 dosdate; + struct tm unixtime; + memset(&unixtime, '\0', sizeof (unixtime)); + + dosdate = (PHYSFS_uint32) ((dostime >> 16) & 0xFFFF); + dostime &= 0xFFFF; + + /* dissect date */ + unixtime.tm_year = ((dosdate >> 9) & 0x7F) + 80; + unixtime.tm_mon = ((dosdate >> 5) & 0x0F) - 1; + unixtime.tm_mday = ((dosdate ) & 0x1F); + + /* dissect time */ + unixtime.tm_hour = ((dostime >> 11) & 0x1F); + unixtime.tm_min = ((dostime >> 5) & 0x3F); + unixtime.tm_sec = ((dostime << 1) & 0x3E); + + /* let mktime calculate daylight savings time. */ + unixtime.tm_isdst = -1; + + return ((PHYSFS_sint64) mktime(&unixtime)); +} /* zip_dos_time_to_physfs_time */ + + +static int zip_load_entry(PHYSFS_Io *io, const int zip64, ZIPentry *entry, + PHYSFS_uint64 ofs_fixup) +{ + PHYSFS_uint16 fnamelen, extralen, commentlen; + PHYSFS_uint32 external_attr; + PHYSFS_uint32 starting_disk; + PHYSFS_uint64 offset; + PHYSFS_uint16 ui16; + PHYSFS_uint32 ui32; + PHYSFS_sint64 si64; + + /* sanity check with central directory signature... */ + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 != ZIP_CENTRAL_DIR_SIG, PHYSFS_ERR_CORRUPT, 0); + + /* Get the pertinent parts of the record... */ + BAIL_IF_MACRO(!readui16(io, &entry->version), ERRPASS, 0); + BAIL_IF_MACRO(!readui16(io, &entry->version_needed), ERRPASS, 0); + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); /* general bits */ + BAIL_IF_MACRO(!readui16(io, &entry->compression_method), ERRPASS, 0); + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + entry->last_mod_time = zip_dos_time_to_physfs_time(ui32); + BAIL_IF_MACRO(!readui32(io, &entry->crc), ERRPASS, 0); + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + entry->compressed_size = (PHYSFS_uint64) ui32; + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + entry->uncompressed_size = (PHYSFS_uint64) ui32; + BAIL_IF_MACRO(!readui16(io, &fnamelen), ERRPASS, 0); + BAIL_IF_MACRO(!readui16(io, &extralen), ERRPASS, 0); + BAIL_IF_MACRO(!readui16(io, &commentlen), ERRPASS, 0); + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); + starting_disk = (PHYSFS_uint32) ui16; + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); /* internal file attribs */ + BAIL_IF_MACRO(!readui32(io, &external_attr), ERRPASS, 0); + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + offset = (PHYSFS_uint64) ui32; + + entry->symlink = NULL; /* will be resolved later, if necessary. */ + entry->resolved = (zip_has_symlink_attr(entry, external_attr)) ? + ZIP_UNRESOLVED_SYMLINK : ZIP_UNRESOLVED_FILE; + + entry->name = (char *) allocator.Malloc(fnamelen + 1); + BAIL_IF_MACRO(entry->name == NULL, PHYSFS_ERR_OUT_OF_MEMORY, 0); + if (!__PHYSFS_readAll(io, entry->name, fnamelen)) + goto zip_load_entry_puked; + + entry->name[fnamelen] = '\0'; /* null-terminate the filename. */ + zip_convert_dos_path(entry, entry->name); + + si64 = io->tell(io); + if (si64 == -1) + goto zip_load_entry_puked; + + /* + * The actual sizes didn't fit in 32-bits; look for the Zip64 + * extended information extra field... + */ + if ( (zip64) && + ((offset == 0xFFFFFFFF) || + (starting_disk == 0xFFFFFFFF) || + (entry->compressed_size == 0xFFFFFFFF) || + (entry->uncompressed_size == 0xFFFFFFFF)) ) + { + int found = 0; + PHYSFS_uint16 sig, len; + while (extralen > 4) + { + if (!readui16(io, &sig)) + goto zip_load_entry_puked; + else if (!readui16(io, &len)) + goto zip_load_entry_puked; + + si64 += 4 + len; + extralen -= 4 + len; + if (sig != ZIP64_EXTENDED_INFO_EXTRA_FIELD_SIG) + { + if (!io->seek(io, si64)) + goto zip_load_entry_puked; + continue; + } /* if */ + + found = 1; + break; + } /* while */ + + GOTO_IF_MACRO(!found, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); + + if (entry->uncompressed_size == 0xFFFFFFFF) + { + GOTO_IF_MACRO(len < 8, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); + if (!readui64(io, &entry->uncompressed_size)) + goto zip_load_entry_puked; + len -= 8; + } /* if */ + + if (entry->compressed_size == 0xFFFFFFFF) + { + GOTO_IF_MACRO(len < 8, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); + if (!readui64(io, &entry->compressed_size)) + goto zip_load_entry_puked; + len -= 8; + } /* if */ + + if (offset == 0xFFFFFFFF) + { + GOTO_IF_MACRO(len < 8, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); + if (!readui64(io, &offset)) + goto zip_load_entry_puked; + len -= 8; + } /* if */ + + if (starting_disk == 0xFFFFFFFF) + { + GOTO_IF_MACRO(len < 8, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); + if (!readui32(io, &starting_disk)) + goto zip_load_entry_puked; + len -= 4; + } /* if */ + + GOTO_IF_MACRO(len != 0, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); + } /* if */ + + GOTO_IF_MACRO(starting_disk != 0, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); + + entry->offset = offset + ofs_fixup; + + /* seek to the start of the next entry in the central directory... */ + if (!io->seek(io, si64 + extralen + commentlen)) + goto zip_load_entry_puked; + + return 1; /* success. */ + +zip_load_entry_puked: + allocator.Free(entry->name); + return 0; /* failure. */ +} /* zip_load_entry */ + + +static int zip_entry_cmp(void *_a, size_t one, size_t two) +{ + if (one != two) + { + const ZIPentry *a = (const ZIPentry *) _a; + return strcmp(a[one].name, a[two].name); + } /* if */ + + return 0; +} /* zip_entry_cmp */ + + +static void zip_entry_swap(void *_a, size_t one, size_t two) +{ + if (one != two) + { + ZIPentry tmp; + ZIPentry *first = &(((ZIPentry *) _a)[one]); + ZIPentry *second = &(((ZIPentry *) _a)[two]); + memcpy(&tmp, first, sizeof (ZIPentry)); + memcpy(first, second, sizeof (ZIPentry)); + memcpy(second, &tmp, sizeof (ZIPentry)); + } /* if */ +} /* zip_entry_swap */ + + +static int zip_load_entries(PHYSFS_Io *io, ZIPinfo *info, + const PHYSFS_uint64 data_ofs, + const PHYSFS_uint64 central_ofs) +{ + const PHYSFS_uint64 max = info->entryCount; + const int zip64 = info->zip64; + PHYSFS_uint64 i; + + BAIL_IF_MACRO(!io->seek(io, central_ofs), ERRPASS, 0); + + info->entries = (ZIPentry *) allocator.Malloc(sizeof (ZIPentry) * max); + BAIL_IF_MACRO(!info->entries, PHYSFS_ERR_OUT_OF_MEMORY, 0); + + for (i = 0; i < max; i++) + { + if (!zip_load_entry(io, zip64, &info->entries[i], data_ofs)) + { + zip_free_entries(info->entries, i); + return 0; + } /* if */ + } /* for */ + + __PHYSFS_sort(info->entries, (size_t) max, zip_entry_cmp, zip_entry_swap); + return 1; +} /* zip_load_entries */ + + +static PHYSFS_sint64 zip64_find_end_of_central_dir(PHYSFS_Io *io, + PHYSFS_sint64 _pos, + PHYSFS_uint64 offset) +{ + /* + * Naturally, the offset is useless to us; it is the offset from the + * start of file, which is meaningless if we've appended this .zip to + * a self-extracting .exe. We need to find this on our own. It should + * be directly before the locator record, but the record in question, + * like the original end-of-central-directory record, ends with a + * variable-length field. Unlike the original, which has to store the + * size of that variable-length field in a 16-bit int and thus has to be + * within 64k, the new one gets 64-bits. + * + * Fortunately, the only currently-specified record for that variable + * length block is some weird proprietary thing that deals with EBCDIC + * and tape backups or something. So we don't seek far. + */ + + PHYSFS_uint32 ui32; + const PHYSFS_uint64 pos = (PHYSFS_uint64) _pos; + + assert(_pos > 0); + + /* Try offset specified in the Zip64 end of central directory locator. */ + /* This works if the entire PHYSFS_Io is the zip file. */ + BAIL_IF_MACRO(!io->seek(io, offset), ERRPASS, -1); + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, -1); + if (ui32 == ZIP64_END_OF_CENTRAL_DIR_SIG) + return offset; + + /* Try 56 bytes before the Zip64 end of central directory locator. */ + /* This works if the record isn't variable length and is version 1. */ + if (pos > 56) + { + BAIL_IF_MACRO(!io->seek(io, pos-56), ERRPASS, -1); + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, -1); + if (ui32 == ZIP64_END_OF_CENTRAL_DIR_SIG) + return pos-56; + } /* if */ + + /* Try 84 bytes before the Zip64 end of central directory locator. */ + /* This works if the record isn't variable length and is version 2. */ + if (pos > 84) + { + BAIL_IF_MACRO(!io->seek(io, pos-84), ERRPASS, -1); + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, -1); + if (ui32 == ZIP64_END_OF_CENTRAL_DIR_SIG) + return pos-84; + } /* if */ + + /* Ok, brute force: we know it's between (offset) and (pos) somewhere. */ + /* Just try moving back at most 256k. Oh well. */ + if ((offset < pos) && (pos > 4)) + { + /* we assume you can eat this stack if you handle Zip64 files. */ + PHYSFS_uint8 buf[256 * 1024]; + PHYSFS_uint64 len = pos - offset; + PHYSFS_sint32 i; + + if (len > sizeof (buf)) + len = sizeof (buf); + + BAIL_IF_MACRO(!io->seek(io, pos - len), ERRPASS, -1); + BAIL_IF_MACRO(!__PHYSFS_readAll(io, buf, len), ERRPASS, -1); + for (i = (PHYSFS_sint32) (len - 4); i >= 0; i--) + { + if (buf[i] != 0x50) + continue; + if ( (buf[i+1] == 0x4b) && + (buf[i+2] == 0x06) && + (buf[i+3] == 0x06) ) + return pos - (len - i); + } /* for */ + } /* if */ + + BAIL_MACRO(PHYSFS_ERR_CORRUPT, -1); /* didn't find it. */ +} /* zip64_find_end_of_central_dir */ + + +static int zip64_parse_end_of_central_dir(PHYSFS_Io *io, ZIPinfo *info, + PHYSFS_uint64 *data_start, + PHYSFS_uint64 *dir_ofs, + PHYSFS_sint64 pos) +{ + PHYSFS_uint64 ui64; + PHYSFS_uint32 ui32; + PHYSFS_uint16 ui16; + + /* We should be positioned right past the locator signature. */ + + if ((pos < 0) || (!io->seek(io, pos))) + return 0; + + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + if (ui32 != ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIG) + return -1; /* it's not a Zip64 archive. Not an error, though! */ + + info->zip64 = 1; + + /* number of the disk with the start of the central directory. */ + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 != 0, PHYSFS_ERR_CORRUPT, 0); + + /* offset of Zip64 end of central directory record. */ + BAIL_IF_MACRO(!readui64(io, &ui64), ERRPASS, 0); + + /* total number of disks */ + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 != 1, PHYSFS_ERR_CORRUPT, 0); + + pos = zip64_find_end_of_central_dir(io, pos, ui64); + if (pos < 0) + return 0; /* oh well. */ + + /* + * For self-extracting archives, etc, there's crapola in the file + * before the zipfile records; we calculate how much data there is + * prepended by determining how far the zip64-end-of-central-directory + * offset is from where it is supposed to be...the difference in bytes + * is how much arbitrary data is at the start of the physical file. + */ + assert(((PHYSFS_uint64) pos) >= ui64); + *data_start = ((PHYSFS_uint64) pos) - ui64; + + BAIL_IF_MACRO(!io->seek(io, pos), ERRPASS, 0); + + /* check signature again, just in case. */ + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 != ZIP64_END_OF_CENTRAL_DIR_SIG, PHYSFS_ERR_CORRUPT, 0); + + /* size of Zip64 end of central directory record. */ + BAIL_IF_MACRO(!readui64(io, &ui64), ERRPASS, 0); + + /* version made by. */ + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); + + /* version needed to extract. */ + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); + + /* number of this disk. */ + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 != 0, PHYSFS_ERR_CORRUPT, 0); + + /* number of disk with start of central directory record. */ + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 != 0, PHYSFS_ERR_CORRUPT, 0); + + /* total number of entries in the central dir on this disk */ + BAIL_IF_MACRO(!readui64(io, &ui64), ERRPASS, 0); + + /* total number of entries in the central dir */ + BAIL_IF_MACRO(!readui64(io, &info->entryCount), ERRPASS, 0); + BAIL_IF_MACRO(ui64 != info->entryCount, PHYSFS_ERR_CORRUPT, 0); + + /* size of the central directory */ + BAIL_IF_MACRO(!readui64(io, &ui64), ERRPASS, 0); + + /* offset of central directory */ + BAIL_IF_MACRO(!readui64(io, dir_ofs), ERRPASS, 0); + + /* Since we know the difference, fix up the central dir offset... */ + *dir_ofs += *data_start; + + /* + * There are more fields here, for encryption and feature-specific things, + * but we don't care about any of them at the moment. + */ + + return 1; /* made it. */ +} /* zip64_parse_end_of_central_dir */ + + +static int zip_parse_end_of_central_dir(PHYSFS_Io *io, ZIPinfo *info, + PHYSFS_uint64 *data_start, + PHYSFS_uint64 *dir_ofs) +{ + PHYSFS_uint16 entryCount16; + PHYSFS_uint32 offset32; + PHYSFS_uint32 ui32; + PHYSFS_uint16 ui16; + PHYSFS_sint64 len; + PHYSFS_sint64 pos; + int rc; + + /* find the end-of-central-dir record, and seek to it. */ + pos = zip_find_end_of_central_dir(io, &len); + BAIL_IF_MACRO(pos == -1, ERRPASS, 0); + BAIL_IF_MACRO(!io->seek(io, pos), ERRPASS, 0); + + /* check signature again, just in case. */ + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + BAIL_IF_MACRO(ui32 != ZIP_END_OF_CENTRAL_DIR_SIG, PHYSFS_ERR_CORRUPT, 0); + + /* Seek back to see if "Zip64 end of central directory locator" exists. */ + /* this record is 20 bytes before end-of-central-dir */ + rc = zip64_parse_end_of_central_dir(io, info, data_start, dir_ofs, pos-20); + BAIL_IF_MACRO(rc == 0, ERRPASS, 0); + if (rc == 1) + return 1; /* we're done here. */ + + assert(rc == -1); /* no error, just not a Zip64 archive. */ + + /* Not Zip64? Seek back to where we were and keep processing. */ + BAIL_IF_MACRO(!io->seek(io, pos + 4), ERRPASS, 0); + + /* number of this disk */ + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); + BAIL_IF_MACRO(ui16 != 0, PHYSFS_ERR_CORRUPT, 0); + + /* number of the disk with the start of the central directory */ + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); + BAIL_IF_MACRO(ui16 != 0, PHYSFS_ERR_CORRUPT, 0); + + /* total number of entries in the central dir on this disk */ + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); + + /* total number of entries in the central dir */ + BAIL_IF_MACRO(!readui16(io, &entryCount16), ERRPASS, 0); + BAIL_IF_MACRO(ui16 != entryCount16, PHYSFS_ERR_CORRUPT, 0); + + info->entryCount = entryCount16; + + /* size of the central directory */ + BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); + + /* offset of central directory */ + BAIL_IF_MACRO(!readui32(io, &offset32), ERRPASS, 0); + *dir_ofs = (PHYSFS_uint64) offset32; + BAIL_IF_MACRO(pos < (*dir_ofs + ui32), PHYSFS_ERR_CORRUPT, 0); + + /* + * For self-extracting archives, etc, there's crapola in the file + * before the zipfile records; we calculate how much data there is + * prepended by determining how far the central directory offset is + * from where it is supposed to be (start of end-of-central-dir minus + * sizeof central dir)...the difference in bytes is how much arbitrary + * data is at the start of the physical file. + */ + *data_start = (PHYSFS_uint64) (pos - (*dir_ofs + ui32)); + + /* Now that we know the difference, fix up the central dir offset... */ + *dir_ofs += *data_start; + + /* zipfile comment length */ + BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); + + /* + * Make sure that the comment length matches to the end of file... + * If it doesn't, we're either in the wrong part of the file, or the + * file is corrupted, but we give up either way. + */ + BAIL_IF_MACRO((pos + 22 + ui16) != len, PHYSFS_ERR_CORRUPT, 0); + + return 1; /* made it. */ +} /* zip_parse_end_of_central_dir */ + + +static void *ZIP_openArchive(PHYSFS_Io *io, const char *name, int forWriting) +{ + ZIPinfo *info = NULL; + PHYSFS_uint64 data_start; + PHYSFS_uint64 cent_dir_ofs; + + assert(io != NULL); /* shouldn't ever happen. */ + + BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL); + BAIL_IF_MACRO(!isZip(io), ERRPASS, NULL); + + info = (ZIPinfo *) allocator.Malloc(sizeof (ZIPinfo)); + BAIL_IF_MACRO(!info, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + memset(info, '\0', sizeof (ZIPinfo)); + info->io = io; + + if (!zip_parse_end_of_central_dir(io, info, &data_start, ¢_dir_ofs)) + goto ZIP_openarchive_failed; + + if (!zip_load_entries(io, info, data_start, cent_dir_ofs)) + goto ZIP_openarchive_failed; + + return info; + +ZIP_openarchive_failed: + if (info != NULL) + allocator.Free(info); + + return NULL; +} /* ZIP_openArchive */ + + +static PHYSFS_sint64 zip_find_start_of_dir(ZIPinfo *info, const char *path, + int stop_on_first_find) +{ + PHYSFS_sint64 lo = 0; + PHYSFS_sint64 hi = (PHYSFS_sint64) (info->entryCount - 1); + PHYSFS_sint64 middle; + PHYSFS_uint32 dlen = (PHYSFS_uint32) strlen(path); + PHYSFS_sint64 retval = -1; + const char *name; + int rc; + + if (*path == '\0') /* root dir? */ + return 0; + + if ((dlen > 0) && (path[dlen - 1] == '/')) /* ignore trailing slash. */ + dlen--; + + while (lo <= hi) + { + middle = lo + ((hi - lo) / 2); + name = info->entries[middle].name; + rc = strncmp(path, name, dlen); + if (rc == 0) + { + char ch = name[dlen]; + if ('/' < ch) /* make sure this isn't just a substr match. */ + rc = -1; + else if ('/' > ch) + rc = 1; + else + { + if (stop_on_first_find) /* Just checking dir's existance? */ + return middle; + + if (name[dlen + 1] == '\0') /* Skip initial dir entry. */ + return (middle + 1); + + /* there might be more entries earlier in the list. */ + retval = middle; + hi = middle - 1; + } /* else */ + } /* if */ + + if (rc > 0) + lo = middle + 1; + else + hi = middle - 1; + } /* while */ + + return retval; +} /* zip_find_start_of_dir */ + + +/* + * Moved to seperate function so we can use alloca then immediately throw + * away the allocated stack space... + */ +static void doEnumCallback(PHYSFS_EnumFilesCallback cb, void *callbackdata, + const char *odir, const char *str, PHYSFS_sint32 ln) +{ + char *newstr = __PHYSFS_smallAlloc(ln + 1); + if (newstr == NULL) + return; + + memcpy(newstr, str, ln); + newstr[ln] = '\0'; + cb(callbackdata, odir, newstr); + __PHYSFS_smallFree(newstr); +} /* doEnumCallback */ + + +static void ZIP_enumerateFiles(void *opaque, const char *dname, + PHYSFS_EnumFilesCallback cb, + const char *origdir, void *callbackdata) +{ + ZIPinfo *info = ((ZIPinfo *) opaque); + PHYSFS_sint32 dlen, dlen_inc; + PHYSFS_sint64 i, max; + + i = zip_find_start_of_dir(info, dname, 0); + if (i == -1) /* no such directory. */ + return; + + dlen = (PHYSFS_sint32) strlen(dname); + if ((dlen > 0) && (dname[dlen - 1] == '/')) /* ignore trailing slash. */ + dlen--; + + dlen_inc = ((dlen > 0) ? 1 : 0) + dlen; + max = (PHYSFS_sint64) info->entryCount; + while (i < max) + { + char *e = info->entries[i].name; + if ((dlen) && ((strncmp(e, dname, dlen) != 0) || (e[dlen] != '/'))) + break; /* past end of this dir; we're done. */ + else + { + char *add = e + dlen_inc; + char *ptr = strchr(add, '/'); + PHYSFS_sint32 ln = (PHYSFS_sint32) ((ptr) ? ptr-add : strlen(add)); + doEnumCallback(cb, callbackdata, origdir, add, ln); + ln += dlen_inc; /* point past entry to children... */ + + /* increment counter and skip children of subdirs... */ + while ((++i < max) && (ptr != NULL)) + { + char *e_new = info->entries[i].name; + if ((strncmp(e, e_new, ln) != 0) || (e_new[ln] != '/')) + break; + } /* while */ + } /* else */ + } /* while */ +} /* ZIP_enumerateFiles */ + + +static PHYSFS_Io *zip_get_io(PHYSFS_Io *io, ZIPinfo *inf, ZIPentry *entry) +{ + int success; + PHYSFS_Io *retval = io->duplicate(io); + BAIL_IF_MACRO(!retval, ERRPASS, NULL); + + /* !!! FIXME: if you open a dir here, it should bail ERR_NOT_A_FILE */ + + /* (inf) can be NULL if we already resolved. */ + success = (inf == NULL) || zip_resolve(retval, inf, entry); + if (success) + { + PHYSFS_sint64 offset; + offset = ((entry->symlink) ? entry->symlink->offset : entry->offset); + success = retval->seek(retval, offset); + } /* if */ + + if (!success) + { + retval->destroy(retval); + retval = NULL; + } /* if */ + + return retval; +} /* zip_get_io */ + + +static PHYSFS_Io *ZIP_openRead(void *opaque, const char *filename) +{ + PHYSFS_Io *retval = NULL; + ZIPinfo *info = (ZIPinfo *) opaque; + ZIPentry *entry = zip_find_entry(info, filename, NULL); + ZIPfileinfo *finfo = NULL; + + BAIL_IF_MACRO(!entry, ERRPASS, NULL); + + retval = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + GOTO_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, ZIP_openRead_failed); + + finfo = (ZIPfileinfo *) allocator.Malloc(sizeof (ZIPfileinfo)); + GOTO_IF_MACRO(!finfo, PHYSFS_ERR_OUT_OF_MEMORY, ZIP_openRead_failed); + memset(finfo, '\0', sizeof (ZIPfileinfo)); + + finfo->io = zip_get_io(info->io, info, entry); + GOTO_IF_MACRO(!finfo->io, ERRPASS, ZIP_openRead_failed); + finfo->entry = ((entry->symlink != NULL) ? entry->symlink : entry); + initializeZStream(&finfo->stream); + + if (finfo->entry->compression_method != COMPMETH_NONE) + { + finfo->buffer = (PHYSFS_uint8 *) allocator.Malloc(ZIP_READBUFSIZE); + if (!finfo->buffer) + GOTO_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, ZIP_openRead_failed); + else if (zlib_err(inflateInit2(&finfo->stream, -MAX_WBITS)) != Z_OK) + goto ZIP_openRead_failed; + } /* if */ + + memcpy(retval, &ZIP_Io, sizeof (PHYSFS_Io)); + retval->opaque = finfo; + + return retval; + +ZIP_openRead_failed: + if (finfo != NULL) + { + if (finfo->io != NULL) + finfo->io->destroy(finfo->io); + + if (finfo->buffer != NULL) + { + allocator.Free(finfo->buffer); + inflateEnd(&finfo->stream); + } /* if */ + + allocator.Free(finfo); + } /* if */ + + if (retval != NULL) + allocator.Free(retval); + + return NULL; +} /* ZIP_openRead */ + + +static PHYSFS_Io *ZIP_openWrite(void *opaque, const char *filename) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL); +} /* ZIP_openWrite */ + + +static PHYSFS_Io *ZIP_openAppend(void *opaque, const char *filename) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL); +} /* ZIP_openAppend */ + + +static void ZIP_closeArchive(void *opaque) +{ + ZIPinfo *zi = (ZIPinfo *) (opaque); + zi->io->destroy(zi->io); + zip_free_entries(zi->entries, zi->entryCount); + allocator.Free(zi); +} /* ZIP_closeArchive */ + + +static int ZIP_remove(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0); +} /* ZIP_remove */ + + +static int ZIP_mkdir(void *opaque, const char *name) +{ + BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0); +} /* ZIP_mkdir */ + + +static int ZIP_stat(void *opaque, const char *filename, PHYSFS_Stat *stat) +{ + int isDir = 0; + const ZIPinfo *info = (const ZIPinfo *) opaque; + const ZIPentry *entry = zip_find_entry(info, filename, &isDir); + + /* !!! FIXME: does this need to resolve entries here? */ + + if ((!isDir) && (entry == NULL)) + return 0; + + else if (isDir) + { + stat->filesize = 0; + stat->filetype = PHYSFS_FILETYPE_DIRECTORY; + } /* if */ + + else if (zip_entry_is_symlink(entry)) + { + stat->filesize = 0; + stat->filetype = PHYSFS_FILETYPE_SYMLINK; + } /* else if */ + + else + { + stat->filesize = (PHYSFS_sint64) entry->uncompressed_size; + stat->filetype = PHYSFS_FILETYPE_REGULAR; + } /* else */ + + stat->modtime = ((entry) ? entry->last_mod_time : 0); + stat->createtime = stat->modtime; + stat->accesstime = 0; + stat->readonly = 1; /* .zip files are always read only */ + + return 1; +} /* ZIP_stat */ + + +const PHYSFS_Archiver __PHYSFS_Archiver_ZIP = +{ + CURRENT_PHYSFS_ARCHIVER_API_VERSION, + { + "ZIP", + "PkZip/WinZip/Info-Zip compatible", + "Ryan C. Gordon ", + "http://icculus.org/physfs/", + 1, /* supportsSymlinks */ + }, + ZIP_openArchive, + ZIP_enumerateFiles, + ZIP_openRead, + ZIP_openWrite, + ZIP_openAppend, + ZIP_remove, + ZIP_mkdir, + ZIP_stat, + ZIP_closeArchive +}; + +#endif /* defined PHYSFS_SUPPORTS_ZIP */ + +/* end of archiver_zip.c ... */ + diff --git a/jni/physfs-2.0.3/lzma/7zC.txt b/jni/physfs-2.1.0/src/lzma/7zC.txt similarity index 100% rename from jni/physfs-2.0.3/lzma/7zC.txt rename to jni/physfs-2.1.0/src/lzma/7zC.txt diff --git a/jni/physfs-2.0.3/lzma/7zFormat.txt b/jni/physfs-2.1.0/src/lzma/7zFormat.txt similarity index 100% rename from jni/physfs-2.0.3/lzma/7zFormat.txt rename to jni/physfs-2.1.0/src/lzma/7zFormat.txt diff --git a/jni/physfs-2.0.3/lzma/C/7zCrc.c b/jni/physfs-2.1.0/src/lzma/C/7zCrc.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/7zCrc.c rename to jni/physfs-2.1.0/src/lzma/C/7zCrc.c diff --git a/jni/physfs-2.0.3/lzma/C/7zCrc.h b/jni/physfs-2.1.0/src/lzma/C/7zCrc.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/7zCrc.h rename to jni/physfs-2.1.0/src/lzma/C/7zCrc.h diff --git a/jni/physfs-2.0.3/lzma/C/7zCrcT8.c b/jni/physfs-2.1.0/src/lzma/C/7zCrcT8.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/7zCrcT8.c rename to jni/physfs-2.1.0/src/lzma/C/7zCrcT8.c diff --git a/jni/physfs-2.0.3/lzma/C/Alloc.c b/jni/physfs-2.1.0/src/lzma/C/Alloc.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Alloc.c rename to jni/physfs-2.1.0/src/lzma/C/Alloc.c diff --git a/jni/physfs-2.0.3/lzma/C/Alloc.h b/jni/physfs-2.1.0/src/lzma/C/Alloc.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Alloc.h rename to jni/physfs-2.1.0/src/lzma/C/Alloc.h diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zAlloc.c b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zAlloc.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zAlloc.c rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zAlloc.c diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zAlloc.h b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zAlloc.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zAlloc.h rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zAlloc.h diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zBuffer.c b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zBuffer.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zBuffer.c rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zBuffer.c diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zBuffer.h b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zBuffer.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zBuffer.h rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zBuffer.h diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zDecode.c b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zDecode.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zDecode.c rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zDecode.c diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zDecode.h b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zDecode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zDecode.h rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zDecode.h diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zExtract.c b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zExtract.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zExtract.c rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zExtract.c diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zExtract.h b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zExtract.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zExtract.h rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zExtract.h diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zHeader.c b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zHeader.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zHeader.c rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zHeader.c diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zHeader.h b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zHeader.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zHeader.h rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zHeader.h diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zIn.c b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zIn.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zIn.c rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zIn.c diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zIn.h b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zIn.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zIn.h rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zIn.h diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zItem.c b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zItem.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zItem.c rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zItem.c diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zItem.h b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zItem.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zItem.h rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zItem.h diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zMain.c b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zMain.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zMain.c rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zMain.c diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zMethodID.c b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zMethodID.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zMethodID.c rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zMethodID.c diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7zMethodID.h b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zMethodID.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7zMethodID.h rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7zMethodID.h diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7z_C.dsp b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7z_C.dsp similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7z_C.dsp rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7z_C.dsp diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/7z_C.dsw b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/7z_C.dsw similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/7z_C.dsw rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/7z_C.dsw diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/makefile b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/makefile similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/makefile rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/makefile diff --git a/jni/physfs-2.0.3/lzma/C/Archive/7z/makefile.gcc b/jni/physfs-2.1.0/src/lzma/C/Archive/7z/makefile.gcc similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Archive/7z/makefile.gcc rename to jni/physfs-2.1.0/src/lzma/C/Archive/7z/makefile.gcc diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchARM.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchARM.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchARM.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchARM.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchARM.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchARM.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchARM.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchARM.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchARMThumb.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchARMThumb.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchARMThumb.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchARMThumb.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchARMThumb.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchARMThumb.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchARMThumb.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchARMThumb.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchIA64.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchIA64.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchIA64.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchIA64.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchIA64.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchIA64.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchIA64.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchIA64.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchPPC.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchPPC.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchPPC.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchPPC.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchPPC.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchPPC.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchPPC.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchPPC.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchSPARC.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchSPARC.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchSPARC.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchSPARC.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchSPARC.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchSPARC.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchSPARC.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchSPARC.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchTypes.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchTypes.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchTypes.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchTypes.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchX86.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchX86.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchX86.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchX86.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchX86.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchX86.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchX86.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchX86.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchX86_2.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchX86_2.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchX86_2.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchX86_2.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchX86_2.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchX86_2.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Branch/BranchX86_2.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Branch/BranchX86_2.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Huffman/HuffmanEncode.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Huffman/HuffmanEncode.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Huffman/HuffmanEncode.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Huffman/HuffmanEncode.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Huffman/HuffmanEncode.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Huffman/HuffmanEncode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Huffman/HuffmanEncode.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Huffman/HuffmanEncode.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lz/LzHash.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Lz/LzHash.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lz/LzHash.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lz/LzHash.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lz/MatchFinder.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Lz/MatchFinder.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lz/MatchFinder.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lz/MatchFinder.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lz/MatchFinder.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Lz/MatchFinder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lz/MatchFinder.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lz/MatchFinder.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lz/MatchFinderMt.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Lz/MatchFinderMt.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lz/MatchFinderMt.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lz/MatchFinderMt.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lz/MatchFinderMt.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Lz/MatchFinderMt.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lz/MatchFinderMt.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lz/MatchFinderMt.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaDecode.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaDecode.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaDecode.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaDecode.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaDecode.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaDecode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaDecode.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaDecode.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaDecodeSize.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaDecodeSize.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaDecodeSize.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaDecodeSize.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaStateDecode.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaStateDecode.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaStateDecode.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaStateDecode.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaStateDecode.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaStateDecode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaStateDecode.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaStateDecode.h diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaStateTest.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaStateTest.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaStateTest.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaStateTest.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaTest.c b/jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaTest.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaTest.c rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaTest.c diff --git a/jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaTypes.h b/jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaTypes.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Compress/Lzma/LzmaTypes.h rename to jni/physfs-2.1.0/src/lzma/C/Compress/Lzma/LzmaTypes.h diff --git a/jni/physfs-2.0.3/lzma/C/CpuArch.h b/jni/physfs-2.1.0/src/lzma/C/CpuArch.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/CpuArch.h rename to jni/physfs-2.1.0/src/lzma/C/CpuArch.h diff --git a/jni/physfs-2.0.3/lzma/C/IStream.h b/jni/physfs-2.1.0/src/lzma/C/IStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/IStream.h rename to jni/physfs-2.1.0/src/lzma/C/IStream.h diff --git a/jni/physfs-2.0.3/lzma/C/Sort.c b/jni/physfs-2.1.0/src/lzma/C/Sort.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Sort.c rename to jni/physfs-2.1.0/src/lzma/C/Sort.c diff --git a/jni/physfs-2.0.3/lzma/C/Sort.h b/jni/physfs-2.1.0/src/lzma/C/Sort.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Sort.h rename to jni/physfs-2.1.0/src/lzma/C/Sort.h diff --git a/jni/physfs-2.0.3/lzma/C/Threads.c b/jni/physfs-2.1.0/src/lzma/C/Threads.c similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Threads.c rename to jni/physfs-2.1.0/src/lzma/C/Threads.c diff --git a/jni/physfs-2.0.3/lzma/C/Threads.h b/jni/physfs-2.1.0/src/lzma/C/Threads.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Threads.h rename to jni/physfs-2.1.0/src/lzma/C/Threads.h diff --git a/jni/physfs-2.0.3/lzma/C/Types.h b/jni/physfs-2.1.0/src/lzma/C/Types.h similarity index 100% rename from jni/physfs-2.0.3/lzma/C/Types.h rename to jni/physfs-2.1.0/src/lzma/C/Types.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7z.ico b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7z.ico similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7z.ico rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7z.ico diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zCompressionMode.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zCompressionMode.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zCompressionMode.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zCompressionMode.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zCompressionMode.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zCompressionMode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zCompressionMode.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zCompressionMode.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zDecode.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zDecode.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zDecode.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zDecode.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zDecode.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zDecode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zDecode.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zDecode.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zEncode.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zEncode.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zEncode.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zEncode.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zEncode.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zEncode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zEncode.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zEncode.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zExtract.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zExtract.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zExtract.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zExtract.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zFolderInStream.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zFolderInStream.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zFolderInStream.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zFolderInStream.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zFolderInStream.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zFolderInStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zFolderInStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zFolderInStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zFolderOutStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHandler.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHandler.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHandler.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHandler.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHandler.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHandler.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHandler.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHandler.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHandlerOut.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHeader.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHeader.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHeader.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHeader.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHeader.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHeader.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zHeader.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zHeader.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zIn.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zIn.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zIn.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zIn.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zIn.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zIn.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zIn.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zIn.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zItem.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zItem.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zItem.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zItem.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zOut.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zOut.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zOut.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zOut.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zOut.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zOut.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zOut.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zOut.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zProperties.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zProperties.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zProperties.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zProperties.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zProperties.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zProperties.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zProperties.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zProperties.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zRegister.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zRegister.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zRegister.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zRegister.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zSpecStream.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zSpecStream.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zSpecStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zSpecStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zSpecStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zUpdate.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zUpdate.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zUpdate.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zUpdate.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zUpdate.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zUpdate.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/7zUpdate.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/7zUpdate.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/7z/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/7z/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Archive.def b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Archive.def similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Archive.def rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Archive.def diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Archive2.def b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Archive2.def similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Archive2.def rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Archive2.def diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/ArchiveExports.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/ArchiveExports.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/ArchiveExports.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/ArchiveExports.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CoderMixer2.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CoderMixer2.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CoderMixer2.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CoderMixer2.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CoderMixer2.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CoderMixer2.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CoderMixer2.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CoderMixer2.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CoderMixer2MT.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/CrossThreadProgress.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/DummyOutStream.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/DummyOutStream.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/DummyOutStream.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/DummyOutStream.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/DummyOutStream.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/DummyOutStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/DummyOutStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/DummyOutStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/HandlerOut.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/HandlerOut.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/HandlerOut.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/HandlerOut.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/HandlerOut.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/HandlerOut.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/HandlerOut.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/HandlerOut.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/InStreamWithCRC.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/ItemNameUtils.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/ItemNameUtils.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/ItemNameUtils.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/ItemNameUtils.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/ItemNameUtils.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/ItemNameUtils.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/ItemNameUtils.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/ItemNameUtils.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/MultiStream.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/MultiStream.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/MultiStream.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/MultiStream.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/MultiStream.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/MultiStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/MultiStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/MultiStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/OutStreamWithCRC.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/ParseProperties.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/ParseProperties.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/ParseProperties.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/ParseProperties.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/ParseProperties.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/ParseProperties.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/Common/ParseProperties.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/Common/ParseProperties.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/DllExports2.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/DllExports2.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/DllExports2.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/DllExports2.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Archive/IArchive.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/IArchive.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Archive/IArchive.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Archive/IArchive.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/Alone.dsw diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/makefile b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/makefile similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/makefile rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/makefile diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/resource.rc b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/resource.rc similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Alone7z/resource.rc rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Alone7z/resource.rc diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zExtractR/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zExtractR/makefile b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zExtractR/makefile similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zExtractR/makefile rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zExtractR/makefile diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zExtractR/resource.rc b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zExtractR/resource.rc similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zExtractR/resource.rc rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zExtractR/resource.rc diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zR/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zR/makefile b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zR/makefile similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zR/makefile rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zR/makefile diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zR/resource.rc b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zR/resource.rc similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Bundles/Format7zR/resource.rc rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Bundles/Format7zR/resource.rc diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/CreateCoder.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/CreateCoder.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/CreateCoder.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/CreateCoder.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/CreateCoder.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/CreateCoder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/CreateCoder.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/CreateCoder.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/FilePathAutoRename.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FilePathAutoRename.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/FilePathAutoRename.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FilePathAutoRename.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/FilePathAutoRename.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FilePathAutoRename.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/FilePathAutoRename.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FilePathAutoRename.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/FileStreams.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FileStreams.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/FileStreams.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FileStreams.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/FileStreams.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FileStreams.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/FileStreams.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FileStreams.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/FilterCoder.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FilterCoder.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/FilterCoder.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FilterCoder.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/FilterCoder.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FilterCoder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/FilterCoder.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/FilterCoder.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/InBuffer.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/InBuffer.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/InBuffer.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/InBuffer.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/InBuffer.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/InBuffer.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/InBuffer.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/InBuffer.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/InOutTempBuffer.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/InOutTempBuffer.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/InOutTempBuffer.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/InOutTempBuffer.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/InOutTempBuffer.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/InOutTempBuffer.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/InOutTempBuffer.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/InOutTempBuffer.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/LimitedStreams.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/LimitedStreams.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/LimitedStreams.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/LimitedStreams.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/LimitedStreams.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/LimitedStreams.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/LimitedStreams.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/LimitedStreams.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/LockedStream.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/LockedStream.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/LockedStream.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/LockedStream.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/LockedStream.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/LockedStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/LockedStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/LockedStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/MethodId.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/MethodId.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/MethodId.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/MethodId.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/MethodId.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/MethodId.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/MethodId.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/MethodId.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/MethodProps.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/MethodProps.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/MethodProps.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/MethodProps.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/MethodProps.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/MethodProps.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/MethodProps.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/MethodProps.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/OffsetStream.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/OffsetStream.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/OffsetStream.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/OffsetStream.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/OffsetStream.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/OffsetStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/OffsetStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/OffsetStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/OutBuffer.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/OutBuffer.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/OutBuffer.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/OutBuffer.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/OutBuffer.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/OutBuffer.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/OutBuffer.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/OutBuffer.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/ProgressUtils.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/ProgressUtils.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/ProgressUtils.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/ProgressUtils.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/ProgressUtils.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/ProgressUtils.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/ProgressUtils.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/ProgressUtils.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/RegisterArc.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/RegisterArc.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/RegisterArc.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/RegisterArc.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/RegisterCodec.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/RegisterCodec.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/RegisterCodec.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/RegisterCodec.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamBinder.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamBinder.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamBinder.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamBinder.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamBinder.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamBinder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamBinder.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamBinder.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamObjects.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamObjects.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamObjects.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamObjects.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamObjects.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamObjects.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamObjects.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamObjects.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamUtils.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamUtils.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamUtils.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamUtils.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamUtils.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamUtils.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/StreamUtils.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/StreamUtils.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/VirtThread.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/VirtThread.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/VirtThread.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/VirtThread.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Common/VirtThread.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/VirtThread.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Common/VirtThread.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Common/VirtThread.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/ARM.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/ARM.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/ARM.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/ARM.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/ARM.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/ARM.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/ARM.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/ARM.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/ARMThumb.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/ARMThumb.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/ARMThumb.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/ARMThumb.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/ARMThumb.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/ARMThumb.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/ARMThumb.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/ARMThumb.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BCJ2Register.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BCJ2Register.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BCJ2Register.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BCJ2Register.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BCJRegister.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BCJRegister.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BCJRegister.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BCJRegister.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BranchCoder.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BranchCoder.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BranchCoder.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BranchCoder.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BranchCoder.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BranchCoder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BranchCoder.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BranchCoder.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BranchRegister.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BranchRegister.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/BranchRegister.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/BranchRegister.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/IA64.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/IA64.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/IA64.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/IA64.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/IA64.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/IA64.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/IA64.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/IA64.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/PPC.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/PPC.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/PPC.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/PPC.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/PPC.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/PPC.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/PPC.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/PPC.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/SPARC.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/SPARC.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/SPARC.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/SPARC.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/SPARC.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/SPARC.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/SPARC.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/SPARC.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/x86.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/x86.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/x86.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/x86.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/x86.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/x86.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/x86.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/x86.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/x86_2.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/x86_2.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/x86_2.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/x86_2.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/x86_2.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/x86_2.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Branch/x86_2.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Branch/x86_2.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwap.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/ByteSwapRegister.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwapRegister.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/ByteSwapRegister.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/ByteSwapRegister.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/ByteSwap/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/CodecExports.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/CodecExports.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/CodecExports.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/CodecExports.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/CopyCoder.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/CopyCoder.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/CopyCoder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/CopyCoder.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/CopyCoder.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/CopyRegister.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/CopyRegister.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/CopyRegister.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/CopyRegister.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/Copy/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/Copy/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZ/LZOutWindow.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZ/LZOutWindow.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZ/LZOutWindow.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZ/LZOutWindow.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZ/LZOutWindow.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZ/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZ/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZ/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZ/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMA.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMA.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMA.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMA.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMADecoder.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMAEncoder.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMARegister.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMARegister.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/LZMARegister.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/LZMARegister.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsw b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsw similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsw rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/AloneLZMA.dsw diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBench.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaBenchCon.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRam.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.c b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.c similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.c rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.c diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/LzmaRamDecode.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/makefile b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/makefile similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/makefile rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/makefile diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/makefile.gcc b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/makefile.gcc similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/LZMA_Alone/makefile.gcc rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/LZMA_Alone/makefile.gcc diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoder.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoder.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoder.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBit.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBitTree.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBitTree.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBitTree.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderBitTree.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderOpt.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderOpt.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderOpt.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/RangeCoderOpt.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/Compress/RangeCoder/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/Compress/RangeCoder/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/ICoder.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/ICoder.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/ICoder.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/ICoder.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/IDecl.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/IDecl.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/IDecl.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/IDecl.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/IPassword.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/IPassword.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/IPassword.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/IPassword.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/IProgress.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/IProgress.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/IProgress.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/IProgress.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/IStream.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/IStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/IStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/IStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/MyVersion.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/MyVersion.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/MyVersion.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/MyVersion.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/MyVersionInfo.rc b/jni/physfs-2.1.0/src/lzma/CPP/7zip/MyVersionInfo.rc similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/MyVersionInfo.rc rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/MyVersionInfo.rc diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/PropID.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/PropID.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/PropID.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/PropID.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/Client7z.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/Client7z.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/Client7z.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/Client7z.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/Client7z.dsp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/Client7z.dsp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/Client7z.dsp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/Client7z.dsp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/Client7z.dsw b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/Client7z.dsw similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/Client7z.dsw rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/Client7z.dsw diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/makefile b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/makefile similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Client7z/makefile rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Client7z/makefile diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveExtractCallback.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveName.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveName.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveName.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveName.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveName.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveName.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveName.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveName.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ArchiveOpenCallback.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/DefaultName.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/DefaultName.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/DefaultName.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/DefaultName.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/DefaultName.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/DefaultName.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/DefaultName.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/DefaultName.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/DirItem.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/DirItem.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/DirItem.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/DirItem.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/EnumDirItems.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/EnumDirItems.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/EnumDirItems.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/EnumDirItems.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/EnumDirItems.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/EnumDirItems.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/EnumDirItems.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/EnumDirItems.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ExitCode.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ExitCode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ExitCode.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ExitCode.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Extract.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Extract.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Extract.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Extract.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Extract.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Extract.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Extract.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Extract.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ExtractMode.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ExtractMode.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ExtractMode.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ExtractMode.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ExtractingFilePath.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ExtractingFilePath.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ExtractingFilePath.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ExtractingFilePath.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ExtractingFilePath.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/IFileExtractCallback.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/IFileExtractCallback.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/IFileExtractCallback.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/IFileExtractCallback.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/LoadCodecs.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/LoadCodecs.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/LoadCodecs.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/LoadCodecs.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/LoadCodecs.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/LoadCodecs.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/LoadCodecs.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/LoadCodecs.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/OpenArchive.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/OpenArchive.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/OpenArchive.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/OpenArchive.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/OpenArchive.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/OpenArchive.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/OpenArchive.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/OpenArchive.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/PropIDUtils.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/PropIDUtils.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/PropIDUtils.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/PropIDUtils.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/PropIDUtils.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/PropIDUtils.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/PropIDUtils.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/PropIDUtils.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Property.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Property.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Property.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Property.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/SetProperties.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/SetProperties.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/SetProperties.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/SetProperties.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/SetProperties.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/SetProperties.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/SetProperties.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/SetProperties.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/SortUtils.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/SortUtils.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/SortUtils.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/SortUtils.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/SortUtils.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/SortUtils.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/SortUtils.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/SortUtils.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/TempFiles.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/TempFiles.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/TempFiles.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/TempFiles.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/TempFiles.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/TempFiles.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/TempFiles.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/TempFiles.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Update.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Update.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Update.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Update.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Update.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Update.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/Update.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/Update.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateAction.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateAction.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateAction.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateAction.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateAction.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateAction.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateAction.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateAction.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateCallback.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateCallback.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateCallback.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateCallback.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateCallback.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateCallback.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateCallback.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateCallback.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdatePair.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdatePair.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdatePair.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdatePair.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdatePair.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdatePair.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdatePair.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdatePair.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateProduce.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateProduce.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateProduce.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateProduce.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateProduce.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateProduce.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/UpdateProduce.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/UpdateProduce.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/WorkDir.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/WorkDir.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/WorkDir.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/WorkDir.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/WorkDir.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/WorkDir.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/WorkDir.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/WorkDir.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ZipRegistry.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ZipRegistry.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Common/ZipRegistry.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Common/ZipRegistry.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/ConsoleClose.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/ConsoleClose.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/ConsoleClose.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/ConsoleClose.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/ConsoleClose.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/ConsoleClose.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/ConsoleClose.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/ConsoleClose.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/List.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/List.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/List.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/List.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/List.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/List.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/List.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/List.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/Main.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/Main.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/Main.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/Main.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/MainAr.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/MainAr.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/MainAr.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/MainAr.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/PercentPrinter.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/PercentPrinter.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/PercentPrinter.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/PercentPrinter.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/PercentPrinter.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/PercentPrinter.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/PercentPrinter.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/PercentPrinter.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/StdAfx.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/StdAfx.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/StdAfx.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/StdAfx.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/UpdateCallbackConsole.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/UserInputUtils.cpp b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/UserInputUtils.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/UserInputUtils.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/UserInputUtils.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/UserInputUtils.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/UserInputUtils.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/UserInputUtils.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/UserInputUtils.h diff --git a/jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/afxres.h b/jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/afxres.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/7zip/UI/Console/afxres.h rename to jni/physfs-2.1.0/src/lzma/CPP/7zip/UI/Console/afxres.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Build.mak b/jni/physfs-2.1.0/src/lzma/CPP/Build.mak similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Build.mak rename to jni/physfs-2.1.0/src/lzma/CPP/Build.mak diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/AutoPtr.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/AutoPtr.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/AutoPtr.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/AutoPtr.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/Buffer.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/Buffer.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/Buffer.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/Buffer.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/CRC.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/CRC.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/CRC.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/CRC.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/C_FileIO.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/C_FileIO.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/C_FileIO.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/C_FileIO.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/C_FileIO.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/C_FileIO.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/C_FileIO.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/C_FileIO.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/ComTry.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/ComTry.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/ComTry.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/ComTry.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/CommandLineParser.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/CommandLineParser.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/CommandLineParser.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/CommandLineParser.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/CommandLineParser.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/CommandLineParser.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/CommandLineParser.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/CommandLineParser.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/Defs.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/Defs.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/Defs.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/Defs.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/DynamicBuffer.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/DynamicBuffer.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/DynamicBuffer.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/DynamicBuffer.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/IntToString.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/IntToString.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/IntToString.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/IntToString.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/IntToString.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/IntToString.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/IntToString.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/IntToString.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/ListFileUtils.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/ListFileUtils.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/ListFileUtils.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/ListFileUtils.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/ListFileUtils.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/ListFileUtils.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/ListFileUtils.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/ListFileUtils.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyCom.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyCom.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyCom.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyCom.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyException.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyException.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyException.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyException.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyGuidDef.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyGuidDef.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyGuidDef.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyGuidDef.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyInitGuid.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyInitGuid.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyInitGuid.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyInitGuid.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyString.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyString.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyString.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyString.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyString.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyString.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyString.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyString.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyUnknown.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyUnknown.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyUnknown.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyUnknown.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyVector.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyVector.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyVector.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyVector.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyVector.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyVector.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyVector.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyVector.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/MyWindows.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/MyWindows.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/MyWindows.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/MyWindows.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/NewHandler.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/NewHandler.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/NewHandler.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/NewHandler.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/NewHandler.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/NewHandler.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/NewHandler.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/NewHandler.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/StdInStream.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/StdInStream.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/StdInStream.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/StdInStream.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/StdInStream.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/StdInStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/StdInStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/StdInStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/StdOutStream.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/StdOutStream.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/StdOutStream.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/StdOutStream.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/StdOutStream.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/StdOutStream.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/StdOutStream.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/StdOutStream.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/StringConvert.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/StringConvert.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/StringConvert.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/StringConvert.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/StringConvert.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/StringConvert.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/StringConvert.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/StringConvert.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/StringToInt.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/StringToInt.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/StringToInt.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/StringToInt.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/StringToInt.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/StringToInt.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/StringToInt.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/StringToInt.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/Types.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/Types.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/Types.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/Types.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/UTFConvert.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/UTFConvert.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/UTFConvert.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/UTFConvert.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/UTFConvert.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/UTFConvert.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/UTFConvert.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/UTFConvert.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/Wildcard.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Common/Wildcard.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/Wildcard.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Common/Wildcard.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Common/Wildcard.h b/jni/physfs-2.1.0/src/lzma/CPP/Common/Wildcard.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Common/Wildcard.h rename to jni/physfs-2.1.0/src/lzma/CPP/Common/Wildcard.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/DLL.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/DLL.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/DLL.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/DLL.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/DLL.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/DLL.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/DLL.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/DLL.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/Defs.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/Defs.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/Defs.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/Defs.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/Error.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/Error.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/Error.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/Error.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/Error.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/Error.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/Error.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/Error.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileDir.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileDir.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileDir.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileDir.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileDir.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileDir.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileDir.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileDir.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileFind.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileFind.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileFind.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileFind.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileFind.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileFind.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileFind.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileFind.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileIO.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileIO.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileIO.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileIO.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileIO.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileIO.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileIO.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileIO.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileMapping.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileMapping.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileMapping.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileMapping.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileMapping.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileMapping.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileMapping.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileMapping.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileName.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileName.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileName.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileName.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/FileName.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/FileName.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/FileName.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/FileName.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/Handle.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/Handle.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/Handle.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/Handle.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/MemoryLock.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/MemoryLock.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/MemoryLock.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/MemoryLock.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/MemoryLock.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/MemoryLock.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/MemoryLock.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/MemoryLock.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/PropVariant.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/PropVariant.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/PropVariant.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/PropVariant.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/PropVariant.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/PropVariant.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/PropVariant.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/PropVariant.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/PropVariantConversions.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/PropVariantConversions.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/PropVariantConversions.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/PropVariantConversions.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/PropVariantConversions.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/PropVariantConversions.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/PropVariantConversions.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/PropVariantConversions.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/StdAfx.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/StdAfx.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/StdAfx.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/StdAfx.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/Synchronization.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/Synchronization.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/Synchronization.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/Synchronization.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/Synchronization.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/Synchronization.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/Synchronization.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/Synchronization.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/System.cpp b/jni/physfs-2.1.0/src/lzma/CPP/Windows/System.cpp similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/System.cpp rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/System.cpp diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/System.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/System.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/System.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/System.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/Thread.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/Thread.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/Thread.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/Thread.h diff --git a/jni/physfs-2.0.3/lzma/CPP/Windows/Time.h b/jni/physfs-2.1.0/src/lzma/CPP/Windows/Time.h similarity index 100% rename from jni/physfs-2.0.3/lzma/CPP/Windows/Time.h rename to jni/physfs-2.1.0/src/lzma/CPP/Windows/Time.h diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Common/CRC.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Common/CRC.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Common/CRC.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Common/CRC.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Common/CommandLineParser.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Common/CommandLineParser.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Common/CommandLineParser.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Common/CommandLineParser.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Common/InBuffer.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Common/InBuffer.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Common/InBuffer.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Common/InBuffer.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Common/OutBuffer.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Common/OutBuffer.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Common/OutBuffer.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Common/OutBuffer.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZ/IMatchFinder.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZ/IMatchFinder.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZ/IMatchFinder.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZ/IMatchFinder.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZ/LzBinTree.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZ/LzBinTree.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZ/LzBinTree.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZ/LzBinTree.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZ/LzInWindow.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZ/LzInWindow.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZ/LzInWindow.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZ/LzInWindow.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZ/LzOutWindow.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZ/LzOutWindow.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZ/LzOutWindow.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZ/LzOutWindow.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZMA/LzmaBase.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZMA/LzmaBase.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZMA/LzmaBase.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZMA/LzmaBase.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZMA/LzmaDecoder.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LZMA/LzmaEncoder.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.sln b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.sln similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.sln rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaAlone.sln diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/LzmaBench.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaBench.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/LzmaBench.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/LzmaBench.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/Properties/AssemblyInfo.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/Properties/AssemblyInfo.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/Properties/AssemblyInfo.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/Properties/AssemblyInfo.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/Properties/Resources.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/Properties/Resources.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/Properties/Resources.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/Properties/Resources.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/Properties/Settings.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/Properties/Settings.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/LzmaAlone/Properties/Settings.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/LzmaAlone/Properties/Settings.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/RangeCoder/RangeCoder.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/RangeCoder/RangeCoder.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/RangeCoder/RangeCoder.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/RangeCoder/RangeCoder.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBit.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBit.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBit.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBit.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs diff --git a/jni/physfs-2.0.3/lzma/CS/7zip/ICoder.cs b/jni/physfs-2.1.0/src/lzma/CS/7zip/ICoder.cs similarity index 100% rename from jni/physfs-2.0.3/lzma/CS/7zip/ICoder.cs rename to jni/physfs-2.1.0/src/lzma/CS/7zip/ICoder.cs diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/CRC.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/CRC.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/CRC.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/CRC.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZ/BinTree.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZ/BinTree.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZ/BinTree.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZ/BinTree.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZ/InWindow.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZ/InWindow.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZ/InWindow.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZ/InWindow.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZ/OutWindow.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZ/OutWindow.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZ/OutWindow.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZ/OutWindow.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZMA/Base.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZMA/Base.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZMA/Base.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZMA/Base.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZMA/Decoder.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZMA/Decoder.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZMA/Decoder.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZMA/Decoder.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZMA/Encoder.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZMA/Encoder.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/LZMA/Encoder.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/LZMA/Encoder.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeDecoder.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeDecoder.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeDecoder.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeDecoder.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeEncoder.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeEncoder.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeEncoder.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/RangeCoder/BitTreeEncoder.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/RangeCoder/Decoder.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/RangeCoder/Decoder.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/RangeCoder/Decoder.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/RangeCoder/Decoder.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/RangeCoder/Encoder.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/RangeCoder/Encoder.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/Compression/RangeCoder/Encoder.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/Compression/RangeCoder/Encoder.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/ICodeProgress.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/ICodeProgress.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/ICodeProgress.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/ICodeProgress.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/LzmaAlone.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/LzmaAlone.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/LzmaAlone.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/LzmaAlone.java diff --git a/jni/physfs-2.0.3/lzma/Java/SevenZip/LzmaBench.java b/jni/physfs-2.1.0/src/lzma/Java/SevenZip/LzmaBench.java similarity index 100% rename from jni/physfs-2.0.3/lzma/Java/SevenZip/LzmaBench.java rename to jni/physfs-2.1.0/src/lzma/Java/SevenZip/LzmaBench.java diff --git a/jni/physfs-2.0.3/lzma/LGPL.txt b/jni/physfs-2.1.0/src/lzma/LGPL.txt similarity index 100% rename from jni/physfs-2.0.3/lzma/LGPL.txt rename to jni/physfs-2.1.0/src/lzma/LGPL.txt diff --git a/jni/physfs-2.0.3/lzma/Methods.txt b/jni/physfs-2.1.0/src/lzma/Methods.txt similarity index 100% rename from jni/physfs-2.0.3/lzma/Methods.txt rename to jni/physfs-2.1.0/src/lzma/Methods.txt diff --git a/jni/physfs-2.0.3/lzma/history.txt b/jni/physfs-2.1.0/src/lzma/history.txt similarity index 100% rename from jni/physfs-2.0.3/lzma/history.txt rename to jni/physfs-2.1.0/src/lzma/history.txt diff --git a/jni/physfs-2.0.3/lzma/lzma.exe b/jni/physfs-2.1.0/src/lzma/lzma.exe similarity index 100% rename from jni/physfs-2.0.3/lzma/lzma.exe rename to jni/physfs-2.1.0/src/lzma/lzma.exe diff --git a/jni/physfs-2.0.3/lzma/lzma.txt b/jni/physfs-2.1.0/src/lzma/lzma.txt similarity index 100% rename from jni/physfs-2.0.3/lzma/lzma.txt rename to jni/physfs-2.1.0/src/lzma/lzma.txt diff --git a/jni/physfs-2.1.0/src/physfs.c b/jni/physfs-2.1.0/src/physfs.c new file mode 100644 index 00000000..a1abbc88 --- /dev/null +++ b/jni/physfs-2.1.0/src/physfs.c @@ -0,0 +1,2966 @@ +/** + * PhysicsFS; a portable, flexible file i/o abstraction. + * + * Documentation is in physfs.h. It's verbose, honest. :) + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon. + */ + +/* !!! FIXME: ERR_PAST_EOF shouldn't trigger for reads. Just return zero. */ +/* !!! FIXME: use snprintf(), not sprintf(). */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + + +typedef struct __PHYSFS_DIRHANDLE__ +{ + void *opaque; /* Instance data unique to the archiver. */ + char *dirName; /* Path to archive in platform-dependent notation. */ + char *mountPoint; /* Mountpoint in virtual file tree. */ + const PHYSFS_Archiver *funcs; /* Ptr to archiver info for this handle. */ + struct __PHYSFS_DIRHANDLE__ *next; /* linked list stuff. */ +} DirHandle; + + +typedef struct __PHYSFS_FILEHANDLE__ +{ + PHYSFS_Io *io; /* Instance data unique to the archiver for this file. */ + PHYSFS_uint8 forReading; /* Non-zero if reading, zero if write/append */ + const DirHandle *dirHandle; /* Archiver instance that created this */ + PHYSFS_uint8 *buffer; /* Buffer, if set (NULL otherwise). Don't touch! */ + PHYSFS_uint32 bufsize; /* Bufsize, if set (0 otherwise). Don't touch! */ + PHYSFS_uint32 buffill; /* Buffer fill size. Don't touch! */ + PHYSFS_uint32 bufpos; /* Buffer position. Don't touch! */ + struct __PHYSFS_FILEHANDLE__ *next; /* linked list stuff. */ +} FileHandle; + + +typedef struct __PHYSFS_ERRSTATETYPE__ +{ + void *tid; + PHYSFS_ErrorCode code; + struct __PHYSFS_ERRSTATETYPE__ *next; +} ErrState; + + +/* General PhysicsFS state ... */ +static int initialized = 0; +static ErrState *errorStates = NULL; +static DirHandle *searchPath = NULL; +static DirHandle *writeDir = NULL; +static FileHandle *openWriteList = NULL; +static FileHandle *openReadList = NULL; +static char *baseDir = NULL; +static char *userDir = NULL; +static char *prefDir = NULL; +static int allowSymLinks = 0; +static const PHYSFS_Archiver **archivers = NULL; +static const PHYSFS_ArchiveInfo **archiveInfo = NULL; +static volatile size_t numArchivers = 0; + +/* mutexes ... */ +static void *errorLock = NULL; /* protects error message list. */ +static void *stateLock = NULL; /* protects other PhysFS static state. */ + +/* allocator ... */ +static int externalAllocator = 0; +PHYSFS_Allocator allocator; + + +/* PHYSFS_Io implementation for i/o to physical filesystem... */ + +/* !!! FIXME: maybe refcount the paths in a string pool? */ +typedef struct __PHYSFS_NativeIoInfo +{ + void *handle; + const char *path; + int mode; /* 'r', 'w', or 'a' */ +} NativeIoInfo; + +static PHYSFS_sint64 nativeIo_read(PHYSFS_Io *io, void *buf, PHYSFS_uint64 len) +{ + NativeIoInfo *info = (NativeIoInfo *) io->opaque; + return __PHYSFS_platformRead(info->handle, buf, len); +} /* nativeIo_read */ + +static PHYSFS_sint64 nativeIo_write(PHYSFS_Io *io, const void *buffer, + PHYSFS_uint64 len) +{ + NativeIoInfo *info = (NativeIoInfo *) io->opaque; + return __PHYSFS_platformWrite(info->handle, buffer, len); +} /* nativeIo_write */ + +static int nativeIo_seek(PHYSFS_Io *io, PHYSFS_uint64 offset) +{ + NativeIoInfo *info = (NativeIoInfo *) io->opaque; + return __PHYSFS_platformSeek(info->handle, offset); +} /* nativeIo_seek */ + +static PHYSFS_sint64 nativeIo_tell(PHYSFS_Io *io) +{ + NativeIoInfo *info = (NativeIoInfo *) io->opaque; + return __PHYSFS_platformTell(info->handle); +} /* nativeIo_tell */ + +static PHYSFS_sint64 nativeIo_length(PHYSFS_Io *io) +{ + NativeIoInfo *info = (NativeIoInfo *) io->opaque; + return __PHYSFS_platformFileLength(info->handle); +} /* nativeIo_length */ + +static PHYSFS_Io *nativeIo_duplicate(PHYSFS_Io *io) +{ + NativeIoInfo *info = (NativeIoInfo *) io->opaque; + return __PHYSFS_createNativeIo(info->path, info->mode); +} /* nativeIo_duplicate */ + +static int nativeIo_flush(PHYSFS_Io *io) +{ + return __PHYSFS_platformFlush(io->opaque); +} /* nativeIo_flush */ + +static void nativeIo_destroy(PHYSFS_Io *io) +{ + NativeIoInfo *info = (NativeIoInfo *) io->opaque; + __PHYSFS_platformClose(info->handle); + allocator.Free((void *) info->path); + allocator.Free(info); + allocator.Free(io); +} /* nativeIo_destroy */ + +static const PHYSFS_Io __PHYSFS_nativeIoInterface = +{ + CURRENT_PHYSFS_IO_API_VERSION, NULL, + nativeIo_read, + nativeIo_write, + nativeIo_seek, + nativeIo_tell, + nativeIo_length, + nativeIo_duplicate, + nativeIo_flush, + nativeIo_destroy +}; + +PHYSFS_Io *__PHYSFS_createNativeIo(const char *path, const int mode) +{ + PHYSFS_Io *io = NULL; + NativeIoInfo *info = NULL; + void *handle = NULL; + char *pathdup = NULL; + + assert((mode == 'r') || (mode == 'w') || (mode == 'a')); + + io = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + GOTO_IF_MACRO(!io, PHYSFS_ERR_OUT_OF_MEMORY, createNativeIo_failed); + info = (NativeIoInfo *) allocator.Malloc(sizeof (NativeIoInfo)); + GOTO_IF_MACRO(!info, PHYSFS_ERR_OUT_OF_MEMORY, createNativeIo_failed); + pathdup = (char *) allocator.Malloc(strlen(path) + 1); + GOTO_IF_MACRO(!pathdup, PHYSFS_ERR_OUT_OF_MEMORY, createNativeIo_failed); + + if (mode == 'r') + handle = __PHYSFS_platformOpenRead(path); + else if (mode == 'w') + handle = __PHYSFS_platformOpenWrite(path); + else if (mode == 'a') + handle = __PHYSFS_platformOpenAppend(path); + + GOTO_IF_MACRO(!handle, ERRPASS, createNativeIo_failed); + + strcpy(pathdup, path); + info->handle = handle; + info->path = pathdup; + info->mode = mode; + memcpy(io, &__PHYSFS_nativeIoInterface, sizeof (*io)); + io->opaque = info; + return io; + +createNativeIo_failed: + if (handle != NULL) __PHYSFS_platformClose(handle); + if (pathdup != NULL) allocator.Free(pathdup); + if (info != NULL) allocator.Free(info); + if (io != NULL) allocator.Free(io); + return NULL; +} /* __PHYSFS_createNativeIo */ + + +/* PHYSFS_Io implementation for i/o to a memory buffer... */ + +typedef struct __PHYSFS_MemoryIoInfo +{ + const PHYSFS_uint8 *buf; + PHYSFS_uint64 len; + PHYSFS_uint64 pos; + PHYSFS_Io *parent; + volatile PHYSFS_uint32 refcount; + void (*destruct)(void *); +} MemoryIoInfo; + +static PHYSFS_sint64 memoryIo_read(PHYSFS_Io *io, void *buf, PHYSFS_uint64 len) +{ + MemoryIoInfo *info = (MemoryIoInfo *) io->opaque; + const PHYSFS_uint64 avail = info->len - info->pos; + assert(avail <= info->len); + + if (avail == 0) + return 0; /* we're at EOF; nothing to do. */ + + if (len > avail) + len = avail; + + memcpy(buf, info->buf + info->pos, (size_t) len); + info->pos += len; + return len; +} /* memoryIo_read */ + +static PHYSFS_sint64 memoryIo_write(PHYSFS_Io *io, const void *buffer, + PHYSFS_uint64 len) +{ + BAIL_MACRO(PHYSFS_ERR_OPEN_FOR_READING, -1); +} /* memoryIo_write */ + +static int memoryIo_seek(PHYSFS_Io *io, PHYSFS_uint64 offset) +{ + MemoryIoInfo *info = (MemoryIoInfo *) io->opaque; + BAIL_IF_MACRO(offset > info->len, PHYSFS_ERR_PAST_EOF, 0); + info->pos = offset; + return 1; +} /* memoryIo_seek */ + +static PHYSFS_sint64 memoryIo_tell(PHYSFS_Io *io) +{ + const MemoryIoInfo *info = (MemoryIoInfo *) io->opaque; + return (PHYSFS_sint64) info->pos; +} /* memoryIo_tell */ + +static PHYSFS_sint64 memoryIo_length(PHYSFS_Io *io) +{ + const MemoryIoInfo *info = (MemoryIoInfo *) io->opaque; + return (PHYSFS_sint64) info->len; +} /* memoryIo_length */ + +static PHYSFS_Io *memoryIo_duplicate(PHYSFS_Io *io) +{ + MemoryIoInfo *info = (MemoryIoInfo *) io->opaque; + MemoryIoInfo *newinfo = NULL; + PHYSFS_Io *parent = info->parent; + PHYSFS_Io *retval = NULL; + + /* avoid deep copies. */ + assert((!parent) || (!((MemoryIoInfo *) parent->opaque)->parent) ); + + /* share the buffer between duplicates. */ + if (parent != NULL) /* dup the parent, increment its refcount. */ + return parent->duplicate(parent); + + /* we're the parent. */ + + retval = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + BAIL_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + newinfo = (MemoryIoInfo *) allocator.Malloc(sizeof (MemoryIoInfo)); + if (!newinfo) + { + allocator.Free(retval); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + } /* if */ + + /* !!! FIXME: want lockless atomic increment. */ + __PHYSFS_platformGrabMutex(stateLock); + info->refcount++; + __PHYSFS_platformReleaseMutex(stateLock); + + memset(newinfo, '\0', sizeof (*info)); + newinfo->buf = info->buf; + newinfo->len = info->len; + newinfo->pos = 0; + newinfo->parent = io; + newinfo->refcount = 0; + newinfo->destruct = NULL; + + memcpy(retval, io, sizeof (*retval)); + retval->opaque = newinfo; + return retval; +} /* memoryIo_duplicate */ + +static int memoryIo_flush(PHYSFS_Io *io) { return 1; /* it's read-only. */ } + +static void memoryIo_destroy(PHYSFS_Io *io) +{ + MemoryIoInfo *info = (MemoryIoInfo *) io->opaque; + PHYSFS_Io *parent = info->parent; + int should_die = 0; + + if (parent != NULL) + { + assert(info->buf == ((MemoryIoInfo *) info->parent->opaque)->buf); + assert(info->len == ((MemoryIoInfo *) info->parent->opaque)->len); + assert(info->refcount == 0); + assert(info->destruct == NULL); + allocator.Free(info); + allocator.Free(io); + parent->destroy(parent); /* decrements refcount. */ + return; + } /* if */ + + /* we _are_ the parent. */ + assert(info->refcount > 0); /* even in a race, we hold a reference. */ + + /* !!! FIXME: want lockless atomic decrement. */ + __PHYSFS_platformGrabMutex(stateLock); + info->refcount--; + should_die = (info->refcount == 0); + __PHYSFS_platformReleaseMutex(stateLock); + + if (should_die) + { + void (*destruct)(void *) = info->destruct; + void *buf = (void *) info->buf; + io->opaque = NULL; /* kill this here in case of race. */ + allocator.Free(info); + allocator.Free(io); + if (destruct != NULL) + destruct(buf); + } /* if */ +} /* memoryIo_destroy */ + + +static const PHYSFS_Io __PHYSFS_memoryIoInterface = +{ + CURRENT_PHYSFS_IO_API_VERSION, NULL, + memoryIo_read, + memoryIo_write, + memoryIo_seek, + memoryIo_tell, + memoryIo_length, + memoryIo_duplicate, + memoryIo_flush, + memoryIo_destroy +}; + +PHYSFS_Io *__PHYSFS_createMemoryIo(const void *buf, PHYSFS_uint64 len, + void (*destruct)(void *)) +{ + PHYSFS_Io *io = NULL; + MemoryIoInfo *info = NULL; + + io = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + GOTO_IF_MACRO(!io, PHYSFS_ERR_OUT_OF_MEMORY, createMemoryIo_failed); + info = (MemoryIoInfo *) allocator.Malloc(sizeof (MemoryIoInfo)); + GOTO_IF_MACRO(!info, PHYSFS_ERR_OUT_OF_MEMORY, createMemoryIo_failed); + + memset(info, '\0', sizeof (*info)); + info->buf = (const PHYSFS_uint8 *) buf; + info->len = len; + info->pos = 0; + info->parent = NULL; + info->refcount = 1; + info->destruct = destruct; + + memcpy(io, &__PHYSFS_memoryIoInterface, sizeof (*io)); + io->opaque = info; + return io; + +createMemoryIo_failed: + if (info != NULL) allocator.Free(info); + if (io != NULL) allocator.Free(io); + return NULL; +} /* __PHYSFS_createMemoryIo */ + + +/* PHYSFS_Io implementation for i/o to a PHYSFS_File... */ + +static PHYSFS_sint64 handleIo_read(PHYSFS_Io *io, void *buf, PHYSFS_uint64 len) +{ + return PHYSFS_readBytes((PHYSFS_File *) io->opaque, buf, len); +} /* handleIo_read */ + +static PHYSFS_sint64 handleIo_write(PHYSFS_Io *io, const void *buffer, + PHYSFS_uint64 len) +{ + return PHYSFS_writeBytes((PHYSFS_File *) io->opaque, buffer, len); +} /* handleIo_write */ + +static int handleIo_seek(PHYSFS_Io *io, PHYSFS_uint64 offset) +{ + return PHYSFS_seek((PHYSFS_File *) io->opaque, offset); +} /* handleIo_seek */ + +static PHYSFS_sint64 handleIo_tell(PHYSFS_Io *io) +{ + return PHYSFS_tell((PHYSFS_File *) io->opaque); +} /* handleIo_tell */ + +static PHYSFS_sint64 handleIo_length(PHYSFS_Io *io) +{ + return PHYSFS_fileLength((PHYSFS_File *) io->opaque); +} /* handleIo_length */ + +static PHYSFS_Io *handleIo_duplicate(PHYSFS_Io *io) +{ + /* + * There's no duplicate at the PHYSFS_File level, so we break the + * abstraction. We're allowed to: we're physfs.c! + */ + FileHandle *origfh = (FileHandle *) io->opaque; + FileHandle *newfh = (FileHandle *) allocator.Malloc(sizeof (FileHandle)); + PHYSFS_Io *retval = NULL; + + GOTO_IF_MACRO(!newfh, PHYSFS_ERR_OUT_OF_MEMORY, handleIo_dupe_failed); + memset(newfh, '\0', sizeof (*newfh)); + + retval = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + GOTO_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, handleIo_dupe_failed); + +#if 0 /* we don't buffer the duplicate, at least not at the moment. */ + if (origfh->buffer != NULL) + { + newfh->buffer = (PHYSFS_uint8 *) allocator.Malloc(origfh->bufsize); + if (!newfh->buffer) + GOTO_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, handleIo_dupe_failed); + newfh->bufsize = origfh->bufsize; + } /* if */ +#endif + + newfh->io = origfh->io->duplicate(origfh->io); + GOTO_IF_MACRO(!newfh->io, ERRPASS, handleIo_dupe_failed); + + newfh->forReading = origfh->forReading; + newfh->dirHandle = origfh->dirHandle; + + __PHYSFS_platformGrabMutex(stateLock); + if (newfh->forReading) + { + newfh->next = openReadList; + openReadList = newfh; + } /* if */ + else + { + newfh->next = openWriteList; + openWriteList = newfh; + } /* else */ + __PHYSFS_platformReleaseMutex(stateLock); + + memcpy(retval, io, sizeof (PHYSFS_Io)); + retval->opaque = newfh; + return retval; + +handleIo_dupe_failed: + if (newfh) + { + if (newfh->io != NULL) newfh->io->destroy(newfh->io); + if (newfh->buffer != NULL) allocator.Free(newfh->buffer); + allocator.Free(newfh); + } /* if */ + + return NULL; +} /* handleIo_duplicate */ + +static int handleIo_flush(PHYSFS_Io *io) +{ + return PHYSFS_flush((PHYSFS_File *) io->opaque); +} /* handleIo_flush */ + +static void handleIo_destroy(PHYSFS_Io *io) +{ + if (io->opaque != NULL) + PHYSFS_close((PHYSFS_File *) io->opaque); + allocator.Free(io); +} /* handleIo_destroy */ + +static const PHYSFS_Io __PHYSFS_handleIoInterface = +{ + CURRENT_PHYSFS_IO_API_VERSION, NULL, + handleIo_read, + handleIo_write, + handleIo_seek, + handleIo_tell, + handleIo_length, + handleIo_duplicate, + handleIo_flush, + handleIo_destroy +}; + +static PHYSFS_Io *__PHYSFS_createHandleIo(PHYSFS_File *f) +{ + PHYSFS_Io *io = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); + BAIL_IF_MACRO(!io, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + memcpy(io, &__PHYSFS_handleIoInterface, sizeof (*io)); + io->opaque = f; + return io; +} /* __PHYSFS_createHandleIo */ + + +/* functions ... */ + +typedef struct +{ + char **list; + PHYSFS_uint32 size; + PHYSFS_ErrorCode errcode; +} EnumStringListCallbackData; + +static void enumStringListCallback(void *data, const char *str) +{ + void *ptr; + char *newstr; + EnumStringListCallbackData *pecd = (EnumStringListCallbackData *) data; + + if (pecd->errcode) + return; + + ptr = allocator.Realloc(pecd->list, (pecd->size + 2) * sizeof (char *)); + newstr = (char *) allocator.Malloc(strlen(str) + 1); + if (ptr != NULL) + pecd->list = (char **) ptr; + + if ((ptr == NULL) || (newstr == NULL)) + { + pecd->errcode = PHYSFS_ERR_OUT_OF_MEMORY; + pecd->list[pecd->size] = NULL; + PHYSFS_freeList(pecd->list); + return; + } /* if */ + + strcpy(newstr, str); + pecd->list[pecd->size] = newstr; + pecd->size++; +} /* enumStringListCallback */ + + +static char **doEnumStringList(void (*func)(PHYSFS_StringCallback, void *)) +{ + EnumStringListCallbackData ecd; + memset(&ecd, '\0', sizeof (ecd)); + ecd.list = (char **) allocator.Malloc(sizeof (char *)); + BAIL_IF_MACRO(!ecd.list, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + func(enumStringListCallback, &ecd); + + if (ecd.errcode) + { + PHYSFS_setErrorCode(ecd.errcode); + return NULL; + } /* if */ + + ecd.list[ecd.size] = NULL; + return ecd.list; +} /* doEnumStringList */ + + +static void __PHYSFS_bubble_sort(void *a, size_t lo, size_t hi, + int (*cmpfn)(void *, size_t, size_t), + void (*swapfn)(void *, size_t, size_t)) +{ + size_t i; + int sorted; + + do + { + sorted = 1; + for (i = lo; i < hi; i++) + { + if (cmpfn(a, i, i + 1) > 0) + { + swapfn(a, i, i + 1); + sorted = 0; + } /* if */ + } /* for */ + } while (!sorted); +} /* __PHYSFS_bubble_sort */ + + +static void __PHYSFS_quick_sort(void *a, size_t lo, size_t hi, + int (*cmpfn)(void *, size_t, size_t), + void (*swapfn)(void *, size_t, size_t)) +{ + size_t i; + size_t j; + size_t v; + + if ((hi - lo) <= PHYSFS_QUICKSORT_THRESHOLD) + __PHYSFS_bubble_sort(a, lo, hi, cmpfn, swapfn); + else + { + i = (hi + lo) / 2; + + if (cmpfn(a, lo, i) > 0) swapfn(a, lo, i); + if (cmpfn(a, lo, hi) > 0) swapfn(a, lo, hi); + if (cmpfn(a, i, hi) > 0) swapfn(a, i, hi); + + j = hi - 1; + swapfn(a, i, j); + i = lo; + v = j; + while (1) + { + while(cmpfn(a, ++i, v) < 0) { /* do nothing */ } + while(cmpfn(a, --j, v) > 0) { /* do nothing */ } + if (j < i) + break; + swapfn(a, i, j); + } /* while */ + if (i != (hi-1)) + swapfn(a, i, hi-1); + __PHYSFS_quick_sort(a, lo, j, cmpfn, swapfn); + __PHYSFS_quick_sort(a, i+1, hi, cmpfn, swapfn); + } /* else */ +} /* __PHYSFS_quick_sort */ + + +void __PHYSFS_sort(void *entries, size_t max, + int (*cmpfn)(void *, size_t, size_t), + void (*swapfn)(void *, size_t, size_t)) +{ + /* + * Quicksort w/ Bubblesort fallback algorithm inspired by code from here: + * http://www.cs.ubc.ca/spider/harrison/Java/sorting-demo.html + */ + if (max > 0) + __PHYSFS_quick_sort(entries, 0, max - 1, cmpfn, swapfn); +} /* __PHYSFS_sort */ + + +static ErrState *findErrorForCurrentThread(void) +{ + ErrState *i; + void *tid; + + if (errorLock != NULL) + __PHYSFS_platformGrabMutex(errorLock); + + if (errorStates != NULL) + { + tid = __PHYSFS_platformGetThreadID(); + + for (i = errorStates; i != NULL; i = i->next) + { + if (i->tid == tid) + { + if (errorLock != NULL) + __PHYSFS_platformReleaseMutex(errorLock); + return i; + } /* if */ + } /* for */ + } /* if */ + + if (errorLock != NULL) + __PHYSFS_platformReleaseMutex(errorLock); + + return NULL; /* no error available. */ +} /* findErrorForCurrentThread */ + + +/* this doesn't reset the error state. */ +static inline PHYSFS_ErrorCode currentErrorCode(void) +{ + const ErrState *err = findErrorForCurrentThread(); + return err ? err->code : PHYSFS_ERR_OK; +} /* currentErrorCode */ + + +PHYSFS_ErrorCode PHYSFS_getLastErrorCode(void) +{ + ErrState *err = findErrorForCurrentThread(); + const PHYSFS_ErrorCode retval = (err) ? err->code : PHYSFS_ERR_OK; + if (err) + err->code = PHYSFS_ERR_OK; + return retval; +} /* PHYSFS_getLastErrorCode */ + + +PHYSFS_DECL const char *PHYSFS_getErrorByCode(PHYSFS_ErrorCode code) +{ + switch (code) + { + case PHYSFS_ERR_OK: return "no error"; + case PHYSFS_ERR_OTHER_ERROR: return "unknown error"; + case PHYSFS_ERR_OUT_OF_MEMORY: return "out of memory"; + case PHYSFS_ERR_NOT_INITIALIZED: return "not initialized"; + case PHYSFS_ERR_IS_INITIALIZED: return "already initialized"; + case PHYSFS_ERR_ARGV0_IS_NULL: return "argv[0] is NULL"; + case PHYSFS_ERR_UNSUPPORTED: return "unsupported"; + case PHYSFS_ERR_PAST_EOF: return "past end of file"; + case PHYSFS_ERR_FILES_STILL_OPEN: return "files still open"; + case PHYSFS_ERR_INVALID_ARGUMENT: return "invalid argument"; + case PHYSFS_ERR_NOT_MOUNTED: return "not mounted"; + case PHYSFS_ERR_NOT_FOUND: return "not found"; + case PHYSFS_ERR_SYMLINK_FORBIDDEN: return "symlinks are forbidden"; + case PHYSFS_ERR_NO_WRITE_DIR: return "write directory is not set"; + case PHYSFS_ERR_OPEN_FOR_READING: return "file open for reading"; + case PHYSFS_ERR_OPEN_FOR_WRITING: return "file open for writing"; + case PHYSFS_ERR_NOT_A_FILE: return "not a file"; + case PHYSFS_ERR_READ_ONLY: return "read-only filesystem"; + case PHYSFS_ERR_CORRUPT: return "corrupted"; + case PHYSFS_ERR_SYMLINK_LOOP: return "infinite symbolic link loop"; + case PHYSFS_ERR_IO: return "i/o error"; + case PHYSFS_ERR_PERMISSION: return "permission denied"; + case PHYSFS_ERR_NO_SPACE: return "no space available for writing"; + case PHYSFS_ERR_BAD_FILENAME: return "filename is illegal or insecure"; + case PHYSFS_ERR_BUSY: return "tried to modify a file the OS needs"; + case PHYSFS_ERR_DIR_NOT_EMPTY: return "directory isn't empty"; + case PHYSFS_ERR_OS_ERROR: return "OS reported an error"; + case PHYSFS_ERR_DUPLICATE: return "duplicate resource"; + } /* switch */ + + return NULL; /* don't know this error code. */ +} /* PHYSFS_getErrorByCode */ + + +void PHYSFS_setErrorCode(PHYSFS_ErrorCode errcode) +{ + ErrState *err; + + if (!errcode) + return; + + err = findErrorForCurrentThread(); + if (err == NULL) + { + err = (ErrState *) allocator.Malloc(sizeof (ErrState)); + if (err == NULL) + return; /* uhh...? */ + + memset(err, '\0', sizeof (ErrState)); + err->tid = __PHYSFS_platformGetThreadID(); + + if (errorLock != NULL) + __PHYSFS_platformGrabMutex(errorLock); + + err->next = errorStates; + errorStates = err; + + if (errorLock != NULL) + __PHYSFS_platformReleaseMutex(errorLock); + } /* if */ + + err->code = errcode; +} /* PHYSFS_setErrorCode */ + + +const char *PHYSFS_getLastError(void) +{ + const PHYSFS_ErrorCode err = PHYSFS_getLastErrorCode(); + return (err) ? PHYSFS_getErrorByCode(err) : NULL; +} /* PHYSFS_getLastError */ + + +/* MAKE SURE that errorLock is held before calling this! */ +static void freeErrorStates(void) +{ + ErrState *i; + ErrState *next; + + for (i = errorStates; i != NULL; i = next) + { + next = i->next; + allocator.Free(i); + } /* for */ + + errorStates = NULL; +} /* freeErrorStates */ + + +void PHYSFS_getLinkedVersion(PHYSFS_Version *ver) +{ + if (ver != NULL) + { + ver->major = PHYSFS_VER_MAJOR; + ver->minor = PHYSFS_VER_MINOR; + ver->patch = PHYSFS_VER_PATCH; + } /* if */ +} /* PHYSFS_getLinkedVersion */ + + +static const char *find_filename_extension(const char *fname) +{ + const char *retval = NULL; + if (fname != NULL) + { + const char *p = strchr(fname, '.'); + retval = p; + + while (p != NULL) + { + p = strchr(p + 1, '.'); + if (p != NULL) + retval = p; + } /* while */ + + if (retval != NULL) + retval++; /* skip '.' */ + } /* if */ + + return retval; +} /* find_filename_extension */ + + +static DirHandle *tryOpenDir(PHYSFS_Io *io, const PHYSFS_Archiver *funcs, + const char *d, int forWriting) +{ + DirHandle *retval = NULL; + void *opaque = NULL; + + if (io != NULL) + BAIL_IF_MACRO(!io->seek(io, 0), ERRPASS, NULL); + + opaque = funcs->openArchive(io, d, forWriting); + if (opaque != NULL) + { + retval = (DirHandle *) allocator.Malloc(sizeof (DirHandle)); + if (retval == NULL) + funcs->closeArchive(opaque); + else + { + memset(retval, '\0', sizeof (DirHandle)); + retval->mountPoint = NULL; + retval->funcs = funcs; + retval->opaque = opaque; + } /* else */ + } /* if */ + + return retval; +} /* tryOpenDir */ + + +static DirHandle *openDirectory(PHYSFS_Io *io, const char *d, int forWriting) +{ + DirHandle *retval = NULL; + const PHYSFS_Archiver **i; + const char *ext; + + assert((io != NULL) || (d != NULL)); + + if (io == NULL) + { + /* DIR gets first shot (unlike the rest, it doesn't deal with files). */ + extern const PHYSFS_Archiver __PHYSFS_Archiver_DIR; + retval = tryOpenDir(io, &__PHYSFS_Archiver_DIR, d, forWriting); + if (retval != NULL) + return retval; + + io = __PHYSFS_createNativeIo(d, forWriting ? 'w' : 'r'); + BAIL_IF_MACRO(!io, ERRPASS, 0); + } /* if */ + + ext = find_filename_extension(d); + if (ext != NULL) + { + /* Look for archivers with matching file extensions first... */ + for (i = archivers; (*i != NULL) && (retval == NULL); i++) + { + if (__PHYSFS_utf8stricmp(ext, (*i)->info.extension) == 0) + retval = tryOpenDir(io, *i, d, forWriting); + } /* for */ + + /* failing an exact file extension match, try all the others... */ + for (i = archivers; (*i != NULL) && (retval == NULL); i++) + { + if (__PHYSFS_utf8stricmp(ext, (*i)->info.extension) != 0) + retval = tryOpenDir(io, *i, d, forWriting); + } /* for */ + } /* if */ + + else /* no extension? Try them all. */ + { + for (i = archivers; (*i != NULL) && (retval == NULL); i++) + retval = tryOpenDir(io, *i, d, forWriting); + } /* else */ + + BAIL_IF_MACRO(!retval, PHYSFS_ERR_UNSUPPORTED, NULL); + return retval; +} /* openDirectory */ + + +/* + * Make a platform-independent path string sane. Doesn't actually check the + * file hierarchy, it just cleans up the string. + * (dst) must be a buffer at least as big as (src), as this is where the + * cleaned up string is deposited. + * If there are illegal bits in the path (".." entries, etc) then we + * return zero and (dst) is undefined. Non-zero if the path was sanitized. + */ +static int sanitizePlatformIndependentPath(const char *src, char *dst) +{ + char *prev; + char ch; + + while (*src == '/') /* skip initial '/' chars... */ + src++; + + prev = dst; + do + { + ch = *(src++); + + if ((ch == ':') || (ch == '\\')) /* illegal chars in a physfs path. */ + BAIL_MACRO(PHYSFS_ERR_BAD_FILENAME, 0); + + if (ch == '/') /* path separator. */ + { + *dst = '\0'; /* "." and ".." are illegal pathnames. */ + if ((strcmp(prev, ".") == 0) || (strcmp(prev, "..") == 0)) + BAIL_MACRO(PHYSFS_ERR_BAD_FILENAME, 0); + + while (*src == '/') /* chop out doubles... */ + src++; + + if (*src == '\0') /* ends with a pathsep? */ + break; /* we're done, don't add final pathsep to dst. */ + + prev = dst + 1; + } /* if */ + + *(dst++) = ch; + } while (ch != '\0'); + + return 1; +} /* sanitizePlatformIndependentPath */ + + +/* + * Figure out if (fname) is part of (h)'s mountpoint. (fname) must be an + * output from sanitizePlatformIndependentPath(), so that it is in a known + * state. + * + * This only finds legitimate segments of a mountpoint. If the mountpoint is + * "/a/b/c" and (fname) is "/a/b/c", "/", or "/a/b/c/d", then the results are + * all zero. "/a/b" will succeed, though. + */ +static int partOfMountPoint(DirHandle *h, char *fname) +{ + /* !!! FIXME: This code feels gross. */ + int rc; + size_t len, mntpntlen; + + if (h->mountPoint == NULL) + return 0; + else if (*fname == '\0') + return 1; + + len = strlen(fname); + mntpntlen = strlen(h->mountPoint); + if (len > mntpntlen) /* can't be a subset of mountpoint. */ + return 0; + + /* if true, must be not a match or a complete match, but not a subset. */ + if ((len + 1) == mntpntlen) + return 0; + + rc = strncmp(fname, h->mountPoint, len); /* !!! FIXME: case insensitive? */ + if (rc != 0) + return 0; /* not a match. */ + + /* make sure /a/b matches /a/b/ and not /a/bc ... */ + return h->mountPoint[len] == '/'; +} /* partOfMountPoint */ + + +static DirHandle *createDirHandle(PHYSFS_Io *io, const char *newDir, + const char *mountPoint, int forWriting) +{ + DirHandle *dirHandle = NULL; + char *tmpmntpnt = NULL; + + if (mountPoint != NULL) + { + const size_t len = strlen(mountPoint) + 1; + tmpmntpnt = (char *) __PHYSFS_smallAlloc(len); + GOTO_IF_MACRO(!tmpmntpnt, PHYSFS_ERR_OUT_OF_MEMORY, badDirHandle); + if (!sanitizePlatformIndependentPath(mountPoint, tmpmntpnt)) + goto badDirHandle; + mountPoint = tmpmntpnt; /* sanitized version. */ + } /* if */ + + dirHandle = openDirectory(io, newDir, forWriting); + GOTO_IF_MACRO(!dirHandle, ERRPASS, badDirHandle); + + if (newDir == NULL) + dirHandle->dirName = NULL; + else + { + dirHandle->dirName = (char *) allocator.Malloc(strlen(newDir) + 1); + if (!dirHandle->dirName) + GOTO_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, badDirHandle); + strcpy(dirHandle->dirName, newDir); + } /* else */ + + if ((mountPoint != NULL) && (*mountPoint != '\0')) + { + dirHandle->mountPoint = (char *)allocator.Malloc(strlen(mountPoint)+2); + if (!dirHandle->mountPoint) + GOTO_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, badDirHandle); + strcpy(dirHandle->mountPoint, mountPoint); + strcat(dirHandle->mountPoint, "/"); + } /* if */ + + __PHYSFS_smallFree(tmpmntpnt); + return dirHandle; + +badDirHandle: + if (dirHandle != NULL) + { + dirHandle->funcs->closeArchive(dirHandle->opaque); + allocator.Free(dirHandle->dirName); + allocator.Free(dirHandle->mountPoint); + allocator.Free(dirHandle); + } /* if */ + + __PHYSFS_smallFree(tmpmntpnt); + return NULL; +} /* createDirHandle */ + + +/* MAKE SURE you've got the stateLock held before calling this! */ +static int freeDirHandle(DirHandle *dh, FileHandle *openList) +{ + FileHandle *i; + + if (dh == NULL) + return 1; + + for (i = openList; i != NULL; i = i->next) + BAIL_IF_MACRO(i->dirHandle == dh, PHYSFS_ERR_FILES_STILL_OPEN, 0); + + dh->funcs->closeArchive(dh->opaque); + allocator.Free(dh->dirName); + allocator.Free(dh->mountPoint); + allocator.Free(dh); + return 1; +} /* freeDirHandle */ + + +static char *calculateBaseDir(const char *argv0) +{ + const char dirsep = __PHYSFS_platformDirSeparator; + char *retval = NULL; + char *ptr = NULL; + + /* Give the platform layer first shot at this. */ + retval = __PHYSFS_platformCalcBaseDir(argv0); + if (retval != NULL) + return retval; + + /* We need argv0 to go on. */ + BAIL_IF_MACRO(argv0 == NULL, PHYSFS_ERR_ARGV0_IS_NULL, NULL); + + ptr = strrchr(argv0, dirsep); + if (ptr != NULL) + { + const size_t size = ((size_t) (ptr - argv0)) + 1; + retval = (char *) allocator.Malloc(size + 1); + BAIL_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + memcpy(retval, argv0, size); + retval[size] = '\0'; + return retval; + } /* if */ + + /* argv0 wasn't helpful. */ + BAIL_MACRO(PHYSFS_ERR_INVALID_ARGUMENT, NULL); +} /* calculateBaseDir */ + + +static int initializeMutexes(void) +{ + errorLock = __PHYSFS_platformCreateMutex(); + if (errorLock == NULL) + goto initializeMutexes_failed; + + stateLock = __PHYSFS_platformCreateMutex(); + if (stateLock == NULL) + goto initializeMutexes_failed; + + return 1; /* success. */ + +initializeMutexes_failed: + if (errorLock != NULL) + __PHYSFS_platformDestroyMutex(errorLock); + + if (stateLock != NULL) + __PHYSFS_platformDestroyMutex(stateLock); + + errorLock = stateLock = NULL; + return 0; /* failed. */ +} /* initializeMutexes */ + + +static int doRegisterArchiver(const PHYSFS_Archiver *_archiver); + +static int initStaticArchivers(void) +{ + #define REGISTER_STATIC_ARCHIVER(arc) { \ + extern const PHYSFS_Archiver __PHYSFS_Archiver_##arc; \ + if (!doRegisterArchiver(&__PHYSFS_Archiver_##arc)) { \ + return 0; \ + } \ + } + + #if PHYSFS_SUPPORTS_ZIP + REGISTER_STATIC_ARCHIVER(ZIP); + #endif + #if PHYSFS_SUPPORTS_7Z + REGISTER_STATIC_ARCHIVER(LZMA); + #endif + #if PHYSFS_SUPPORTS_GRP + REGISTER_STATIC_ARCHIVER(GRP); + #endif + #if PHYSFS_SUPPORTS_QPAK + REGISTER_STATIC_ARCHIVER(QPAK); + #endif + #if PHYSFS_SUPPORTS_HOG + REGISTER_STATIC_ARCHIVER(HOG); + #endif + #if PHYSFS_SUPPORTS_MVL + REGISTER_STATIC_ARCHIVER(MVL); + #endif + #if PHYSFS_SUPPORTS_WAD + REGISTER_STATIC_ARCHIVER(WAD); + #endif + #if PHYSFS_SUPPORTS_SLB + REGISTER_STATIC_ARCHIVER(SLB); + #endif + #if PHYSFS_SUPPORTS_ISO9660 + REGISTER_STATIC_ARCHIVER(ISO9660); + #endif + + #undef REGISTER_STATIC_ARCHIVER + + return 1; +} /* initStaticArchivers */ + + +static void setDefaultAllocator(void); +static int doDeinit(void); + +int PHYSFS_init(const char *argv0) +{ + BAIL_IF_MACRO(initialized, PHYSFS_ERR_IS_INITIALIZED, 0); + + if (!externalAllocator) + setDefaultAllocator(); + + if ((allocator.Init != NULL) && (!allocator.Init())) return 0; + + if (!__PHYSFS_platformInit()) + { + if (allocator.Deinit != NULL) allocator.Deinit(); + return 0; + } /* if */ + + /* everything below here can be cleaned up safely by doDeinit(). */ + + if (!initializeMutexes()) goto initFailed; + + baseDir = calculateBaseDir(argv0); + if (!baseDir) goto initFailed; + + userDir = __PHYSFS_platformCalcUserDir(); + if (!userDir) goto initFailed; + + /* Platform layer is required to append a dirsep. */ + assert(baseDir[strlen(baseDir) - 1] == __PHYSFS_platformDirSeparator); + assert(userDir[strlen(userDir) - 1] == __PHYSFS_platformDirSeparator); + + if (!initStaticArchivers()) goto initFailed; + + initialized = 1; + + /* This makes sure that the error subsystem is initialized. */ + PHYSFS_setErrorCode(PHYSFS_getLastErrorCode()); + + return 1; + +initFailed: + doDeinit(); + return 0; +} /* PHYSFS_init */ + + +/* MAKE SURE you hold stateLock before calling this! */ +static int closeFileHandleList(FileHandle **list) +{ + FileHandle *i; + FileHandle *next = NULL; + + for (i = *list; i != NULL; i = next) + { + PHYSFS_Io *io = i->io; + next = i->next; + + if (!io->flush(io)) + { + *list = i; + return 0; + } /* if */ + + io->destroy(io); + allocator.Free(i); + } /* for */ + + *list = NULL; + return 1; +} /* closeFileHandleList */ + + +/* MAKE SURE you hold the stateLock before calling this! */ +static void freeSearchPath(void) +{ + DirHandle *i; + DirHandle *next = NULL; + + closeFileHandleList(&openReadList); + + if (searchPath != NULL) + { + for (i = searchPath; i != NULL; i = next) + { + next = i->next; + freeDirHandle(i, openReadList); + } /* for */ + searchPath = NULL; + } /* if */ +} /* freeSearchPath */ + + +/* MAKE SURE you hold stateLock before calling this! */ +static int archiverInUse(const PHYSFS_Archiver *arc, const DirHandle *list) +{ + const DirHandle *i; + for (i = list; i != NULL; i = i->next) + { + if (i->funcs == arc) + return 1; + } /* for */ + + return 0; /* not in use */ +} /* archiverInUse */ + + +/* MAKE SURE you hold stateLock before calling this! */ +static int doDeregisterArchiver(const size_t idx) +{ + const size_t len = (numArchivers - idx) * sizeof (void *); + const PHYSFS_ArchiveInfo *info = archiveInfo[idx]; + const PHYSFS_Archiver *arc = archivers[idx]; + + /* make sure nothing is still using this archiver */ + if (archiverInUse(arc, searchPath) || archiverInUse(arc, writeDir)) + BAIL_MACRO(PHYSFS_ERR_FILES_STILL_OPEN, 0); + + allocator.Free((void *) info->extension); + allocator.Free((void *) info->description); + allocator.Free((void *) info->author); + allocator.Free((void *) info->url); + allocator.Free((void *) arc); + + memmove(&archiveInfo[idx], &archiveInfo[idx+1], len); + memmove(&archivers[idx], &archivers[idx+1], len); + + assert(numArchivers > 0); + numArchivers--; + + return 1; +} /* doDeregisterArchiver */ + + +/* Does NOT hold the state lock; we're shutting down. */ +static void freeArchivers(void) +{ + while (numArchivers > 0) + { + const int rc = doDeregisterArchiver(numArchivers - 1); + assert(rc); /* nothing should be mounted during shutdown. */ + } /* while */ + + allocator.Free(archivers); + allocator.Free(archiveInfo); + archivers = NULL; + archiveInfo = NULL; +} /* freeArchivers */ + + +static int doDeinit(void) +{ + BAIL_IF_MACRO(!__PHYSFS_platformDeinit(), ERRPASS, 0); + + closeFileHandleList(&openWriteList); + BAIL_IF_MACRO(!PHYSFS_setWriteDir(NULL), PHYSFS_ERR_FILES_STILL_OPEN, 0); + + freeSearchPath(); + freeArchivers(); + freeErrorStates(); + + if (baseDir != NULL) + { + allocator.Free(baseDir); + baseDir = NULL; + } /* if */ + + if (userDir != NULL) + { + allocator.Free(userDir); + userDir = NULL; + } /* if */ + + if (prefDir != NULL) + { + allocator.Free(prefDir); + prefDir = NULL; + } /* if */ + + if (archiveInfo != NULL) + { + allocator.Free(archiveInfo); + archiveInfo = NULL; + } /* if */ + + if (archivers != NULL) + { + allocator.Free(archivers); + archivers = NULL; + } /* if */ + + allowSymLinks = 0; + initialized = 0; + + if (errorLock) __PHYSFS_platformDestroyMutex(errorLock); + if (stateLock) __PHYSFS_platformDestroyMutex(stateLock); + + if (allocator.Deinit != NULL) + allocator.Deinit(); + + errorLock = stateLock = NULL; + return 1; +} /* doDeinit */ + + +int PHYSFS_deinit(void) +{ + BAIL_IF_MACRO(!initialized, PHYSFS_ERR_NOT_INITIALIZED, 0); + return doDeinit(); +} /* PHYSFS_deinit */ + + +int PHYSFS_isInit(void) +{ + return initialized; +} /* PHYSFS_isInit */ + + +char *__PHYSFS_strdup(const char *str) +{ + char *retval = (char *) allocator.Malloc(strlen(str) + 1); + if (retval) + strcpy(retval, str); + return retval; +} /* __PHYSFS_strdup */ + + +/* MAKE SURE you hold stateLock before calling this! */ +static int doRegisterArchiver(const PHYSFS_Archiver *_archiver) +{ + const PHYSFS_uint32 maxver = CURRENT_PHYSFS_ARCHIVER_API_VERSION; + const size_t len = (numArchivers + 2) * sizeof (void *); + PHYSFS_Archiver *archiver = NULL; + PHYSFS_ArchiveInfo *info = NULL; + const char *ext = NULL; + void *ptr = NULL; + size_t i; + + BAIL_IF_MACRO(!_archiver, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(_archiver->version > maxver, PHYSFS_ERR_UNSUPPORTED, 0); + BAIL_IF_MACRO(!_archiver->info.extension, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->info.description, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->info.author, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->info.url, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->openArchive, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->enumerateFiles, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->openRead, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->openWrite, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->openAppend, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->remove, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->mkdir, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->closeArchive, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(!_archiver->stat, PHYSFS_ERR_INVALID_ARGUMENT, 0); + + ext = _archiver->info.extension; + for (i = 0; i < numArchivers; i++) + { + if (__PHYSFS_utf8stricmp(archiveInfo[i]->extension, ext) == 0) + BAIL_MACRO(PHYSFS_ERR_DUPLICATE, 0); // !!! FIXME: better error? ERR_IN_USE? + } /* for */ + + /* make a copy of the data. */ + archiver = (PHYSFS_Archiver *) allocator.Malloc(sizeof (*archiver)); + GOTO_IF_MACRO(!archiver, PHYSFS_ERR_OUT_OF_MEMORY, regfailed); + + /* Must copy sizeof (OLD_VERSION_OF_STRUCT) when version changes! */ + memcpy(archiver, _archiver, sizeof (*archiver)); + + info = (PHYSFS_ArchiveInfo *) &archiver->info; + memset(info, '\0', sizeof (*info)); /* NULL in case an alloc fails. */ + #define CPYSTR(item) \ + info->item = __PHYSFS_strdup(_archiver->info.item); \ + GOTO_IF_MACRO(!info->item, PHYSFS_ERR_OUT_OF_MEMORY, regfailed); + CPYSTR(extension); + CPYSTR(description); + CPYSTR(author); + CPYSTR(url); + info->supportsSymlinks = _archiver->info.supportsSymlinks; + #undef CPYSTR + + ptr = allocator.Realloc(archiveInfo, len); + GOTO_IF_MACRO(!ptr, PHYSFS_ERR_OUT_OF_MEMORY, regfailed); + archiveInfo = (const PHYSFS_ArchiveInfo **) ptr; + + ptr = allocator.Realloc(archivers, len); + GOTO_IF_MACRO(!ptr, PHYSFS_ERR_OUT_OF_MEMORY, regfailed); + archivers = (const PHYSFS_Archiver **) ptr; + + archiveInfo[numArchivers] = info; + archiveInfo[numArchivers + 1] = NULL; + + archivers[numArchivers] = archiver; + archivers[numArchivers + 1] = NULL; + + numArchivers++; + + return 1; + +regfailed: + if (info != NULL) + { + allocator.Free((void *) info->extension); + allocator.Free((void *) info->description); + allocator.Free((void *) info->author); + allocator.Free((void *) info->url); + } /* if */ + allocator.Free(archiver); + + return 0; +} /* doRegisterArchiver */ + + +int PHYSFS_registerArchiver(const PHYSFS_Archiver *archiver) +{ + int retval; + BAIL_IF_MACRO(!initialized, PHYSFS_ERR_NOT_INITIALIZED, 0); + __PHYSFS_platformGrabMutex(stateLock); + retval = doRegisterArchiver(archiver); + __PHYSFS_platformReleaseMutex(stateLock); + return retval; +} /* PHYSFS_registerArchiver */ + + +int PHYSFS_deregisterArchiver(const char *ext) +{ + size_t i; + + BAIL_IF_MACRO(!initialized, PHYSFS_ERR_NOT_INITIALIZED, 0); + BAIL_IF_MACRO(!ext, PHYSFS_ERR_INVALID_ARGUMENT, 0); + + __PHYSFS_platformGrabMutex(stateLock); + for (i = 0; i < numArchivers; i++) + { + if (__PHYSFS_utf8stricmp(archiveInfo[i]->extension, ext) == 0) + { + const int retval = doDeregisterArchiver(i); + __PHYSFS_platformReleaseMutex(stateLock); + return retval; + } /* if */ + } /* for */ + __PHYSFS_platformReleaseMutex(stateLock); + + BAIL_MACRO(PHYSFS_ERR_NOT_FOUND, 0); +} /* PHYSFS_deregisterArchiver */ + + +const PHYSFS_ArchiveInfo **PHYSFS_supportedArchiveTypes(void) +{ + BAIL_IF_MACRO(!initialized, PHYSFS_ERR_NOT_INITIALIZED, NULL); + return archiveInfo; +} /* PHYSFS_supportedArchiveTypes */ + + +void PHYSFS_freeList(void *list) +{ + void **i; + if (list != NULL) + { + for (i = (void **) list; *i != NULL; i++) + allocator.Free(*i); + + allocator.Free(list); + } /* if */ +} /* PHYSFS_freeList */ + + +const char *PHYSFS_getDirSeparator(void) +{ + static char retval[2] = { __PHYSFS_platformDirSeparator, '\0' }; + return retval; +} /* PHYSFS_getDirSeparator */ + + +char **PHYSFS_getCdRomDirs(void) +{ + return doEnumStringList(__PHYSFS_platformDetectAvailableCDs); +} /* PHYSFS_getCdRomDirs */ + + +void PHYSFS_getCdRomDirsCallback(PHYSFS_StringCallback callback, void *data) +{ + __PHYSFS_platformDetectAvailableCDs(callback, data); +} /* PHYSFS_getCdRomDirsCallback */ + + +const char *PHYSFS_getPrefDir(const char *org, const char *app) +{ + const char dirsep = __PHYSFS_platformDirSeparator; + PHYSFS_Stat statbuf; + char *ptr = NULL; + char *endstr = NULL; + + BAIL_IF_MACRO(!initialized, PHYSFS_ERR_NOT_INITIALIZED, 0); + BAIL_IF_MACRO(!org, PHYSFS_ERR_INVALID_ARGUMENT, NULL); + BAIL_IF_MACRO(*org == '\0', PHYSFS_ERR_INVALID_ARGUMENT, NULL); + BAIL_IF_MACRO(!app, PHYSFS_ERR_INVALID_ARGUMENT, NULL); + BAIL_IF_MACRO(*app == '\0', PHYSFS_ERR_INVALID_ARGUMENT, NULL); + + allocator.Free(prefDir); + prefDir = __PHYSFS_platformCalcPrefDir(org, app); + BAIL_IF_MACRO(!prefDir, ERRPASS, NULL); + + assert(strlen(prefDir) > 0); + endstr = prefDir + (strlen(prefDir) - 1); + assert(*endstr == dirsep); + *endstr = '\0'; /* mask out the final dirsep for now. */ + + if (!__PHYSFS_platformStat(prefDir, &statbuf)) + { + for (ptr = strchr(prefDir, dirsep); ptr; ptr = strchr(ptr+1, dirsep)) + { + *ptr = '\0'; + __PHYSFS_platformMkDir(prefDir); + *ptr = dirsep; + } /* for */ + + if (!__PHYSFS_platformMkDir(prefDir)) + { + allocator.Free(prefDir); + prefDir = NULL; + } /* if */ + } /* if */ + + *endstr = dirsep; /* readd the final dirsep. */ + + return prefDir; +} /* PHYSFS_getPrefDir */ + + +const char *PHYSFS_getBaseDir(void) +{ + return baseDir; /* this is calculated in PHYSFS_init()... */ +} /* PHYSFS_getBaseDir */ + + +const char *__PHYSFS_getUserDir(void) /* not deprecated internal version. */ +{ + return userDir; /* this is calculated in PHYSFS_init()... */ +} /* __PHYSFS_getUserDir */ + + +const char *PHYSFS_getUserDir(void) +{ + return __PHYSFS_getUserDir(); +} /* PHYSFS_getUserDir */ + + +const char *PHYSFS_getWriteDir(void) +{ + const char *retval = NULL; + + __PHYSFS_platformGrabMutex(stateLock); + if (writeDir != NULL) + retval = writeDir->dirName; + __PHYSFS_platformReleaseMutex(stateLock); + + return retval; +} /* PHYSFS_getWriteDir */ + + +int PHYSFS_setWriteDir(const char *newDir) +{ + int retval = 1; + + __PHYSFS_platformGrabMutex(stateLock); + + if (writeDir != NULL) + { + BAIL_IF_MACRO_MUTEX(!freeDirHandle(writeDir, openWriteList), ERRPASS, + stateLock, 0); + writeDir = NULL; + } /* if */ + + if (newDir != NULL) + { + /* !!! FIXME: PHYSFS_Io shouldn't be NULL */ + writeDir = createDirHandle(NULL, newDir, NULL, 1); + retval = (writeDir != NULL); + } /* if */ + + __PHYSFS_platformReleaseMutex(stateLock); + + return retval; +} /* PHYSFS_setWriteDir */ + + +static int doMount(PHYSFS_Io *io, const char *fname, + const char *mountPoint, int appendToPath) +{ + DirHandle *dh; + DirHandle *prev = NULL; + DirHandle *i; + + if (mountPoint == NULL) + mountPoint = "/"; + + __PHYSFS_platformGrabMutex(stateLock); + + if (fname != NULL) + { + for (i = searchPath; i != NULL; i = i->next) + { + /* already in search path? */ + if ((i->dirName != NULL) && (strcmp(fname, i->dirName) == 0)) + BAIL_MACRO_MUTEX(ERRPASS, stateLock, 1); + prev = i; + } /* for */ + } /* if */ + + dh = createDirHandle(io, fname, mountPoint, 0); + BAIL_IF_MACRO_MUTEX(!dh, ERRPASS, stateLock, 0); + + if (appendToPath) + { + if (prev == NULL) + searchPath = dh; + else + prev->next = dh; + } /* if */ + else + { + dh->next = searchPath; + searchPath = dh; + } /* else */ + + __PHYSFS_platformReleaseMutex(stateLock); + return 1; +} /* doMount */ + + +int PHYSFS_mountIo(PHYSFS_Io *io, const char *fname, + const char *mountPoint, int appendToPath) +{ + BAIL_IF_MACRO(!io, PHYSFS_ERR_INVALID_ARGUMENT, 0); + BAIL_IF_MACRO(io->version != 0, PHYSFS_ERR_UNSUPPORTED, 0); + return doMount(io, fname, mountPoint, appendToPath); +} /* PHYSFS_mountIo */ + + +int PHYSFS_mountMemory(const void *buf, PHYSFS_uint64 len, void (*del)(void *), + const char *fname, const char *mountPoint, + int appendToPath) +{ + int retval = 0; + PHYSFS_Io *io = NULL; + + BAIL_IF_MACRO(!buf, PHYSFS_ERR_INVALID_ARGUMENT, 0); + + io = __PHYSFS_createMemoryIo(buf, len, del); + BAIL_IF_MACRO(!io, ERRPASS, 0); + retval = doMount(io, fname, mountPoint, appendToPath); + if (!retval) + { + /* docs say not to call (del) in case of failure, so cheat. */ + MemoryIoInfo *info = (MemoryIoInfo *) io->opaque; + info->destruct = NULL; + io->destroy(io); + } /* if */ + + return retval; +} /* PHYSFS_mountMemory */ + + +int PHYSFS_mountHandle(PHYSFS_File *file, const char *fname, + const char *mountPoint, int appendToPath) +{ + int retval = 0; + PHYSFS_Io *io = NULL; + + BAIL_IF_MACRO(file == NULL, PHYSFS_ERR_INVALID_ARGUMENT, 0); + + io = __PHYSFS_createHandleIo(file); + BAIL_IF_MACRO(!io, ERRPASS, 0); + retval = doMount(io, fname, mountPoint, appendToPath); + if (!retval) + { + /* docs say not to destruct in case of failure, so cheat. */ + io->opaque = NULL; + io->destroy(io); + } /* if */ + + return retval; +} /* PHYSFS_mountHandle */ + + +int PHYSFS_mount(const char *newDir, const char *mountPoint, int appendToPath) +{ + BAIL_IF_MACRO(!newDir, PHYSFS_ERR_INVALID_ARGUMENT, 0); + return doMount(NULL, newDir, mountPoint, appendToPath); +} /* PHYSFS_mount */ + + +int PHYSFS_addToSearchPath(const char *newDir, int appendToPath) +{ + return doMount(NULL, newDir, NULL, appendToPath); +} /* PHYSFS_addToSearchPath */ + + +int PHYSFS_removeFromSearchPath(const char *oldDir) +{ + return PHYSFS_unmount(oldDir); +} /* PHYSFS_removeFromSearchPath */ + + +int PHYSFS_unmount(const char *oldDir) +{ + DirHandle *i; + DirHandle *prev = NULL; + DirHandle *next = NULL; + + BAIL_IF_MACRO(oldDir == NULL, PHYSFS_ERR_INVALID_ARGUMENT, 0); + + __PHYSFS_platformGrabMutex(stateLock); + for (i = searchPath; i != NULL; i = i->next) + { + if (strcmp(i->dirName, oldDir) == 0) + { + next = i->next; + BAIL_IF_MACRO_MUTEX(!freeDirHandle(i, openReadList), ERRPASS, + stateLock, 0); + + if (prev == NULL) + searchPath = next; + else + prev->next = next; + + BAIL_MACRO_MUTEX(ERRPASS, stateLock, 1); + } /* if */ + prev = i; + } /* for */ + + BAIL_MACRO_MUTEX(PHYSFS_ERR_NOT_MOUNTED, stateLock, 0); +} /* PHYSFS_unmount */ + + +char **PHYSFS_getSearchPath(void) +{ + return doEnumStringList(PHYSFS_getSearchPathCallback); +} /* PHYSFS_getSearchPath */ + + +const char *PHYSFS_getMountPoint(const char *dir) +{ + DirHandle *i; + __PHYSFS_platformGrabMutex(stateLock); + for (i = searchPath; i != NULL; i = i->next) + { + if (strcmp(i->dirName, dir) == 0) + { + const char *retval = ((i->mountPoint) ? i->mountPoint : "/"); + __PHYSFS_platformReleaseMutex(stateLock); + return retval; + } /* if */ + } /* for */ + __PHYSFS_platformReleaseMutex(stateLock); + + BAIL_MACRO(PHYSFS_ERR_NOT_MOUNTED, NULL); +} /* PHYSFS_getMountPoint */ + + +void PHYSFS_getSearchPathCallback(PHYSFS_StringCallback callback, void *data) +{ + DirHandle *i; + + __PHYSFS_platformGrabMutex(stateLock); + + for (i = searchPath; i != NULL; i = i->next) + callback(data, i->dirName); + + __PHYSFS_platformReleaseMutex(stateLock); +} /* PHYSFS_getSearchPathCallback */ + + +/* Split out to avoid stack allocation in a loop. */ +static void setSaneCfgAddPath(const char *i, const size_t l, const char *dirsep, + int archivesFirst) +{ + const char *d = PHYSFS_getRealDir(i); + const size_t allocsize = strlen(d) + strlen(dirsep) + l + 1; + char *str = (char *) __PHYSFS_smallAlloc(allocsize); + if (str != NULL) + { + sprintf(str, "%s%s%s", d, dirsep, i); + PHYSFS_mount(str, NULL, archivesFirst == 0); + __PHYSFS_smallFree(str); + } /* if */ +} /* setSaneCfgAddPath */ + + +int PHYSFS_setSaneConfig(const char *organization, const char *appName, + const char *archiveExt, int includeCdRoms, + int archivesFirst) +{ + const char *dirsep = PHYSFS_getDirSeparator(); + const char *basedir; + const char *prefdir; + + BAIL_IF_MACRO(!initialized, PHYSFS_ERR_NOT_INITIALIZED, 0); + + prefdir = PHYSFS_getPrefDir(organization, appName); + BAIL_IF_MACRO(!prefdir, ERRPASS, 0); + + basedir = PHYSFS_getBaseDir(); + BAIL_IF_MACRO(!basedir, ERRPASS, 0); + + BAIL_IF_MACRO(!PHYSFS_setWriteDir(prefdir), PHYSFS_ERR_NO_WRITE_DIR, 0); + + /* Put write dir first in search path... */ + PHYSFS_mount(prefdir, NULL, 0); + + /* Put base path on search path... */ + PHYSFS_mount(basedir, NULL, 1); + + /* handle CD-ROMs... */ + if (includeCdRoms) + { + char **cds = PHYSFS_getCdRomDirs(); + char **i; + for (i = cds; *i != NULL; i++) + PHYSFS_mount(*i, NULL, 1); + PHYSFS_freeList(cds); + } /* if */ + + /* Root out archives, and add them to search path... */ + if (archiveExt != NULL) + { + char **rc = PHYSFS_enumerateFiles("/"); + char **i; + size_t extlen = strlen(archiveExt); + char *ext; + + for (i = rc; *i != NULL; i++) + { + size_t l = strlen(*i); + if ((l > extlen) && ((*i)[l - extlen - 1] == '.')) + { + ext = (*i) + (l - extlen); + if (__PHYSFS_utf8stricmp(ext, archiveExt) == 0) + setSaneCfgAddPath(*i, l, dirsep, archivesFirst); + } /* if */ + } /* for */ + + PHYSFS_freeList(rc); + } /* if */ + + return 1; +} /* PHYSFS_setSaneConfig */ + + +void PHYSFS_permitSymbolicLinks(int allow) +{ + allowSymLinks = allow; +} /* PHYSFS_permitSymbolicLinks */ + + +int PHYSFS_symbolicLinksPermitted(void) +{ + return allowSymLinks; +} /* PHYSFS_symbolicLinksPermitted */ + + +/* + * Verify that (fname) (in platform-independent notation), in relation + * to (h) is secure. That means that each element of fname is checked + * for symlinks (if they aren't permitted). This also allows for quick + * rejection of files that exist outside an archive's mountpoint. + * + * With some exceptions (like PHYSFS_mkdir(), which builds multiple subdirs + * at a time), you should always pass zero for "allowMissing" for efficiency. + * + * (fname) must point to an output from sanitizePlatformIndependentPath(), + * since it will make sure that path names are in the right format for + * passing certain checks. It will also do checks for "insecure" pathnames + * like ".." which should be done once instead of once per archive. This also + * gives us license to treat (fname) as scratch space in this function. + * + * Returns non-zero if string is safe, zero if there's a security issue. + * PHYSFS_getLastError() will specify what was wrong. (*fname) will be + * updated to point past any mount point elements so it is prepared to + * be used with the archiver directly. + */ +static int verifyPath(DirHandle *h, char **_fname, int allowMissing) +{ + char *fname = *_fname; + int retval = 1; + char *start; + char *end; + + if (*fname == '\0') /* quick rejection. */ + return 1; + + /* !!! FIXME: This codeblock sucks. */ + if (h->mountPoint != NULL) /* NULL mountpoint means "/". */ + { + size_t mntpntlen = strlen(h->mountPoint); + size_t len = strlen(fname); + assert(mntpntlen > 1); /* root mount points should be NULL. */ + /* not under the mountpoint, so skip this archive. */ + BAIL_IF_MACRO(len < mntpntlen-1, PHYSFS_ERR_NOT_FOUND, 0); + /* !!! FIXME: Case insensitive? */ + retval = strncmp(h->mountPoint, fname, mntpntlen-1); + BAIL_IF_MACRO(retval != 0, PHYSFS_ERR_NOT_FOUND, 0); + if (len > mntpntlen-1) /* corner case... */ + BAIL_IF_MACRO(fname[mntpntlen-1]!='/', PHYSFS_ERR_NOT_FOUND, 0); + fname += mntpntlen-1; /* move to start of actual archive path. */ + if (*fname == '/') + fname++; + *_fname = fname; /* skip mountpoint for later use. */ + retval = 1; /* may be reset, below. */ + } /* if */ + + start = fname; + if (!allowSymLinks) + { + while (1) + { + PHYSFS_Stat statbuf; + int rc = 0; + end = strchr(start, '/'); + + if (end != NULL) *end = '\0'; + rc = h->funcs->stat(h->opaque, fname, &statbuf); + if (rc) + rc = (statbuf.filetype == PHYSFS_FILETYPE_SYMLINK); + else if (currentErrorCode() == PHYSFS_ERR_NOT_FOUND) + retval = 0; + + if (end != NULL) *end = '/'; + + /* insecure path (has a disallowed symlink in it)? */ + BAIL_IF_MACRO(rc, PHYSFS_ERR_SYMLINK_FORBIDDEN, 0); + + /* break out early if path element is missing. */ + if (!retval) + { + /* + * We need to clear it if it's the last element of the path, + * since this might be a non-existant file we're opening + * for writing... + */ + if ((end == NULL) || (allowMissing)) + retval = 1; + break; + } /* if */ + + if (end == NULL) + break; + + start = end + 1; + } /* while */ + } /* if */ + + return retval; +} /* verifyPath */ + + +static int doMkdir(const char *_dname, char *dname) +{ + DirHandle *h; + char *start; + char *end; + int retval = 0; + int exists = 1; /* force existance check on first path element. */ + + BAIL_IF_MACRO(!sanitizePlatformIndependentPath(_dname, dname), ERRPASS, 0); + + __PHYSFS_platformGrabMutex(stateLock); + BAIL_IF_MACRO_MUTEX(!writeDir, PHYSFS_ERR_NO_WRITE_DIR, stateLock, 0); + h = writeDir; + BAIL_IF_MACRO_MUTEX(!verifyPath(h, &dname, 1), ERRPASS, stateLock, 0); + + start = dname; + while (1) + { + end = strchr(start, '/'); + if (end != NULL) + *end = '\0'; + + /* only check for existance if all parent dirs existed, too... */ + if (exists) + { + PHYSFS_Stat statbuf; + const int rc = h->funcs->stat(h->opaque, dname, &statbuf); + if ((!rc) && (currentErrorCode() == PHYSFS_ERR_NOT_FOUND)) + exists = 0; + retval = ((rc) && (statbuf.filetype == PHYSFS_FILETYPE_DIRECTORY)); + } /* if */ + + if (!exists) + retval = h->funcs->mkdir(h->opaque, dname); + + if (!retval) + break; + + if (end == NULL) + break; + + *end = '/'; + start = end + 1; + } /* while */ + + __PHYSFS_platformReleaseMutex(stateLock); + return retval; +} /* doMkdir */ + + +int PHYSFS_mkdir(const char *_dname) +{ + int retval = 0; + char *dname; + size_t len; + + BAIL_IF_MACRO(!_dname, PHYSFS_ERR_INVALID_ARGUMENT, 0); + len = strlen(_dname) + 1; + dname = (char *) __PHYSFS_smallAlloc(len); + BAIL_IF_MACRO(!dname, PHYSFS_ERR_OUT_OF_MEMORY, 0); + retval = doMkdir(_dname, dname); + __PHYSFS_smallFree(dname); + return retval; +} /* PHYSFS_mkdir */ + + +static int doDelete(const char *_fname, char *fname) +{ + int retval; + DirHandle *h; + BAIL_IF_MACRO(!sanitizePlatformIndependentPath(_fname, fname), ERRPASS, 0); + + __PHYSFS_platformGrabMutex(stateLock); + + BAIL_IF_MACRO_MUTEX(!writeDir, PHYSFS_ERR_NO_WRITE_DIR, stateLock, 0); + h = writeDir; + BAIL_IF_MACRO_MUTEX(!verifyPath(h, &fname, 0), ERRPASS, stateLock, 0); + retval = h->funcs->remove(h->opaque, fname); + + __PHYSFS_platformReleaseMutex(stateLock); + return retval; +} /* doDelete */ + + +int PHYSFS_delete(const char *_fname) +{ + int retval; + char *fname; + size_t len; + + BAIL_IF_MACRO(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, 0); + len = strlen(_fname) + 1; + fname = (char *) __PHYSFS_smallAlloc(len); + BAIL_IF_MACRO(!fname, PHYSFS_ERR_OUT_OF_MEMORY, 0); + retval = doDelete(_fname, fname); + __PHYSFS_smallFree(fname); + return retval; +} /* PHYSFS_delete */ + + +const char *PHYSFS_getRealDir(const char *_fname) +{ + const char *retval = NULL; + char *fname = NULL; + size_t len; + + BAIL_IF_MACRO(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, NULL); + len = strlen(_fname) + 1; + fname = __PHYSFS_smallAlloc(len); + BAIL_IF_MACRO(!fname, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + if (sanitizePlatformIndependentPath(_fname, fname)) + { + DirHandle *i; + __PHYSFS_platformGrabMutex(stateLock); + for (i = searchPath; i != NULL; i = i->next) + { + char *arcfname = fname; + if (partOfMountPoint(i, arcfname)) + { + retval = i->dirName; + break; + } /* if */ + else if (verifyPath(i, &arcfname, 0)) + { + PHYSFS_Stat statbuf; + if (i->funcs->stat(i->opaque, arcfname, &statbuf)) + { + retval = i->dirName; + break; + } /* if */ + } /* if */ + } /* for */ + __PHYSFS_platformReleaseMutex(stateLock); + } /* if */ + + __PHYSFS_smallFree(fname); + return retval; +} /* PHYSFS_getRealDir */ + + +static int locateInStringList(const char *str, + char **list, + PHYSFS_uint32 *pos) +{ + PHYSFS_uint32 len = *pos; + PHYSFS_uint32 half_len; + PHYSFS_uint32 lo = 0; + PHYSFS_uint32 middle; + int cmp; + + while (len > 0) + { + half_len = len >> 1; + middle = lo + half_len; + cmp = strcmp(list[middle], str); + + if (cmp == 0) /* it's in the list already. */ + return 1; + else if (cmp > 0) + len = half_len; + else + { + lo = middle + 1; + len -= half_len + 1; + } /* else */ + } /* while */ + + *pos = lo; + return 0; +} /* locateInStringList */ + + +static void enumFilesCallback(void *data, const char *origdir, const char *str) +{ + PHYSFS_uint32 pos; + void *ptr; + char *newstr; + EnumStringListCallbackData *pecd = (EnumStringListCallbackData *) data; + + /* + * See if file is in the list already, and if not, insert it in there + * alphabetically... + */ + pos = pecd->size; + if (locateInStringList(str, pecd->list, &pos)) + return; /* already in the list. */ + + ptr = allocator.Realloc(pecd->list, (pecd->size + 2) * sizeof (char *)); + newstr = (char *) allocator.Malloc(strlen(str) + 1); + if (ptr != NULL) + pecd->list = (char **) ptr; + + if ((ptr == NULL) || (newstr == NULL)) + return; /* better luck next time. */ + + strcpy(newstr, str); + + if (pos != pecd->size) + { + memmove(&pecd->list[pos+1], &pecd->list[pos], + sizeof (char *) * ((pecd->size) - pos)); + } /* if */ + + pecd->list[pos] = newstr; + pecd->size++; +} /* enumFilesCallback */ + + +char **PHYSFS_enumerateFiles(const char *path) +{ + EnumStringListCallbackData ecd; + memset(&ecd, '\0', sizeof (ecd)); + ecd.list = (char **) allocator.Malloc(sizeof (char *)); + BAIL_IF_MACRO(!ecd.list, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + PHYSFS_enumerateFilesCallback(path, enumFilesCallback, &ecd); + ecd.list[ecd.size] = NULL; + return ecd.list; +} /* PHYSFS_enumerateFiles */ + + +/* + * Broke out to seperate function so we can use stack allocation gratuitously. + */ +static void enumerateFromMountPoint(DirHandle *i, const char *arcfname, + PHYSFS_EnumFilesCallback callback, + const char *_fname, void *data) +{ + const size_t len = strlen(arcfname); + char *ptr = NULL; + char *end = NULL; + const size_t slen = strlen(i->mountPoint) + 1; + char *mountPoint = (char *) __PHYSFS_smallAlloc(slen); + + if (mountPoint == NULL) + return; /* oh well. */ + + strcpy(mountPoint, i->mountPoint); + ptr = mountPoint + ((len) ? len + 1 : 0); + end = strchr(ptr, '/'); + assert(end); /* should always find a terminating '/'. */ + *end = '\0'; + callback(data, _fname, ptr); + __PHYSFS_smallFree(mountPoint); +} /* enumerateFromMountPoint */ + + +typedef struct SymlinkFilterData +{ + PHYSFS_EnumFilesCallback callback; + void *callbackData; + DirHandle *dirhandle; +} SymlinkFilterData; + +static void enumCallbackFilterSymLinks(void *_data, const char *origdir, + const char *fname) +{ + const char *trimmedDir = (*origdir == '/') ? (origdir+1) : origdir; + const size_t slen = strlen(trimmedDir) + strlen(fname) + 2; + char *path = (char *) __PHYSFS_smallAlloc(slen); + + if (path != NULL) + { + SymlinkFilterData *data = (SymlinkFilterData *) _data; + const DirHandle *dh = data->dirhandle; + PHYSFS_Stat statbuf; + + sprintf(path, "%s%s%s", trimmedDir, *trimmedDir ? "/" : "", fname); + if (dh->funcs->stat(dh->opaque, path, &statbuf)) + { + /* Pass it on to the application if it's not a symlink. */ + if (statbuf.filetype != PHYSFS_FILETYPE_SYMLINK) + data->callback(data->callbackData, origdir, fname); + } /* if */ + + __PHYSFS_smallFree(path); + } /* if */ +} /* enumCallbackFilterSymLinks */ + + +/* !!! FIXME: this should report error conditions. */ +void PHYSFS_enumerateFilesCallback(const char *_fname, + PHYSFS_EnumFilesCallback callback, + void *data) +{ + size_t len; + char *fname; + + BAIL_IF_MACRO(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, ) /*0*/; + BAIL_IF_MACRO(!callback, PHYSFS_ERR_INVALID_ARGUMENT, ) /*0*/; + + len = strlen(_fname) + 1; + fname = (char *) __PHYSFS_smallAlloc(len); + BAIL_IF_MACRO(!fname, PHYSFS_ERR_OUT_OF_MEMORY, ) /*0*/; + + if (sanitizePlatformIndependentPath(_fname, fname)) + { + DirHandle *i; + SymlinkFilterData filterdata; + + __PHYSFS_platformGrabMutex(stateLock); + + if (!allowSymLinks) + { + memset(&filterdata, '\0', sizeof (filterdata)); + filterdata.callback = callback; + filterdata.callbackData = data; + } /* if */ + + for (i = searchPath; i != NULL; i = i->next) + { + char *arcfname = fname; + if (partOfMountPoint(i, arcfname)) + enumerateFromMountPoint(i, arcfname, callback, _fname, data); + + else if (verifyPath(i, &arcfname, 0)) + { + if ((!allowSymLinks) && (i->funcs->info.supportsSymlinks)) + { + filterdata.dirhandle = i; + i->funcs->enumerateFiles(i->opaque, arcfname, + enumCallbackFilterSymLinks, + _fname, &filterdata); + } /* if */ + else + { + i->funcs->enumerateFiles(i->opaque, arcfname, + callback, _fname, data); + } /* else */ + } /* else if */ + } /* for */ + __PHYSFS_platformReleaseMutex(stateLock); + } /* if */ + + __PHYSFS_smallFree(fname); +} /* PHYSFS_enumerateFilesCallback */ + + +int PHYSFS_exists(const char *fname) +{ + return (PHYSFS_getRealDir(fname) != NULL); +} /* PHYSFS_exists */ + + +PHYSFS_sint64 PHYSFS_getLastModTime(const char *fname) +{ + PHYSFS_Stat statbuf; + BAIL_IF_MACRO(!PHYSFS_stat(fname, &statbuf), ERRPASS, -1); + return statbuf.modtime; +} /* PHYSFS_getLastModTime */ + + +int PHYSFS_isDirectory(const char *fname) +{ + PHYSFS_Stat statbuf; + BAIL_IF_MACRO(!PHYSFS_stat(fname, &statbuf), ERRPASS, 0); + return (statbuf.filetype == PHYSFS_FILETYPE_DIRECTORY); +} /* PHYSFS_isDirectory */ + + +int PHYSFS_isSymbolicLink(const char *fname) +{ + PHYSFS_Stat statbuf; + BAIL_IF_MACRO(!PHYSFS_stat(fname, &statbuf), ERRPASS, 0); + return (statbuf.filetype == PHYSFS_FILETYPE_SYMLINK); +} /* PHYSFS_isSymbolicLink */ + + +static PHYSFS_File *doOpenWrite(const char *_fname, int appending) +{ + FileHandle *fh = NULL; + size_t len; + char *fname; + + BAIL_IF_MACRO(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, 0); + len = strlen(_fname) + 1; + fname = (char *) __PHYSFS_smallAlloc(len); + BAIL_IF_MACRO(!fname, PHYSFS_ERR_OUT_OF_MEMORY, 0); + + if (sanitizePlatformIndependentPath(_fname, fname)) + { + PHYSFS_Io *io = NULL; + DirHandle *h = NULL; + const PHYSFS_Archiver *f; + + __PHYSFS_platformGrabMutex(stateLock); + + GOTO_IF_MACRO(!writeDir, PHYSFS_ERR_NO_WRITE_DIR, doOpenWriteEnd); + + h = writeDir; + GOTO_IF_MACRO(!verifyPath(h, &fname, 0), ERRPASS, doOpenWriteEnd); + + f = h->funcs; + if (appending) + io = f->openAppend(h->opaque, fname); + else + io = f->openWrite(h->opaque, fname); + + GOTO_IF_MACRO(!io, ERRPASS, doOpenWriteEnd); + + fh = (FileHandle *) allocator.Malloc(sizeof (FileHandle)); + if (fh == NULL) + { + io->destroy(io); + GOTO_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, doOpenWriteEnd); + } /* if */ + else + { + memset(fh, '\0', sizeof (FileHandle)); + fh->io = io; + fh->dirHandle = h; + fh->next = openWriteList; + openWriteList = fh; + } /* else */ + + doOpenWriteEnd: + __PHYSFS_platformReleaseMutex(stateLock); + } /* if */ + + __PHYSFS_smallFree(fname); + return ((PHYSFS_File *) fh); +} /* doOpenWrite */ + + +PHYSFS_File *PHYSFS_openWrite(const char *filename) +{ + return doOpenWrite(filename, 0); +} /* PHYSFS_openWrite */ + + +PHYSFS_File *PHYSFS_openAppend(const char *filename) +{ + return doOpenWrite(filename, 1); +} /* PHYSFS_openAppend */ + + +PHYSFS_File *PHYSFS_openRead(const char *_fname) +{ + FileHandle *fh = NULL; + char *fname; + size_t len; + + BAIL_IF_MACRO(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, 0); + len = strlen(_fname) + 1; + fname = (char *) __PHYSFS_smallAlloc(len); + BAIL_IF_MACRO(!fname, PHYSFS_ERR_OUT_OF_MEMORY, 0); + + if (sanitizePlatformIndependentPath(_fname, fname)) + { + DirHandle *i = NULL; + PHYSFS_Io *io = NULL; + + __PHYSFS_platformGrabMutex(stateLock); + + GOTO_IF_MACRO(!searchPath, PHYSFS_ERR_NOT_FOUND, openReadEnd); + + for (i = searchPath; i != NULL; i = i->next) + { + char *arcfname = fname; + if (verifyPath(i, &arcfname, 0)) + { + io = i->funcs->openRead(i->opaque, arcfname); + if (io) + break; + } /* if */ + } /* for */ + + GOTO_IF_MACRO(!io, ERRPASS, openReadEnd); + + fh = (FileHandle *) allocator.Malloc(sizeof (FileHandle)); + if (fh == NULL) + { + io->destroy(io); + GOTO_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, openReadEnd); + } /* if */ + + memset(fh, '\0', sizeof (FileHandle)); + fh->io = io; + fh->forReading = 1; + fh->dirHandle = i; + fh->next = openReadList; + openReadList = fh; + + openReadEnd: + __PHYSFS_platformReleaseMutex(stateLock); + } /* if */ + + __PHYSFS_smallFree(fname); + return ((PHYSFS_File *) fh); +} /* PHYSFS_openRead */ + + +static int closeHandleInOpenList(FileHandle **list, FileHandle *handle) +{ + FileHandle *prev = NULL; + FileHandle *i; + int rc = 1; + + for (i = *list; i != NULL; i = i->next) + { + if (i == handle) /* handle is in this list? */ + { + PHYSFS_Io *io = handle->io; + PHYSFS_uint8 *tmp = handle->buffer; + rc = PHYSFS_flush((PHYSFS_File *) handle); + if (!rc) + return -1; + io->destroy(io); + + if (tmp != NULL) /* free any associated buffer. */ + allocator.Free(tmp); + + if (prev == NULL) + *list = handle->next; + else + prev->next = handle->next; + + allocator.Free(handle); + return 1; + } /* if */ + prev = i; + } /* for */ + + return 0; +} /* closeHandleInOpenList */ + + +int PHYSFS_close(PHYSFS_File *_handle) +{ + FileHandle *handle = (FileHandle *) _handle; + int rc; + + __PHYSFS_platformGrabMutex(stateLock); + + /* -1 == close failure. 0 == not found. 1 == success. */ + rc = closeHandleInOpenList(&openReadList, handle); + BAIL_IF_MACRO_MUTEX(rc == -1, ERRPASS, stateLock, 0); + if (!rc) + { + rc = closeHandleInOpenList(&openWriteList, handle); + BAIL_IF_MACRO_MUTEX(rc == -1, ERRPASS, stateLock, 0); + } /* if */ + + __PHYSFS_platformReleaseMutex(stateLock); + BAIL_IF_MACRO(!rc, PHYSFS_ERR_INVALID_ARGUMENT, 0); + return 1; +} /* PHYSFS_close */ + + +static PHYSFS_sint64 doBufferedRead(FileHandle *fh, void *buffer, + PHYSFS_uint64 len) +{ + PHYSFS_Io *io = NULL; + PHYSFS_sint64 retval = 0; + PHYSFS_uint32 buffered = 0; + PHYSFS_sint64 rc = 0; + + if (len == 0) + return 0; + + buffered = fh->buffill - fh->bufpos; + if (buffered >= len) /* totally in the buffer, just copy and return! */ + { + memcpy(buffer, fh->buffer + fh->bufpos, (size_t) len); + fh->bufpos += (PHYSFS_uint32) len; + return (PHYSFS_sint64) len; + } /* else if */ + + if (buffered > 0) /* partially in the buffer... */ + { + memcpy(buffer, fh->buffer + fh->bufpos, (size_t) buffered); + buffer = ((PHYSFS_uint8 *) buffer) + buffered; + len -= buffered; + retval = buffered; + fh->buffill = fh->bufpos = 0; + } /* if */ + + /* if you got here, the buffer is drained and we still need bytes. */ + assert(len > 0); + + io = fh->io; + if (len >= fh->bufsize) /* need more than the buffer takes. */ + { + /* leave buffer empty, go right to output instead. */ + rc = io->read(io, buffer, len); + if (rc < 0) + return ((retval == 0) ? rc : retval); + return retval + rc; + } /* if */ + + /* need less than buffer can take. Fill buffer. */ + rc = io->read(io, fh->buffer, fh->bufsize); + if (rc < 0) + return ((retval == 0) ? rc : retval); + + assert(fh->bufpos == 0); + fh->buffill = (PHYSFS_uint32) rc; + rc = doBufferedRead(fh, buffer, len); /* go from the start, again. */ + if (rc < 0) + return ((retval == 0) ? rc : retval); + + return retval + rc; +} /* doBufferedRead */ + + +PHYSFS_sint64 PHYSFS_read(PHYSFS_File *handle, void *buffer, + PHYSFS_uint32 size, PHYSFS_uint32 count) +{ + const PHYSFS_uint64 len = ((PHYSFS_uint64) size) * ((PHYSFS_uint64) count); + const PHYSFS_sint64 retval = PHYSFS_readBytes(handle, buffer, len); + return ( (retval <= 0) ? retval : (retval / ((PHYSFS_sint64) size)) ); +} /* PHYSFS_read */ + + +PHYSFS_sint64 PHYSFS_readBytes(PHYSFS_File *handle, void *buffer, + PHYSFS_uint64 len) +{ + FileHandle *fh = (FileHandle *) handle; + +#ifdef PHYSFS_NO_64BIT_SUPPORT + const PHYSFS_uint64 maxlen = __PHYSFS_UI64(0x7FFFFFFF); +#else + const PHYSFS_uint64 maxlen = __PHYSFS_UI64(0x7FFFFFFFFFFFFFFF); +#endif + + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL_MACRO(PHYSFS_ERR_INVALID_ARGUMENT, -1); + + BAIL_IF_MACRO(len > maxlen, PHYSFS_ERR_INVALID_ARGUMENT, -1); + BAIL_IF_MACRO(!fh->forReading, PHYSFS_ERR_OPEN_FOR_WRITING, -1); + BAIL_IF_MACRO(len == 0, ERRPASS, 0); + if (fh->buffer) + return doBufferedRead(fh, buffer, len); + + return fh->io->read(fh->io, buffer, len); +} /* PHYSFS_readBytes */ + + +static PHYSFS_sint64 doBufferedWrite(PHYSFS_File *handle, const void *buffer, + PHYSFS_uint64 len) +{ + FileHandle *fh = (FileHandle *) handle; + + /* whole thing fits in the buffer? */ + if ( (((PHYSFS_uint64) fh->buffill) + len) < fh->bufsize ) + { + memcpy(fh->buffer + fh->buffill, buffer, (size_t) len); + fh->buffill += (PHYSFS_uint32) len; + return (PHYSFS_sint64) len; + } /* if */ + + /* would overflow buffer. Flush and then write the new objects, too. */ + BAIL_IF_MACRO(!PHYSFS_flush(handle), ERRPASS, -1); + return fh->io->write(fh->io, buffer, len); +} /* doBufferedWrite */ + + +PHYSFS_sint64 PHYSFS_write(PHYSFS_File *handle, const void *buffer, + PHYSFS_uint32 size, PHYSFS_uint32 count) +{ + const PHYSFS_uint64 len = ((PHYSFS_uint64) size) * ((PHYSFS_uint64) count); + const PHYSFS_sint64 retval = PHYSFS_writeBytes(handle, buffer, len); + return ( (retval <= 0) ? retval : (retval / ((PHYSFS_sint64) size)) ); +} /* PHYSFS_write */ + + +PHYSFS_sint64 PHYSFS_writeBytes(PHYSFS_File *handle, const void *buffer, + PHYSFS_uint64 len) +{ + FileHandle *fh = (FileHandle *) handle; + +#ifdef PHYSFS_NO_64BIT_SUPPORT + const PHYSFS_uint64 maxlen = __PHYSFS_UI64(0x7FFFFFFF); +#else + const PHYSFS_uint64 maxlen = __PHYSFS_UI64(0x7FFFFFFFFFFFFFFF); +#endif + + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL_MACRO(PHYSFS_ERR_INVALID_ARGUMENT, -1); + + BAIL_IF_MACRO(len > maxlen, PHYSFS_ERR_INVALID_ARGUMENT, -1); + BAIL_IF_MACRO(fh->forReading, PHYSFS_ERR_OPEN_FOR_READING, -1); + BAIL_IF_MACRO(len == 0, ERRPASS, 0); + if (fh->buffer) + return doBufferedWrite(handle, buffer, len); + + return fh->io->write(fh->io, buffer, len); +} /* PHYSFS_write */ + + +int PHYSFS_eof(PHYSFS_File *handle) +{ + FileHandle *fh = (FileHandle *) handle; + + if (!fh->forReading) /* never EOF on files opened for write/append. */ + return 0; + + /* can't be eof if buffer isn't empty */ + if (fh->bufpos == fh->buffill) + { + /* check the Io. */ + PHYSFS_Io *io = fh->io; + const PHYSFS_sint64 pos = io->tell(io); + const PHYSFS_sint64 len = io->length(io); + if ((pos < 0) || (len < 0)) + return 0; /* beats me. */ + return (pos >= len); + } /* if */ + + return 0; +} /* PHYSFS_eof */ + + +PHYSFS_sint64 PHYSFS_tell(PHYSFS_File *handle) +{ + FileHandle *fh = (FileHandle *) handle; + const PHYSFS_sint64 pos = fh->io->tell(fh->io); + const PHYSFS_sint64 retval = fh->forReading ? + (pos - fh->buffill) + fh->bufpos : + (pos + fh->buffill); + return retval; +} /* PHYSFS_tell */ + + +int PHYSFS_seek(PHYSFS_File *handle, PHYSFS_uint64 pos) +{ + FileHandle *fh = (FileHandle *) handle; + BAIL_IF_MACRO(!PHYSFS_flush(handle), ERRPASS, 0); + + if (fh->buffer && fh->forReading) + { + /* avoid throwing away our precious buffer if seeking within it. */ + PHYSFS_sint64 offset = pos - PHYSFS_tell(handle); + if ( /* seeking within the already-buffered range? */ + ((offset >= 0) && (offset <= fh->buffill - fh->bufpos)) /* fwd */ + || ((offset < 0) && (-offset <= fh->bufpos)) /* backward */ ) + { + fh->bufpos += (PHYSFS_uint32) offset; + return 1; /* successful seek */ + } /* if */ + } /* if */ + + /* we have to fall back to a 'raw' seek. */ + fh->buffill = fh->bufpos = 0; + return fh->io->seek(fh->io, pos); +} /* PHYSFS_seek */ + + +PHYSFS_sint64 PHYSFS_fileLength(PHYSFS_File *handle) +{ + PHYSFS_Io *io = ((FileHandle *) handle)->io; + return io->length(io); +} /* PHYSFS_filelength */ + + +int PHYSFS_setBuffer(PHYSFS_File *handle, PHYSFS_uint64 _bufsize) +{ + FileHandle *fh = (FileHandle *) handle; + PHYSFS_uint32 bufsize; + + /* !!! FIXME: actually, why use 32 bits here? */ + /*BAIL_IF_MACRO(_bufsize > 0xFFFFFFFF, "buffer must fit in 32-bits", 0);*/ + BAIL_IF_MACRO(_bufsize > 0xFFFFFFFF, PHYSFS_ERR_INVALID_ARGUMENT, 0); + bufsize = (PHYSFS_uint32) _bufsize; + + BAIL_IF_MACRO(!PHYSFS_flush(handle), ERRPASS, 0); + + /* + * For reads, we need to move the file pointer to where it would be + * if we weren't buffering, so that the next read will get the + * right chunk of stuff from the file. PHYSFS_flush() handles writes. + */ + if ((fh->forReading) && (fh->buffill != fh->bufpos)) + { + PHYSFS_uint64 pos; + const PHYSFS_sint64 curpos = fh->io->tell(fh->io); + BAIL_IF_MACRO(curpos == -1, ERRPASS, 0); + pos = ((curpos - fh->buffill) + fh->bufpos); + BAIL_IF_MACRO(!fh->io->seek(fh->io, pos), ERRPASS, 0); + } /* if */ + + if (bufsize == 0) /* delete existing buffer. */ + { + if (fh->buffer) + { + allocator.Free(fh->buffer); + fh->buffer = NULL; + } /* if */ + } /* if */ + + else + { + PHYSFS_uint8 *newbuf; + newbuf = (PHYSFS_uint8 *) allocator.Realloc(fh->buffer, bufsize); + BAIL_IF_MACRO(!newbuf, PHYSFS_ERR_OUT_OF_MEMORY, 0); + fh->buffer = newbuf; + } /* else */ + + fh->bufsize = bufsize; + fh->buffill = fh->bufpos = 0; + return 1; +} /* PHYSFS_setBuffer */ + + +int PHYSFS_flush(PHYSFS_File *handle) +{ + FileHandle *fh = (FileHandle *) handle; + PHYSFS_Io *io; + PHYSFS_sint64 rc; + + if ((fh->forReading) || (fh->bufpos == fh->buffill)) + return 1; /* open for read or buffer empty are successful no-ops. */ + + /* dump buffer to disk. */ + io = fh->io; + rc = io->write(io, fh->buffer + fh->bufpos, fh->buffill - fh->bufpos); + BAIL_IF_MACRO(rc <= 0, ERRPASS, 0); + fh->bufpos = fh->buffill = 0; + return io->flush(io); +} /* PHYSFS_flush */ + + +int PHYSFS_stat(const char *_fname, PHYSFS_Stat *stat) +{ + int retval = 0; + char *fname; + size_t len; + + BAIL_IF_MACRO(!_fname, PHYSFS_ERR_INVALID_ARGUMENT, -1); + BAIL_IF_MACRO(!stat, PHYSFS_ERR_INVALID_ARGUMENT, -1); + len = strlen(_fname) + 1; + fname = (char *) __PHYSFS_smallAlloc(len); + BAIL_IF_MACRO(!fname, PHYSFS_ERR_OUT_OF_MEMORY, -1); + + /* set some sane defaults... */ + stat->filesize = -1; + stat->modtime = -1; + stat->createtime = -1; + stat->accesstime = -1; + stat->filetype = PHYSFS_FILETYPE_OTHER; + stat->readonly = 1; /* !!! FIXME */ + + if (sanitizePlatformIndependentPath(_fname, fname)) + { + if (*fname == '\0') + { + stat->filetype = PHYSFS_FILETYPE_DIRECTORY; + stat->readonly = !writeDir; /* Writeable if we have a writeDir */ + retval = 1; + } /* if */ + else + { + DirHandle *i; + int exists = 0; + __PHYSFS_platformGrabMutex(stateLock); + for (i = searchPath; ((i != NULL) && (!exists)); i = i->next) + { + char *arcfname = fname; + exists = partOfMountPoint(i, arcfname); + if (exists) + { + stat->filetype = PHYSFS_FILETYPE_DIRECTORY; + stat->readonly = 1; /* !!! FIXME */ + retval = 1; + } /* if */ + else if (verifyPath(i, &arcfname, 0)) + { + /* !!! FIXME: this test is wrong and should be elsewhere. */ + stat->readonly = !(writeDir && + (strcmp(writeDir->dirName, i->dirName) == 0)); + retval = i->funcs->stat(i->opaque, arcfname, stat); + if ((retval) || (currentErrorCode() != PHYSFS_ERR_NOT_FOUND)) + exists = 1; + } /* else if */ + } /* for */ + __PHYSFS_platformReleaseMutex(stateLock); + } /* else */ + } /* if */ + + __PHYSFS_smallFree(fname); + return retval; +} /* PHYSFS_stat */ + + +int __PHYSFS_readAll(PHYSFS_Io *io, void *buf, const PHYSFS_uint64 len) +{ + return (io->read(io, buf, len) == len); +} /* __PHYSFS_readAll */ + + +void *__PHYSFS_initSmallAlloc(void *ptr, PHYSFS_uint64 len) +{ + void *useHeap = ((ptr == NULL) ? ((void *) 1) : ((void *) 0)); + if (useHeap) /* too large for stack allocation or alloca() failed. */ + ptr = allocator.Malloc(len+sizeof (void *)); + + if (ptr != NULL) + { + void **retval = (void **) ptr; + /*printf("%s alloc'd (%d) bytes at (%p).\n", + useHeap ? "heap" : "stack", (int) len, ptr);*/ + *retval = useHeap; + return retval + 1; + } /* if */ + + return NULL; /* allocation failed. */ +} /* __PHYSFS_initSmallAlloc */ + + +void __PHYSFS_smallFree(void *ptr) +{ + if (ptr != NULL) + { + void **block = ((void **) ptr) - 1; + const int useHeap = (*block != 0); + if (useHeap) + allocator.Free(block); + /*printf("%s free'd (%p).\n", useHeap ? "heap" : "stack", block);*/ + } /* if */ +} /* __PHYSFS_smallFree */ + + +int PHYSFS_setAllocator(const PHYSFS_Allocator *a) +{ + BAIL_IF_MACRO(initialized, PHYSFS_ERR_IS_INITIALIZED, 0); + externalAllocator = (a != NULL); + if (externalAllocator) + memcpy(&allocator, a, sizeof (PHYSFS_Allocator)); + + return 1; +} /* PHYSFS_setAllocator */ + + +const PHYSFS_Allocator *PHYSFS_getAllocator(void) +{ + BAIL_IF_MACRO(!initialized, PHYSFS_ERR_NOT_INITIALIZED, NULL); + return &allocator; +} /* PHYSFS_getAllocator */ + + +static void *mallocAllocatorMalloc(PHYSFS_uint64 s) +{ + if (!__PHYSFS_ui64FitsAddressSpace(s)) + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + #undef malloc + return malloc((size_t) s); +} /* mallocAllocatorMalloc */ + + +static void *mallocAllocatorRealloc(void *ptr, PHYSFS_uint64 s) +{ + if (!__PHYSFS_ui64FitsAddressSpace(s)) + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + #undef realloc + return realloc(ptr, (size_t) s); +} /* mallocAllocatorRealloc */ + + +static void mallocAllocatorFree(void *ptr) +{ + #undef free + free(ptr); +} /* mallocAllocatorFree */ + + +static void setDefaultAllocator(void) +{ + assert(!externalAllocator); + if (!__PHYSFS_platformSetDefaultAllocator(&allocator)) + { + allocator.Init = NULL; + allocator.Deinit = NULL; + allocator.Malloc = mallocAllocatorMalloc; + allocator.Realloc = mallocAllocatorRealloc; + allocator.Free = mallocAllocatorFree; + } /* if */ +} /* setDefaultAllocator */ + +/* end of physfs.c ... */ + diff --git a/jni/physfs-2.0.3/physfs.h b/jni/physfs-2.1.0/src/physfs.h similarity index 57% rename from jni/physfs-2.0.3/physfs.h rename to jni/physfs-2.1.0/src/physfs.h index 3c252c6e..904a624f 100644 --- a/jni/physfs-2.0.3/physfs.h +++ b/jni/physfs-2.1.0/src/physfs.h @@ -20,10 +20,6 @@ * - It's flexible. Archives (.ZIP files) can be used transparently as * directory structures. * - * This system is largely inspired by Quake 3's PK3 files and the related - * fs_* cvars. If you've ever tinkered with these, then this API will be - * familiar to you. - * * With PhysicsFS, you have a single writing directory and multiple * directories (the "search path") for reading. You can think of this as a * filesystem within a filesystem. If (on Windows) you were to set the @@ -111,7 +107,7 @@ * use the base dir for both searching and writing. There is a helper * function (PHYSFS_setSaneConfig()) that puts together a basic configuration * for you, based on a few parameters. Also see the comments on - * PHYSFS_getBaseDir(), and PHYSFS_getUserDir() for info on what those + * PHYSFS_getBaseDir(), and PHYSFS_getPrefDir() for info on what those * are and how they can help you determine an optimal search path. * * PhysicsFS 2.0 adds the concept of "mounting" archives to arbitrary points @@ -127,7 +123,7 @@ * utmost importance to some applications. * * PhysicsFS is mostly thread safe. The error messages returned by - * PHYSFS_getLastError are unique by thread, and library-state-setting + * PHYSFS_getLastError() are unique by thread, and library-state-setting * functions are mutex'd. For efficiency, individual file accesses are * not locked, so you can not safely read/write/seek/close/etc the same * file from two threads at the same time. Other race conditions are bugs @@ -144,6 +140,8 @@ * * Currently supported archive types: * - .ZIP (pkZip/WinZip/Info-ZIP compatible) + * - .7Z (7zip archives) + * - .ISO (ISO9660 files, CD-ROM images) * - .GRP (Build Engine groupfile archives) * - .PAK (Quake I/II archive format) * - .HOG (Descent I/II HOG file archives) @@ -163,35 +161,38 @@ * This means that if all you care about is English (ASCII characters <= 127) * then you just use regular C strings. If you care about Unicode (and you * should!) then you need to figure out what your platform wants, needs, and - * offers. If you are on Windows and build with Unicode support, your TCHAR - * strings are two bytes per character (this is called "UCS-2 encoding"). You + * offers. If you are on Windows before Win2000 and build with Unicode + * support, your TCHAR strings are two bytes per character (this is called + * "UCS-2 encoding"). Any modern Windows uses UTF-16, which is two bytes + * per character for most characters, but some characters are four. You * should convert them to UTF-8 before handing them to PhysicsFS with - * PHYSFS_utf8FromUcs2(). If you're using Unix or Mac OS X, your wchar_t - * strings are four bytes per character ("UCS-4 encoding"). Use - * PHYSFS_utf8FromUcs4(). Mac OS X can give you UTF-8 directly from a - * CFString, and many Unixes generally give you C strings in UTF-8 format - * everywhere. If you have a single-byte high ASCII charset, like so-many - * European "codepages" you may be out of luck. We'll convert from "Latin1" - * to UTF-8 only, and never back to Latin1. If you're above ASCII 127, all - * bets are off: move to Unicode or use your platform's facilities. Passing a - * C string with high-ASCII data that isn't UTF-8 encoded will NOT do what - * you expect! + * PHYSFS_utf8FromUtf16(), which handles both UTF-16 and UCS-2. If you're + * using Unix or Mac OS X, your wchar_t strings are four bytes per character + * ("UCS-4 encoding"). Use PHYSFS_utf8FromUcs4(). Mac OS X can give you UTF-8 + * directly from a CFString or NSString, and many Unixes generally give you C + * strings in UTF-8 format everywhere. If you have a single-byte high ASCII + * charset, like so-many European "codepages" you may be out of luck. We'll + * convert from "Latin1" to UTF-8 only, and never back to Latin1. If you're + * above ASCII 127, all bets are off: move to Unicode or use your platform's + * facilities. Passing a C string with high-ASCII data that isn't UTF-8 + * encoded will NOT do what you expect! * - * Naturally, there's also PHYSFS_utf8ToUcs2() and PHYSFS_utf8ToUcs4() to get - * data back into a format you like. Behind the scenes, PhysicsFS will use - * Unicode where possible: the UTF-8 strings on Windows will be converted - * and used with the multibyte Windows APIs, for example. + * Naturally, there's also PHYSFS_utf8ToUcs2(), PHYSFS_utf8ToUtf16(), and + * PHYSFS_utf8ToUcs4() to get data back into a format you like. Behind the + * scenes, PhysicsFS will use Unicode where possible: the UTF-8 strings on + * Windows will be converted and used with the multibyte Windows APIs, for + * example. * * PhysicsFS offers basic encoding conversion support, but not a whole string * library. Get your stuff into whatever format you can work with. * - * Some platforms and archivers don't offer full Unicode support behind the - * scenes. For example, OS/2 only offers "codepages" and the filesystem - * itself doesn't support multibyte encodings. We make an earnest effort to - * convert to/from the current locale here, but all bets are off if - * you want to hand an arbitrary Japanese character through to these systems. - * Modern OSes (Mac OS X, Linux, Windows, PocketPC, etc) should all be fine. - * Many game-specific archivers are seriously unprepared for Unicode (the + * All platforms supported by PhysicsFS 2.1 and later fully support Unicode. + * We have dropped platforms that don't (OS/2, Mac OS 9, Windows 95, etc), as + * even an OS that's over a decade old should be expected to handle this well. + * If you absolutely must support one of these platforms, you should use an + * older release of PhysicsFS. + * + * Many game-specific archivers are seriously unprepared for Unicode (the * Descent HOG/MVL and Build Engine GRP archivers, for example, only offer a * DOS 8.3 filename, for example). Nothing can be done for these, but they * tend to be legacy formats for existing content that was all ASCII (and @@ -204,11 +205,11 @@ * * Other stuff: * - * Please see the file LICENSE.txt in the source's root directory for licensing - * and redistribution rights. + * Please see the file LICENSE.txt in the source's root directory for + * licensing and redistribution rights. * - * Please see the file CREDITS.txt in the source's root directory for a more or - * less complete list of who's responsible for this. + * Please see the file CREDITS.txt in the source's "docs" directory for + * a more or less complete list of who's responsible for this. * * \author Ryan C. Gordon. */ @@ -220,15 +221,39 @@ extern "C" { #endif -#ifndef DOXYGEN_SHOULD_IGNORE_THIS -#if (defined _MSC_VER) -#define __EXPORT__ __declspec(dllexport) -#elif (__GNUC__ >= 3) -#define __EXPORT__ __attribute__((visibility("default"))) +#if defined(PHYSFS_DECL) +/* do nothing. */ +#elif (defined SWIG) +#define PHYSFS_DECL extern +#elif (defined _MSC_VER) +#define PHYSFS_DECL __declspec(dllexport) +#elif (defined __SUNPRO_C) +#define PHYSFS_DECL __global +#elif ((__GNUC__ >= 3) && (!__EMX__) && (!sun)) +#define PHYSFS_DECL __attribute__((visibility("default"))) #else -#define __EXPORT__ +#define PHYSFS_DECL +#endif + +#if defined(PHYSFS_DEPRECATED) +/* do nothing. */ +#elif (defined SWIG) /* ignore deprecated, since bindings use everything. */ +#define PHYSFS_DEPRECATED +#elif (__GNUC__ >= 4) /* technically, this arrived in gcc 3.1, but oh well. */ +#define PHYSFS_DEPRECATED __attribute__((deprecated)) +#else +#define PHYSFS_DEPRECATED +#endif + +#if 0 /* !!! FIXME: look into this later. */ +#if defined(PHYSFS_CALL) +/* do nothing. */ +#elif defined(__WIN32__) && !defined(__GNUC__) +#define PHYSFS_CALL __cdecl +#else +#define PHYSFS_CALL +#endif #endif -#endif /* DOXYGEN_SHOULD_IGNORE_THIS */ /** * \typedef PHYSFS_uint8 @@ -293,6 +318,7 @@ typedef signed long long PHYSFS_sint64; #endif +#ifndef SWIG #ifndef DOXYGEN_SHOULD_IGNORE_THIS /* Make sure the types really have the right sizes */ #define PHYSFS_COMPILE_TIME_ASSERT(name, x) \ @@ -313,6 +339,7 @@ PHYSFS_COMPILE_TIME_ASSERT(sint64, sizeof(PHYSFS_sint64) == 8); #undef PHYSFS_COMPILE_TIME_ASSERT #endif /* DOXYGEN_SHOULD_IGNORE_THIS */ +#endif /* SWIG */ /** @@ -372,6 +399,8 @@ typedef struct PHYSFS_File * supported. * * \sa PHYSFS_supportedArchiveTypes + * \sa PHYSFS_registerArchiver + * \sa PHYSFS_deregisterArchiver */ typedef struct PHYSFS_ArchiveInfo { @@ -379,6 +408,7 @@ typedef struct PHYSFS_ArchiveInfo const char *description; /**< Human-readable archive description. */ const char *author; /**< Person who did support for this archive. */ const char *url; /**< URL related to this archive */ + int supportsSymlinks; /**< non-zero if archive offers symbolic links. */ } PHYSFS_ArchiveInfo; @@ -402,10 +432,13 @@ typedef struct PHYSFS_Version PHYSFS_uint8 patch; /**< patchlevel */ } PHYSFS_Version; + +#ifndef SWIG /* not available from scripting languages. */ + #ifndef DOXYGEN_SHOULD_IGNORE_THIS #define PHYSFS_VER_MAJOR 2 -#define PHYSFS_VER_MINOR 0 -#define PHYSFS_VER_PATCH 3 +#define PHYSFS_VER_MINOR 1 +#define PHYSFS_VER_PATCH 0 #endif /* DOXYGEN_SHOULD_IGNORE_THIS */ @@ -434,6 +467,8 @@ typedef struct PHYSFS_Version (x)->patch = PHYSFS_VER_PATCH; \ } +#endif /* SWIG */ + /** * \fn void PHYSFS_getLinkedVersion(PHYSFS_Version *ver) @@ -461,7 +496,7 @@ typedef struct PHYSFS_Version * * \sa PHYSFS_VERSION */ -__EXPORT__ void PHYSFS_getLinkedVersion(PHYSFS_Version *ver); +PHYSFS_DECL void PHYSFS_getLinkedVersion(PHYSFS_Version *ver); /** @@ -484,7 +519,7 @@ __EXPORT__ void PHYSFS_getLinkedVersion(PHYSFS_Version *ver); * \sa PHYSFS_deinit * \sa PHYSFS_isInit */ -__EXPORT__ int PHYSFS_init(const char *argv0); +PHYSFS_DECL int PHYSFS_init(const char *argv0); /** @@ -513,7 +548,7 @@ __EXPORT__ int PHYSFS_init(const char *argv0); * \sa PHYSFS_init * \sa PHYSFS_isInit */ -__EXPORT__ int PHYSFS_deinit(void); +PHYSFS_DECL int PHYSFS_deinit(void); /** @@ -539,12 +574,17 @@ __EXPORT__ int PHYSFS_deinit(void); * } * \endcode * - * The return values are pointers to static internal memory, and should - * be considered READ ONLY, and never freed. + * The return values are pointers to internal memory, and should + * be considered READ ONLY, and never freed. The returned values are + * valid until the next call to PHYSFS_deinit(), PHYSFS_registerArchiver(), + * or PHYSFS_deregisterArchiver(). * * \return READ ONLY Null-terminated array of READ ONLY structures. + * + * \sa PHYSFS_registerArchiver + * \sa PHYSFS_deregisterArchiver */ -__EXPORT__ const PHYSFS_ArchiveInfo **PHYSFS_supportedArchiveTypes(void); +PHYSFS_DECL const PHYSFS_ArchiveInfo **PHYSFS_supportedArchiveTypes(void); /** @@ -554,34 +594,68 @@ __EXPORT__ const PHYSFS_ArchiveInfo **PHYSFS_supportedArchiveTypes(void); * Certain PhysicsFS functions return lists of information that are * dynamically allocated. Use this function to free those resources. * + * It is safe to pass a NULL here, but doing so will cause a crash in versions + * before PhysicsFS 2.1.0. + * * \param listVar List of information specified as freeable by this function. + * Passing NULL is safe; it is a valid no-op. * * \sa PHYSFS_getCdRomDirs * \sa PHYSFS_enumerateFiles * \sa PHYSFS_getSearchPath */ -__EXPORT__ void PHYSFS_freeList(void *listVar); +PHYSFS_DECL void PHYSFS_freeList(void *listVar); /** * \fn const char *PHYSFS_getLastError(void) * \brief Get human-readable error information. * + * \warning As of PhysicsFS 2.1, this function has been nerfed. + * Before PhysicsFS 2.1, this function was the only way to get + * error details beyond a given function's basic return value. + * This was meant to be a human-readable string in one of several + * languages, and was not useful for application parsing. This was + * a problem, because the developer and not the user chose the + * language at compile time, and the PhysicsFS maintainers had + * to (poorly) maintain a significant amount of localization work. + * The app couldn't parse the strings, even if they counted on a + * specific language, since some were dynamically generated. + * In 2.1 and later, this always returns a static string in + * English; you may use it as a key string for your own + * localizations if you like, as we'll promise not to change + * existing error strings. Also, if your application wants to + * look at specific errors, we now offer a better option: + * use PHYSFS_getLastErrorCode() instead. + * * Get the last PhysicsFS error message as a human-readable, null-terminated - * string. This will be NULL if there's been no error since the last call to - * this function. The pointer returned by this call points to an internal + * string. This will return NULL if there's been no error since the last call + * to this function. The pointer returned by this call points to an internal * buffer. Each thread has a unique error state associated with it, but each * time a new error message is set, it will overwrite the previous one * associated with that thread. It is safe to call this function at anytime, * even before PHYSFS_init(). * - * It is not wise to expect a specific string of characters here, since the - * error message may be localized into an unfamiliar language. These strings - * are meant to be passed on directly to the user. + * PHYSFS_getLastError() and PHYSFS_getLastErrorCode() both reset the same + * thread-specific error state. Calling one will wipe out the other's + * data. If you need both, call PHYSFS_getLastErrorCode(), then pass that + * value to PHYSFS_getErrorByCode(). + * + * As of PhysicsFS 2.1, this function only presents text in the English + * language, but the strings are static, so you can use them as keys into + * your own localization dictionary. These strings are meant to be passed on + * directly to the user. + * + * Generally, applications should only concern themselves with whether a + * given function failed; however, if your code require more specifics, you + * should use PHYSFS_getLastErrorCode() instead of this function. * * \return READ ONLY string of last error message. + * + * \sa PHYSFS_getLastErrorCode + * \sa PHYSFS_getErrorByCode */ -__EXPORT__ const char *PHYSFS_getLastError(void); +PHYSFS_DECL const char *PHYSFS_getLastError(void); /** @@ -597,7 +671,7 @@ __EXPORT__ const char *PHYSFS_getLastError(void); * * \return READ ONLY null-terminated string of platform's dir separator. */ -__EXPORT__ const char *PHYSFS_getDirSeparator(void); +PHYSFS_DECL const char *PHYSFS_getDirSeparator(void); /** @@ -623,6 +697,11 @@ __EXPORT__ const char *PHYSFS_getDirSeparator(void); * in platform-independent notation. That is, when setting up your * search and write paths, etc, symlinks are never checked for. * + * Please note that PHYSFS_stat() will always check the path specified; if + * that path is a symlink, it will not be followed in any case. If symlinks + * aren't permitted through this function, PHYSFS_stat() ignores them, and + * would treat the query as if the path didn't exist at all. + * * Symbolic link permission can be enabled or disabled at any time after * you've called PHYSFS_init(), and is disabled by default. * @@ -630,7 +709,7 @@ __EXPORT__ const char *PHYSFS_getDirSeparator(void); * * \sa PHYSFS_symbolicLinksPermitted */ -__EXPORT__ void PHYSFS_permitSymbolicLinks(int allow); +PHYSFS_DECL void PHYSFS_permitSymbolicLinks(int allow); /* !!! FIXME: const this? */ @@ -673,7 +752,7 @@ __EXPORT__ void PHYSFS_permitSymbolicLinks(int allow); * * \sa PHYSFS_getCdRomDirsCallback */ -__EXPORT__ char **PHYSFS_getCdRomDirs(void); +PHYSFS_DECL char **PHYSFS_getCdRomDirs(void); /** @@ -690,15 +769,17 @@ __EXPORT__ char **PHYSFS_getCdRomDirs(void); * * \return READ ONLY string of base dir in platform-dependent notation. * - * \sa PHYSFS_getUserDir + * \sa PHYSFS_getPrefDir */ -__EXPORT__ const char *PHYSFS_getBaseDir(void); +PHYSFS_DECL const char *PHYSFS_getBaseDir(void); /** * \fn const char *PHYSFS_getUserDir(void) * \brief Get the path where user's home directory resides. * + * \deprecated As of PhysicsFS 2.1, you probably want PHYSFS_getPrefDir(). + * * Helper function. * * Get the "user dir". This is meant to be a suggestion of where a specific @@ -708,14 +789,12 @@ __EXPORT__ const char *PHYSFS_getBaseDir(void); * where "username" will either be the login name, or "default" if the * platform doesn't support multiple users, either. * - * You should probably use the user dir as the basis for your write dir, and - * also put it near the beginning of your search path. - * * \return READ ONLY string of user dir in platform-dependent notation. * * \sa PHYSFS_getBaseDir + * \sa PHYSFS_getPrefDir */ -__EXPORT__ const char *PHYSFS_getUserDir(void); +PHYSFS_DECL const char *PHYSFS_getUserDir(void) PHYSFS_DEPRECATED; /** @@ -729,7 +808,7 @@ __EXPORT__ const char *PHYSFS_getUserDir(void); * * \sa PHYSFS_setWriteDir */ -__EXPORT__ const char *PHYSFS_getWriteDir(void); +PHYSFS_DECL const char *PHYSFS_getWriteDir(void); /** @@ -751,15 +830,21 @@ __EXPORT__ const char *PHYSFS_getWriteDir(void); * * \sa PHYSFS_getWriteDir */ -__EXPORT__ int PHYSFS_setWriteDir(const char *newDir); +PHYSFS_DECL int PHYSFS_setWriteDir(const char *newDir); /** * \fn int PHYSFS_addToSearchPath(const char *newDir, int appendToPath) * \brief Add an archive or directory to the search path. * - * This is a legacy call in PhysicsFS 2.0, equivalent to: - * PHYSFS_mount(newDir, NULL, appendToPath); + * \deprecated As of PhysicsFS 2.0, use PHYSFS_mount() instead. This + * function just wraps it anyhow. + * + * This function is equivalent to: + * + * \code + * PHYSFS_mount(newDir, NULL, appendToPath); + * \endcode * * You must use this and not PHYSFS_mount if binary compatibility with * PhysicsFS 1.0 is important (which it may not be for many people). @@ -768,27 +853,35 @@ __EXPORT__ int PHYSFS_setWriteDir(const char *newDir); * \sa PHYSFS_removeFromSearchPath * \sa PHYSFS_getSearchPath */ -__EXPORT__ int PHYSFS_addToSearchPath(const char *newDir, int appendToPath); - +PHYSFS_DECL int PHYSFS_addToSearchPath(const char *newDir, int appendToPath) + PHYSFS_DEPRECATED; /** * \fn int PHYSFS_removeFromSearchPath(const char *oldDir) * \brief Remove a directory or archive from the search path. * - * This must be a (case-sensitive) match to a dir or archive already in the - * search path, specified in platform-dependent notation. + * \deprecated As of PhysicsFS 2.1, use PHYSFS_unmount() instead. This + * function just wraps it anyhow. There's no functional difference + * except the vocabulary changed from "adding to the search path" + * to "mounting" when that functionality was extended, and thus + * the preferred way to accomplish this function's work is now + * called "unmounting." * - * This call will fail (and fail to remove from the path) if the element still - * has files open in it. + * This function is equivalent to: * - * \param oldDir dir/archive to remove. - * \return nonzero on success, zero on failure. - * Specifics of the error can be gleaned from PHYSFS_getLastError(). + * \code + * PHYSFS_unmount(oldDir); + * \endcode + * + * You must use this and not PHYSFS_unmount if binary compatibility with + * PhysicsFS 1.0 is important (which it may not be for many people). * * \sa PHYSFS_addToSearchPath * \sa PHYSFS_getSearchPath + * \sa PHYSFS_unmount */ -__EXPORT__ int PHYSFS_removeFromSearchPath(const char *oldDir); +PHYSFS_DECL int PHYSFS_removeFromSearchPath(const char *oldDir) + PHYSFS_DEPRECATED; /** @@ -817,7 +910,7 @@ __EXPORT__ int PHYSFS_removeFromSearchPath(const char *oldDir); * \sa PHYSFS_addToSearchPath * \sa PHYSFS_removeFromSearchPath */ -__EXPORT__ char **PHYSFS_getSearchPath(void); +PHYSFS_DECL char **PHYSFS_getSearchPath(void); /** @@ -826,12 +919,12 @@ __EXPORT__ char **PHYSFS_getSearchPath(void); * * Helper function. * - * The write dir will be set to "userdir/.organization/appName", which is + * The write dir will be set to the pref dir returned by + * \code PHYSFS_getPrefDir(organization, appName) \endcode, which is * created if it doesn't exist. * * The above is sufficient to make sure your program's configuration directory - * is separated from other clutter, and platform-independent. The period - * before "mygame" even hides the directory on Unix systems. + * is separated from other clutter, and platform-independent. * * The search path will be: * @@ -844,7 +937,8 @@ __EXPORT__ char **PHYSFS_getSearchPath(void); * be added to the search path. If you specified "PKG" for (archiveExt), and * there's a file named data.PKG in the base dir, it'll be checked. Archives * can either be appended or prepended to the search path in alphabetical - * order, regardless of which directories they were found in. + * order, regardless of which directories they were found in. All archives + * are mounted in the root of the virtual file system ("/"). * * All of this can be accomplished from the application, but this just does it * all for you. Feel free to add more to the search path manually, too. @@ -877,11 +971,11 @@ __EXPORT__ char **PHYSFS_getSearchPath(void); * \return nonzero on success, zero on error. Specifics of the error can be * gleaned from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_setSaneConfig(const char *organization, - const char *appName, - const char *archiveExt, - int includeCdRoms, - int archivesFirst); +PHYSFS_DECL int PHYSFS_setSaneConfig(const char *organization, + const char *appName, + const char *archiveExt, + int includeCdRoms, + int archivesFirst); /* Directory management stuff ... */ @@ -907,7 +1001,7 @@ __EXPORT__ int PHYSFS_setSaneConfig(const char *organization, * * \sa PHYSFS_delete */ -__EXPORT__ int PHYSFS_mkdir(const char *dirName); +PHYSFS_DECL int PHYSFS_mkdir(const char *dirName); /** @@ -940,7 +1034,7 @@ __EXPORT__ int PHYSFS_mkdir(const char *dirName); * \return nonzero on success, zero on error. Specifics of the error can be * gleaned from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_delete(const char *filename); +PHYSFS_DECL int PHYSFS_delete(const char *filename); /** @@ -964,11 +1058,16 @@ __EXPORT__ int PHYSFS_delete(const char *filename); * be associated with the first archive mounted there, even though that * directory isn't necessarily contained in a real archive. * + * \warning This will return NULL if there is no real directory associated + * with (filename). Specifically, PHYSFS_mountIo(), + * PHYSFS_mountMemory(), and PHYSFS_mountHandle() will return NULL + * even if the filename is found in the search path. Plan accordingly. + * * \param filename file to look for. * \return READ ONLY string of element of search path containing the * the file in question. NULL if not found. */ -__EXPORT__ const char *PHYSFS_getRealDir(const char *filename); +PHYSFS_DECL const char *PHYSFS_getRealDir(const char *filename); /** @@ -1009,7 +1108,7 @@ __EXPORT__ const char *PHYSFS_getRealDir(const char *filename); * * \sa PHYSFS_enumerateFilesCallback */ -__EXPORT__ char **PHYSFS_enumerateFiles(const char *dir); +PHYSFS_DECL char **PHYSFS_enumerateFiles(const char *dir); /** @@ -1025,17 +1124,17 @@ __EXPORT__ char **PHYSFS_enumerateFiles(const char *dir); * * \param fname filename in platform-independent notation. * \return non-zero if filename exists. zero otherwise. - * - * \sa PHYSFS_isDirectory - * \sa PHYSFS_isSymbolicLink */ -__EXPORT__ int PHYSFS_exists(const char *fname); +PHYSFS_DECL int PHYSFS_exists(const char *fname); /** * \fn int PHYSFS_isDirectory(const char *fname) * \brief Determine if a file in the search path is really a directory. * + * \deprecated As of PhysicsFS 2.1, use PHYSFS_stat() instead. This + * function just wraps it anyhow. + * * Determine if the first occurence of (fname) in the search path is * really a directory entry. * @@ -1046,16 +1145,19 @@ __EXPORT__ int PHYSFS_exists(const char *fname); * \param fname filename in platform-independent notation. * \return non-zero if filename exists and is a directory. zero otherwise. * + * \sa PHYSFS_stat * \sa PHYSFS_exists - * \sa PHYSFS_isSymbolicLink */ -__EXPORT__ int PHYSFS_isDirectory(const char *fname); +PHYSFS_DECL int PHYSFS_isDirectory(const char *fname) PHYSFS_DEPRECATED; /** * \fn int PHYSFS_isSymbolicLink(const char *fname) * \brief Determine if a file in the search path is really a symbolic link. * + * \deprecated As of PhysicsFS 2.1, use PHYSFS_stat() instead. This + * function just wraps it anyhow. + * * Determine if the first occurence of (fname) in the search path is * really a symbolic link. * @@ -1066,26 +1168,35 @@ __EXPORT__ int PHYSFS_isDirectory(const char *fname); * \param fname filename in platform-independent notation. * \return non-zero if filename exists and is a symlink. zero otherwise. * + * \sa PHYSFS_stat * \sa PHYSFS_exists - * \sa PHYSFS_isDirectory */ -__EXPORT__ int PHYSFS_isSymbolicLink(const char *fname); +PHYSFS_DECL int PHYSFS_isSymbolicLink(const char *fname) PHYSFS_DEPRECATED; /** * \fn PHYSFS_sint64 PHYSFS_getLastModTime(const char *filename) * \brief Get the last modification time of a file. * - * The modtime is returned as a number of seconds since the epoch - * (Jan 1, 1970). The exact derivation and accuracy of this time depends on - * the particular archiver. If there is no reasonable way to obtain this - * information for a particular archiver, or there was some sort of error, - * this function returns (-1). + * \deprecated As of PhysicsFS 2.1, use PHYSFS_stat() instead. This + * function just wraps it anyhow. + * + * The modtime is returned as a number of seconds since the Unix epoch + * (midnight, Jan 1, 1970). The exact derivation and accuracy of this time + * depends on the particular archiver. If there is no reasonable way to + * obtain this information for a particular archiver, or there was some sort + * of error, this function returns (-1). + * + * You must use this and not PHYSFS_stat() if binary compatibility with + * PhysicsFS 2.0 is important (which it may not be for many people). * * \param filename filename to check, in platform-independent notation. * \return last modified time of the file. -1 if it can't be determined. + * + * \sa PHYSFS_stat */ -__EXPORT__ PHYSFS_sint64 PHYSFS_getLastModTime(const char *filename); +PHYSFS_DECL PHYSFS_sint64 PHYSFS_getLastModTime(const char *filename) + PHYSFS_DEPRECATED; /* i/o stuff... */ @@ -1112,7 +1223,7 @@ __EXPORT__ PHYSFS_sint64 PHYSFS_getLastModTime(const char *filename); * \sa PHYSFS_write * \sa PHYSFS_close */ -__EXPORT__ PHYSFS_File *PHYSFS_openWrite(const char *filename); +PHYSFS_DECL PHYSFS_File *PHYSFS_openWrite(const char *filename); /** @@ -1138,7 +1249,7 @@ __EXPORT__ PHYSFS_File *PHYSFS_openWrite(const char *filename); * \sa PHYSFS_write * \sa PHYSFS_close */ -__EXPORT__ PHYSFS_File *PHYSFS_openAppend(const char *filename); +PHYSFS_DECL PHYSFS_File *PHYSFS_openAppend(const char *filename); /** @@ -1163,7 +1274,7 @@ __EXPORT__ PHYSFS_File *PHYSFS_openAppend(const char *filename); * \sa PHYSFS_read * \sa PHYSFS_close */ -__EXPORT__ PHYSFS_File *PHYSFS_openRead(const char *filename); +PHYSFS_DECL PHYSFS_File *PHYSFS_openRead(const char *filename); /** @@ -1184,7 +1295,7 @@ __EXPORT__ PHYSFS_File *PHYSFS_openRead(const char *filename); * \sa PHYSFS_openWrite * \sa PHYSFS_openAppend */ -__EXPORT__ int PHYSFS_close(PHYSFS_File *handle); +PHYSFS_DECL int PHYSFS_close(PHYSFS_File *handle); /** @@ -1193,6 +1304,13 @@ __EXPORT__ int PHYSFS_close(PHYSFS_File *handle); * * The file must be opened for reading. * + * \deprecated As of PhysicsFS 2.1, use PHYSFS_readBytes() instead. This + * function just wraps it anyhow. This function never clarified + * what would happen if you managed to read a partial object, so + * working at the byte level makes this cleaner for everyone, + * especially now that PHYSFS_Io interfaces can be supplied by the + * application. + * * \param handle handle returned from PHYSFS_openRead(). * \param buffer buffer to store read data into. * \param objSize size in bytes of objects being read from (handle). @@ -1201,12 +1319,14 @@ __EXPORT__ int PHYSFS_close(PHYSFS_File *handle); * the reason this might be < (objCount), as can PHYSFS_eof(). * -1 if complete failure. * + * \sa PHYSFS_readBytes * \sa PHYSFS_eof */ -__EXPORT__ PHYSFS_sint64 PHYSFS_read(PHYSFS_File *handle, - void *buffer, - PHYSFS_uint32 objSize, - PHYSFS_uint32 objCount); +PHYSFS_DECL PHYSFS_sint64 PHYSFS_read(PHYSFS_File *handle, + void *buffer, + PHYSFS_uint32 objSize, + PHYSFS_uint32 objCount) + PHYSFS_DEPRECATED; /** * \fn PHYSFS_sint64 PHYSFS_write(PHYSFS_File *handle, const void *buffer, PHYSFS_uint32 objSize, PHYSFS_uint32 objCount) @@ -1214,17 +1334,27 @@ __EXPORT__ PHYSFS_sint64 PHYSFS_read(PHYSFS_File *handle, * * The file must be opened for writing. * + * \deprecated As of PhysicsFS 2.1, use PHYSFS_writeBytes() instead. This + * function just wraps it anyhow. This function never clarified + * what would happen if you managed to write a partial object, so + * working at the byte level makes this cleaner for everyone, + * especially now that PHYSFS_Io interfaces can be supplied by the + * application. + * * \param handle retval from PHYSFS_openWrite() or PHYSFS_openAppend(). * \param buffer buffer of bytes to write to (handle). * \param objSize size in bytes of objects being written to (handle). * \param objCount number of (objSize) objects to write to (handle). * \return number of objects written. PHYSFS_getLastError() can shed light on * the reason this might be < (objCount). -1 if complete failure. + * + * \sa PHYSFS_writeBytes */ -__EXPORT__ PHYSFS_sint64 PHYSFS_write(PHYSFS_File *handle, - const void *buffer, - PHYSFS_uint32 objSize, - PHYSFS_uint32 objCount); +PHYSFS_DECL PHYSFS_sint64 PHYSFS_write(PHYSFS_File *handle, + const void *buffer, + PHYSFS_uint32 objSize, + PHYSFS_uint32 objCount) + PHYSFS_DEPRECATED; /* File position stuff... */ @@ -1241,7 +1371,7 @@ __EXPORT__ PHYSFS_sint64 PHYSFS_write(PHYSFS_File *handle, * \sa PHYSFS_read * \sa PHYSFS_tell */ -__EXPORT__ int PHYSFS_eof(PHYSFS_File *handle); +PHYSFS_DECL int PHYSFS_eof(PHYSFS_File *handle); /** @@ -1254,7 +1384,7 @@ __EXPORT__ int PHYSFS_eof(PHYSFS_File *handle); * * \sa PHYSFS_seek */ -__EXPORT__ PHYSFS_sint64 PHYSFS_tell(PHYSFS_File *handle); +PHYSFS_DECL PHYSFS_sint64 PHYSFS_tell(PHYSFS_File *handle); /** @@ -1271,18 +1401,16 @@ __EXPORT__ PHYSFS_sint64 PHYSFS_tell(PHYSFS_File *handle); * * \sa PHYSFS_tell */ -__EXPORT__ int PHYSFS_seek(PHYSFS_File *handle, PHYSFS_uint64 pos); +PHYSFS_DECL int PHYSFS_seek(PHYSFS_File *handle, PHYSFS_uint64 pos); /** * \fn PHYSFS_sint64 PHYSFS_fileLength(PHYSFS_File *handle) * \brief Get total length of a file in bytes. * - * Note that if the file size can't be determined (since the archive is - * "streamed" or whatnot) than this will report (-1). Also note that if - * another process/thread is writing to this file at the same time, then - * the information this function supplies could be incorrect before you - * get it. Use with caution, or better yet, don't use at all. + * Note that if another process/thread is writing to this file at the same + * time, then the information this function supplies could be incorrect + * before you get it. Use with caution, or better yet, don't use at all. * * \param handle handle returned from PHYSFS_open*(). * \return size in bytes of the file. -1 if can't be determined. @@ -1290,7 +1418,7 @@ __EXPORT__ int PHYSFS_seek(PHYSFS_File *handle, PHYSFS_uint64 pos); * \sa PHYSFS_tell * \sa PHYSFS_seek */ -__EXPORT__ PHYSFS_sint64 PHYSFS_fileLength(PHYSFS_File *handle); +PHYSFS_DECL PHYSFS_sint64 PHYSFS_fileLength(PHYSFS_File *handle); /* Buffering stuff... */ @@ -1335,7 +1463,7 @@ __EXPORT__ PHYSFS_sint64 PHYSFS_fileLength(PHYSFS_File *handle); * \sa PHYSFS_write * \sa PHYSFS_close */ -__EXPORT__ int PHYSFS_setBuffer(PHYSFS_File *handle, PHYSFS_uint64 bufsize); +PHYSFS_DECL int PHYSFS_setBuffer(PHYSFS_File *handle, PHYSFS_uint64 bufsize); /** @@ -1354,11 +1482,13 @@ __EXPORT__ int PHYSFS_setBuffer(PHYSFS_File *handle, PHYSFS_uint64 bufsize); * \sa PHYSFS_setBuffer * \sa PHYSFS_close */ -__EXPORT__ int PHYSFS_flush(PHYSFS_File *handle); +PHYSFS_DECL int PHYSFS_flush(PHYSFS_File *handle); /* Byteorder stuff... */ +#ifndef SWIG /* not available from scripting languages. */ + /** * \fn PHYSFS_sint16 PHYSFS_swapSLE16(PHYSFS_sint16 val) * \brief Swap littleendian signed 16 to platform's native byte order. @@ -1369,7 +1499,7 @@ __EXPORT__ int PHYSFS_flush(PHYSFS_File *handle); * \param val value to convert * \return converted value. */ -__EXPORT__ PHYSFS_sint16 PHYSFS_swapSLE16(PHYSFS_sint16 val); +PHYSFS_DECL PHYSFS_sint16 PHYSFS_swapSLE16(PHYSFS_sint16 val); /** @@ -1382,7 +1512,7 @@ __EXPORT__ PHYSFS_sint16 PHYSFS_swapSLE16(PHYSFS_sint16 val); * \param val value to convert * \return converted value. */ -__EXPORT__ PHYSFS_uint16 PHYSFS_swapULE16(PHYSFS_uint16 val); +PHYSFS_DECL PHYSFS_uint16 PHYSFS_swapULE16(PHYSFS_uint16 val); /** * \fn PHYSFS_sint32 PHYSFS_swapSLE32(PHYSFS_sint32 val) @@ -1394,7 +1524,7 @@ __EXPORT__ PHYSFS_uint16 PHYSFS_swapULE16(PHYSFS_uint16 val); * \param val value to convert * \return converted value. */ -__EXPORT__ PHYSFS_sint32 PHYSFS_swapSLE32(PHYSFS_sint32 val); +PHYSFS_DECL PHYSFS_sint32 PHYSFS_swapSLE32(PHYSFS_sint32 val); /** @@ -1407,7 +1537,7 @@ __EXPORT__ PHYSFS_sint32 PHYSFS_swapSLE32(PHYSFS_sint32 val); * \param val value to convert * \return converted value. */ -__EXPORT__ PHYSFS_uint32 PHYSFS_swapULE32(PHYSFS_uint32 val); +PHYSFS_DECL PHYSFS_uint32 PHYSFS_swapULE32(PHYSFS_uint32 val); /** * \fn PHYSFS_sint64 PHYSFS_swapSLE64(PHYSFS_sint64 val) @@ -1422,7 +1552,7 @@ __EXPORT__ PHYSFS_uint32 PHYSFS_swapULE32(PHYSFS_uint32 val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ PHYSFS_sint64 PHYSFS_swapSLE64(PHYSFS_sint64 val); +PHYSFS_DECL PHYSFS_sint64 PHYSFS_swapSLE64(PHYSFS_sint64 val); /** @@ -1438,7 +1568,7 @@ __EXPORT__ PHYSFS_sint64 PHYSFS_swapSLE64(PHYSFS_sint64 val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ PHYSFS_uint64 PHYSFS_swapULE64(PHYSFS_uint64 val); +PHYSFS_DECL PHYSFS_uint64 PHYSFS_swapULE64(PHYSFS_uint64 val); /** @@ -1451,7 +1581,7 @@ __EXPORT__ PHYSFS_uint64 PHYSFS_swapULE64(PHYSFS_uint64 val); * \param val value to convert * \return converted value. */ -__EXPORT__ PHYSFS_sint16 PHYSFS_swapSBE16(PHYSFS_sint16 val); +PHYSFS_DECL PHYSFS_sint16 PHYSFS_swapSBE16(PHYSFS_sint16 val); /** @@ -1464,7 +1594,7 @@ __EXPORT__ PHYSFS_sint16 PHYSFS_swapSBE16(PHYSFS_sint16 val); * \param val value to convert * \return converted value. */ -__EXPORT__ PHYSFS_uint16 PHYSFS_swapUBE16(PHYSFS_uint16 val); +PHYSFS_DECL PHYSFS_uint16 PHYSFS_swapUBE16(PHYSFS_uint16 val); /** * \fn PHYSFS_sint32 PHYSFS_swapSBE32(PHYSFS_sint32 val) @@ -1476,7 +1606,7 @@ __EXPORT__ PHYSFS_uint16 PHYSFS_swapUBE16(PHYSFS_uint16 val); * \param val value to convert * \return converted value. */ -__EXPORT__ PHYSFS_sint32 PHYSFS_swapSBE32(PHYSFS_sint32 val); +PHYSFS_DECL PHYSFS_sint32 PHYSFS_swapSBE32(PHYSFS_sint32 val); /** @@ -1489,7 +1619,7 @@ __EXPORT__ PHYSFS_sint32 PHYSFS_swapSBE32(PHYSFS_sint32 val); * \param val value to convert * \return converted value. */ -__EXPORT__ PHYSFS_uint32 PHYSFS_swapUBE32(PHYSFS_uint32 val); +PHYSFS_DECL PHYSFS_uint32 PHYSFS_swapUBE32(PHYSFS_uint32 val); /** @@ -1505,7 +1635,7 @@ __EXPORT__ PHYSFS_uint32 PHYSFS_swapUBE32(PHYSFS_uint32 val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ PHYSFS_sint64 PHYSFS_swapSBE64(PHYSFS_sint64 val); +PHYSFS_DECL PHYSFS_sint64 PHYSFS_swapSBE64(PHYSFS_sint64 val); /** @@ -1521,7 +1651,9 @@ __EXPORT__ PHYSFS_sint64 PHYSFS_swapSBE64(PHYSFS_sint64 val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ PHYSFS_uint64 PHYSFS_swapUBE64(PHYSFS_uint64 val); +PHYSFS_DECL PHYSFS_uint64 PHYSFS_swapUBE64(PHYSFS_uint64 val); + +#endif /* SWIG */ /** @@ -1537,7 +1669,7 @@ __EXPORT__ PHYSFS_uint64 PHYSFS_swapUBE64(PHYSFS_uint64 val); * store the result. On failure, you can find out what went wrong * from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_readSLE16(PHYSFS_File *file, PHYSFS_sint16 *val); +PHYSFS_DECL int PHYSFS_readSLE16(PHYSFS_File *file, PHYSFS_sint16 *val); /** @@ -1554,7 +1686,7 @@ __EXPORT__ int PHYSFS_readSLE16(PHYSFS_File *file, PHYSFS_sint16 *val); * from PHYSFS_getLastError(). * */ -__EXPORT__ int PHYSFS_readULE16(PHYSFS_File *file, PHYSFS_uint16 *val); +PHYSFS_DECL int PHYSFS_readULE16(PHYSFS_File *file, PHYSFS_uint16 *val); /** @@ -1570,7 +1702,7 @@ __EXPORT__ int PHYSFS_readULE16(PHYSFS_File *file, PHYSFS_uint16 *val); * store the result. On failure, you can find out what went wrong * from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_readSBE16(PHYSFS_File *file, PHYSFS_sint16 *val); +PHYSFS_DECL int PHYSFS_readSBE16(PHYSFS_File *file, PHYSFS_sint16 *val); /** @@ -1587,7 +1719,7 @@ __EXPORT__ int PHYSFS_readSBE16(PHYSFS_File *file, PHYSFS_sint16 *val); * from PHYSFS_getLastError(). * */ -__EXPORT__ int PHYSFS_readUBE16(PHYSFS_File *file, PHYSFS_uint16 *val); +PHYSFS_DECL int PHYSFS_readUBE16(PHYSFS_File *file, PHYSFS_uint16 *val); /** @@ -1603,7 +1735,7 @@ __EXPORT__ int PHYSFS_readUBE16(PHYSFS_File *file, PHYSFS_uint16 *val); * store the result. On failure, you can find out what went wrong * from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_readSLE32(PHYSFS_File *file, PHYSFS_sint32 *val); +PHYSFS_DECL int PHYSFS_readSLE32(PHYSFS_File *file, PHYSFS_sint32 *val); /** @@ -1620,7 +1752,7 @@ __EXPORT__ int PHYSFS_readSLE32(PHYSFS_File *file, PHYSFS_sint32 *val); * from PHYSFS_getLastError(). * */ -__EXPORT__ int PHYSFS_readULE32(PHYSFS_File *file, PHYSFS_uint32 *val); +PHYSFS_DECL int PHYSFS_readULE32(PHYSFS_File *file, PHYSFS_uint32 *val); /** @@ -1636,7 +1768,7 @@ __EXPORT__ int PHYSFS_readULE32(PHYSFS_File *file, PHYSFS_uint32 *val); * store the result. On failure, you can find out what went wrong * from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_readSBE32(PHYSFS_File *file, PHYSFS_sint32 *val); +PHYSFS_DECL int PHYSFS_readSBE32(PHYSFS_File *file, PHYSFS_sint32 *val); /** @@ -1653,7 +1785,7 @@ __EXPORT__ int PHYSFS_readSBE32(PHYSFS_File *file, PHYSFS_sint32 *val); * from PHYSFS_getLastError(). * */ -__EXPORT__ int PHYSFS_readUBE32(PHYSFS_File *file, PHYSFS_uint32 *val); +PHYSFS_DECL int PHYSFS_readUBE32(PHYSFS_File *file, PHYSFS_uint32 *val); /** @@ -1672,7 +1804,7 @@ __EXPORT__ int PHYSFS_readUBE32(PHYSFS_File *file, PHYSFS_uint32 *val); * \warning Remember, PHYSFS_sint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ int PHYSFS_readSLE64(PHYSFS_File *file, PHYSFS_sint64 *val); +PHYSFS_DECL int PHYSFS_readSLE64(PHYSFS_File *file, PHYSFS_sint64 *val); /** @@ -1691,7 +1823,7 @@ __EXPORT__ int PHYSFS_readSLE64(PHYSFS_File *file, PHYSFS_sint64 *val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ int PHYSFS_readULE64(PHYSFS_File *file, PHYSFS_uint64 *val); +PHYSFS_DECL int PHYSFS_readULE64(PHYSFS_File *file, PHYSFS_uint64 *val); /** @@ -1710,7 +1842,7 @@ __EXPORT__ int PHYSFS_readULE64(PHYSFS_File *file, PHYSFS_uint64 *val); * \warning Remember, PHYSFS_sint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ int PHYSFS_readSBE64(PHYSFS_File *file, PHYSFS_sint64 *val); +PHYSFS_DECL int PHYSFS_readSBE64(PHYSFS_File *file, PHYSFS_sint64 *val); /** @@ -1729,7 +1861,7 @@ __EXPORT__ int PHYSFS_readSBE64(PHYSFS_File *file, PHYSFS_sint64 *val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ int PHYSFS_readUBE64(PHYSFS_File *file, PHYSFS_uint64 *val); +PHYSFS_DECL int PHYSFS_readUBE64(PHYSFS_File *file, PHYSFS_uint64 *val); /** @@ -1744,7 +1876,7 @@ __EXPORT__ int PHYSFS_readUBE64(PHYSFS_File *file, PHYSFS_uint64 *val); * \return zero on failure, non-zero on success. On failure, you can * find out what went wrong from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_writeSLE16(PHYSFS_File *file, PHYSFS_sint16 val); +PHYSFS_DECL int PHYSFS_writeSLE16(PHYSFS_File *file, PHYSFS_sint16 val); /** @@ -1759,7 +1891,7 @@ __EXPORT__ int PHYSFS_writeSLE16(PHYSFS_File *file, PHYSFS_sint16 val); * \return zero on failure, non-zero on success. On failure, you can * find out what went wrong from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_writeULE16(PHYSFS_File *file, PHYSFS_uint16 val); +PHYSFS_DECL int PHYSFS_writeULE16(PHYSFS_File *file, PHYSFS_uint16 val); /** @@ -1774,7 +1906,7 @@ __EXPORT__ int PHYSFS_writeULE16(PHYSFS_File *file, PHYSFS_uint16 val); * \return zero on failure, non-zero on success. On failure, you can * find out what went wrong from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_writeSBE16(PHYSFS_File *file, PHYSFS_sint16 val); +PHYSFS_DECL int PHYSFS_writeSBE16(PHYSFS_File *file, PHYSFS_sint16 val); /** @@ -1789,7 +1921,7 @@ __EXPORT__ int PHYSFS_writeSBE16(PHYSFS_File *file, PHYSFS_sint16 val); * \return zero on failure, non-zero on success. On failure, you can * find out what went wrong from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_writeUBE16(PHYSFS_File *file, PHYSFS_uint16 val); +PHYSFS_DECL int PHYSFS_writeUBE16(PHYSFS_File *file, PHYSFS_uint16 val); /** @@ -1804,7 +1936,7 @@ __EXPORT__ int PHYSFS_writeUBE16(PHYSFS_File *file, PHYSFS_uint16 val); * \return zero on failure, non-zero on success. On failure, you can * find out what went wrong from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_writeSLE32(PHYSFS_File *file, PHYSFS_sint32 val); +PHYSFS_DECL int PHYSFS_writeSLE32(PHYSFS_File *file, PHYSFS_sint32 val); /** @@ -1819,7 +1951,7 @@ __EXPORT__ int PHYSFS_writeSLE32(PHYSFS_File *file, PHYSFS_sint32 val); * \return zero on failure, non-zero on success. On failure, you can * find out what went wrong from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_writeULE32(PHYSFS_File *file, PHYSFS_uint32 val); +PHYSFS_DECL int PHYSFS_writeULE32(PHYSFS_File *file, PHYSFS_uint32 val); /** @@ -1834,7 +1966,7 @@ __EXPORT__ int PHYSFS_writeULE32(PHYSFS_File *file, PHYSFS_uint32 val); * \return zero on failure, non-zero on success. On failure, you can * find out what went wrong from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_writeSBE32(PHYSFS_File *file, PHYSFS_sint32 val); +PHYSFS_DECL int PHYSFS_writeSBE32(PHYSFS_File *file, PHYSFS_sint32 val); /** @@ -1849,7 +1981,7 @@ __EXPORT__ int PHYSFS_writeSBE32(PHYSFS_File *file, PHYSFS_sint32 val); * \return zero on failure, non-zero on success. On failure, you can * find out what went wrong from PHYSFS_getLastError(). */ -__EXPORT__ int PHYSFS_writeUBE32(PHYSFS_File *file, PHYSFS_uint32 val); +PHYSFS_DECL int PHYSFS_writeUBE32(PHYSFS_File *file, PHYSFS_uint32 val); /** @@ -1867,7 +1999,7 @@ __EXPORT__ int PHYSFS_writeUBE32(PHYSFS_File *file, PHYSFS_uint32 val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ int PHYSFS_writeSLE64(PHYSFS_File *file, PHYSFS_sint64 val); +PHYSFS_DECL int PHYSFS_writeSLE64(PHYSFS_File *file, PHYSFS_sint64 val); /** @@ -1885,7 +2017,7 @@ __EXPORT__ int PHYSFS_writeSLE64(PHYSFS_File *file, PHYSFS_sint64 val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ int PHYSFS_writeULE64(PHYSFS_File *file, PHYSFS_uint64 val); +PHYSFS_DECL int PHYSFS_writeULE64(PHYSFS_File *file, PHYSFS_uint64 val); /** @@ -1903,7 +2035,7 @@ __EXPORT__ int PHYSFS_writeULE64(PHYSFS_File *file, PHYSFS_uint64 val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ int PHYSFS_writeSBE64(PHYSFS_File *file, PHYSFS_sint64 val); +PHYSFS_DECL int PHYSFS_writeSBE64(PHYSFS_File *file, PHYSFS_sint64 val); /** @@ -1921,7 +2053,7 @@ __EXPORT__ int PHYSFS_writeSBE64(PHYSFS_File *file, PHYSFS_sint64 val); * \warning Remember, PHYSFS_uint64 is only 32 bits on platforms without * any sort of 64-bit support. */ -__EXPORT__ int PHYSFS_writeUBE64(PHYSFS_File *file, PHYSFS_uint64 val); +PHYSFS_DECL int PHYSFS_writeUBE64(PHYSFS_File *file, PHYSFS_uint64 val); /* Everything above this line is part of the PhysicsFS 1.0 API. */ @@ -1940,7 +2072,7 @@ __EXPORT__ int PHYSFS_writeUBE64(PHYSFS_File *file, PHYSFS_uint64 val); * \sa PHYSFS_init * \sa PHYSFS_deinit */ -__EXPORT__ int PHYSFS_isInit(void); +PHYSFS_DECL int PHYSFS_isInit(void); /** @@ -1955,9 +2087,11 @@ __EXPORT__ int PHYSFS_isInit(void); * * \sa PHYSFS_permitSymbolicLinks */ -__EXPORT__ int PHYSFS_symbolicLinksPermitted(void); +PHYSFS_DECL int PHYSFS_symbolicLinksPermitted(void); +#ifndef SWIG /* not available from scripting languages. */ + /** * \struct PHYSFS_Allocator * \brief PhysicsFS allocation function pointers. @@ -1996,7 +2130,7 @@ typedef struct PHYSFS_Allocator * for it, you can probably ignore this forever.) * * By default, PhysicsFS will use whatever is reasonable for a platform - * to manage dynamic memory (usually ANSI C malloc/realloc/calloc/free, but + * to manage dynamic memory (usually ANSI C malloc/realloc/free, but * some platforms might use something else), but in some uncommon cases, the * app might want more control over the library's memory management. This * lets you redirect PhysicsFS to use your own allocation routines instead. @@ -2015,7 +2149,9 @@ typedef struct PHYSFS_Allocator * \return zero on failure, non-zero on success. This call only fails * when used between PHYSFS_init() and PHYSFS_deinit() calls. */ -__EXPORT__ int PHYSFS_setAllocator(const PHYSFS_Allocator *allocator); +PHYSFS_DECL int PHYSFS_setAllocator(const PHYSFS_Allocator *allocator); + +#endif /* SWIG */ /** @@ -2057,8 +2193,11 @@ __EXPORT__ int PHYSFS_setAllocator(const PHYSFS_Allocator *allocator); * \sa PHYSFS_removeFromSearchPath * \sa PHYSFS_getSearchPath * \sa PHYSFS_getMountPoint + * \sa PHYSFS_mountIo */ -__EXPORT__ int PHYSFS_mount(const char *newDir, const char *mountPoint, int appendToPath); +PHYSFS_DECL int PHYSFS_mount(const char *newDir, + const char *mountPoint, + int appendToPath); /** * \fn int PHYSFS_getMountPoint(const char *dir) @@ -2082,9 +2221,11 @@ __EXPORT__ int PHYSFS_mount(const char *newDir, const char *mountPoint, int appe * \sa PHYSFS_getSearchPath * \sa PHYSFS_getMountPoint */ -__EXPORT__ const char *PHYSFS_getMountPoint(const char *dir); +PHYSFS_DECL const char *PHYSFS_getMountPoint(const char *dir); +#ifndef SWIG /* not available from scripting languages. */ + /** * \typedef PHYSFS_StringCallback * \brief Function signature for callbacks that report strings. @@ -2178,7 +2319,7 @@ typedef void (*PHYSFS_EnumFilesCallback)(void *data, const char *origdir, * \sa PHYSFS_StringCallback * \sa PHYSFS_getCdRomDirs */ -__EXPORT__ void PHYSFS_getCdRomDirsCallback(PHYSFS_StringCallback c, void *d); +PHYSFS_DECL void PHYSFS_getCdRomDirsCallback(PHYSFS_StringCallback c, void *d); /** @@ -2214,7 +2355,7 @@ __EXPORT__ void PHYSFS_getCdRomDirsCallback(PHYSFS_StringCallback c, void *d); * \sa PHYSFS_StringCallback * \sa PHYSFS_getSearchPath */ -__EXPORT__ void PHYSFS_getSearchPathCallback(PHYSFS_StringCallback c, void *d); +PHYSFS_DECL void PHYSFS_getSearchPathCallback(PHYSFS_StringCallback c, void *d); /** @@ -2240,13 +2381,18 @@ __EXPORT__ void PHYSFS_getSearchPathCallback(PHYSFS_StringCallback c, void *d); * PHYSFS_enumerateFilesCallback("/some/path", printDir, NULL); * \endcode * + * !!! FIXME: enumerateFiles() does not promise alphabetical sorting by + * !!! FIXME: case-sensitivity in the code, and doesn't promise sorting at + * !!! FIXME: all in the above docs. + * * Items sent to the callback are not guaranteed to be in any order whatsoever. * There is no sorting done at this level, and if you need that, you should * probably use PHYSFS_enumerateFiles() instead, which guarantees * alphabetical sorting. This form reports whatever is discovered in each * archive before moving on to the next. Even within one archive, we can't * guarantee what order it will discover data. Any sorting you find in - * these callbacks is just pure luck. Do not rely on it. + * these callbacks is just pure luck. Do not rely on it. As this walks + * the entire list of archives, you may receive duplicate filenames. * * \param dir Directory, in platform-independent notation, to enumerate. * \param c Callback function to notify about search path elements. @@ -2255,9 +2401,9 @@ __EXPORT__ void PHYSFS_getSearchPathCallback(PHYSFS_StringCallback c, void *d); * \sa PHYSFS_EnumFilesCallback * \sa PHYSFS_enumerateFiles */ -__EXPORT__ void PHYSFS_enumerateFilesCallback(const char *dir, - PHYSFS_EnumFilesCallback c, - void *d); +PHYSFS_DECL void PHYSFS_enumerateFilesCallback(const char *dir, + PHYSFS_EnumFilesCallback c, + void *d); /** * \fn void PHYSFS_utf8FromUcs4(const PHYSFS_uint32 *src, char *dst, PHYSFS_uint64 len) @@ -2278,8 +2424,8 @@ __EXPORT__ void PHYSFS_enumerateFilesCallback(const char *dir, * \param dst Buffer to store converted UTF-8 string. * \param len Size, in bytes, of destination buffer. */ -__EXPORT__ void PHYSFS_utf8FromUcs4(const PHYSFS_uint32 *src, char *dst, - PHYSFS_uint64 len); +PHYSFS_DECL void PHYSFS_utf8FromUcs4(const PHYSFS_uint32 *src, char *dst, + PHYSFS_uint64 len); /** * \fn void PHYSFS_utf8ToUcs4(const char *src, PHYSFS_uint32 *dst, PHYSFS_uint64 len) @@ -2300,15 +2446,20 @@ __EXPORT__ void PHYSFS_utf8FromUcs4(const PHYSFS_uint32 *src, char *dst, * \param dst Buffer to store converted UCS-4 string. * \param len Size, in bytes, of destination buffer. */ -__EXPORT__ void PHYSFS_utf8ToUcs4(const char *src, PHYSFS_uint32 *dst, - PHYSFS_uint64 len); +PHYSFS_DECL void PHYSFS_utf8ToUcs4(const char *src, PHYSFS_uint32 *dst, + PHYSFS_uint64 len); /** * \fn void PHYSFS_utf8FromUcs2(const PHYSFS_uint16 *src, char *dst, PHYSFS_uint64 len) * \brief Convert a UCS-2 string to a UTF-8 string. * + * \warning you almost certainly should use PHYSFS_utf8FromUtf16(), which + * became available in PhysicsFS 2.1, unless you know what you're doing. + * * UCS-2 strings are 16-bits per character: \c TCHAR on Windows, when building - * with Unicode support. + * with Unicode support. Please note that modern versions of Windows use + * UTF-16, which is an extended form of UCS-2, and not UCS-2 itself. You + * almost certainly want PHYSFS_utf8FromUtf16() instead. * * To ensure that the destination buffer is large enough for the conversion, * please allocate a buffer that is double the size of the source buffer. @@ -2319,22 +2470,27 @@ __EXPORT__ void PHYSFS_utf8ToUcs4(const char *src, PHYSFS_uint32 *dst, * will always be null-terminated and never have an incomplete UTF-8 * sequence at the end. If the buffer length is 0, this function does nothing. * - * Please note that UCS-2 is not UTF-16; we do not support the "surrogate" - * values at this time. - * * \param src Null-terminated source string in UCS-2 format. * \param dst Buffer to store converted UTF-8 string. * \param len Size, in bytes, of destination buffer. + * + * \sa PHYSFS_utf8FromUtf16 */ -__EXPORT__ void PHYSFS_utf8FromUcs2(const PHYSFS_uint16 *src, char *dst, - PHYSFS_uint64 len); +PHYSFS_DECL void PHYSFS_utf8FromUcs2(const PHYSFS_uint16 *src, char *dst, + PHYSFS_uint64 len); /** * \fn PHYSFS_utf8ToUcs2(const char *src, PHYSFS_uint16 *dst, PHYSFS_uint64 len) * \brief Convert a UTF-8 string to a UCS-2 string. * + * \warning you almost certainly should use PHYSFS_utf8ToUtf16(), which + * became available in PhysicsFS 2.1, unless you know what you're doing. + * * UCS-2 strings are 16-bits per character: \c TCHAR on Windows, when building - * with Unicode support. + * with Unicode support. Please note that modern versions of Windows use + * UTF-16, which is an extended form of UCS-2, and not UCS-2 itself. You + * almost certainly want PHYSFS_utf8ToUtf16() instead, but you need to + * understand how that changes things, too. * * To ensure that the destination buffer is large enough for the conversion, * please allocate a buffer that is double the size of the source buffer. @@ -2345,22 +2501,20 @@ __EXPORT__ void PHYSFS_utf8FromUcs2(const PHYSFS_uint16 *src, char *dst, * will always be null-terminated and never have an incomplete UCS-2 * sequence at the end. If the buffer length is 0, this function does nothing. * - * Please note that UCS-2 is not UTF-16; we do not support the "surrogate" - * values at this time. - * * \param src Null-terminated source string in UTF-8 format. * \param dst Buffer to store converted UCS-2 string. * \param len Size, in bytes, of destination buffer. + * + * \sa PHYSFS_utf8ToUtf16 */ -__EXPORT__ void PHYSFS_utf8ToUcs2(const char *src, PHYSFS_uint16 *dst, - PHYSFS_uint64 len); +PHYSFS_DECL void PHYSFS_utf8ToUcs2(const char *src, PHYSFS_uint16 *dst, + PHYSFS_uint64 len); /** * \fn void PHYSFS_utf8FromLatin1(const char *src, char *dst, PHYSFS_uint64 len) * \brief Convert a UTF-8 string to a Latin1 string. * - * Latin1 strings are 8-bits per character: a popular "high ASCII" - * encoding. + * Latin1 strings are 8-bits per character: a popular "high ASCII" encoding. * * To ensure that the destination buffer is large enough for the conversion, * please allocate a buffer that is double the size of the source buffer. @@ -2379,11 +2533,1005 @@ __EXPORT__ void PHYSFS_utf8ToUcs2(const char *src, PHYSFS_uint16 *dst, * \param dst Buffer to store converted UTF-8 string. * \param len Size, in bytes, of destination buffer. */ -__EXPORT__ void PHYSFS_utf8FromLatin1(const char *src, char *dst, - PHYSFS_uint64 len); +PHYSFS_DECL void PHYSFS_utf8FromLatin1(const char *src, char *dst, + PHYSFS_uint64 len); /* Everything above this line is part of the PhysicsFS 2.0 API. */ +/** + * \fn int PHYSFS_unmount(const char *oldDir) + * \brief Remove a directory or archive from the search path. + * + * This is functionally equivalent to PHYSFS_removeFromSearchPath(), but that + * function is deprecated to keep the vocabulary paired with PHYSFS_mount(). + * + * This must be a (case-sensitive) match to a dir or archive already in the + * search path, specified in platform-dependent notation. + * + * This call will fail (and fail to remove from the path) if the element still + * has files open in it. + * + * \param oldDir dir/archive to remove. + * \return nonzero on success, zero on failure. + * Specifics of the error can be gleaned from PHYSFS_getLastError(). + * + * \sa PHYSFS_getSearchPath + * \sa PHYSFS_mount + */ +PHYSFS_DECL int PHYSFS_unmount(const char *oldDir); + +/** + * \fn const PHYSFS_Allocator *PHYSFS_getAllocator(void) + * \brief Discover the current allocator. + * + * (This is for limited, hardcore use. If you don't immediately see a need + * for it, you can probably ignore this forever.) + * + * This function exposes the function pointers that make up the currently used + * allocator. This can be useful for apps that want to access PhysicsFS's + * internal, default allocation routines, as well as for external code that + * wants to share the same allocator, even if the application specified their + * own. + * + * This call is only valid between PHYSFS_init() and PHYSFS_deinit() calls; + * it will return NULL if the library isn't initialized. As we can't + * guarantee the state of the internal allocators unless the library is + * initialized, you shouldn't use any allocator returned here after a call + * to PHYSFS_deinit(). + * + * Do not call the returned allocator's Init() or Deinit() methods under any + * circumstances. + * + * If you aren't immediately sure what to do with this function, you can + * safely ignore it altogether. + * + * \return Current allocator, as set by PHYSFS_setAllocator(), or PhysicsFS's + * internal, default allocator if no application defined allocator + * is currently set. Will return NULL if the library is not + * initialized. + * + * \sa PHYSFS_Allocator + * \sa PHYSFS_setAllocator + */ +PHYSFS_DECL const PHYSFS_Allocator *PHYSFS_getAllocator(void); + +#endif /* SWIG */ + +/** + * \enum PHYSFS_FileType + * \brief Type of a File + * + * Possible types of a file. + * + * \sa PHYSFS_stat + */ +typedef enum PHYSFS_FileType +{ + PHYSFS_FILETYPE_REGULAR, /**< a normal file */ + PHYSFS_FILETYPE_DIRECTORY, /**< a directory */ + PHYSFS_FILETYPE_SYMLINK, /**< a symlink */ + PHYSFS_FILETYPE_OTHER /**< something completely different like a device */ +} PHYSFS_FileType; + +/** + * \struct PHYSFS_Stat + * \brief Meta data for a file or directory + * + * Container for various meta data about a file in the virtual file system. + * PHYSFS_stat() uses this structure for returning the information. The time + * data will be either the number of seconds since the Unix epoch (midnight, + * Jan 1, 1970), or -1 if the information isn't available or applicable. + * The (filesize) field is measured in bytes. + * The (readonly) field tells you whether when you open a file for writing you + * are writing to the same file as if you were opening it, given you have + * enough filesystem rights to do that. !!! FIXME: this might change. + * + * \sa PHYSFS_stat + * \sa PHYSFS_FileType + */ +typedef struct PHYSFS_Stat +{ + PHYSFS_sint64 filesize; /**< size in bytes, -1 for non-files and unknown */ + PHYSFS_sint64 modtime; /**< last modification time */ + PHYSFS_sint64 createtime; /**< like modtime, but for file creation time */ + PHYSFS_sint64 accesstime; /**< like modtime, but for file access time */ + PHYSFS_FileType filetype; /**< File? Directory? Symlink? */ + int readonly; /**< non-zero if read only, zero if writable. */ +} PHYSFS_Stat; + +/** + * \fn int PHYSFS_stat(const char *fname, PHYSFS_Stat *stat) + * \brief Get various information about a directory or a file. + * + * Obtain various information about a file or directory from the meta data. + * + * This function will never follow symbolic links. If you haven't enabled + * symlinks with PHYSFS_permitSymbolicLinks(), stat'ing a symlink will be + * treated like stat'ing a non-existant file. If symlinks are enabled, + * stat'ing a symlink will give you information on the link itself and not + * what it points to. + * + * \param fname filename to check, in platform-indepedent notation. + * \param stat pointer to structure to fill in with data about (fname). + * \return non-zero on success, zero on failure. On failure, (stat)'s + * contents are undefined. + * + * \sa PHYSFS_Stat + */ +PHYSFS_DECL int PHYSFS_stat(const char *fname, PHYSFS_Stat *stat); + + +#ifndef SWIG /* not available from scripting languages. */ + +/** + * \fn void PHYSFS_utf8FromUtf16(const PHYSFS_uint16 *src, char *dst, PHYSFS_uint64 len) + * \brief Convert a UTF-16 string to a UTF-8 string. + * + * UTF-16 strings are 16-bits per character (except some chars, which are + * 32-bits): \c TCHAR on Windows, when building with Unicode support. Modern + * Windows releases use UTF-16. Windows releases before 2000 used TCHAR, but + * only handled UCS-2. UTF-16 _is_ UCS-2, except for the characters that + * are 4 bytes, which aren't representable in UCS-2 at all anyhow. If you + * aren't sure, you should be using UTF-16 at this point on Windows. + * + * To ensure that the destination buffer is large enough for the conversion, + * please allocate a buffer that is double the size of the source buffer. + * UTF-8 never uses more than 32-bits per character, so while it may shrink + * a UTF-16 string, it may also expand it. + * + * Strings that don't fit in the destination buffer will be truncated, but + * will always be null-terminated and never have an incomplete UTF-8 + * sequence at the end. If the buffer length is 0, this function does nothing. + * + * \param src Null-terminated source string in UTF-16 format. + * \param dst Buffer to store converted UTF-8 string. + * \param len Size, in bytes, of destination buffer. + */ +PHYSFS_DECL void PHYSFS_utf8FromUtf16(const PHYSFS_uint16 *src, char *dst, + PHYSFS_uint64 len); + +/** + * \fn PHYSFS_utf8ToUtf16(const char *src, PHYSFS_uint16 *dst, PHYSFS_uint64 len) + * \brief Convert a UTF-8 string to a UTF-16 string. + * + * UTF-16 strings are 16-bits per character (except some chars, which are + * 32-bits): \c TCHAR on Windows, when building with Unicode support. Modern + * Windows releases use UTF-16. Windows releases before 2000 used TCHAR, but + * only handled UCS-2. UTF-16 _is_ UCS-2, except for the characters that + * are 4 bytes, which aren't representable in UCS-2 at all anyhow. If you + * aren't sure, you should be using UTF-16 at this point on Windows. + * + * To ensure that the destination buffer is large enough for the conversion, + * please allocate a buffer that is double the size of the source buffer. + * UTF-8 uses from one to four bytes per character, but UTF-16 always uses + * two to four, so an entirely low-ASCII string will double in size! The + * UTF-16 characters that would take four bytes also take four bytes in UTF-8, + * so you don't need to allocate 4x the space just in case: double will do. + * + * Strings that don't fit in the destination buffer will be truncated, but + * will always be null-terminated and never have an incomplete UTF-16 + * surrogate pair at the end. If the buffer length is 0, this function does + * nothing. + * + * \param src Null-terminated source string in UTF-8 format. + * \param dst Buffer to store converted UTF-16 string. + * \param len Size, in bytes, of destination buffer. + * + * \sa PHYSFS_utf8ToUtf16 + */ +PHYSFS_DECL void PHYSFS_utf8ToUtf16(const char *src, PHYSFS_uint16 *dst, + PHYSFS_uint64 len); + +#endif /* SWIG */ + + +/** + * \fn PHYSFS_sint64 PHYSFS_readBytes(PHYSFS_File *handle, void *buffer, PHYSFS_uint64 len) + * \brief Read bytes from a PhysicsFS filehandle + * + * The file must be opened for reading. + * + * \param handle handle returned from PHYSFS_openRead(). + * \param buffer buffer of at least (len) bytes to store read data into. + * \param len number of bytes being read from (handle). + * \return number of bytes read. This may be less than (len); this does not + * signify an error, necessarily (a short read may mean EOF). + * PHYSFS_getLastError() can shed light on the reason this might + * be < (len), as can PHYSFS_eof(). -1 if complete failure. + * + * \sa PHYSFS_eof + */ +PHYSFS_DECL PHYSFS_sint64 PHYSFS_readBytes(PHYSFS_File *handle, void *buffer, + PHYSFS_uint64 len); + +/** + * \fn PHYSFS_sint64 PHYSFS_writeBytes(PHYSFS_File *handle, const void *buffer, PHYSFS_uint64 len) + * \brief Write data to a PhysicsFS filehandle + * + * The file must be opened for writing. + * + * Please note that while (len) is an unsigned 64-bit integer, you are limited + * to 63 bits (9223372036854775807 bytes), so we can return a negative value + * on error. If length is greater than 0x7FFFFFFFFFFFFFFF, this function will + * immediately fail. For systems without a 64-bit datatype, you are limited + * to 31 bits (0x7FFFFFFF, or 2147483647 bytes). We trust most things won't + * need to do multiple gigabytes of i/o in one call anyhow, but why limit + * things? + * + * \param handle retval from PHYSFS_openWrite() or PHYSFS_openAppend(). + * \param buffer buffer of (len) bytes to write to (handle). + * \param len number of bytes being written to (handle). + * \return number of bytes written. This may be less than (len); in the case + * of an error, the system may try to write as many bytes as possible, + * so an incomplete write might occur. PHYSFS_getLastError() can shed + * light on the reason this might be < (len). -1 if complete failure. + */ +PHYSFS_DECL PHYSFS_sint64 PHYSFS_writeBytes(PHYSFS_File *handle, + const void *buffer, + PHYSFS_uint64 len); + + +#ifndef SWIG /* not available from scripting languages. */ + +/** + * \struct PHYSFS_Io + * \brief An abstract i/o interface. + * + * \warning This is advanced, hardcore stuff. You don't need this unless you + * really know what you're doing. Most apps will not need this. + * + * Historically, PhysicsFS provided access to the physical filesystem and + * archives within that filesystem. However, sometimes you need more power + * than this. Perhaps you need to provide an archive that is entirely + * contained in RAM, or you need to bridge some other file i/o API to + * PhysicsFS, or you need to translate the bits (perhaps you have a + * a standard .zip file that's encrypted, and you need to decrypt on the fly + * for the unsuspecting zip archiver). + * + * A PHYSFS_Io is the interface that Archivers use to get archive data. + * Historically, this has mapped to file i/o to the physical filesystem, but + * as of PhysicsFS 2.1, applications can provide their own i/o implementations + * at runtime. + * + * This interface isn't necessarily a good universal fit for i/o. There are a + * few requirements of note: + * + * - They only do blocking i/o (at least, for now). + * - They need to be able to duplicate. If you have a file handle from + * fopen(), you need to be able to create a unique clone of it (so we + * have two handles to the same file that can both seek/read/etc without + * stepping on each other). + * - They need to know the size of their entire data set. + * - They need to be able to seek and rewind on demand. + * + * ...in short, you're probably not going to write an HTTP implementation. + * + * Thread safety: TO BE DECIDED. !!! FIXME + * + * \sa PHYSFS_mountIo + */ +typedef struct PHYSFS_Io +{ + /** + * \brief Binary compatibility information. + * + * This must be set to zero at this time. Future versions of this + * struct will increment this field, so we know what a given + * implementation supports. We'll presumably keep supporting older + * versions as we offer new features, though. + */ + PHYSFS_uint32 version; + + /** + * \brief Instance data for this struct. + * + * Each instance has a pointer associated with it that can be used to + * store anything it likes. This pointer is per-instance of the stream, + * so presumably it will change when calling duplicate(). This can be + * deallocated during the destroy() method. + */ + void *opaque; + + /** + * \brief Read more data. + * + * Read (len) bytes from the interface, at the current i/o position, and + * store them in (buffer). The current i/o position should move ahead + * by the number of bytes successfully read. + * + * You don't have to implement this; set it to NULL if not implemented. + * This will only be used if the file is opened for reading. If set to + * NULL, a default implementation that immediately reports failure will + * be used. + * + * \param io The i/o instance to read from. + * \param buf The buffer to store data into. It must be at least + * (len) bytes long and can't be NULL. + * \param len The number of bytes to read from the interface. + * \return number of bytes read from file, 0 on EOF, -1 if complete + * failure. + */ + PHYSFS_sint64 (*read)(struct PHYSFS_Io *io, void *buf, PHYSFS_uint64 len); + + /** + * \brief Write more data. + * + * Write (len) bytes from (buffer) to the interface at the current i/o + * position. The current i/o position should move ahead by the number of + * bytes successfully written. + * + * You don't have to implement this; set it to NULL if not implemented. + * This will only be used if the file is opened for writing. If set to + * NULL, a default implementation that immediately reports failure will + * be used. + * + * You are allowed to buffer; a write can succeed here and then later + * fail when flushing. Note that PHYSFS_setBuffer() may be operating a + * level above your i/o, so you should usually not implement your + * own buffering routines. + * + * \param io The i/o instance to write to. + * \param buffer The buffer to read data from. It must be at least + * (len) bytes long and can't be NULL. + * \param len The number of bytes to read from (buffer). + * \return number of bytes written to file, -1 if complete failure. + */ + PHYSFS_sint64 (*write)(struct PHYSFS_Io *io, const void *buffer, + PHYSFS_uint64 len); + + /** + * \brief Move i/o position to a given byte offset from start. + * + * This method moves the i/o position, so the next read/write will + * be of the byte at (offset) offset. Seeks past the end of file should + * be treated as an error condition. + * + * \param io The i/o instance to seek. + * \param offset The new byte offset for the i/o position. + * \return non-zero on success, zero on error. + */ + int (*seek)(struct PHYSFS_Io *io, PHYSFS_uint64 offset); + + /** + * \brief Report current i/o position. + * + * Return bytes offset, or -1 if you aren't able to determine. A failure + * will almost certainly be fatal to further use of this stream, so you + * may not leave this unimplemented. + * + * \param io The i/o instance to query. + * \return The current byte offset for the i/o position, -1 if unknown. + */ + PHYSFS_sint64 (*tell)(struct PHYSFS_Io *io); + + /** + * \brief Determine size of the i/o instance's dataset. + * + * Return number of bytes available in the file, or -1 if you + * aren't able to determine. A failure will almost certainly be fatal + * to further use of this stream, so you may not leave this unimplemented. + * + * \param io The i/o instance to query. + * \return Total size, in bytes, of the dataset. + */ + PHYSFS_sint64 (*length)(struct PHYSFS_Io *io); + + /** + * \brief Duplicate this i/o instance. + * + * // !!! FIXME: write me. + * + * \param io The i/o instance to duplicate. + * \return A new value for a stream's (opaque) field, or NULL on error. + */ + struct PHYSFS_Io *(*duplicate)(struct PHYSFS_Io *io); + + /** + * \brief Flush resources to media, or wherever. + * + * This is the chance to report failure for writes that had claimed + * success earlier, but still had a chance to actually fail. This method + * can be NULL if flushing isn't necessary. + * + * This function may be called before destroy(), as it can report failure + * and destroy() can not. It may be called at other times, too. + * + * \param io The i/o instance to flush. + * \return Zero on error, non-zero on success. + */ + int (*flush)(struct PHYSFS_Io *io); + + /** + * \brief Cleanup and deallocate i/o instance. + * + * Free associated resources, including (opaque) if applicable. + * + * This function must always succeed: as such, it returns void. The + * system may call your flush() method before this. You may report + * failure there if necessary. This method may still be called if + * flush() fails, in which case you'll have to abandon unflushed data + * and other failing conditions and clean up. + * + * Once this method is called for a given instance, the system will assume + * it is unsafe to touch that instance again and will discard any + * references to it. + * + * \param s The i/o instance to destroy. + */ + void (*destroy)(struct PHYSFS_Io *io); +} PHYSFS_Io; + + +/** + * \fn int PHYSFS_mountIo(PHYSFS_Io *io, const char *fname, const char *mountPoint, int appendToPath) + * \brief Add an archive, built on a PHYSFS_Io, to the search path. + * + * \warning Unless you have some special, low-level need, you should be using + * PHYSFS_mount() instead of this. + * + * This function operates just like PHYSFS_mount(), but takes a PHYSFS_Io + * instead of a pathname. Behind the scenes, PHYSFS_mount() calls this + * function with a physical-filesystem-based PHYSFS_Io. + * + * (filename) is only used here to optimize archiver selection (if you name it + * XXXXX.zip, we might try the ZIP archiver first, for example). It doesn't + * need to refer to a real file at all, and can even be NULL. If the filename + * isn't helpful, the system will try every archiver until one works or none + * of them do. + * + * (io) must remain until the archive is unmounted. When the archive is + * unmounted, the system will call (io)->destroy(io), which will give you + * a chance to free your resources. + * + * If this function fails, (io)->destroy(io) is not called. + * + * \param io i/o instance for archive to add to the path. + * \param fname Filename that can represent this stream. Can be NULL. + * \param mountPoint Location in the interpolated tree that this archive + * will be "mounted", in platform-independent notation. + * NULL or "" is equivalent to "/". + * \param appendToPath nonzero to append to search path, zero to prepend. + * \return nonzero if added to path, zero on failure (bogus archive, stream + * i/o issue, etc). Specifics of the error can be + * gleaned from PHYSFS_getLastError(). + * + * \sa PHYSFS_unmount + * \sa PHYSFS_getSearchPath + * \sa PHYSFS_getMountPoint + */ +PHYSFS_DECL int PHYSFS_mountIo(PHYSFS_Io *io, const char *fname, + const char *mountPoint, int appendToPath); + +#endif /* SWIG */ + +/** + * \fn int PHYSFS_mountMemory(const void *ptr, PHYSFS_uint64 len, void (*del)(void *), const char *fname, const char *mountPoint, int appendToPath) + * \brief Add an archive, contained in a memory buffer, to the search path. + * + * \warning Unless you have some special, low-level need, you should be using + * PHYSFS_mount() instead of this. + * + * This function operates just like PHYSFS_mount(), but takes a memory buffer + * instead of a pathname. This buffer contains all the data of the archive, + * and is used instead of a real file in the physical filesystem. + * + * (filename) is only used here to optimize archiver selection (if you name it + * XXXXX.zip, we might try the ZIP archiver first, for example). It doesn't + * need to refer to a real file at all, and can even be NULL. If the filename + * isn't helpful, the system will try every archiver until one works or none + * of them do. + * + * (ptr) must remain until the archive is unmounted. When the archive is + * unmounted, the system will call (del)(ptr), which will notify you that + * the system is done with the buffer, and give you a chance to free your + * resources. (del) can be NULL, in which case the system will make no + * attempt to free the buffer. + * + * If this function fails, (del) is not called. + * + * \param ptr Address of the memory buffer containing the archive data. + * \param len Size of memory buffer, in bytes. + * \param del A callback that triggers upon unmount. Can be NULL. + * \param fname Filename that can represent this stream. Can be NULL. + * \param mountPoint Location in the interpolated tree that this archive + * will be "mounted", in platform-independent notation. + * NULL or "" is equivalent to "/". + * \param appendToPath nonzero to append to search path, zero to prepend. + * \return nonzero if added to path, zero on failure (bogus archive, etc). + * Specifics of the error can be gleaned from + * PHYSFS_getLastError(). + * + * \sa PHYSFS_unmount + * \sa PHYSFS_getSearchPath + * \sa PHYSFS_getMountPoint + */ +PHYSFS_DECL int PHYSFS_mountMemory(const void *buf, PHYSFS_uint64 len, + void (*del)(void *), const char *fname, + const char *mountPoint, int appendToPath); + + +/** + * \fn int PHYSFS_mountHandle(PHYSFS_File *file, const char *fname, const char *mountPoint, int appendToPath) + * \brief Add an archive, contained in a PHYSFS_File handle, to the search path. + * + * \warning Unless you have some special, low-level need, you should be using + * PHYSFS_mount() instead of this. + * + * \warning Archives-in-archives may be very slow! While a PHYSFS_File can + * seek even when the data is compressed, it may do so by rewinding + * to the start and decompressing everything before the seek point. + * Normal archive usage may do a lot of seeking behind the scenes. + * As such, you might find normal archive usage extremely painful + * if mounted this way. Plan accordingly: if you, say, have a + * self-extracting .zip file, and want to mount something in it, + * compress the contents of the inner archive and make sure the outer + * .zip file doesn't compress the inner archive too. + * + * This function operates just like PHYSFS_mount(), but takes a PHYSFS_File + * handle instead of a pathname. This handle contains all the data of the + * archive, and is used instead of a real file in the physical filesystem. + * The PHYSFS_File may be backed by a real file in the physical filesystem, + * but isn't necessarily. The most popular use for this is likely to mount + * archives stored inside other archives. + * + * (filename) is only used here to optimize archiver selection (if you name it + * XXXXX.zip, we might try the ZIP archiver first, for example). It doesn't + * need to refer to a real file at all, and can even be NULL. If the filename + * isn't helpful, the system will try every archiver until one works or none + * of them do. + * + * (file) must remain until the archive is unmounted. When the archive is + * unmounted, the system will call PHYSFS_close(file). If you need this + * handle to survive, you will have to wrap this in a PHYSFS_Io and use + * PHYSFS_mountIo() instead. + * + * If this function fails, PHYSFS_close(file) is not called. + * + * \param file The PHYSFS_File handle containing archive data. + * \param fname Filename that can represent this stream. Can be NULL. + * \param mountPoint Location in the interpolated tree that this archive + * will be "mounted", in platform-independent notation. + * NULL or "" is equivalent to "/". + * \param appendToPath nonzero to append to search path, zero to prepend. + * \return nonzero if added to path, zero on failure (bogus archive, etc). + * Specifics of the error can be gleaned from + * PHYSFS_getLastError(). + * + * \sa PHYSFS_unmount + * \sa PHYSFS_getSearchPath + * \sa PHYSFS_getMountPoint + */ +PHYSFS_DECL int PHYSFS_mountHandle(PHYSFS_File *file, const char *fname, + const char *mountPoint, int appendToPath); + + +/** + * \enum PHYSFS_ErrorCode + * \brief Values that represent specific causes of failure. + * + * Most of the time, you should only concern yourself with whether a given + * operation failed or not, but there may be occasions where you plan to + * handle a specific failure case gracefully, so we provide specific error + * codes. + * + * Most of these errors are a little vague, and most aren't things you can + * fix...if there's a permission error, for example, all you can really do + * is pass that information on to the user and let them figure out how to + * handle it. In most these cases, your program should only care that it + * failed to accomplish its goals, and not care specifically why. + * + * \sa PHYSFS_getLastErrorCode + * \sa PHYSFS_getErrorByCode + */ +typedef enum PHYSFS_ErrorCode +{ + PHYSFS_ERR_OK, /**< Success; no error. */ + PHYSFS_ERR_OTHER_ERROR, /**< Error not otherwise covered here. */ + PHYSFS_ERR_OUT_OF_MEMORY, /**< Memory allocation failed. */ + PHYSFS_ERR_NOT_INITIALIZED, /**< PhysicsFS is not initialized. */ + PHYSFS_ERR_IS_INITIALIZED, /**< PhysicsFS is already initialized. */ + PHYSFS_ERR_ARGV0_IS_NULL, /**< Needed argv[0], but it is NULL. */ + PHYSFS_ERR_UNSUPPORTED, /**< Operation or feature unsupported. */ + PHYSFS_ERR_PAST_EOF, /**< Attempted to access past end of file. */ + PHYSFS_ERR_FILES_STILL_OPEN, /**< Files still open. */ + PHYSFS_ERR_INVALID_ARGUMENT, /**< Bad parameter passed to an function. */ + PHYSFS_ERR_NOT_MOUNTED, /**< Requested archive/dir not mounted. */ + PHYSFS_ERR_NOT_FOUND, /**< File (or whatever) not found. */ + PHYSFS_ERR_SYMLINK_FORBIDDEN,/**< Symlink seen when not permitted. */ + PHYSFS_ERR_NO_WRITE_DIR, /**< No write dir has been specified. */ + PHYSFS_ERR_OPEN_FOR_READING, /**< Wrote to a file opened for reading. */ + PHYSFS_ERR_OPEN_FOR_WRITING, /**< Read from a file opened for writing. */ + PHYSFS_ERR_NOT_A_FILE, /**< Needed a file, got a directory (etc). */ + PHYSFS_ERR_READ_ONLY, /**< Wrote to a read-only filesystem. */ + PHYSFS_ERR_CORRUPT, /**< Corrupted data encountered. */ + PHYSFS_ERR_SYMLINK_LOOP, /**< Infinite symbolic link loop. */ + PHYSFS_ERR_IO, /**< i/o error (hardware failure, etc). */ + PHYSFS_ERR_PERMISSION, /**< Permission denied. */ + PHYSFS_ERR_NO_SPACE, /**< No space (disk full, over quota, etc) */ + PHYSFS_ERR_BAD_FILENAME, /**< Filename is bogus/insecure. */ + PHYSFS_ERR_BUSY, /**< Tried to modify a file the OS needs. */ + PHYSFS_ERR_DIR_NOT_EMPTY, /**< Tried to delete dir with files in it. */ + PHYSFS_ERR_OS_ERROR, /**< Unspecified OS-level error. */ + PHYSFS_ERR_DUPLICATE /**< Duplicate entry. */ +} PHYSFS_ErrorCode; + + +/** + * \fn PHYSFS_ErrorCode PHYSFS_getLastErrorCode(void) + * \brief Get machine-readable error information. + * + * Get the last PhysicsFS error message as an integer value. This will return + * PHYSFS_ERR_OK if there's been no error since the last call to this + * function. Each thread has a unique error state associated with it, but + * each time a new error message is set, it will overwrite the previous one + * associated with that thread. It is safe to call this function at anytime, + * even before PHYSFS_init(). + * + * PHYSFS_getLastError() and PHYSFS_getLastErrorCode() both reset the same + * thread-specific error state. Calling one will wipe out the other's + * data. If you need both, call PHYSFS_getLastErrorCode(), then pass that + * value to PHYSFS_getErrorByCode(). + * + * Generally, applications should only concern themselves with whether a + * given function failed; however, if you require more specifics, you can + * try this function to glean information, if there's some specific problem + * you're expecting and plan to handle. But with most things that involve + * file systems, the best course of action is usually to give up, report the + * problem to the user, and let them figure out what should be done about it. + * For that, you might prefer PHYSFS_getLastError() instead. + * + * \return Enumeration value that represents last reported error. + * + * \sa PHYSFS_getErrorByCode + */ +PHYSFS_DECL PHYSFS_ErrorCode PHYSFS_getLastErrorCode(void); + + +/** + * \fn const char *PHYSFS_getErrorByCode(PHYSFS_ErrorCode code) + * \brief Get human-readable description string for a given error code. + * + * Get a static string, in UTF-8 format, that represents an English + * description of a given error code. + * + * This string is guaranteed to never change (although we may add new strings + * for new error codes in later versions of PhysicsFS), so you can use it + * for keying a localization dictionary. + * + * It is safe to call this function at anytime, even before PHYSFS_init(). + * + * These strings are meant to be passed on directly to the user. + * Generally, applications should only concern themselves with whether a + * given function failed, but not care about the specifics much. + * + * Do not attempt to free the returned strings; they are read-only and you + * don't own their memory pages. + * + * \param code Error code to convert to a string. + * \return READ ONLY string of requested error message, NULL if this + * is not a valid PhysicsFS error code. Always check for NULL if + * you might be looking up an error code that didn't exist in an + * earlier version of PhysicsFS. + * + * \sa PHYSFS_getLastErrorCode + */ +PHYSFS_DECL const char *PHYSFS_getErrorByCode(PHYSFS_ErrorCode code); + +/** + * \fn void PHYSFS_setErrorCode(PHYSFS_ErrorCode code) + * \brief Set the current thread's error code. + * + * This lets you set the value that will be returned by the next call to + * PHYSFS_getLastErrorCode(). This will replace any existing error code, + * whether set by your application or internally by PhysicsFS. + * + * Error codes are stored per-thread; what you set here will not be + * accessible to another thread. + * + * Any call into PhysicsFS may change the current error code, so any code you + * set here is somewhat fragile, and thus you shouldn't build any serious + * error reporting framework on this function. The primary goal of this + * function is to allow PHYSFS_Io implementations to set the error state, + * which generally will be passed back to your application when PhysicsFS + * makes a PHYSFS_Io call that fails internally. + * + * This function doesn't care if the error code is a value known to PhysicsFS + * or not (but PHYSFS_getErrorByCode() will return NULL for unknown values). + * The value will be reported unmolested by PHYSFS_getLastErrorCode(). + * + * \param code Error code to become the current thread's new error state. + * + * \sa PHYSFS_getLastErrorCode + * \sa PHYSFS_getErrorByCode + */ +PHYSFS_DECL void PHYSFS_setErrorCode(PHYSFS_ErrorCode code); + + +/** + * \fn const char *PHYSFS_getPrefDir(const char *org, const char *app) + * \brief Get the user-and-app-specific path where files can be written. + * + * Helper function. + * + * Get the "pref dir". This is meant to be where users can write personal + * files (preferences and save games, etc) that are specific to your + * application. This directory is unique per user, per application. + * + * This function will decide the appropriate location in the native filesystem, + * create the directory if necessary, and return a string in + * platform-dependent notation, suitable for passing to PHYSFS_setWriteDir(). + * + * On Windows, this might look like: + * "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name" + * + * On Linux, this might look like: + * "/home/bob/.local/share/My Program Name" + * + * On Mac OS X, this might look like: + * "/Users/bob/Library/Application Support/My Program Name" + * + * (etc.) + * + * You should probably use the pref dir for your write dir, and also put it + * near the beginning of your search path. Older versions of PhysicsFS + * offered only PHYSFS_getUserDir() and left you to figure out where the + * files should go under that tree. This finds the correct location + * for whatever platform, which not only changes between operating systems, + * but also versions of the same operating system. + * + * You specify the name of your organization (if it's not a real organization, + * your name or an Internet domain you own might do) and the name of your + * application. These should be proper names. + * + * Both the (org) and (app) strings may become part of a directory name, so + * please follow these rules: + * + * - Try to use the same org string (including case-sensitivity) for + * all your applications that use this function. + * - Always use a unique app string for each one, and make sure it never + * changes for an app once you've decided on it. + * - Unicode characters are legal, as long as it's UTF-8 encoded, but... + * - ...only use letters, numbers, and spaces. Avoid punctuation like + * "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. + * + * The pointer returned by this function remains valid until you call this + * function again, or call PHYSFS_deinit(). This is not necessarily a fast + * call, though, so you should call this once at startup and copy the string + * if you need it. + * + * You should assume the path returned by this function is the only safe + * place to write files (and that PHYSFS_getUserDir() and PHYSFS_getBaseDir(), + * while they might be writable, or even parents of the returned path, aren't + * where you should be writing things). + * + * \param org The name of your organization. + * \param app The name of your application. + * \return READ ONLY string of user dir in platform-dependent notation. NULL + * if there's a problem (creating directory failed, etc). + * + * \sa PHYSFS_getBaseDir + * \sa PHYSFS_getUserDir + */ +PHYSFS_DECL const char *PHYSFS_getPrefDir(const char *org, const char *app); + + +/** + * \struct PHYSFS_Archiver + * \brief Abstract interface to provide support for user-defined archives. + * + * \warning This is advanced, hardcore stuff. You don't need this unless you + * really know what you're doing. Most apps will not need this. + * + * Historically, PhysicsFS provided a means to mount various archive file + * formats, and physical directories in the native filesystem. However, + * applications have been limited to the file formats provided by the + * library. This interface allows an application to provide their own + * archive file types. + * + * Conceptually, a PHYSFS_Archiver provides directory entries, while + * PHYSFS_Io provides data streams for those directory entries. The most + * obvious use of PHYSFS_Archiver is to provide support for an archive + * file type that isn't provided by PhysicsFS directly: perhaps some + * proprietary format that only your application needs to understand. + * + * Internally, all the built-in archive support uses this interface, so the + * best examples for building a PHYSFS_Archiver is the source code to + * PhysicsFS itself. + * + * An archiver is added to the system with PHYSFS_registerArchiver(), and then + * it will be available for use automatically with PHYSFS_mount(); if a + * given archive can be handled with your archiver, it will be given control + * as appropriate. + * + * These methods deal with dir handles. You have one instance of your + * archiver, and it generates a unique, opaque handle for each opened + * archive in its openArchive() method. Since the lifetime of an Archiver + * (not an archive) is generally the entire lifetime of the process, and it's + * assumed to be a singleton, we do not provide any instance data for the + * archiver itself; the app can just use some static variables if necessary. + * + * Symlinks should always be followed (except in stat()); PhysicsFS will + * use the stat() method to check for symlinks and make a judgement on + * whether to continue to call other methods based on that. + * + * Archivers, when necessary, should set the PhysicsFS error state with + * PHYSFS_setErrorCode() before returning. PhysicsFS will pass these errors + * back to the application unmolested in most cases. + * + * Thread safety: TO BE DECIDED. !!! FIXME + * + * \sa PHYSFS_registerArchiver + * \sa PHYSFS_deregisterArchiver + * \sa PHYSFS_supportedArchiveTypes + */ +typedef struct PHYSFS_Archiver +{ + +// !!! FIXME: split read/write interfaces? + + /** + * \brief Binary compatibility information. + * + * This must be set to zero at this time. Future versions of this + * struct will increment this field, so we know what a given + * implementation supports. We'll presumably keep supporting older + * versions as we offer new features, though. + */ + PHYSFS_uint32 version; + + /** + * \brief Basic info about this archiver. + * + * This is used to identify your archive, and is returned in + * PHYSFS_supportedArchiveTypes(). + */ + PHYSFS_ArchiveInfo info; + +// !!! FIXME: documentation: \brief? + /** + * \brief + * + * Open an archive provided by (io). + * (name) is a filename associated with (io), but doesn't necessarily + * map to anything, let alone a real filename. This possibly- + * meaningless name is in platform-dependent notation. + * (forWrite) is non-zero if this is to be used for + * the write directory, and zero if this is to be used for an + * element of the search path. + * Return NULL on failure. We ignore any error code you set here; + * when PHYSFS_mount() returns, the error will be PHYSFS_ERR_UNSUPPORTED + * (no Archivers could handle this data). // !!! FIXME: yeah? + * Returns non-NULL on success. The pointer returned will be + * passed as the "opaque" parameter for later calls. + */ + void *(*openArchive)(PHYSFS_Io *io, const char *name, int forWrite); + + /** + * List all files in (dirname). Each file is passed to (cb), + * where a copy is made if appropriate, so you should dispose of + * it properly upon return from the callback. + * If you have a failure, report as much as you can. + * (dirname) is in platform-independent notation. + */ + void (*enumerateFiles)(void *opaque, const char *dirname, + PHYSFS_EnumFilesCallback cb, + const char *origdir, void *callbackdata); + + /** + * Open file for reading. + * This filename, (fnm), is in platform-independent notation. + * If you can't handle multiple opens of the same file, + * you can opt to fail for the second call. + * Fail if the file does not exist. + * Returns NULL on failure, and calls PHYSFS_setErrorCode(). + * Returns non-NULL on success. The pointer returned will be + * passed as the "opaque" parameter for later file calls. + */ + PHYSFS_Io *(*openRead)(void *opaque, const char *fnm); + + /** + * Open file for writing. + * If the file does not exist, it should be created. If it exists, + * it should be truncated to zero bytes. The writing + * offset should be the start of the file. + * This filename is in platform-independent notation. + * If you can't handle multiple opens of the same file, + * you can opt to fail for the second call. + * Returns NULL on failure, and calls PHYSFS_setErrorCode(). + * Returns non-NULL on success. The pointer returned will be + * passed as the "opaque" parameter for later file calls. + */ + PHYSFS_Io *(*openWrite)(void *opaque, const char *filename); + + /** + * Open file for appending. + * If the file does not exist, it should be created. The writing + * offset should be the end of the file. + * This filename is in platform-independent notation. + * If you can't handle multiple opens of the same file, + * you can opt to fail for the second call. + * Returns NULL on failure, and calls PHYSFS_setErrorCode(). + * Returns non-NULL on success. The pointer returned will be + * passed as the "opaque" parameter for later file calls. + */ + PHYSFS_Io *(*openAppend)(void *opaque, const char *filename); + + /** + * Delete a file in the archive/directory. + * Return non-zero on success, zero on failure. + * This filename is in platform-independent notation. + * This method may be NULL. + * On failure, call PHYSFS_setErrorCode(). + */ + int (*remove)(void *opaque, const char *filename); + + /** + * Create a directory in the archive/directory. + * If the application is trying to make multiple dirs, PhysicsFS + * will split them up into multiple calls before passing them to + * your driver. + * Return non-zero on success, zero on failure. + * This filename is in platform-independent notation. + * This method may be NULL. + * On failure, call PHYSFS_setErrorCode(). + */ + int (*mkdir)(void *opaque, const char *filename); + + /** + * Obtain basic file metadata. + * Returns non-zero on success, zero on failure. + * On failure, call PHYSFS_setErrorCode(). + */ + int (*stat)(void *opaque, const char *fn, PHYSFS_Stat *stat); + + /** + * Close directories/archives, and free any associated memory, + * including the original PHYSFS_Io and (opaque) itself, if + * applicable. Implementation can assume that it won't be called if + * there are still files open from this archive. + */ + void (*closeArchive)(void *opaque); +} PHYSFS_Archiver; + +/** + * \fn int PHYSFS_registerArchiver(const PHYSFS_Archiver *archiver) + * \brief Add a new archiver to the system. + * + * !!! FIXME: write me. + * + * You may not have two archivers that handle the same extension. If you are + * going to have a clash, you can deregister the other archiver (including + * built-in ones) with PHYSFS_deregisterArchiver(). + * + * The data in (archiver) is copied; you may free this pointer when this + * function returns. + * + * \param archiver The archiver to register. + * \return Zero on error, non-zero on success. + * + * \sa PHYSFS_Archiver + * \sa PHYSFS_deregisterArchiver + */ +PHYSFS_DECL int PHYSFS_registerArchiver(const PHYSFS_Archiver *archiver); + +/** + * \fn int PHYSFS_deregisterArchiver(const char *ext) + * \brief Remove an archiver from the system. + * + * !!! FIXME: write me. + * + * This fails if there are any archives still open that use this archiver. + * + * \param ext Filename extension that the archiver handles. + * \return Zero on error, non-zero on success. + * + * \sa PHYSFS_Archiver + * \sa PHYSFS_registerArchiver + */ +PHYSFS_DECL int PHYSFS_deregisterArchiver(const char *ext); + + +/* Everything above this line is part of the PhysicsFS 2.1 API. */ #ifdef __cplusplus } diff --git a/jni/physfs-2.1.0/src/physfs_byteorder.c b/jni/physfs-2.1.0/src/physfs_byteorder.c new file mode 100644 index 00000000..b3706ffd --- /dev/null +++ b/jni/physfs-2.1.0/src/physfs_byteorder.c @@ -0,0 +1,137 @@ +/** + * PhysicsFS; a portable, flexible file i/o abstraction. + * + * Documentation is in physfs.h. It's verbose, honest. :) + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_internal.h" + +#ifndef PHYSFS_Swap16 +static inline PHYSFS_uint16 PHYSFS_Swap16(PHYSFS_uint16 D) +{ + return ((D<<8)|(D>>8)); +} +#endif +#ifndef PHYSFS_Swap32 +static inline PHYSFS_uint32 PHYSFS_Swap32(PHYSFS_uint32 D) +{ + return ((D<<24)|((D<<8)&0x00FF0000)|((D>>8)&0x0000FF00)|(D>>24)); +} +#endif +#ifndef PHYSFS_NO_64BIT_SUPPORT +#ifndef PHYSFS_Swap64 +static inline PHYSFS_uint64 PHYSFS_Swap64(PHYSFS_uint64 val) { + PHYSFS_uint32 hi, lo; + + /* Separate into high and low 32-bit values and swap them */ + lo = (PHYSFS_uint32)(val&0xFFFFFFFF); + val >>= 32; + hi = (PHYSFS_uint32)(val&0xFFFFFFFF); + val = PHYSFS_Swap32(lo); + val <<= 32; + val |= PHYSFS_Swap32(hi); + return val; +} +#endif +#else +#ifndef PHYSFS_Swap64 +/* This is mainly to keep compilers from complaining in PHYSFS code. + If there is no real 64-bit datatype, then compilers will complain about + the fake 64-bit datatype that PHYSFS provides when it compiles user code. +*/ +#define PHYSFS_Swap64(X) (X) +#endif +#endif /* PHYSFS_NO_64BIT_SUPPORT */ + + +/* Byteswap item from the specified endianness to the native endianness */ +#if PHYSFS_BYTEORDER == PHYSFS_LIL_ENDIAN +PHYSFS_uint16 PHYSFS_swapULE16(PHYSFS_uint16 x) { return x; } +PHYSFS_sint16 PHYSFS_swapSLE16(PHYSFS_sint16 x) { return x; } +PHYSFS_uint32 PHYSFS_swapULE32(PHYSFS_uint32 x) { return x; } +PHYSFS_sint32 PHYSFS_swapSLE32(PHYSFS_sint32 x) { return x; } +PHYSFS_uint64 PHYSFS_swapULE64(PHYSFS_uint64 x) { return x; } +PHYSFS_sint64 PHYSFS_swapSLE64(PHYSFS_sint64 x) { return x; } + +PHYSFS_uint16 PHYSFS_swapUBE16(PHYSFS_uint16 x) { return PHYSFS_Swap16(x); } +PHYSFS_sint16 PHYSFS_swapSBE16(PHYSFS_sint16 x) { return PHYSFS_Swap16(x); } +PHYSFS_uint32 PHYSFS_swapUBE32(PHYSFS_uint32 x) { return PHYSFS_Swap32(x); } +PHYSFS_sint32 PHYSFS_swapSBE32(PHYSFS_sint32 x) { return PHYSFS_Swap32(x); } +PHYSFS_uint64 PHYSFS_swapUBE64(PHYSFS_uint64 x) { return PHYSFS_Swap64(x); } +PHYSFS_sint64 PHYSFS_swapSBE64(PHYSFS_sint64 x) { return PHYSFS_Swap64(x); } +#else +PHYSFS_uint16 PHYSFS_swapULE16(PHYSFS_uint16 x) { return PHYSFS_Swap16(x); } +PHYSFS_sint16 PHYSFS_swapSLE16(PHYSFS_sint16 x) { return PHYSFS_Swap16(x); } +PHYSFS_uint32 PHYSFS_swapULE32(PHYSFS_uint32 x) { return PHYSFS_Swap32(x); } +PHYSFS_sint32 PHYSFS_swapSLE32(PHYSFS_sint32 x) { return PHYSFS_Swap32(x); } +PHYSFS_uint64 PHYSFS_swapULE64(PHYSFS_uint64 x) { return PHYSFS_Swap64(x); } +PHYSFS_sint64 PHYSFS_swapSLE64(PHYSFS_sint64 x) { return PHYSFS_Swap64(x); } + +PHYSFS_uint16 PHYSFS_swapUBE16(PHYSFS_uint16 x) { return x; } +PHYSFS_sint16 PHYSFS_swapSBE16(PHYSFS_sint16 x) { return x; } +PHYSFS_uint32 PHYSFS_swapUBE32(PHYSFS_uint32 x) { return x; } +PHYSFS_sint32 PHYSFS_swapSBE32(PHYSFS_sint32 x) { return x; } +PHYSFS_uint64 PHYSFS_swapUBE64(PHYSFS_uint64 x) { return x; } +PHYSFS_sint64 PHYSFS_swapSBE64(PHYSFS_sint64 x) { return x; } +#endif + +static inline int readAll(PHYSFS_File *file, void *val, const size_t len) +{ + return (PHYSFS_readBytes(file, val, len) == len); +} /* readAll */ + +#define PHYSFS_BYTEORDER_READ(datatype, swaptype) \ + int PHYSFS_read##swaptype(PHYSFS_File *file, PHYSFS_##datatype *val) { \ + PHYSFS_##datatype in; \ + BAIL_IF_MACRO(val == NULL, PHYSFS_ERR_INVALID_ARGUMENT, 0); \ + BAIL_IF_MACRO(!readAll(file, &in, sizeof (in)), ERRPASS, 0); \ + *val = PHYSFS_swap##swaptype(in); \ + return 1; \ + } + +PHYSFS_BYTEORDER_READ(sint16, SLE16) +PHYSFS_BYTEORDER_READ(uint16, ULE16) +PHYSFS_BYTEORDER_READ(sint16, SBE16) +PHYSFS_BYTEORDER_READ(uint16, UBE16) +PHYSFS_BYTEORDER_READ(sint32, SLE32) +PHYSFS_BYTEORDER_READ(uint32, ULE32) +PHYSFS_BYTEORDER_READ(sint32, SBE32) +PHYSFS_BYTEORDER_READ(uint32, UBE32) +PHYSFS_BYTEORDER_READ(sint64, SLE64) +PHYSFS_BYTEORDER_READ(uint64, ULE64) +PHYSFS_BYTEORDER_READ(sint64, SBE64) +PHYSFS_BYTEORDER_READ(uint64, UBE64) + + +static inline int writeAll(PHYSFS_File *f, const void *val, const size_t len) +{ + return (PHYSFS_writeBytes(f, val, len) == len); +} /* writeAll */ + +#define PHYSFS_BYTEORDER_WRITE(datatype, swaptype) \ + int PHYSFS_write##swaptype(PHYSFS_File *file, PHYSFS_##datatype val) { \ + const PHYSFS_##datatype out = PHYSFS_swap##swaptype(val); \ + BAIL_IF_MACRO(!writeAll(file, &out, sizeof (out)), ERRPASS, 0); \ + return 1; \ + } + +PHYSFS_BYTEORDER_WRITE(sint16, SLE16) +PHYSFS_BYTEORDER_WRITE(uint16, ULE16) +PHYSFS_BYTEORDER_WRITE(sint16, SBE16) +PHYSFS_BYTEORDER_WRITE(uint16, UBE16) +PHYSFS_BYTEORDER_WRITE(sint32, SLE32) +PHYSFS_BYTEORDER_WRITE(uint32, ULE32) +PHYSFS_BYTEORDER_WRITE(sint32, SBE32) +PHYSFS_BYTEORDER_WRITE(uint32, UBE32) +PHYSFS_BYTEORDER_WRITE(sint64, SLE64) +PHYSFS_BYTEORDER_WRITE(uint64, ULE64) +PHYSFS_BYTEORDER_WRITE(sint64, SBE64) +PHYSFS_BYTEORDER_WRITE(uint64, UBE64) + +/* end of physfs_byteorder.c ... */ + diff --git a/jni/physfs-2.0.3/physfs_casefolding.h b/jni/physfs-2.1.0/src/physfs_casefolding.h similarity index 100% rename from jni/physfs-2.0.3/physfs_casefolding.h rename to jni/physfs-2.1.0/src/physfs_casefolding.h diff --git a/jni/physfs-2.1.0/src/physfs_internal.h b/jni/physfs-2.1.0/src/physfs_internal.h new file mode 100644 index 00000000..94171c94 --- /dev/null +++ b/jni/physfs-2.1.0/src/physfs_internal.h @@ -0,0 +1,646 @@ +/* + * Internal function/structure declaration. Do NOT include in your + * application. + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon. + */ + +#ifndef _INCLUDE_PHYSFS_INTERNAL_H_ +#define _INCLUDE_PHYSFS_INTERNAL_H_ + +#ifndef __PHYSICSFS_INTERNAL__ +#error Do not include this header from your applications. +#endif + +#include "physfs.h" + +/* The holy trinity. */ +#include +#include +#include + +#include "physfs_platforms.h" + +#include + +/* !!! FIXME: remove this when revamping stack allocation code... */ +#if defined(_MSC_VER) || defined(__MINGW32__) +#include +#endif + +#if PHYSFS_PLATFORM_SOLARIS +#include +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __GNUC__ +#define PHYSFS_MINIMUM_GCC_VERSION(major, minor) \ + ( ((__GNUC__ << 16) + __GNUC_MINOR__) >= (((major) << 16) + (minor)) ) +#else +#define PHYSFS_MINIMUM_GCC_VERSION(major, minor) (0) +#endif + +#ifdef __cplusplus + /* C++ always has a real inline keyword. */ +#elif (defined macintosh) && !(defined __MWERKS__) +# define inline +#elif (defined _MSC_VER) +# define inline __inline +#endif + +#if PHYSFS_PLATFORM_LINUX && !defined(_FILE_OFFSET_BITS) +#define _FILE_OFFSET_BITS 64 +#endif + +/* + * Interface for small allocations. If you need a little scratch space for + * a throwaway buffer or string, use this. It will make small allocations + * on the stack if possible, and use allocator.Malloc() if they are too + * large. This helps reduce malloc pressure. + * There are some rules, though: + * NEVER return a pointer from this, as stack-allocated buffers go away + * when your function returns. + * NEVER allocate in a loop, as stack-allocated pointers will pile up. Call + * a function that uses smallAlloc from your loop, so the allocation can + * free each time. + * NEVER call smallAlloc with any complex expression (it's a macro that WILL + * have side effects...it references the argument multiple times). Use a + * variable or a literal. + * NEVER free a pointer from this with anything but smallFree. It will not + * be a valid pointer to the allocator, regardless of where the memory came + * from. + * NEVER realloc a pointer from this. + * NEVER forget to use smallFree: it may not be a pointer from the stack. + * NEVER forget to check for NULL...allocation can fail here, of course! + */ +#define __PHYSFS_SMALLALLOCTHRESHOLD 256 +void *__PHYSFS_initSmallAlloc(void *ptr, PHYSFS_uint64 len); + +#define __PHYSFS_smallAlloc(bytes) ( \ + __PHYSFS_initSmallAlloc( \ + (((bytes) < __PHYSFS_SMALLALLOCTHRESHOLD) ? \ + alloca((size_t)((bytes)+sizeof(void*))) : NULL), (bytes)) \ +) + +void __PHYSFS_smallFree(void *ptr); + + +/* Use the allocation hooks. */ +#define malloc(x) Do not use malloc() directly. +#define realloc(x, y) Do not use realloc() directly. +#define free(x) Do not use free() directly. +/* !!! FIXME: add alloca check here. */ + +#ifndef PHYSFS_SUPPORTS_ZIP +#define PHYSFS_SUPPORTS_ZIP 1 +#endif +#ifndef PHYSFS_SUPPORTS_7Z +#define PHYSFS_SUPPORTS_7Z 0 +#endif +#ifndef PHYSFS_SUPPORTS_GRP +#define PHYSFS_SUPPORTS_GRP 0 +#endif +#ifndef PHYSFS_SUPPORTS_HOG +#define PHYSFS_SUPPORTS_HOG 0 +#endif +#ifndef PHYSFS_SUPPORTS_MVL +#define PHYSFS_SUPPORTS_MVL 0 +#endif +#ifndef PHYSFS_SUPPORTS_WAD +#define PHYSFS_SUPPORTS_WAD 0 +#endif +#ifndef PHYSFS_SUPPORTS_SLB +#define PHYSFS_SUPPORTS_SLB 0 +#endif +#ifndef PHYSFS_SUPPORTS_ISO9660 +#define PHYSFS_SUPPORTS_ISO9660 0 +#endif + +/* The latest supported PHYSFS_Io::version value. */ +#define CURRENT_PHYSFS_IO_API_VERSION 0 + +/* The latest supported PHYSFS_Archiver::version value. */ +#define CURRENT_PHYSFS_ARCHIVER_API_VERSION 0 + +/* This byteorder stuff was lifted from SDL. http://www.libsdl.org/ */ +#define PHYSFS_LIL_ENDIAN 1234 +#define PHYSFS_BIG_ENDIAN 4321 + +#if defined(__i386__) || defined(__ia64__) || \ + defined(_M_IX86) || defined(_M_IA64) || defined(_M_X64) || \ + (defined(__alpha__) || defined(__alpha)) || \ + defined(__arm__) || defined(ARM) || \ + (defined(__mips__) && defined(__MIPSEL__)) || \ + defined(__SYMBIAN32__) || \ + defined(__x86_64__) || \ + defined(__LITTLE_ENDIAN__) +#define PHYSFS_BYTEORDER PHYSFS_LIL_ENDIAN +#else +#define PHYSFS_BYTEORDER PHYSFS_BIG_ENDIAN +#endif + + +/* + * When sorting the entries in an archive, we use a modified QuickSort. + * When there are less then PHYSFS_QUICKSORT_THRESHOLD entries left to sort, + * we switch over to a BubbleSort for the remainder. Tweak to taste. + * + * You can override this setting by defining PHYSFS_QUICKSORT_THRESHOLD + * before #including "physfs_internal.h". + */ +#ifndef PHYSFS_QUICKSORT_THRESHOLD +#define PHYSFS_QUICKSORT_THRESHOLD 4 +#endif + +/* + * Sort an array (or whatever) of (max) elements. This uses a mixture of + * a QuickSort and BubbleSort internally. + * (cmpfn) is used to determine ordering, and (swapfn) does the actual + * swapping of elements in the list. + * + * See zip.c for an example. + */ +void __PHYSFS_sort(void *entries, size_t max, + int (*cmpfn)(void *, size_t, size_t), + void (*swapfn)(void *, size_t, size_t)); + +/* + * This isn't a formal error code, it's just for BAIL_MACRO. + * It means: there was an error, but someone else already set it for us. + */ +#define ERRPASS PHYSFS_ERR_OK + +/* These get used all over for lessening code clutter. */ +#define BAIL_MACRO(e, r) do { if (e) PHYSFS_setErrorCode(e); return r; } while (0) +#define BAIL_IF_MACRO(c, e, r) do { if (c) { if (e) PHYSFS_setErrorCode(e); return r; } } while (0) +#define BAIL_MACRO_MUTEX(e, m, r) do { if (e) PHYSFS_setErrorCode(e); __PHYSFS_platformReleaseMutex(m); return r; } while (0) +#define BAIL_IF_MACRO_MUTEX(c, e, m, r) do { if (c) { if (e) PHYSFS_setErrorCode(e); __PHYSFS_platformReleaseMutex(m); return r; } } while (0) +#define GOTO_MACRO(e, g) do { if (e) PHYSFS_setErrorCode(e); goto g; } while (0) +#define GOTO_IF_MACRO(c, e, g) do { if (c) { if (e) PHYSFS_setErrorCode(e); goto g; } } while (0) +#define GOTO_MACRO_MUTEX(e, m, g) do { if (e) PHYSFS_setErrorCode(e); __PHYSFS_platformReleaseMutex(m); goto g; } while (0) +#define GOTO_IF_MACRO_MUTEX(c, e, m, g) do { if (c) { if (e) PHYSFS_setErrorCode(e); __PHYSFS_platformReleaseMutex(m); goto g; } } while (0) + +#define __PHYSFS_ARRAYLEN(x) ( (sizeof (x)) / (sizeof (x[0])) ) + +#ifdef PHYSFS_NO_64BIT_SUPPORT +#define __PHYSFS_SI64(x) ((PHYSFS_sint64) (x)) +#define __PHYSFS_UI64(x) ((PHYSFS_uint64) (x)) +#elif (defined __GNUC__) +#define __PHYSFS_SI64(x) x##LL +#define __PHYSFS_UI64(x) x##ULL +#elif (defined _MSC_VER) +#define __PHYSFS_SI64(x) x##i64 +#define __PHYSFS_UI64(x) x##ui64 +#else +#define __PHYSFS_SI64(x) ((PHYSFS_sint64) (x)) +#define __PHYSFS_UI64(x) ((PHYSFS_uint64) (x)) +#endif + + +/* + * Check if a ui64 will fit in the platform's address space. + * The initial sizeof check will optimize this macro out entirely on + * 64-bit (and larger?!) platforms, and the other condition will + * return zero or non-zero if the variable will fit in the platform's + * size_t, suitable to pass to malloc. This is kinda messy, but effective. + */ +#define __PHYSFS_ui64FitsAddressSpace(s) ( \ + (sizeof (PHYSFS_uint64) <= sizeof (size_t)) || \ + ((s) < (__PHYSFS_UI64(0xFFFFFFFFFFFFFFFF) >> (64-(sizeof(size_t)*8)))) \ +) + + +/* + * This is a strcasecmp() or stricmp() replacement that expects both strings + * to be in UTF-8 encoding. It will do "case folding" to decide if the + * Unicode codepoints in the strings match. + * + * It will report which string is "greater than" the other, but be aware that + * this doesn't necessarily mean anything: 'a' may be "less than" 'b', but + * a random Kanji codepoint has no meaningful alphabetically relationship to + * a Greek Lambda, but being able to assign a reliable "value" makes sorting + * algorithms possible, if not entirely sane. Most cases should treat the + * return value as "equal" or "not equal". + */ +int __PHYSFS_utf8stricmp(const char *s1, const char *s2); + +/* + * This works like __PHYSFS_utf8stricmp(), but takes a character (NOT BYTE + * COUNT) argument, like strcasencmp(). + */ +int __PHYSFS_utf8strnicmp(const char *s1, const char *s2, PHYSFS_uint32 l); + +/* + * stricmp() that guarantees to only work with low ASCII. The C runtime + * stricmp() might try to apply a locale/codepage/etc, which we don't want. + */ +int __PHYSFS_stricmpASCII(const char *s1, const char *s2); + +/* + * strnicmp() that guarantees to only work with low ASCII. The C runtime + * strnicmp() might try to apply a locale/codepage/etc, which we don't want. + */ +int __PHYSFS_strnicmpASCII(const char *s1, const char *s2, PHYSFS_uint32 l); + + +/* + * The current allocator. Not valid before PHYSFS_init is called! + */ +extern PHYSFS_Allocator __PHYSFS_AllocatorHooks; + +/* convenience macro to make this less cumbersome internally... */ +#define allocator __PHYSFS_AllocatorHooks + +/* + * Create a PHYSFS_Io for a file in the physical filesystem. + * This path is in platform-dependent notation. (mode) must be 'r', 'w', or + * 'a' for Read, Write, or Append. + */ +PHYSFS_Io *__PHYSFS_createNativeIo(const char *path, const int mode); + +/* + * Create a PHYSFS_Io for a buffer of memory (READ-ONLY). If you already + * have one of these, just use its duplicate() method, and it'll increment + * its refcount without allocating a copy of the buffer. + */ +PHYSFS_Io *__PHYSFS_createMemoryIo(const void *buf, PHYSFS_uint64 len, + void (*destruct)(void *)); + + +/* + * Read (len) bytes from (io) into (buf). Returns non-zero on success, + * zero on i/o error. Literally: "return (io->read(io, buf, len) == len);" + */ +int __PHYSFS_readAll(PHYSFS_Io *io, void *buf, const PHYSFS_uint64 len); + + +/* These are shared between some archivers. */ + +typedef struct +{ + char name[64]; + PHYSFS_uint32 startPos; + PHYSFS_uint32 size; +} UNPKentry; + +void UNPK_closeArchive(void *opaque); +void *UNPK_openArchive(PHYSFS_Io *io,UNPKentry *e,const PHYSFS_uint32 n); +void UNPK_enumerateFiles(void *opaque, const char *dname, + PHYSFS_EnumFilesCallback cb, + const char *origdir, void *callbackdata); +PHYSFS_Io *UNPK_openRead(void *opaque, const char *name); +PHYSFS_Io *UNPK_openWrite(void *opaque, const char *name); +PHYSFS_Io *UNPK_openAppend(void *opaque, const char *name); +int UNPK_remove(void *opaque, const char *name); +int UNPK_mkdir(void *opaque, const char *name); +int UNPK_stat(void *opaque, const char *fn, PHYSFS_Stat *st); + + +/*--------------------------------------------------------------------------*/ +/*--------------------------------------------------------------------------*/ +/*------------ ----------------*/ +/*------------ You MUST implement the following functions ----------------*/ +/*------------ if porting to a new platform. ----------------*/ +/*------------ (see platform/unix.c for an example) ----------------*/ +/*------------ ----------------*/ +/*--------------------------------------------------------------------------*/ +/*--------------------------------------------------------------------------*/ + + +/* + * The dir separator; '/' on unix, '\\' on win32, ":" on MacOS, etc... + * Obviously, this isn't a function. If you need more than one char for this, + * you'll need to pull some old pieces of PhysicsFS out of revision control. + */ +#if PHYSFS_PLATFORM_WINDOWS +#define __PHYSFS_platformDirSeparator '\\' +#else +#define __PHYSFS_platformDirSeparator '/' +#endif + +/* + * Initialize the platform. This is called when PHYSFS_init() is called from + * the application. + * + * Return zero if there was a catastrophic failure (which prevents you from + * functioning at all), and non-zero otherwise. + */ +int __PHYSFS_platformInit(void); + + +/* + * Deinitialize the platform. This is called when PHYSFS_deinit() is called + * from the application. You can use this to clean up anything you've + * allocated in your platform driver. + * + * Return zero if there was a catastrophic failure (which prevents you from + * functioning at all), and non-zero otherwise. + */ +int __PHYSFS_platformDeinit(void); + + +/* + * Open a file for reading. (filename) is in platform-dependent notation. The + * file pointer should be positioned on the first byte of the file. + * + * The return value will be some platform-specific datatype that is opaque to + * the caller; it could be a (FILE *) under Unix, or a (HANDLE *) under win32. + * + * The same file can be opened for read multiple times, and each should have + * a unique file handle; this is frequently employed to prevent race + * conditions in the archivers. + * + * Call PHYSFS_setErrorCode() and return (NULL) if the file can't be opened. + */ +void *__PHYSFS_platformOpenRead(const char *filename); + + +/* + * Open a file for writing. (filename) is in platform-dependent notation. If + * the file exists, it should be truncated to zero bytes, and if it doesn't + * exist, it should be created as a zero-byte file. The file pointer should + * be positioned on the first byte of the file. + * + * The return value will be some platform-specific datatype that is opaque to + * the caller; it could be a (FILE *) under Unix, or a (HANDLE *) under win32, + * etc. + * + * Opening a file for write multiple times has undefined results. + * + * Call PHYSFS_setErrorCode() and return (NULL) if the file can't be opened. + */ +void *__PHYSFS_platformOpenWrite(const char *filename); + + +/* + * Open a file for appending. (filename) is in platform-dependent notation. If + * the file exists, the file pointer should be place just past the end of the + * file, so that the first write will be one byte after the current end of + * the file. If the file doesn't exist, it should be created as a zero-byte + * file. The file pointer should be positioned on the first byte of the file. + * + * The return value will be some platform-specific datatype that is opaque to + * the caller; it could be a (FILE *) under Unix, or a (HANDLE *) under win32, + * etc. + * + * Opening a file for append multiple times has undefined results. + * + * Call PHYSFS_setErrorCode() and return (NULL) if the file can't be opened. + */ +void *__PHYSFS_platformOpenAppend(const char *filename); + +/* + * Read more data from a platform-specific file handle. (opaque) should be + * cast to whatever data type your platform uses. Read a maximum of (len) + * 8-bit bytes to the area pointed to by (buf). If there isn't enough data + * available, return the number of bytes read, and position the file pointer + * immediately after those bytes. + * On success, return (len) and position the file pointer immediately past + * the end of the last read byte. Return (-1) if there is a catastrophic + * error, and call PHYSFS_setErrorCode() to describe the problem; the file + * pointer should not move in such a case. A partial read is success; only + * return (-1) on total failure; presumably, the next read call after a + * partial read will fail as such. + */ +PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buf, PHYSFS_uint64 len); + +/* + * Write more data to a platform-specific file handle. (opaque) should be + * cast to whatever data type your platform uses. Write a maximum of (len) + * 8-bit bytes from the area pointed to by (buffer). If there is a problem, + * return the number of bytes written, and position the file pointer + * immediately after those bytes. Return (-1) if there is a catastrophic + * error, and call PHYSFS_setErrorCode() to describe the problem; the file + * pointer should not move in such a case. A partial write is success; only + * return (-1) on total failure; presumably, the next write call after a + * partial write will fail as such. + */ +PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, + PHYSFS_uint64 len); + +/* + * Set the file pointer to a new position. (opaque) should be cast to + * whatever data type your platform uses. (pos) specifies the number + * of 8-bit bytes to seek to from the start of the file. Seeking past the + * end of the file is an error condition, and you should check for it. + * + * Not all file types can seek; this is to be expected by the caller. + * + * On error, call PHYSFS_setErrorCode() and return zero. On success, return + * a non-zero value. + */ +int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos); + + +/* + * Get the file pointer's position, in an 8-bit byte offset from the start of + * the file. (opaque) should be cast to whatever data type your platform + * uses. + * + * Not all file types can "tell"; this is to be expected by the caller. + * + * On error, call PHYSFS_setErrorCode() and return -1. On success, return >= 0. + */ +PHYSFS_sint64 __PHYSFS_platformTell(void *opaque); + + +/* + * Determine the current size of a file, in 8-bit bytes, from an open file. + * + * The caller expects that this information may not be available for all + * file types on all platforms. + * + * Return -1 if you can't do it, and call PHYSFS_setErrorCode(). Otherwise, + * return the file length in 8-bit bytes. + */ +PHYSFS_sint64 __PHYSFS_platformFileLength(void *handle); + + +/* + * !!! FIXME: comment me. + */ +int __PHYSFS_platformStat(const char *fn, PHYSFS_Stat *stat); + +/* + * Flush any pending writes to disk. (opaque) should be cast to whatever data + * type your platform uses. Be sure to check for errors; the caller expects + * that this function can fail if there was a flushing error, etc. + * + * Return zero on failure, non-zero on success. + */ +int __PHYSFS_platformFlush(void *opaque); + +/* + * Close file and deallocate resources. (opaque) should be cast to whatever + * data type your platform uses. This should close the file in any scenario: + * flushing is a separate function call, and this function should never fail. + * + * You should clean up all resources associated with (opaque); the pointer + * will be considered invalid after this call. + */ +void __PHYSFS_platformClose(void *opaque); + +/* + * Platform implementation of PHYSFS_getCdRomDirsCallback()... + * CD directories are discovered and reported to the callback one at a time. + * Pointers passed to the callback are assumed to be invalid to the + * application after the callback returns, so you can free them or whatever. + * Callback does not assume results will be sorted in any meaningful way. + */ +void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data); + +/* + * Calculate the base dir, if your platform needs special consideration. + * Just return NULL if the standard routines will suffice. (see + * calculateBaseDir() in physfs.c ...) + * Your string must end with a dir separator if you don't return NULL. + * Caller will allocator.Free() the retval if it's not NULL. + */ +char *__PHYSFS_platformCalcBaseDir(const char *argv0); + +/* + * Get the platform-specific user dir. + * As of PhysicsFS 2.1, returning NULL means fatal error. + * Your string must end with a dir separator if you don't return NULL. + * Caller will allocator.Free() the retval if it's not NULL. + */ +char *__PHYSFS_platformCalcUserDir(void); + + +/* This is the cached version from PHYSFS_init(). This is a fast call. */ +const char *__PHYSFS_getUserDir(void); /* not deprecated internal version. */ + + +/* + * Get the platform-specific pref dir. + * Returning NULL means fatal error. + * Your string must end with a dir separator if you don't return NULL. + * Caller will allocator.Free() the retval if it's not NULL. + * Caller will make missing directories if necessary; this just reports + * the final path. + */ +char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app); + + +/* + * Return a pointer that uniquely identifies the current thread. + * On a platform without threading, (0x1) will suffice. These numbers are + * arbitrary; the only requirement is that no two threads have the same + * pointer. + */ +void *__PHYSFS_platformGetThreadID(void); + + +/* + * Enumerate a directory of files. This follows the rules for the + * PHYSFS_Archiver::enumerateFiles() method (see above), except that the + * (dirName) that is passed to this function is converted to + * platform-DEPENDENT notation by the caller. The PHYSFS_Archiver version + * uses platform-independent notation. Note that ".", "..", and other + * meta-entries should always be ignored. + */ +void __PHYSFS_platformEnumerateFiles(const char *dirname, + PHYSFS_EnumFilesCallback callback, + const char *origdir, + void *callbackdata); + +/* + * Make a directory in the actual filesystem. (path) is specified in + * platform-dependent notation. On error, return zero and set the error + * message. Return non-zero on success. + */ +int __PHYSFS_platformMkDir(const char *path); + + +/* + * Remove a file or directory entry in the actual filesystem. (path) is + * specified in platform-dependent notation. Note that this deletes files + * _and_ directories, so you might need to do some determination. + * Non-empty directories should report an error and not delete themselves + * or their contents. + * + * Deleting a symlink should remove the link, not what it points to. + * + * On error, return zero and set the error message. Return non-zero on success. + */ +int __PHYSFS_platformDelete(const char *path); + + +/* + * Create a platform-specific mutex. This can be whatever datatype your + * platform uses for mutexes, but it is cast to a (void *) for abstractness. + * + * Return (NULL) if you couldn't create one. Systems without threads can + * return any arbitrary non-NULL value. + */ +void *__PHYSFS_platformCreateMutex(void); + +/* + * Destroy a platform-specific mutex, and clean up any resources associated + * with it. (mutex) is a value previously returned by + * __PHYSFS_platformCreateMutex(). This can be a no-op on single-threaded + * platforms. + */ +void __PHYSFS_platformDestroyMutex(void *mutex); + +/* + * Grab possession of a platform-specific mutex. Mutexes should be recursive; + * that is, the same thread should be able to call this function multiple + * times in a row without causing a deadlock. This function should block + * until a thread can gain possession of the mutex. + * + * Return non-zero if the mutex was grabbed, zero if there was an + * unrecoverable problem grabbing it (this should not be a matter of + * timing out! We're talking major system errors; block until the mutex + * is available otherwise.) + * + * _DO NOT_ call PHYSFS_setErrorCode() in here! Since setErrorCode calls this + * function, you'll cause an infinite recursion. This means you can't + * use the BAIL_*MACRO* macros, either. + */ +int __PHYSFS_platformGrabMutex(void *mutex); + +/* + * Relinquish possession of the mutex when this method has been called + * once for each time that platformGrabMutex was called. Once possession has + * been released, the next thread in line to grab the mutex (if any) may + * proceed. + * + * _DO NOT_ call PHYSFS_setErrorCode() in here! Since setErrorCode calls this + * function, you'll cause an infinite recursion. This means you can't + * use the BAIL_*MACRO* macros, either. + */ +void __PHYSFS_platformReleaseMutex(void *mutex); + +/* + * Called at the start of PHYSFS_init() to prepare the allocator, if the user + * hasn't selected their own allocator via PHYSFS_setAllocator(). + * If the platform has a custom allocator, it should fill in the fields of + * (a) with the proper function pointers and return non-zero. + * If the platform just wants to use malloc()/free()/etc, return zero + * immediately and the higher level will handle it. The Init and Deinit + * fields of (a) are optional...set them to NULL if you don't need them. + * Everything else must be implemented. All rules follow those for + * PHYSFS_setAllocator(). If Init isn't NULL, it will be called shortly + * after this function returns non-zero. + */ +int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a); + +/* + * Like strdup(), but uses the current PhysicsFS allocator. + */ +char *__PHYSFS_strdup(const char *str); + +#ifdef __cplusplus +} +#endif + +#endif + +/* end of physfs_internal.h ... */ + diff --git a/jni/physfs-2.1.0/src/physfs_miniz.h b/jni/physfs-2.1.0/src/physfs_miniz.h new file mode 100644 index 00000000..141a5b99 --- /dev/null +++ b/jni/physfs-2.1.0/src/physfs_miniz.h @@ -0,0 +1,698 @@ +/* tinfl.c v1.11 - public domain inflate with zlib header parsing/adler32 checking (inflate-only subset of miniz.c) + See "unlicense" statement at the end of this file. + Rich Geldreich , last updated May 20, 2011 + Implements RFC 1950: http://www.ietf.org/rfc/rfc1950.txt and RFC 1951: http://www.ietf.org/rfc/rfc1951.txt + + The entire decompressor coroutine is implemented in tinfl_decompress(). The other functions are optional high-level helpers. +*/ +#ifndef TINFL_HEADER_INCLUDED +#define TINFL_HEADER_INCLUDED + +typedef PHYSFS_uint8 mz_uint8; +typedef PHYSFS_sint16 mz_int16; +typedef PHYSFS_uint16 mz_uint16; +typedef PHYSFS_uint32 mz_uint32; +typedef unsigned int mz_uint; +typedef PHYSFS_uint64 mz_uint64; + +/* For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. */ +typedef unsigned long mz_ulong; + +/* Heap allocation callbacks. */ +typedef void *(*mz_alloc_func)(void *opaque, unsigned int items, unsigned int size); +typedef void (*mz_free_func)(void *opaque, void *address); + +#if defined(_M_IX86) || defined(_M_X64) +/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 if integer loads and stores to unaligned addresses are acceptable on the target platform (slightly faster). */ +#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 +/* Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. */ +#define MINIZ_LITTLE_ENDIAN 1 +#endif + +#if defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) +/* Set MINIZ_HAS_64BIT_REGISTERS to 1 if the processor has 64-bit general purpose registers (enables 64-bit bitbuffer in inflator) */ +#define MINIZ_HAS_64BIT_REGISTERS 1 +#endif + +/* Works around MSVC's spammy "warning C4127: conditional expression is constant" message. */ +#ifdef _MSC_VER +#define MZ_MACRO_END while (0, 0) +#else +#define MZ_MACRO_END while (0) +#endif + +/* Decompression flags. */ +enum +{ + TINFL_FLAG_PARSE_ZLIB_HEADER = 1, + TINFL_FLAG_HAS_MORE_INPUT = 2, + TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4, + TINFL_FLAG_COMPUTE_ADLER32 = 8 +}; + +struct tinfl_decompressor_tag; typedef struct tinfl_decompressor_tag tinfl_decompressor; + +/* Max size of LZ dictionary. */ +#define TINFL_LZ_DICT_SIZE 32768 + +/* Return status. */ +typedef enum +{ + TINFL_STATUS_BAD_PARAM = -3, + TINFL_STATUS_ADLER32_MISMATCH = -2, + TINFL_STATUS_FAILED = -1, + TINFL_STATUS_DONE = 0, + TINFL_STATUS_NEEDS_MORE_INPUT = 1, + TINFL_STATUS_HAS_MORE_OUTPUT = 2 +} tinfl_status; + +/* Initializes the decompressor to its initial state. */ +#define tinfl_init(r) do { (r)->m_state = 0; } MZ_MACRO_END +#define tinfl_get_adler32(r) (r)->m_check_adler32 + +/* Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. */ +/* This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. */ +static tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags); + +/* Internal/private bits follow. */ +enum +{ + TINFL_MAX_HUFF_TABLES = 3, TINFL_MAX_HUFF_SYMBOLS_0 = 288, TINFL_MAX_HUFF_SYMBOLS_1 = 32, TINFL_MAX_HUFF_SYMBOLS_2 = 19, + TINFL_FAST_LOOKUP_BITS = 10, TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS +}; + +typedef struct +{ + mz_uint8 m_code_size[TINFL_MAX_HUFF_SYMBOLS_0]; + mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2]; +} tinfl_huff_table; + +#if MINIZ_HAS_64BIT_REGISTERS + #define TINFL_USE_64BIT_BITBUF 1 +#endif + +#if TINFL_USE_64BIT_BITBUF + typedef mz_uint64 tinfl_bit_buf_t; + #define TINFL_BITBUF_SIZE (64) +#else + typedef mz_uint32 tinfl_bit_buf_t; + #define TINFL_BITBUF_SIZE (32) +#endif + +struct tinfl_decompressor_tag +{ + mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, m_check_adler32, m_dist, m_counter, m_num_extra, m_table_sizes[TINFL_MAX_HUFF_TABLES]; + tinfl_bit_buf_t m_bit_buf; + size_t m_dist_from_out_buf_start; + tinfl_huff_table m_tables[TINFL_MAX_HUFF_TABLES]; + mz_uint8 m_raw_header[4], m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137]; +}; + +#endif /* #ifdef TINFL_HEADER_INCLUDED */ + +/* ------------------- End of Header: Implementation follows. (If you only want the header, define MINIZ_HEADER_FILE_ONLY.) */ + +#ifndef TINFL_HEADER_FILE_ONLY + +#define MZ_MAX(a,b) (((a)>(b))?(a):(b)) +#define MZ_MIN(a,b) (((a)<(b))?(a):(b)) +#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj)) + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN + #define MZ_READ_LE16(p) *((const mz_uint16 *)(p)) + #define MZ_READ_LE32(p) *((const mz_uint32 *)(p)) +#else + #define MZ_READ_LE16(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U)) + #define MZ_READ_LE32(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) | ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) | ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U)) +#endif + +#define TINFL_MEMCPY(d, s, l) memcpy(d, s, l) +#define TINFL_MEMSET(p, c, l) memset(p, c, l) + +#define TINFL_CR_BEGIN switch(r->m_state) { case 0: +#define TINFL_CR_RETURN(state_index, result) do { status = result; r->m_state = state_index; goto common_exit; case state_index:; } MZ_MACRO_END +#define TINFL_CR_RETURN_FOREVER(state_index, result) do { for ( ; ; ) { TINFL_CR_RETURN(state_index, result); } } MZ_MACRO_END +#define TINFL_CR_FINISH } + +/* TODO: If the caller has indicated that there's no more input, and we attempt to read beyond the input buf, then something is wrong with the input because the inflator never */ +/* reads ahead more than it needs to. Currently TINFL_GET_BYTE() pads the end of the stream with 0's in this scenario. */ +#define TINFL_GET_BYTE(state_index, c) do { \ + if (pIn_buf_cur >= pIn_buf_end) { \ + for ( ; ; ) { \ + if (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) { \ + TINFL_CR_RETURN(state_index, TINFL_STATUS_NEEDS_MORE_INPUT); \ + if (pIn_buf_cur < pIn_buf_end) { \ + c = *pIn_buf_cur++; \ + break; \ + } \ + } else { \ + c = 0; \ + break; \ + } \ + } \ + } else c = *pIn_buf_cur++; } MZ_MACRO_END + +#define TINFL_NEED_BITS(state_index, n) do { mz_uint c; TINFL_GET_BYTE(state_index, c); bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); num_bits += 8; } while (num_bits < (mz_uint)(n)) +#define TINFL_SKIP_BITS(state_index, n) do { if (num_bits < (mz_uint)(n)) { TINFL_NEED_BITS(state_index, n); } bit_buf >>= (n); num_bits -= (n); } MZ_MACRO_END +#define TINFL_GET_BITS(state_index, b, n) do { if (num_bits < (mz_uint)(n)) { TINFL_NEED_BITS(state_index, n); } b = bit_buf & ((1 << (n)) - 1); bit_buf >>= (n); num_bits -= (n); } MZ_MACRO_END + +/* TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes remaining in the input buffer falls below 2. */ +/* It reads just enough bytes from the input stream that are needed to decode the next Huffman code (and absolutely no more). It works by trying to fully decode a */ +/* Huffman code by using whatever bits are currently present in the bit buffer. If this fails, it reads another byte, and tries again until it succeeds or until the */ +/* bit buffer contains >=15 bits (deflate's max. Huffman code size). */ +#define TINFL_HUFF_BITBUF_FILL(state_index, pHuff) \ + do { \ + temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]; \ + if (temp >= 0) { \ + code_len = temp >> 9; \ + if ((code_len) && (num_bits >= code_len)) \ + break; \ + } else if (num_bits > TINFL_FAST_LOOKUP_BITS) { \ + code_len = TINFL_FAST_LOOKUP_BITS; \ + do { \ + temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; \ + } while ((temp < 0) && (num_bits >= (code_len + 1))); if (temp >= 0) break; \ + } TINFL_GET_BYTE(state_index, c); bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); num_bits += 8; \ + } while (num_bits < 15); + +/* TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex than you would initially expect because the zlib API expects the decompressor to never read */ +/* beyond the final byte of the deflate stream. (In other words, when this macro wants to read another byte from the input, it REALLY needs another byte in order to fully */ +/* decode the next Huffman code.) Handling this properly is particularly important on raw deflate (non-zlib) streams, which aren't followed by a byte aligned adler-32. */ +/* The slow path is only executed at the very end of the input buffer. */ +#define TINFL_HUFF_DECODE(state_index, sym, pHuff) do { \ + int temp; mz_uint code_len, c; \ + if (num_bits < 15) { \ + if ((pIn_buf_end - pIn_buf_cur) < 2) { \ + TINFL_HUFF_BITBUF_FILL(state_index, pHuff); \ + } else { \ + bit_buf |= (((tinfl_bit_buf_t)pIn_buf_cur[0]) << num_bits) | (((tinfl_bit_buf_t)pIn_buf_cur[1]) << (num_bits + 8)); pIn_buf_cur += 2; num_bits += 16; \ + } \ + } \ + if ((temp = (pHuff)->m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0) \ + code_len = temp >> 9, temp &= 511; \ + else { \ + code_len = TINFL_FAST_LOOKUP_BITS; do { temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; } while (temp < 0); \ + } sym = temp; bit_buf >>= code_len; num_bits -= code_len; } MZ_MACRO_END + +static tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags) +{ + static const int s_length_base[31] = { 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 }; + static const int s_length_extra[31]= { 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,0,0 }; + static const int s_dist_base[32] = { 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,0,0}; + static const int s_dist_extra[32] = { 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}; + static const mz_uint8 s_length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 }; + static const int s_min_table_sizes[3] = { 257, 1, 4 }; + + tinfl_status status = TINFL_STATUS_FAILED; mz_uint32 num_bits, dist, counter, num_extra; tinfl_bit_buf_t bit_buf; + const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = pIn_buf_next + *pIn_buf_size; + mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = pOut_buf_next + *pOut_buf_size; + size_t out_buf_size_mask = (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) ? (size_t)-1 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1, dist_from_out_buf_start; + + /* Ensure the output buffer's size is a power of 2, unless the output buffer is large enough to hold the entire output file (in which case it doesn't matter). */ + if (((out_buf_size_mask + 1) & out_buf_size_mask) || (pOut_buf_next < pOut_buf_start)) { *pIn_buf_size = *pOut_buf_size = 0; return TINFL_STATUS_BAD_PARAM; } + + num_bits = r->m_num_bits; bit_buf = r->m_bit_buf; dist = r->m_dist; counter = r->m_counter; num_extra = r->m_num_extra; dist_from_out_buf_start = r->m_dist_from_out_buf_start; + TINFL_CR_BEGIN + + bit_buf = num_bits = dist = counter = num_extra = r->m_zhdr0 = r->m_zhdr1 = 0; r->m_z_adler32 = r->m_check_adler32 = 1; + if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) + { + TINFL_GET_BYTE(1, r->m_zhdr0); TINFL_GET_BYTE(2, r->m_zhdr1); + counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) || (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8)); + if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)(1U << (8U + (r->m_zhdr0 >> 4))))); + if (counter) { TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED); } + } + + do + { + TINFL_GET_BITS(3, r->m_final, 3); r->m_type = r->m_final >> 1; + if (r->m_type == 0) + { + TINFL_SKIP_BITS(5, num_bits & 7); + for (counter = 0; counter < 4; ++counter) { if (num_bits) TINFL_GET_BITS(6, r->m_raw_header[counter], 8); else TINFL_GET_BYTE(7, r->m_raw_header[counter]); } + if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) != (mz_uint)(0xFFFF ^ (r->m_raw_header[2] | (r->m_raw_header[3] << 8)))) { TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED); } + while ((counter) && (num_bits)) + { + TINFL_GET_BITS(51, dist, 8); + while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT); } + *pOut_buf_cur++ = (mz_uint8)dist; + counter--; + } + while (counter) + { + size_t n; while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(9, TINFL_STATUS_HAS_MORE_OUTPUT); } + while (pIn_buf_cur >= pIn_buf_end) + { + if (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) + { + TINFL_CR_RETURN(38, TINFL_STATUS_NEEDS_MORE_INPUT); + } + else + { + TINFL_CR_RETURN_FOREVER(40, TINFL_STATUS_FAILED); + } + } + n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur), (size_t)(pIn_buf_end - pIn_buf_cur)), counter); + TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n); pIn_buf_cur += n; pOut_buf_cur += n; counter -= (mz_uint)n; + } + } + else if (r->m_type == 3) + { + TINFL_CR_RETURN_FOREVER(10, TINFL_STATUS_FAILED); + } + else + { + if (r->m_type == 1) + { + mz_uint8 *p = r->m_tables[0].m_code_size; mz_uint i; + r->m_table_sizes[0] = 288; r->m_table_sizes[1] = 32; TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32); + for ( i = 0; i <= 143; ++i) *p++ = 8; for ( ; i <= 255; ++i) *p++ = 9; for ( ; i <= 279; ++i) *p++ = 7; for ( ; i <= 287; ++i) *p++ = 8; + } + else + { + for (counter = 0; counter < 3; counter++) { TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]); r->m_table_sizes[counter] += s_min_table_sizes[counter]; } + MZ_CLEAR_OBJ(r->m_tables[2].m_code_size); for (counter = 0; counter < r->m_table_sizes[2]; counter++) { mz_uint s; TINFL_GET_BITS(14, s, 3); r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (mz_uint8)s; } + r->m_table_sizes[2] = 19; + } + for ( ; (int)r->m_type >= 0; r->m_type--) + { + int tree_next, tree_cur; tinfl_huff_table *pTable; + mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16]; pTable = &r->m_tables[r->m_type]; MZ_CLEAR_OBJ(total_syms); MZ_CLEAR_OBJ(pTable->m_look_up); MZ_CLEAR_OBJ(pTable->m_tree); + for (i = 0; i < r->m_table_sizes[r->m_type]; ++i) total_syms[pTable->m_code_size[i]]++; + used_syms = 0, total = 0; next_code[0] = next_code[1] = 0; + for (i = 1; i <= 15; ++i) { used_syms += total_syms[i]; next_code[i + 1] = (total = ((total + total_syms[i]) << 1)); } + if ((65536 != total) && (used_syms > 1)) + { + TINFL_CR_RETURN_FOREVER(35, TINFL_STATUS_FAILED); + } + for (tree_next = -1, sym_index = 0; sym_index < r->m_table_sizes[r->m_type]; ++sym_index) + { + mz_uint rev_code = 0, l, cur_code, code_size = pTable->m_code_size[sym_index]; if (!code_size) continue; + cur_code = next_code[code_size]++; for (l = code_size; l > 0; l--, cur_code >>= 1) rev_code = (rev_code << 1) | (cur_code & 1); + if (code_size <= TINFL_FAST_LOOKUP_BITS) { mz_int16 k = (mz_int16)((code_size << 9) | sym_index); while (rev_code < TINFL_FAST_LOOKUP_SIZE) { pTable->m_look_up[rev_code] = k; rev_code += (1 << code_size); } continue; } + if (0 == (tree_cur = pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)])) { pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] = (mz_int16)tree_next; tree_cur = tree_next; tree_next -= 2; } + rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1); + for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--) + { + tree_cur -= ((rev_code >>= 1) & 1); + if (!pTable->m_tree[-tree_cur - 1]) { pTable->m_tree[-tree_cur - 1] = (mz_int16)tree_next; tree_cur = tree_next; tree_next -= 2; } else tree_cur = pTable->m_tree[-tree_cur - 1]; + } + tree_cur -= ((rev_code >>= 1) & 1); pTable->m_tree[-tree_cur - 1] = (mz_int16)sym_index; + } + if (r->m_type == 2) + { + for (counter = 0; counter < (r->m_table_sizes[0] + r->m_table_sizes[1]); ) + { + mz_uint s; TINFL_HUFF_DECODE(16, dist, &r->m_tables[2]); if (dist < 16) { r->m_len_codes[counter++] = (mz_uint8)dist; continue; } + if ((dist == 16) && (!counter)) + { + TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED); + } + num_extra = "\02\03\07"[dist - 16]; TINFL_GET_BITS(18, s, num_extra); s += "\03\03\013"[dist - 16]; + TINFL_MEMSET(r->m_len_codes + counter, (dist == 16) ? r->m_len_codes[counter - 1] : 0, s); counter += s; + } + if ((r->m_table_sizes[0] + r->m_table_sizes[1]) != counter) + { + TINFL_CR_RETURN_FOREVER(21, TINFL_STATUS_FAILED); + } + TINFL_MEMCPY(r->m_tables[0].m_code_size, r->m_len_codes, r->m_table_sizes[0]); TINFL_MEMCPY(r->m_tables[1].m_code_size, r->m_len_codes + r->m_table_sizes[0], r->m_table_sizes[1]); + } + } + for ( ; ; ) + { + mz_uint8 *pSrc; + for ( ; ; ) + { + if (((pIn_buf_end - pIn_buf_cur) < 4) || ((pOut_buf_end - pOut_buf_cur) < 2)) + { + TINFL_HUFF_DECODE(23, counter, &r->m_tables[0]); + if (counter >= 256) + break; + while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT); } + *pOut_buf_cur++ = (mz_uint8)counter; + } + else + { + int sym2; mz_uint code_len; +#if TINFL_USE_64BIT_BITBUF + if (num_bits < 30) { bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits); pIn_buf_cur += 4; num_bits += 32; } +#else + if (num_bits < 15) { bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); pIn_buf_cur += 2; num_bits += 16; } +#endif + if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0) + code_len = sym2 >> 9; + else + { + code_len = TINFL_FAST_LOOKUP_BITS; do { sym2 = r->m_tables[0].m_tree[~sym2 + ((bit_buf >> code_len++) & 1)]; } while (sym2 < 0); + } + counter = sym2; bit_buf >>= code_len; num_bits -= code_len; + if (counter & 256) + break; + +#if !TINFL_USE_64BIT_BITBUF + if (num_bits < 15) { bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); pIn_buf_cur += 2; num_bits += 16; } +#endif + if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0) + code_len = sym2 >> 9; + else + { + code_len = TINFL_FAST_LOOKUP_BITS; do { sym2 = r->m_tables[0].m_tree[~sym2 + ((bit_buf >> code_len++) & 1)]; } while (sym2 < 0); + } + bit_buf >>= code_len; num_bits -= code_len; + + pOut_buf_cur[0] = (mz_uint8)counter; + if (sym2 & 256) + { + pOut_buf_cur++; + counter = sym2; + break; + } + pOut_buf_cur[1] = (mz_uint8)sym2; + pOut_buf_cur += 2; + } + } + if ((counter &= 511) == 256) break; + + num_extra = s_length_extra[counter - 257]; counter = s_length_base[counter - 257]; + if (num_extra) { mz_uint extra_bits; TINFL_GET_BITS(25, extra_bits, num_extra); counter += extra_bits; } + + TINFL_HUFF_DECODE(26, dist, &r->m_tables[1]); + num_extra = s_dist_extra[dist]; dist = s_dist_base[dist]; + if (num_extra) { mz_uint extra_bits; TINFL_GET_BITS(27, extra_bits, num_extra); dist += extra_bits; } + + dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start; + if ((dist > dist_from_out_buf_start) && (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)) + { + TINFL_CR_RETURN_FOREVER(37, TINFL_STATUS_FAILED); + } + + pSrc = pOut_buf_start + ((dist_from_out_buf_start - dist) & out_buf_size_mask); + + if ((MZ_MAX(pOut_buf_cur, pSrc) + counter) > pOut_buf_end) + { + while (counter--) + { + while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(53, TINFL_STATUS_HAS_MORE_OUTPUT); } + *pOut_buf_cur++ = pOut_buf_start[(dist_from_out_buf_start++ - dist) & out_buf_size_mask]; + } + continue; + } +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES + else if ((counter >= 9) && (counter <= dist)) + { + const mz_uint8 *pSrc_end = pSrc + (counter & ~7); + do + { + ((mz_uint32 *)pOut_buf_cur)[0] = ((const mz_uint32 *)pSrc)[0]; + ((mz_uint32 *)pOut_buf_cur)[1] = ((const mz_uint32 *)pSrc)[1]; + pOut_buf_cur += 8; + } while ((pSrc += 8) < pSrc_end); + if ((counter &= 7) < 3) + { + if (counter) + { + pOut_buf_cur[0] = pSrc[0]; + if (counter > 1) + pOut_buf_cur[1] = pSrc[1]; + pOut_buf_cur += counter; + } + continue; + } + } +#endif + do + { + pOut_buf_cur[0] = pSrc[0]; + pOut_buf_cur[1] = pSrc[1]; + pOut_buf_cur[2] = pSrc[2]; + pOut_buf_cur += 3; pSrc += 3; + } while ((int)(counter -= 3) > 2); + if ((int)counter > 0) + { + pOut_buf_cur[0] = pSrc[0]; + if ((int)counter > 1) + pOut_buf_cur[1] = pSrc[1]; + pOut_buf_cur += counter; + } + } + } + } while (!(r->m_final & 1)); + if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) + { + TINFL_SKIP_BITS(32, num_bits & 7); for (counter = 0; counter < 4; ++counter) { mz_uint s; if (num_bits) TINFL_GET_BITS(41, s, 8); else TINFL_GET_BYTE(42, s); r->m_z_adler32 = (r->m_z_adler32 << 8) | s; } + } + TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE); + TINFL_CR_FINISH + +common_exit: + r->m_num_bits = num_bits; r->m_bit_buf = bit_buf; r->m_dist = dist; r->m_counter = counter; r->m_num_extra = num_extra; r->m_dist_from_out_buf_start = dist_from_out_buf_start; + *pIn_buf_size = pIn_buf_cur - pIn_buf_next; *pOut_buf_size = pOut_buf_cur - pOut_buf_next; + if ((decomp_flags & (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) && (status >= 0)) + { + const mz_uint8 *ptr = pOut_buf_next; size_t buf_len = *pOut_buf_size; + mz_uint32 i, s1 = r->m_check_adler32 & 0xffff, s2 = r->m_check_adler32 >> 16; size_t block_len = buf_len % 5552; + while (buf_len) + { + for (i = 0; i + 7 < block_len; i += 8, ptr += 8) + { + s1 += ptr[0], s2 += s1; s1 += ptr[1], s2 += s1; s1 += ptr[2], s2 += s1; s1 += ptr[3], s2 += s1; + s1 += ptr[4], s2 += s1; s1 += ptr[5], s2 += s1; s1 += ptr[6], s2 += s1; s1 += ptr[7], s2 += s1; + } + for ( ; i < block_len; ++i) s1 += *ptr++, s2 += s1; + s1 %= 65521U, s2 %= 65521U; buf_len -= block_len; block_len = 5552; + } + r->m_check_adler32 = (s2 << 16) + s1; if ((status == TINFL_STATUS_DONE) && (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) && (r->m_check_adler32 != r->m_z_adler32)) status = TINFL_STATUS_ADLER32_MISMATCH; + } + return status; +} + +/* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other stuff is for advanced use. */ +enum { MZ_NO_FLUSH = 0, MZ_PARTIAL_FLUSH = 1, MZ_SYNC_FLUSH = 2, MZ_FULL_FLUSH = 3, MZ_FINISH = 4, MZ_BLOCK = 5 }; + +/* Return status codes. MZ_PARAM_ERROR is non-standard. */ +enum { MZ_OK = 0, MZ_STREAM_END = 1, MZ_NEED_DICT = 2, MZ_ERRNO = -1, MZ_STREAM_ERROR = -2, MZ_DATA_ERROR = -3, MZ_MEM_ERROR = -4, MZ_BUF_ERROR = -5, MZ_VERSION_ERROR = -6, MZ_PARAM_ERROR = -10000 }; + +/* Compression levels. */ +enum { MZ_NO_COMPRESSION = 0, MZ_BEST_SPEED = 1, MZ_BEST_COMPRESSION = 9, MZ_DEFAULT_COMPRESSION = -1 }; + +/* Window bits */ +#define MZ_DEFAULT_WINDOW_BITS 15 + +struct mz_internal_state; + +/* Compression/decompression stream struct. */ +typedef struct mz_stream_s +{ + const unsigned char *next_in; /* pointer to next byte to read */ + unsigned int avail_in; /* number of bytes available at next_in */ + mz_ulong total_in; /* total number of bytes consumed so far */ + + unsigned char *next_out; /* pointer to next byte to write */ + unsigned int avail_out; /* number of bytes that can be written to next_out */ + mz_ulong total_out; /* total number of bytes produced so far */ + + char *msg; /* error msg (unused) */ + struct mz_internal_state *state; /* internal state, allocated by zalloc/zfree */ + + mz_alloc_func zalloc; /* optional heap allocation function (defaults to malloc) */ + mz_free_func zfree; /* optional heap free function (defaults to free) */ + void *opaque; /* heap alloc function user pointer */ + + int data_type; /* data_type (unused) */ + mz_ulong adler; /* adler32 of the source or uncompressed data */ + mz_ulong reserved; /* not used */ +} mz_stream; + +typedef mz_stream *mz_streamp; + + +typedef struct +{ + tinfl_decompressor m_decomp; + mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed; int m_window_bits; + mz_uint8 m_dict[TINFL_LZ_DICT_SIZE]; + tinfl_status m_last_status; +} inflate_state; + +static int mz_inflateInit2(mz_streamp pStream, int window_bits) +{ + inflate_state *pDecomp; + if (!pStream) return MZ_STREAM_ERROR; + if ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS)) return MZ_PARAM_ERROR; + + pStream->data_type = 0; + pStream->adler = 0; + pStream->msg = NULL; + pStream->total_in = 0; + pStream->total_out = 0; + pStream->reserved = 0; + /* if (!pStream->zalloc) pStream->zalloc = def_alloc_func; */ + /* if (!pStream->zfree) pStream->zfree = def_free_func; */ + + pDecomp = (inflate_state*)pStream->zalloc(pStream->opaque, 1, sizeof(inflate_state)); + if (!pDecomp) return MZ_MEM_ERROR; + + pStream->state = (struct mz_internal_state *)pDecomp; + + tinfl_init(&pDecomp->m_decomp); + pDecomp->m_dict_ofs = 0; + pDecomp->m_dict_avail = 0; + pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT; + pDecomp->m_first_call = 1; + pDecomp->m_has_flushed = 0; + pDecomp->m_window_bits = window_bits; + + return MZ_OK; +} + +static int mz_inflate(mz_streamp pStream, int flush) +{ + inflate_state* pState; + mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32; + size_t in_bytes, out_bytes, orig_avail_in; + tinfl_status status; + + if ((!pStream) || (!pStream->state)) return MZ_STREAM_ERROR; + if (flush == MZ_PARTIAL_FLUSH) flush = MZ_SYNC_FLUSH; + if ((flush) && (flush != MZ_SYNC_FLUSH) && (flush != MZ_FINISH)) return MZ_STREAM_ERROR; + + pState = (inflate_state*)pStream->state; + if (pState->m_window_bits > 0) decomp_flags |= TINFL_FLAG_PARSE_ZLIB_HEADER; + orig_avail_in = pStream->avail_in; + + first_call = pState->m_first_call; pState->m_first_call = 0; + if (pState->m_last_status < 0) return MZ_DATA_ERROR; + + if (pState->m_has_flushed && (flush != MZ_FINISH)) return MZ_STREAM_ERROR; + pState->m_has_flushed |= (flush == MZ_FINISH); + + if ((flush == MZ_FINISH) && (first_call)) + { + /* MZ_FINISH on the first call implies that the input and output buffers are large enough to hold the entire compressed/decompressed file. */ + decomp_flags |= TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF; + in_bytes = pStream->avail_in; out_bytes = pStream->avail_out; + status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pStream->next_out, pStream->next_out, &out_bytes, decomp_flags); + pState->m_last_status = status; + pStream->next_in += (mz_uint)in_bytes; pStream->avail_in -= (mz_uint)in_bytes; pStream->total_in += (mz_uint)in_bytes; + pStream->adler = tinfl_get_adler32(&pState->m_decomp); + pStream->next_out += (mz_uint)out_bytes; pStream->avail_out -= (mz_uint)out_bytes; pStream->total_out += (mz_uint)out_bytes; + + if (status < 0) + return MZ_DATA_ERROR; + else if (status != TINFL_STATUS_DONE) + { + pState->m_last_status = TINFL_STATUS_FAILED; + return MZ_BUF_ERROR; + } + return MZ_STREAM_END; + } + /* flush != MZ_FINISH then we must assume there's more input. */ + if (flush != MZ_FINISH) decomp_flags |= TINFL_FLAG_HAS_MORE_INPUT; + + if (pState->m_dict_avail) + { + n = MZ_MIN(pState->m_dict_avail, pStream->avail_out); + memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n); + pStream->next_out += n; pStream->avail_out -= n; pStream->total_out += n; + pState->m_dict_avail -= n; pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1); + return ((pState->m_last_status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK; + } + + for ( ; ; ) + { + in_bytes = pStream->avail_in; + out_bytes = TINFL_LZ_DICT_SIZE - pState->m_dict_ofs; + + status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pState->m_dict, pState->m_dict + pState->m_dict_ofs, &out_bytes, decomp_flags); + pState->m_last_status = status; + + pStream->next_in += (mz_uint)in_bytes; pStream->avail_in -= (mz_uint)in_bytes; + pStream->total_in += (mz_uint)in_bytes; pStream->adler = tinfl_get_adler32(&pState->m_decomp); + + pState->m_dict_avail = (mz_uint)out_bytes; + + n = MZ_MIN(pState->m_dict_avail, pStream->avail_out); + memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n); + pStream->next_out += n; pStream->avail_out -= n; pStream->total_out += n; + pState->m_dict_avail -= n; pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1); + + if (status < 0) + return MZ_DATA_ERROR; /* Stream is corrupted (there could be some uncompressed data left in the output dictionary - oh well). */ + else if ((status == TINFL_STATUS_NEEDS_MORE_INPUT) && (!orig_avail_in)) + return MZ_BUF_ERROR; /* Signal caller that we can't make forward progress without supplying more input or by setting flush to MZ_FINISH. */ + else if (flush == MZ_FINISH) + { + /* The output buffer MUST be large to hold the remaining uncompressed data when flush==MZ_FINISH. */ + if (status == TINFL_STATUS_DONE) + return pState->m_dict_avail ? MZ_BUF_ERROR : MZ_STREAM_END; + /* status here must be TINFL_STATUS_HAS_MORE_OUTPUT, which means there's at least 1 more byte on the way. If there's no more room left in the output buffer then something is wrong. */ + else if (!pStream->avail_out) + return MZ_BUF_ERROR; + } + else if ((status == TINFL_STATUS_DONE) || (!pStream->avail_in) || (!pStream->avail_out) || (pState->m_dict_avail)) + break; + } + + return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK; +} + +static int mz_inflateEnd(mz_streamp pStream) +{ + if (!pStream) + return MZ_STREAM_ERROR; + if (pStream->state) + { + pStream->zfree(pStream->opaque, pStream->state); + pStream->state = NULL; + } + return MZ_OK; +} + +/* make this a drop-in replacement for zlib... */ + #define voidpf void* + #define uInt unsigned int + #define z_stream mz_stream + #define inflateInit2 mz_inflateInit2 + #define inflate mz_inflate + #define inflateEnd mz_inflateEnd + #define Z_SYNC_FLUSH MZ_SYNC_FLUSH + #define Z_FINISH MZ_FINISH + #define Z_OK MZ_OK + #define Z_STREAM_END MZ_STREAM_END + #define Z_NEED_DICT MZ_NEED_DICT + #define Z_ERRNO MZ_ERRNO + #define Z_STREAM_ERROR MZ_STREAM_ERROR + #define Z_DATA_ERROR MZ_DATA_ERROR + #define Z_MEM_ERROR MZ_MEM_ERROR + #define Z_BUF_ERROR MZ_BUF_ERROR + #define Z_VERSION_ERROR MZ_VERSION_ERROR + #define MAX_WBITS 15 + +#endif /* #ifndef TINFL_HEADER_FILE_ONLY */ + +/* + This is free and unencumbered software released into the public domain. + + Anyone is free to copy, modify, publish, use, compile, sell, or + distribute this software, either in source code form or as a compiled + binary, for any purpose, commercial or non-commercial, and by any + means. + + In jurisdictions that recognize copyright laws, the author or authors + of this software dedicate any and all copyright interest in the + software to the public domain. We make this dedication for the benefit + of the public at large and to the detriment of our heirs and + successors. We intend this dedication to be an overt act of + relinquishment in perpetuity of all present and future rights to this + software under copyright law. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + For more information, please refer to +*/ diff --git a/jni/physfs-2.1.0/src/physfs_platforms.h b/jni/physfs-2.1.0/src/physfs_platforms.h new file mode 100644 index 00000000..bc78e0bb --- /dev/null +++ b/jni/physfs-2.1.0/src/physfs_platforms.h @@ -0,0 +1,68 @@ +#ifndef _INCL_PHYSFS_PLATFORMS +#define _INCL_PHYSFS_PLATFORMS + +#ifndef __PHYSICSFS_INTERNAL__ +#error Do not include this header from your applications. +#endif + +/* + * These only define the platforms to determine which files in the platforms + * directory should be compiled. For example, technically BeOS can be called + * a "unix" system, but since it doesn't use unix.c, we don't define + * PHYSFS_PLATFORM_UNIX on that system. + */ + +#if (defined __HAIKU__) +# define PHYSFS_PLATFORM_HAIKU 1 +# define PHYSFS_PLATFORM_BEOS 1 +# define PHYSFS_PLATFORM_POSIX 1 +#elif ((defined __BEOS__) || (defined __beos__)) +# define PHYSFS_PLATFORM_BEOS 1 +# define PHYSFS_PLATFORM_POSIX 1 +#elif (defined _WIN32_WCE) || (defined _WIN64_WCE) +# error PocketPC support was dropped from PhysicsFS 2.1. Sorry. +#elif (((defined _WIN32) || (defined _WIN64)) && (!defined __CYGWIN__)) +# define PHYSFS_PLATFORM_WINDOWS 1 +#elif (defined OS2) +# error OS/2 support was dropped from PhysicsFS 2.1. Sorry. +#elif ((defined __MACH__) && (defined __APPLE__)) +/* To check if iphone or not, we need to include this file */ +# include +# if ((TARGET_IPHONE_SIMULATOR) || (TARGET_OS_IPHONE)) +# define PHYSFS_NO_CDROM_SUPPORT 1 +# endif +# define PHYSFS_PLATFORM_MACOSX 1 +# define PHYSFS_PLATFORM_POSIX 1 +#elif defined(macintosh) +# error Classic Mac OS support was dropped from PhysicsFS 2.0. Move to OS X. +#elif defined(ANDROID) +# define PHYSFS_PLATFORM_LINUX 1 +# define PHYSFS_PLATFORM_UNIX 1 +# define PHYSFS_PLATFORM_POSIX 1 +# define PHYSFS_NO_CDROM_SUPPORT 1 +#elif defined(__linux) +# define PHYSFS_PLATFORM_LINUX 1 +# define PHYSFS_PLATFORM_UNIX 1 +# define PHYSFS_PLATFORM_POSIX 1 +#elif defined(__sun) || defined(sun) +# define PHYSFS_PLATFORM_SOLARIS 1 +# define PHYSFS_PLATFORM_UNIX 1 +# define PHYSFS_PLATFORM_POSIX 1 +#elif defined(__FreeBSD__) || defined(__DragonFly__) +# define PHYSFS_PLATFORM_FREEBSD 1 +# define PHYSFS_PLATFORM_BSD 1 +# define PHYSFS_PLATFORM_UNIX 1 +# define PHYSFS_PLATFORM_POSIX 1 +#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) +# define PHYSFS_PLATFORM_BSD 1 +# define PHYSFS_PLATFORM_UNIX 1 +# define PHYSFS_PLATFORM_POSIX 1 +#elif defined(unix) || defined(__unix__) +# define PHYSFS_PLATFORM_UNIX 1 +# define PHYSFS_PLATFORM_POSIX 1 +#else +# error Unknown platform. +#endif + +#endif /* include-once blocker. */ + diff --git a/jni/physfs-2.0.3/physfs_unicode.c b/jni/physfs-2.1.0/src/physfs_unicode.c similarity index 80% rename from jni/physfs-2.0.3/physfs_unicode.c rename to jni/physfs-2.1.0/src/physfs_unicode.c index 15b6c031..64cff474 100644 --- a/jni/physfs-2.0.3/physfs_unicode.c +++ b/jni/physfs-2.1.0/src/physfs_unicode.c @@ -1,5 +1,3 @@ -#include "physfs.h" - #define __PHYSICSFS_INTERNAL__ #include "physfs_internal.h" @@ -48,7 +46,7 @@ static PHYSFS_uint32 utf8codepoint(const char **_str) else if (octet < 128) /* one octet char: 0 to 127 */ { (*_str)++; /* skip to next possible start of codepoint. */ - return(octet); + return octet; } /* else if */ else if ((octet > 127) && (octet < 192)) /* bad (starts with 10xxxxxx). */ @@ -77,7 +75,7 @@ static PHYSFS_uint32 utf8codepoint(const char **_str) else if (octet < 240) /* three octets */ { - (*_str)++; // advance at least one byte in case of an error + (*_str)++; /* advance at least one byte in case of an error */ octet -= (128+64+32); octet2 = (PHYSFS_uint32) ((PHYSFS_uint8) *(++str)); if ((octet2 & (128+64)) != 128) /* Format isn't 10xxxxxx? */ @@ -110,7 +108,7 @@ static PHYSFS_uint32 utf8codepoint(const char **_str) else if (octet < 248) /* four octets */ { - (*_str)++; // advance at least one byte in case of an error + (*_str)++; /* advance at least one byte in case of an error */ octet -= (128+64+32+16); octet2 = (PHYSFS_uint32) ((PHYSFS_uint8) *(++str)); if ((octet2 & (128+64)) != 128) /* Format isn't 10xxxxxx? */ @@ -139,7 +137,7 @@ static PHYSFS_uint32 utf8codepoint(const char **_str) else if (octet < 252) /* five octets */ { - (*_str)++; // advance at least one byte in case of an error + (*_str)++; /* advance at least one byte in case of an error */ octet = (PHYSFS_uint32) ((PHYSFS_uint8) *(++str)); if ((octet & (128+64)) != 128) /* Format isn't 10xxxxxx? */ return UNICODE_BOGUS_CHAR_VALUE; @@ -162,7 +160,7 @@ static PHYSFS_uint32 utf8codepoint(const char **_str) else /* six octets */ { - (*_str)++; // advance at least one byte in case of an error + (*_str)++; /* advance at least one byte in case of an error */ octet = (PHYSFS_uint32) ((PHYSFS_uint8) *(++str)); if ((octet & (128+64)) != 128) /* Format isn't 10xxxxxx? */ return UNICODE_BOGUS_CHAR_VALUE; @@ -183,7 +181,7 @@ static PHYSFS_uint32 utf8codepoint(const char **_str) if ((octet & (128+64)) != 128) /* Format isn't 10xxxxxx? */ return UNICODE_BOGUS_CHAR_VALUE; - *_str += 5; /* skip to next possible start of codepoint. */ + *_str += 6; /* skip to next possible start of codepoint. */ return UNICODE_BOGUS_CHAR_VALUE; } /* else if */ @@ -220,8 +218,7 @@ void PHYSFS_utf8ToUcs2(const char *src, PHYSFS_uint16 *dst, PHYSFS_uint64 len) else if (cp == UNICODE_BOGUS_CHAR_VALUE) cp = UNICODE_BOGUS_CHAR_CODEPOINT; - /* !!! BLUESKY: UTF-16 surrogates? */ - if (cp > 0xFFFF) + if (cp > 0xFFFF) /* UTF-16 surrogates (bogus chars in UCS-2) */ cp = UNICODE_BOGUS_CHAR_CODEPOINT; *(dst++) = cp; @@ -231,6 +228,38 @@ void PHYSFS_utf8ToUcs2(const char *src, PHYSFS_uint16 *dst, PHYSFS_uint64 len) *dst = 0; } /* PHYSFS_utf8ToUcs2 */ + +void PHYSFS_utf8ToUtf16(const char *src, PHYSFS_uint16 *dst, PHYSFS_uint64 len) +{ + len -= sizeof (PHYSFS_uint16); /* save room for null char. */ + while (len >= sizeof (PHYSFS_uint16)) + { + PHYSFS_uint32 cp = utf8codepoint(&src); + if (cp == 0) + break; + else if (cp == UNICODE_BOGUS_CHAR_VALUE) + cp = UNICODE_BOGUS_CHAR_CODEPOINT; + + if (cp > 0xFFFF) /* encode as surrogate pair */ + { + if (len < (sizeof (PHYSFS_uint16) * 2)) + break; /* not enough room for the pair, stop now. */ + + cp -= 0x10000; /* Make this a 20-bit value */ + + *(dst++) = 0xD800 + ((cp >> 10) & 0x3FF); + len -= sizeof (PHYSFS_uint16); + + cp = 0xDC00 + (cp & 0x3FF); + } /* if */ + + *(dst++) = cp; + len -= sizeof (PHYSFS_uint16); + } /* while */ + + *dst = 0; +} /* PHYSFS_utf8ToUtf16 */ + static void utf8fromcodepoint(PHYSFS_uint32 cp, char **_dst, PHYSFS_uint64 *_len) { char *dst = *_dst; @@ -328,7 +357,7 @@ void PHYSFS_utf8FromUcs4(const PHYSFS_uint32 *src, char *dst, PHYSFS_uint64 len) void PHYSFS_utf8FromUcs2(const PHYSFS_uint16 *src, char *dst, PHYSFS_uint64 len) { UTF8FROMTYPE(PHYSFS_uint64, src, dst, len); -} /* PHYSFS_utf8FromUcs4 */ +} /* PHYSFS_utf8FromUcs2 */ /* latin1 maps to unicode codepoints directly, we just utf-8 encode it. */ void PHYSFS_utf8FromLatin1(const char *src, char *dst, PHYSFS_uint64 len) @@ -339,6 +368,40 @@ void PHYSFS_utf8FromLatin1(const char *src, char *dst, PHYSFS_uint64 len) #undef UTF8FROMTYPE +void PHYSFS_utf8FromUtf16(const PHYSFS_uint16 *src, char *dst, PHYSFS_uint64 len) +{ + if (len == 0) + return; + + len--; + while (len) + { + PHYSFS_uint32 cp = (PHYSFS_uint32) *(src++); + if (cp == 0) + break; + + /* Orphaned second half of surrogate pair? */ + if ((cp >= 0xDC00) && (cp <= 0xDFFF)) + cp = UNICODE_BOGUS_CHAR_CODEPOINT; + else if ((cp >= 0xD800) && (cp <= 0xDBFF)) /* start surrogate pair! */ + { + const PHYSFS_uint32 pair = (PHYSFS_uint32) *src; + if ((pair < 0xDC00) || (pair > 0xDFFF)) + cp = UNICODE_BOGUS_CHAR_CODEPOINT; + else + { + src++; /* eat the other surrogate. */ + cp = (((cp - 0xD800) << 10) | (pair - 0xDC00)); + } /* else */ + } /* else if */ + + utf8fromcodepoint(cp, &dst, &len); + } /* while */ + + *dst = '\0'; +} /* PHYSFS_utf8FromUtf16 */ + + typedef struct CaseFoldMapping { PHYSFS_uint32 from; @@ -386,24 +449,39 @@ static int utf8codepointcmp(const PHYSFS_uint32 cp1, const PHYSFS_uint32 cp2) PHYSFS_uint32 folded1[3], folded2[3]; locate_case_fold_mapping(cp1, folded1); locate_case_fold_mapping(cp2, folded2); - return ( (folded1[0] == folded2[0]) && - (folded1[1] == folded2[1]) && - (folded1[2] == folded2[2]) ); + + if (folded1[0] < folded2[0]) + return -1; + else if (folded1[0] > folded2[0]) + return 1; + else if (folded1[1] < folded2[1]) + return -1; + else if (folded1[1] > folded2[1]) + return 1; + else if (folded1[2] < folded2[2]) + return -1; + else if (folded1[2] > folded2[2]) + return 1; + + return 0; /* complete match. */ } /* utf8codepointcmp */ -int __PHYSFS_utf8strcasecmp(const char *str1, const char *str2) +int __PHYSFS_utf8stricmp(const char *str1, const char *str2) { while (1) { const PHYSFS_uint32 cp1 = utf8codepoint(&str1); const PHYSFS_uint32 cp2 = utf8codepoint(&str2); - if (!utf8codepointcmp(cp1, cp2)) return 0; - if (cp1 == 0) return 1; + const int rc = utf8codepointcmp(cp1, cp2); + if (rc != 0) + return rc; + else if (cp1 == 0) + break; /* complete match. */ } /* while */ - return 0; /* shouldn't hit this. */ -} /* __PHYSFS_utf8strcasecmp */ + return 0; +} /* __PHYSFS_utf8stricmp */ int __PHYSFS_utf8strnicmp(const char *str1, const char *str2, PHYSFS_uint32 n) @@ -412,12 +490,15 @@ int __PHYSFS_utf8strnicmp(const char *str1, const char *str2, PHYSFS_uint32 n) { const PHYSFS_uint32 cp1 = utf8codepoint(&str1); const PHYSFS_uint32 cp2 = utf8codepoint(&str2); - if (!utf8codepointcmp(cp1, cp2)) return 0; - if (cp1 == 0) return 1; + const int rc = utf8codepointcmp(cp1, cp2); + if (rc != 0) + return rc; + else if (cp1 == 0) + return 0; n--; } /* while */ - return 1; /* matched to n chars. */ + return 0; /* matched to n chars. */ } /* __PHYSFS_utf8strnicmp */ @@ -434,10 +515,10 @@ int __PHYSFS_stricmpASCII(const char *str1, const char *str2) else if (cp1 > cp2) return 1; else if (cp1 == 0) /* they're both null chars? */ - return 0; + break; } /* while */ - return 0; /* shouldn't hit this. */ + return 0; } /* __PHYSFS_stricmpASCII */ @@ -458,7 +539,7 @@ int __PHYSFS_strnicmpASCII(const char *str1, const char *str2, PHYSFS_uint32 n) } /* while */ return 0; -} /* __PHYSFS_stricmpASCII */ +} /* __PHYSFS_strnicmpASCII */ /* end of physfs_unicode.c ... */ diff --git a/jni/physfs-2.0.3/platform/beos.cpp b/jni/physfs-2.1.0/src/platform_beos.cpp similarity index 57% rename from jni/physfs-2.0.3/platform/beos.cpp rename to jni/physfs-2.1.0/src/platform_beos.cpp index ee7b1908..fd4bbd5a 100644 --- a/jni/physfs-2.0.3/platform/beos.cpp +++ b/jni/physfs-2.1.0/src/platform_beos.cpp @@ -35,28 +35,24 @@ #include #endif -#include -#include -#include #include #include #include "physfs_internal.h" - int __PHYSFS_platformInit(void) { - return(1); /* always succeed. */ + return 1; /* always succeed. */ } /* __PHYSFS_platformInit */ int __PHYSFS_platformDeinit(void) { - return(1); /* always succeed. */ + return 1; /* always succeed. */ } /* __PHYSFS_platformDeinit */ -static char *getMountPoint(const char *devname) +static char *getMountPoint(const char *devname, char *buf, size_t bufsize) { BVolumeRoster mounts; BVolume vol; @@ -68,33 +64,30 @@ static char *getMountPoint(const char *devname) fs_stat_dev(vol.Device(), &fsinfo); if (strcmp(devname, fsinfo.device_name) == 0) { - //char buf[B_FILE_NAME_LENGTH]; BDirectory directory; BEntry entry; BPath path; - status_t rc; - rc = vol.GetRootDirectory(&directory); - BAIL_IF_MACRO(rc < B_OK, strerror(rc), NULL); - rc = directory.GetEntry(&entry); - BAIL_IF_MACRO(rc < B_OK, strerror(rc), NULL); - rc = entry.GetPath(&path); - BAIL_IF_MACRO(rc < B_OK, strerror(rc), NULL); - const char *str = path.Path(); - BAIL_IF_MACRO(str == NULL, ERR_OS_ERROR, NULL); /* ?! */ - char *retval = (char *) allocator.Malloc(strlen(str) + 1); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - strcpy(retval, str); - return(retval); + const char *str; + + if ( (vol.GetRootDirectory(&directory) < B_OK) || + (directory.GetEntry(&entry) < B_OK) || + (entry.GetPath(&path) < B_OK) || + ( (str = path.Path()) == NULL) ) + return NULL; + + strncpy(buf, str, bufsize-1); + buf[bufsize-1] = '\0'; + return buf; } /* if */ } /* while */ - return(NULL); + return NULL; } /* getMountPoint */ /* * This function is lifted from Simple Directmedia Layer (SDL): - * http://www.libsdl.org/ + * http://www.libsdl.org/ ... this is zlib-licensed code, too. */ static void tryDir(const char *d, PHYSFS_StringCallback callback, void *data) { @@ -123,36 +116,28 @@ static void tryDir(const char *d, PHYSFS_StringCallback callback, void *data) { if (strcmp(e.name, "floppy") != 0) tryDir(name, callback, data); + continue; } /* if */ - else - { - bool add_it = false; - int devfd; - device_geometry g; + if (strcmp(e.name, "raw") != 0) /* ignore partitions. */ + continue; - if (strcmp(e.name, "raw") == 0) /* ignore partitions. */ - { - int devfd = open(name, O_RDONLY); - if (devfd >= 0) - { - if (ioctl(devfd, B_GET_GEOMETRY, &g, sizeof(g)) >= 0) - { - if (g.device_type == B_CD) - { - char *mntpnt = getMountPoint(name); - if (mntpnt != NULL) - { - callback(data, mntpnt); - allocator.Free(mntpnt); /* !!! FIXME: lose this malloc! */ - } /* if */ - } /* if */ - } /* if */ - } /* if */ - } /* if */ + const int devfd = open(name, O_RDONLY); + if (devfd < 0) + continue; - close(devfd); - } /* else */ + device_geometry g; + const int rc = ioctl(devfd, B_GET_GEOMETRY, &g, sizeof (g)); + close(devfd); + if (rc < 0) + continue; + + if (g.device_type != B_CD) + continue; + + char mntpnt[B_FILE_NAME_LENGTH]; + if (getMountPoint(name, mntpnt, sizeof (mntpnt))) + callback(data, mntpnt); } /* while */ } /* tryDir */ @@ -168,7 +153,7 @@ static team_id getTeamID(void) thread_info info; thread_id tid = find_thread(NULL); get_thread_info(tid, &info); - return(info.team); + return info.team; } /* getTeamID */ @@ -177,10 +162,11 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0) image_info info; int32 cookie = 0; - while (get_next_image_info(0, &cookie, &info) == B_OK) { + while (get_next_image_info(0, &cookie, &info) == B_OK) + { if (info.type == B_APP_IMAGE) break; - } + } /* while */ BEntry entry(info.name, true); BPath path; @@ -190,40 +176,37 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0) assert(rc == B_OK); const char *str = path.Path(); assert(str != NULL); - char *retval = (char *) allocator.Malloc(strlen(str) + 1); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); + const size_t len = strlen(str); + char *retval = (char *) allocator.Malloc(len + 2); + BAIL_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, NULL); strcpy(retval, str); - return(retval); + retval[len] = '/'; + retval[len+1] = '\0'; + return retval; } /* __PHYSFS_platformCalcBaseDir */ +char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app) +{ + const char *userdir = __PHYSFS_getUserDir(); + const char *append = "config/settings/"; + const size_t len = strlen(userdir) + strlen(append) + strlen(app) + 2; + char *retval = allocator.Malloc(len); + BAIL_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + snprintf(retval, len, "%s%s%s/", userdir, append, app); + return retval; +} /* __PHYSFS_platformCalcPrefDir */ + + void *__PHYSFS_platformGetThreadID(void) { - return((void *) find_thread(NULL)); + return (void *) find_thread(NULL); } /* __PHYSFS_platformGetThreadID */ -char *__PHYSFS_platformRealPath(const char *path) -{ - BPath normalized(path, NULL, true); /* force normalization of path. */ - const char *resolved_path = normalized.Path(); - BAIL_IF_MACRO(resolved_path == NULL, ERR_NO_SUCH_FILE, NULL); - char *retval = (char *) allocator.Malloc(strlen(resolved_path) + 1); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - strcpy(retval, resolved_path); - return(retval); -} /* __PHYSFS_platformRealPath */ - - -char *__PHYSFS_platformCurrentDir(void) -{ - return(__PHYSFS_platformRealPath(".")); /* let BPath sort it out. */ -} /* __PHYSFS_platformCurrentDir */ - - void *__PHYSFS_platformCreateMutex(void) { - return(new BLocker("PhysicsFS lock", true)); + return new BLocker("PhysicsFS lock", true); } /* __PHYSFS_platformCreateMutex */ @@ -247,7 +230,7 @@ void __PHYSFS_platformReleaseMutex(void *mutex) int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a) { - return(0); /* just use malloc() and friends. */ + return 0; /* just use malloc() and friends. */ } /* __PHYSFS_platformSetDefaultAllocator */ #endif /* PHYSFS_PLATFORM_BEOS */ diff --git a/jni/physfs-2.0.3/platform/macosx.c b/jni/physfs-2.1.0/src/platform_macosx.c similarity index 59% rename from jni/physfs-2.0.3/platform/macosx.c rename to jni/physfs-2.1.0/src/platform_macosx.c index a483994b..802826ae 100644 --- a/jni/physfs-2.0.3/platform/macosx.c +++ b/jni/physfs-2.1.0/src/platform_macosx.c @@ -11,12 +11,15 @@ #ifdef PHYSFS_PLATFORM_MACOSX -#include +#include + +#if !defined(PHYSFS_NO_CDROM_SUPPORT) +#include /* !!! FIXME */ #include #include #include #include -#include +#endif /* Seems to get defined in some system header... */ #ifdef Free @@ -29,10 +32,10 @@ /* Wrap PHYSFS_Allocator in a CFAllocator... */ static CFAllocatorRef cfallocator = NULL; -CFStringRef cfallocDesc(const void *info) +static CFStringRef cfallocDesc(const void *info) { - return(CFStringCreateWithCString(cfallocator, "PhysicsFS", - kCFStringEncodingASCII)); + return CFStringCreateWithCString(cfallocator, "PhysicsFS", + kCFStringEncodingASCII); } /* cfallocDesc */ @@ -67,8 +70,8 @@ int __PHYSFS_platformInit(void) ctx.reallocate = cfallocRealloc; ctx.deallocate = cfallocFree; cfallocator = CFAllocatorCreate(kCFAllocatorUseContext, &ctx); - BAIL_IF_MACRO(cfallocator == NULL, ERR_OUT_OF_MEMORY, 0); - return(1); /* success. */ + BAIL_IF_MACRO(!cfallocator, PHYSFS_ERR_OUT_OF_MEMORY, 0); + return 1; /* success. */ } /* __PHYSFS_platformInit */ @@ -76,10 +79,11 @@ int __PHYSFS_platformDeinit(void) { CFRelease(cfallocator); cfallocator = NULL; - return(1); /* always succeed. */ + return 1; /* always succeed. */ } /* __PHYSFS_platformDeinit */ + /* CD-ROM detection code... */ /* @@ -87,19 +91,21 @@ int __PHYSFS_platformDeinit(void) * http://developer.apple.com/samplecode/Sample_Code/Devices_and_Hardware/Disks/VolumeToBSDNode/VolumeToBSDNode.c.htm */ +#if !defined(PHYSFS_NO_CDROM_SUPPORT) + static int darwinIsWholeMedia(io_service_t service) { int retval = 0; CFTypeRef wholeMedia; if (!IOObjectConformsTo(service, kIOMediaClass)) - return(0); + return 0; wholeMedia = IORegistryEntryCreateCFProperty(service, CFSTR(kIOMediaWholeKey), cfallocator, 0); if (wholeMedia == NULL) - return(0); + return 0; retval = CFBooleanGetValue(wholeMedia); CFRelease(wholeMedia); @@ -117,27 +123,27 @@ static int darwinIsMountedDisc(char *bsdName, mach_port_t masterPort) io_service_t service; if ((matchingDict = IOBSDNameMatching(masterPort, 0, bsdName)) == NULL) - return(0); + return 0; rc = IOServiceGetMatchingServices(masterPort, matchingDict, &iter); if ((rc != KERN_SUCCESS) || (!iter)) - return(0); + return 0; service = IOIteratorNext(iter); IOObjectRelease(iter); if (!service) - return(0); + return 0; rc = IORegistryEntryCreateIterator(service, kIOServicePlane, kIORegistryIterateRecursively | kIORegistryIterateParents, &iter); if (!iter) - return(0); + return 0; if (rc != KERN_SUCCESS) { IOObjectRelease(iter); - return(0); + return 0; } /* if */ IOObjectRetain(service); /* add an extra object reference... */ @@ -158,12 +164,15 @@ static int darwinIsMountedDisc(char *bsdName, mach_port_t masterPort) IOObjectRelease(iter); IOObjectRelease(service); - return(retval); + return retval; } /* darwinIsMountedDisc */ +#endif /* !defined(PHYSFS_NO_CDROM_SUPPORT) */ + void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) { +#if !defined(PHYSFS_NO_CDROM_SUPPORT) const char *devPrefix = "/dev/"; const int prefixLen = strlen(devPrefix); mach_port_t masterPort = 0; @@ -171,7 +180,7 @@ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) int i, mounts; if (IOMasterPort(MACH_PORT_NULL, &masterPort) != KERN_SUCCESS) - BAIL_MACRO(ERR_OS_ERROR, ) /*return void*/; + BAIL_MACRO(PHYSFS_ERR_OS_ERROR, ) /*return void*/; mounts = getmntinfo(&mntbufp, MNT_WAIT); /* NOT THREAD SAFE! */ for (i = 0; i < mounts; i++) @@ -185,6 +194,7 @@ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) if (darwinIsMountedDisc(dev, masterPort)) cb(data, mnt); } /* for */ +#endif /* !defined(PHYSFS_NO_CDROM_SUPPORT) */ } /* __PHYSFS_platformDetectAvailableCDs */ @@ -193,7 +203,7 @@ static char *convertCFString(CFStringRef cfstr) CFIndex len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstr), kCFStringEncodingUTF8) + 1; char *retval = (char *) allocator.Malloc(len); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); + BAIL_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, NULL); if (CFStringGetCString(cfstr, retval, len, kCFStringEncodingUTF8)) { @@ -210,114 +220,47 @@ static char *convertCFString(CFStringRef cfstr) else /* probably shouldn't fail, but just in case... */ { allocator.Free(retval); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); } /* else */ - return(retval); + return retval; } /* convertCFString */ char *__PHYSFS_platformCalcBaseDir(const char *argv0) { - ProcessSerialNumber psn = { 0, kCurrentProcess }; - struct stat statbuf; - FSRef fsref; - CFRange cfrange; CFURLRef cfurl = NULL; CFStringRef cfstr = NULL; CFMutableStringRef cfmutstr = NULL; char *retval = NULL; - char *cstr = NULL; - int rc = 0; - BAIL_IF_MACRO(GetProcessBundleLocation(&psn, &fsref) != noErr, NULL, NULL); - cfurl = CFURLCreateFromFSRef(cfallocator, &fsref); - BAIL_IF_MACRO(cfurl == NULL, NULL, NULL); + cfurl = CFBundleCopyBundleURL(CFBundleGetMainBundle()); + BAIL_IF_MACRO(cfurl == NULL, PHYSFS_ERR_OS_ERROR, NULL); cfstr = CFURLCopyFileSystemPath(cfurl, kCFURLPOSIXPathStyle); CFRelease(cfurl); - BAIL_IF_MACRO(cfstr == NULL, NULL, NULL); + BAIL_IF_MACRO(!cfstr, PHYSFS_ERR_OUT_OF_MEMORY, NULL); cfmutstr = CFStringCreateMutableCopy(cfallocator, 0, cfstr); CFRelease(cfstr); - BAIL_IF_MACRO(cfmutstr == NULL, NULL, NULL); - - /* we have to decide if we got a binary's path, or the .app dir... */ - cstr = convertCFString(cfmutstr); - if (cstr == NULL) - { - CFRelease(cfmutstr); - return(NULL); - } /* if */ - - rc = stat(cstr, &statbuf); - allocator.Free(cstr); /* done with this. */ - if (rc == -1) - { - CFRelease(cfmutstr); - return(NULL); /* maybe default behaviour will work? */ - } /* if */ - - if (S_ISREG(statbuf.st_mode)) - { - /* Find last dirsep so we can chop the filename from the path. */ - cfrange = CFStringFind(cfmutstr, CFSTR("/"), kCFCompareBackwards); - if (cfrange.location == kCFNotFound) - { - assert(0); /* shouldn't ever hit this... */ - CFRelease(cfmutstr); - return(NULL); - } /* if */ - - /* chop the "/exename" from the end of the path string... */ - cfrange.length = CFStringGetLength(cfmutstr) - cfrange.location; - CFStringDelete(cfmutstr, cfrange); - - /* If we're an Application Bundle, chop everything but the base. */ - cfrange = CFStringFind(cfmutstr, CFSTR("/Contents/MacOS"), - kCFCompareCaseInsensitive | - kCFCompareBackwards | - kCFCompareAnchored); - - if (cfrange.location != kCFNotFound) - CFStringDelete(cfmutstr, cfrange); /* chop that, too. */ - } /* if */ - + BAIL_IF_MACRO(!cfmutstr, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + CFStringAppendCString(cfmutstr, "/", kCFStringEncodingUTF8); retval = convertCFString(cfmutstr); CFRelease(cfmutstr); - return(retval); /* whew. */ + return retval; /* whew. */ } /* __PHYSFS_platformCalcBaseDir */ -/* !!! FIXME */ -#define osxerr(x) x - -char *__PHYSFS_platformRealPath(const char *path) +char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app) { - /* The symlink and relative path resolving happens in FSPathMakeRef() */ - FSRef fsref; - CFURLRef cfurl = NULL; - CFStringRef cfstr = NULL; - char *retval = NULL; - OSStatus rc = osxerr(FSPathMakeRef((UInt8 *) path, &fsref, NULL)); - BAIL_IF_MACRO(rc != noErr, NULL, NULL); - - /* Now get it to spit out a full path. */ - cfurl = CFURLCreateFromFSRef(cfallocator, &fsref); - BAIL_IF_MACRO(cfurl == NULL, ERR_OUT_OF_MEMORY, NULL); - cfstr = CFURLCopyFileSystemPath(cfurl, kCFURLPOSIXPathStyle); - CFRelease(cfurl); - BAIL_IF_MACRO(cfstr == NULL, ERR_OUT_OF_MEMORY, NULL); - retval = convertCFString(cfstr); - CFRelease(cfstr); - - return(retval); -} /* __PHYSFS_platformRealPath */ - - -char *__PHYSFS_platformCurrentDir(void) -{ - return(__PHYSFS_platformRealPath(".")); /* let CFURL sort it out. */ -} /* __PHYSFS_platformCurrentDir */ + /* !!! FIXME: there's a real API to determine this */ + const char *userdir = __PHYSFS_getUserDir(); + const char *append = "Library/Application Support/"; + const size_t len = strlen(userdir) + strlen(append) + strlen(app) + 2; + char *retval = allocator.Malloc(len); + BAIL_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + snprintf(retval, len, "%s%s%s/", userdir, append, app); + return retval; +} /* __PHYSFS_platformCalcPrefDir */ /* Platform allocator uses default CFAllocator at PHYSFS_init() time. */ @@ -331,7 +274,7 @@ static int macosxAllocatorInit(void) retval = (cfallocdef != NULL); if (retval) CFRetain(cfallocdef); - return(retval); + return retval; } /* macosxAllocatorInit */ @@ -347,15 +290,17 @@ static void macosxAllocatorDeinit(void) static void *macosxAllocatorMalloc(PHYSFS_uint64 s) { - BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL); - return(CFAllocatorAllocate(cfallocdef, (CFIndex) s, 0)); + if (!__PHYSFS_ui64FitsAddressSpace(s)) + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + return CFAllocatorAllocate(cfallocdef, (CFIndex) s, 0); } /* macosxAllocatorMalloc */ static void *macosxAllocatorRealloc(void *ptr, PHYSFS_uint64 s) { - BAIL_IF_MACRO(__PHYSFS_ui64FitsAddressSpace(s), ERR_OUT_OF_MEMORY, NULL); - return(CFAllocatorReallocate(cfallocdef, ptr, (CFIndex) s, 0)); + if (!__PHYSFS_ui64FitsAddressSpace(s)) + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + return CFAllocatorReallocate(cfallocdef, ptr, (CFIndex) s, 0); } /* macosxAllocatorRealloc */ @@ -372,47 +317,9 @@ int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a) allocator.Malloc = macosxAllocatorMalloc; allocator.Realloc = macosxAllocatorRealloc; allocator.Free = macosxAllocatorFree; - return(1); /* return non-zero: we're supplying custom allocator. */ + return 1; /* return non-zero: we're supplying custom allocator. */ } /* __PHYSFS_platformSetDefaultAllocator */ - -void *__PHYSFS_platformGetThreadID(void) -{ - return( (void *) ((size_t) MPCurrentTaskID()) ); -} /* __PHYSFS_platformGetThreadID */ - - -void *__PHYSFS_platformCreateMutex(void) -{ - MPCriticalRegionID m = NULL; - if (osxerr(MPCreateCriticalRegion(&m)) != noErr) - return NULL; - return m; -} /* __PHYSFS_platformCreateMutex */ - - -void __PHYSFS_platformDestroyMutex(void *mutex) -{ - MPCriticalRegionID m = (MPCriticalRegionID) mutex; - MPDeleteCriticalRegion(m); -} /* __PHYSFS_platformDestroyMutex */ - - -int __PHYSFS_platformGrabMutex(void *mutex) -{ - MPCriticalRegionID m = (MPCriticalRegionID) mutex; - if (MPEnterCriticalRegion(m, kDurationForever) != noErr) - return(0); - return(1); -} /* __PHYSFS_platformGrabMutex */ - - -void __PHYSFS_platformReleaseMutex(void *mutex) -{ - MPCriticalRegionID m = (MPCriticalRegionID) mutex; - MPExitCriticalRegion(m); -} /* __PHYSFS_platformReleaseMutex */ - #endif /* PHYSFS_PLATFORM_MACOSX */ /* end of macosx.c ... */ diff --git a/jni/physfs-2.1.0/src/platform_posix.c b/jni/physfs-2.1.0/src/platform_posix.c new file mode 100644 index 00000000..018ae760 --- /dev/null +++ b/jni/physfs-2.1.0/src/platform_posix.c @@ -0,0 +1,436 @@ +/* + * Posix-esque support routines for PhysicsFS. + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon. + */ + +/* !!! FIXME: check for EINTR? */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_platforms.h" + +#ifdef PHYSFS_PLATFORM_POSIX + +#include +#include +#include +#include +#include +#include +#include +#include + +#if ((!defined PHYSFS_NO_THREAD_SUPPORT) && (!defined PHYSFS_PLATFORM_BEOS)) +#include +#endif + +#include "physfs_internal.h" + + +static PHYSFS_ErrorCode errcodeFromErrnoError(const int err) +{ + switch (err) + { + case 0: return PHYSFS_ERR_OK; + case EACCES: return PHYSFS_ERR_PERMISSION; + case EPERM: return PHYSFS_ERR_PERMISSION; + case EDQUOT: return PHYSFS_ERR_NO_SPACE; + case EIO: return PHYSFS_ERR_IO; + case ELOOP: return PHYSFS_ERR_SYMLINK_LOOP; + case EMLINK: return PHYSFS_ERR_NO_SPACE; + case ENAMETOOLONG: return PHYSFS_ERR_BAD_FILENAME; + case ENOENT: return PHYSFS_ERR_NOT_FOUND; + case ENOSPC: return PHYSFS_ERR_NO_SPACE; + case ENOTDIR: return PHYSFS_ERR_NOT_FOUND; + case EISDIR: return PHYSFS_ERR_NOT_A_FILE; + case EROFS: return PHYSFS_ERR_READ_ONLY; + case ETXTBSY: return PHYSFS_ERR_BUSY; + case EBUSY: return PHYSFS_ERR_BUSY; + case ENOMEM: return PHYSFS_ERR_OUT_OF_MEMORY; + case ENOTEMPTY: return PHYSFS_ERR_DIR_NOT_EMPTY; + default: return PHYSFS_ERR_OS_ERROR; + } /* switch */ +} /* errcodeFromErrnoError */ + + +static inline PHYSFS_ErrorCode errcodeFromErrno(void) +{ + return errcodeFromErrnoError(errno); +} /* errcodeFromErrno */ + + +static char *getUserDirByUID(void) +{ + uid_t uid = getuid(); + struct passwd *pw; + char *retval = NULL; + + pw = getpwuid(uid); + if ((pw != NULL) && (pw->pw_dir != NULL) && (*pw->pw_dir != '\0')) + { + const size_t dlen = strlen(pw->pw_dir); + const size_t add_dirsep = (pw->pw_dir[dlen-1] != '/') ? 1 : 0; + retval = (char *) allocator.Malloc(dlen + 1 + add_dirsep); + if (retval != NULL) + { + strcpy(retval, pw->pw_dir); + if (add_dirsep) + { + retval[dlen] = '/'; + retval[dlen+1] = '\0'; + } /* if */ + } /* if */ + } /* if */ + + return retval; +} /* getUserDirByUID */ + + +char *__PHYSFS_platformCalcUserDir(void) +{ + char *retval = NULL; + char *envr = getenv("HOME"); + + /* if the environment variable was set, make sure it's really a dir. */ + if (envr != NULL) + { + struct stat statbuf; + if ((stat(envr, &statbuf) != -1) && (S_ISDIR(statbuf.st_mode))) + { + const size_t envrlen = strlen(envr); + const size_t add_dirsep = (envr[envrlen-1] != '/') ? 1 : 0; + retval = allocator.Malloc(envrlen + 1 + add_dirsep); + if (retval) + { + strcpy(retval, envr); + if (add_dirsep) + { + retval[envrlen] = '/'; + retval[envrlen+1] = '\0'; + } /* if */ + } /* if */ + } /* if */ + } /* if */ + + if (retval == NULL) + retval = getUserDirByUID(); + + return retval; +} /* __PHYSFS_platformCalcUserDir */ + + +void __PHYSFS_platformEnumerateFiles(const char *dirname, + PHYSFS_EnumFilesCallback callback, + const char *origdir, + void *callbackdata) +{ + DIR *dir; + struct dirent *ent; + char *buf = NULL; + + errno = 0; + dir = opendir(dirname); + if (dir == NULL) + { + allocator.Free(buf); + return; + } /* if */ + + while ((ent = readdir(dir)) != NULL) + { + if (strcmp(ent->d_name, ".") == 0) + continue; + else if (strcmp(ent->d_name, "..") == 0) + continue; + + callback(callbackdata, origdir, ent->d_name); + } /* while */ + + allocator.Free(buf); + closedir(dir); +} /* __PHYSFS_platformEnumerateFiles */ + + +int __PHYSFS_platformMkDir(const char *path) +{ + const int rc = mkdir(path, S_IRWXU); + BAIL_IF_MACRO(rc == -1, errcodeFromErrno(), 0); + return 1; +} /* __PHYSFS_platformMkDir */ + + +static void *doOpen(const char *filename, int mode) +{ + const int appending = (mode & O_APPEND); + int fd; + int *retval; + errno = 0; + + /* O_APPEND doesn't actually behave as we'd like. */ + mode &= ~O_APPEND; + + fd = open(filename, mode, S_IRUSR | S_IWUSR); + BAIL_IF_MACRO(fd < 0, errcodeFromErrno(), NULL); + + if (appending) + { + if (lseek(fd, 0, SEEK_END) < 0) + { + const int err = errno; + close(fd); + BAIL_MACRO(errcodeFromErrnoError(err), NULL); + } /* if */ + } /* if */ + + retval = (int *) allocator.Malloc(sizeof (int)); + if (!retval) + { + close(fd); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + } /* if */ + + *retval = fd; + return ((void *) retval); +} /* doOpen */ + + +void *__PHYSFS_platformOpenRead(const char *filename) +{ + return doOpen(filename, O_RDONLY); +} /* __PHYSFS_platformOpenRead */ + + +void *__PHYSFS_platformOpenWrite(const char *filename) +{ + return doOpen(filename, O_WRONLY | O_CREAT | O_TRUNC); +} /* __PHYSFS_platformOpenWrite */ + + +void *__PHYSFS_platformOpenAppend(const char *filename) +{ + return doOpen(filename, O_WRONLY | O_CREAT | O_APPEND); +} /* __PHYSFS_platformOpenAppend */ + + +PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer, + PHYSFS_uint64 len) +{ + const int fd = *((int *) opaque); + ssize_t rc = 0; + + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL_MACRO(PHYSFS_ERR_INVALID_ARGUMENT, -1); + + rc = read(fd, buffer, (size_t) len); + BAIL_IF_MACRO(rc == -1, errcodeFromErrno(), -1); + assert(rc >= 0); + assert(rc <= len); + return (PHYSFS_sint64) rc; +} /* __PHYSFS_platformRead */ + + +PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, + PHYSFS_uint64 len) +{ + const int fd = *((int *) opaque); + ssize_t rc = 0; + + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL_MACRO(PHYSFS_ERR_INVALID_ARGUMENT, -1); + + rc = write(fd, (void *) buffer, (size_t) len); + BAIL_IF_MACRO(rc == -1, errcodeFromErrno(), rc); + assert(rc >= 0); + assert(rc <= len); + return (PHYSFS_sint64) rc; +} /* __PHYSFS_platformWrite */ + + +int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos) +{ + const int fd = *((int *) opaque); + const int rc = lseek(fd, (off_t) pos, SEEK_SET); + BAIL_IF_MACRO(rc == -1, errcodeFromErrno(), 0); + return 1; +} /* __PHYSFS_platformSeek */ + + +PHYSFS_sint64 __PHYSFS_platformTell(void *opaque) +{ + const int fd = *((int *) opaque); + PHYSFS_sint64 retval; + retval = (PHYSFS_sint64) lseek(fd, 0, SEEK_CUR); + BAIL_IF_MACRO(retval == -1, errcodeFromErrno(), -1); + return retval; +} /* __PHYSFS_platformTell */ + + +PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque) +{ + const int fd = *((int *) opaque); + struct stat statbuf; + BAIL_IF_MACRO(fstat(fd, &statbuf) == -1, errcodeFromErrno(), -1); + return ((PHYSFS_sint64) statbuf.st_size); +} /* __PHYSFS_platformFileLength */ + + +int __PHYSFS_platformFlush(void *opaque) +{ + const int fd = *((int *) opaque); + if ((fcntl(fd, F_GETFL) & O_ACCMODE) != O_RDONLY) + BAIL_IF_MACRO(fsync(fd) == -1, errcodeFromErrno(), 0); + return 1; +} /* __PHYSFS_platformFlush */ + + +void __PHYSFS_platformClose(void *opaque) +{ + const int fd = *((int *) opaque); + (void) close(fd); /* we don't check this. You should have used flush! */ + allocator.Free(opaque); +} /* __PHYSFS_platformClose */ + + +int __PHYSFS_platformDelete(const char *path) +{ + BAIL_IF_MACRO(remove(path) == -1, errcodeFromErrno(), 0); + return 1; +} /* __PHYSFS_platformDelete */ + + +int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *st) +{ + struct stat statbuf; + + BAIL_IF_MACRO(lstat(filename, &statbuf) == -1, errcodeFromErrno(), 0); + + if (S_ISREG(statbuf.st_mode)) + { + st->filetype = PHYSFS_FILETYPE_REGULAR; + st->filesize = statbuf.st_size; + } /* if */ + + else if(S_ISDIR(statbuf.st_mode)) + { + st->filetype = PHYSFS_FILETYPE_DIRECTORY; + st->filesize = 0; + } /* else if */ + + else if(S_ISLNK(statbuf.st_mode)) + { + st->filetype = PHYSFS_FILETYPE_SYMLINK; + st->filesize = 0; + } /* else if */ + + else + { + st->filetype = PHYSFS_FILETYPE_OTHER; + st->filesize = statbuf.st_size; + } /* else */ + + st->modtime = statbuf.st_mtime; + st->createtime = statbuf.st_ctime; + st->accesstime = statbuf.st_atime; + + /* !!! FIXME: maybe we should just report full permissions? */ + st->readonly = access(filename, W_OK); + return 1; +} /* __PHYSFS_platformStat */ + + +#ifndef PHYSFS_PLATFORM_BEOS /* BeOS has its own code in platform_beos.cpp */ +#if (defined PHYSFS_NO_THREAD_SUPPORT) + +void *__PHYSFS_platformGetThreadID(void) { return ((void *) 0x0001); } +void *__PHYSFS_platformCreateMutex(void) { return ((void *) 0x0001); } +void __PHYSFS_platformDestroyMutex(void *mutex) {} +int __PHYSFS_platformGrabMutex(void *mutex) { return 1; } +void __PHYSFS_platformReleaseMutex(void *mutex) {} + +#else + +typedef struct +{ + pthread_mutex_t mutex; + pthread_t owner; + PHYSFS_uint32 count; +} PthreadMutex; + + +void *__PHYSFS_platformGetThreadID(void) +{ + return ( (void *) ((size_t) pthread_self()) ); +} /* __PHYSFS_platformGetThreadID */ + + +void *__PHYSFS_platformCreateMutex(void) +{ + int rc; + PthreadMutex *m = (PthreadMutex *) allocator.Malloc(sizeof (PthreadMutex)); + BAIL_IF_MACRO(!m, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + rc = pthread_mutex_init(&m->mutex, NULL); + if (rc != 0) + { + allocator.Free(m); + BAIL_MACRO(PHYSFS_ERR_OS_ERROR, NULL); + } /* if */ + + m->count = 0; + m->owner = (pthread_t) 0xDEADBEEF; + return ((void *) m); +} /* __PHYSFS_platformCreateMutex */ + + +void __PHYSFS_platformDestroyMutex(void *mutex) +{ + PthreadMutex *m = (PthreadMutex *) mutex; + + /* Destroying a locked mutex is a bug, but we'll try to be helpful. */ + if ((m->owner == pthread_self()) && (m->count > 0)) + pthread_mutex_unlock(&m->mutex); + + pthread_mutex_destroy(&m->mutex); + allocator.Free(m); +} /* __PHYSFS_platformDestroyMutex */ + + +int __PHYSFS_platformGrabMutex(void *mutex) +{ + PthreadMutex *m = (PthreadMutex *) mutex; + pthread_t tid = pthread_self(); + if (m->owner != tid) + { + if (pthread_mutex_lock(&m->mutex) != 0) + return 0; + m->owner = tid; + } /* if */ + + m->count++; + return 1; +} /* __PHYSFS_platformGrabMutex */ + + +void __PHYSFS_platformReleaseMutex(void *mutex) +{ + PthreadMutex *m = (PthreadMutex *) mutex; + assert(m->owner == pthread_self()); /* catch programming errors. */ + assert(m->count > 0); /* catch programming errors. */ + if (m->owner == pthread_self()) + { + if (--m->count == 0) + { + m->owner = (pthread_t) 0xDEADBEEF; + pthread_mutex_unlock(&m->mutex); + } /* if */ + } /* if */ +} /* __PHYSFS_platformReleaseMutex */ + +#endif /* !PHYSFS_NO_THREAD_SUPPORT */ +#endif /* !PHYSFS_PLATFORM_BEOS */ + +#endif /* PHYSFS_PLATFORM_POSIX */ + +/* end of posix.c ... */ + diff --git a/jni/physfs-2.0.3/platform/unix.c b/jni/physfs-2.1.0/src/platform_unix.c similarity index 50% rename from jni/physfs-2.0.3/platform/unix.c rename to jni/physfs-2.1.0/src/platform_unix.c index 093e7ebf..e11c24bc 100644 --- a/jni/physfs-2.0.3/platform/unix.c +++ b/jni/physfs-2.1.0/src/platform_unix.c @@ -11,11 +11,9 @@ #ifdef PHYSFS_PLATFORM_UNIX -#include -#include -#include #include #include +#include #include #include #include @@ -23,52 +21,53 @@ #include #include #include +#include -#if (!defined PHYSFS_NO_THREAD_SUPPORT) -#include +#if PHYSFS_PLATFORM_LINUX && !defined(PHYSFS_HAVE_MNTENT_H) +#define PHYSFS_HAVE_MNTENT_H 1 +#elif PHYSFS_PLATFORM_SOLARIS && !defined(PHYSFS_HAVE_SYS_MNTTAB_H) +#define PHYSFS_HAVE_SYS_MNTTAB_H 1 +#elif PHYSFS_PLATFORM_BSD && !defined(PHYSFS_HAVE_SYS_UCRED_H) +#define PHYSFS_HAVE_SYS_UCRED_H 1 #endif #ifdef PHYSFS_HAVE_SYS_UCRED_H # ifdef PHYSFS_HAVE_MNTENT_H # undef PHYSFS_HAVE_MNTENT_H /* don't do both... */ # endif -# include # include +# include #endif #ifdef PHYSFS_HAVE_MNTENT_H #include #endif -#include "physfs_internal.h" - -#ifndef MAXPATHLEN -#define MAXPATHLEN 1024 +#ifdef PHYSFS_HAVE_SYS_MNTTAB_H +#include #endif +#include "physfs_internal.h" + int __PHYSFS_platformInit(void) { - return(1); /* always succeed. */ + return 1; /* always succeed. */ } /* __PHYSFS_platformInit */ int __PHYSFS_platformDeinit(void) { - return(1); /* always succeed. */ + return 1; /* always succeed. */ } /* __PHYSFS_platformDeinit */ -#ifdef PHYSFS_NO_CDROM_SUPPORT - /* Stub version for platforms without CD-ROM support. */ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) { -} /* __PHYSFS_platformDetectAvailableCDs */ +#if (defined PHYSFS_NO_CDROM_SUPPORT) + /* no-op. */ #elif (defined PHYSFS_HAVE_SYS_UCRED_H) - -void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) -{ int i; struct statfs *mntbufp = NULL; int mounts = getmntinfo(&mntbufp, MNT_WAIT); @@ -87,17 +86,13 @@ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) if (add_it) cb(data, mntbufp[i].f_mntonname); } /* for */ -} /* __PHYSFS_platformDetectAvailableCDs */ #elif (defined PHYSFS_HAVE_MNTENT_H) - -void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) -{ FILE *mounts = NULL; struct mntent *ent = NULL; mounts = setmntent("/etc/mtab", "r"); - BAIL_IF_MACRO(mounts == NULL, ERR_IO_ERROR, /*return void*/); + BAIL_IF_MACRO(mounts == NULL, PHYSFS_ERR_IO, /*return void*/); while ( (ent = getmntent(mounts)) != NULL ) { @@ -113,6 +108,8 @@ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) else if (strcmp(ent->mnt_type, "supermount") == 0) add_it = 1; + /* !!! FIXME: udf? automount? */ + /* add other mount types here */ if (add_it) @@ -121,13 +118,29 @@ void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) endmntent(mounts); -} /* __PHYSFS_platformDetectAvailableCDs */ +#elif (defined PHYSFS_HAVE_SYS_MNTTAB_H) + FILE *mounts = fopen(MNTTAB, "r"); + struct mnttab ent; + BAIL_IF_MACRO(mounts == NULL, PHYSFS_ERR_IO, /*return void*/); + while (getmntent(mounts, &ent) == 0) + { + int add_it = 0; + if (strcmp(ent.mnt_fstype, "hsfs") == 0) + add_it = 1; + + /* add other mount types here */ + + if (add_it) + cb(data, ent.mnt_mountp); + } /* while */ + + fclose(mounts); + +#else +#error Unknown platform. Should have defined PHYSFS_NO_CDROM_SUPPORT, perhaps. #endif - - -/* this is in posix.c ... */ -extern char *__PHYSFS_platformCopyEnvironmentVariable(const char *varname); +} /* __PHYSFS_platformDetectAvailableCDs */ /* @@ -146,25 +159,28 @@ static char *findBinaryInPath(const char *bin, char *envr) char *start = envr; char *ptr; - BAIL_IF_MACRO(bin == NULL, ERR_INVALID_ARGUMENT, NULL); - BAIL_IF_MACRO(envr == NULL, ERR_INVALID_ARGUMENT, NULL); + assert(bin != NULL); + assert(envr != NULL); do { size_t size; + size_t binlen; + ptr = strchr(start, ':'); /* find next $PATH separator. */ if (ptr) *ptr = '\0'; - size = strlen(start) + strlen(bin) + 2; + binlen = strlen(bin); + size = strlen(start) + binlen + 2; if (size > alloc_size) { char *x = (char *) allocator.Realloc(exe, size); - if (x == NULL) + if (!x) { if (exe != NULL) allocator.Free(exe); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); } /* if */ alloc_size = size; @@ -179,8 +195,8 @@ static char *findBinaryInPath(const char *bin, char *envr) if (access(exe, X_OK) == 0) /* Exists as executable? We're done. */ { - strcpy(exe, start); /* i'm lazy. piss off. */ - return(exe); + exe[(size - binlen) - 1] = '\0'; /* chop off filename, leave '/' */ + return exe; } /* if */ start = ptr + 1; /* start points to beginning of next element. */ @@ -189,7 +205,7 @@ static char *findBinaryInPath(const char *bin, char *envr) if (exe != NULL) allocator.Free(exe); - return(NULL); /* doesn't exist in path. */ + return NULL; /* doesn't exist in path. */ } /* findBinaryInPath */ @@ -228,42 +244,78 @@ static char *readSymLink(const char *path) char *__PHYSFS_platformCalcBaseDir(const char *argv0) { char *retval = NULL; - char *envr = NULL; + const char *envr = NULL; - /* fast path: default behaviour can handle this. */ - if ( (argv0 != NULL) && (strchr(argv0, '/') != NULL) ) - return(NULL); /* higher level will parse out real path from argv0. */ - - /* - * Try to avoid using argv0 unless forced to. If there's a Linux-like - * /proc filesystem, you can get the full path to the current process from - * the /proc/self/exe symlink. - */ - retval = readSymLink("/proc/self/exe"); - if (retval == NULL) + /* Try to avoid using argv0 unless forced to. Try system-specific stuff. */ + + #if PHYSFS_PLATFORM_FREEBSD { - /* older kernels don't have /proc/self ... try PID version... */ - const unsigned long long pid = (unsigned long long) getpid(); - char path[64]; - const int rc = (int) snprintf(path,sizeof(path),"/proc/%llu/exe",pid); - if ( (rc > 0) && (rc < sizeof(path)) ) - retval = readSymLink(path); + char fullpath[PATH_MAX]; + size_t buflen = sizeof (fullpath); + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + if (sysctl(mib, 4, fullpath, &buflen, NULL, 0) != -1) + retval = __PHYSFS_strdup(fullpath); + } + #elif PHYSFS_PLATFORM_SOLARIS + { + const char *path = getexecname(); + if ((path != NULL) && (path[0] == '/')) /* must be absolute path... */ + retval = __PHYSFS_strdup(path); + } + #endif + + if (retval) + return retval; /* already got it. */ + + /* If there's a Linux-like /proc filesystem, you can get the full path to + * the current process from a symlink in there. + */ + + if (access("/proc", F_OK) == 0) + { + retval = readSymLink("/proc/self/exe"); + if (!retval) retval = readSymLink("/proc/curproc/file"); + if (!retval) retval = readSymLink("/proc/curproc/exe"); + if (retval == NULL) + { + /* older kernels don't have /proc/self ... try PID version... */ + const unsigned long long pid = (unsigned long long) getpid(); + char path[64]; + const int rc = (int) snprintf(path,sizeof(path),"/proc/%llu/exe",pid); + if ( (rc > 0) && (rc < sizeof(path)) ) + retval = readSymLink(path); + } /* if */ } /* if */ if (retval != NULL) /* chop off filename. */ { char *ptr = strrchr(retval, '/'); if (ptr != NULL) - *ptr = '\0'; + *(ptr+1) = '\0'; + else /* shouldn't happen, but just in case... */ + { + allocator.Free(retval); + retval = NULL; + } /* else */ } /* if */ + /* No /proc/self/exe, etc, but we have an argv[0] we can parse? */ if ((retval == NULL) && (argv0 != NULL)) { + /* fast path: default behaviour can handle this. */ + if (strchr(argv0, '/') != NULL) + return NULL; /* higher level parses out real path from argv0. */ + /* If there's no dirsep on argv0, then look through $PATH for it. */ - envr = __PHYSFS_platformCopyEnvironmentVariable("PATH"); - BAIL_IF_MACRO(!envr, NULL, NULL); - retval = findBinaryInPath(argv0, envr); - allocator.Free(envr); + envr = getenv("PATH"); + if (envr != NULL) + { + char *path = (char *) __PHYSFS_smallAlloc(strlen(envr) + 1); + BAIL_IF_MACRO(!path, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + strcpy(path, envr); + retval = findBinaryInPath(argv0, path); + __PHYSFS_smallFree(path); + } /* if */ } /* if */ if (retval != NULL) @@ -274,157 +326,45 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0) retval = ptr; /* oh well if it failed. */ } /* if */ - return(retval); + return retval; } /* __PHYSFS_platformCalcBaseDir */ -char *__PHYSFS_platformRealPath(const char *path) -{ - char resolved_path[MAXPATHLEN]; - char *retval = NULL; - - errno = 0; - BAIL_IF_MACRO(!realpath(path, resolved_path), strerror(errno), NULL); - retval = (char *) allocator.Malloc(strlen(resolved_path) + 1); - BAIL_IF_MACRO(retval == NULL, ERR_OUT_OF_MEMORY, NULL); - strcpy(retval, resolved_path); - - return(retval); -} /* __PHYSFS_platformRealPath */ - - -char *__PHYSFS_platformCurrentDir(void) +char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app) { /* - * This can't just do platformRealPath("."), since that would eventually - * just end up calling back into here. + * We use XDG's base directory spec, even if you're not on Linux. + * This isn't strictly correct, but the results are relatively sane + * in any case. + * + * http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html */ - - int allocSize = 0; + const char *envr = getenv("XDG_DATA_HOME"); + const char *append = "/"; char *retval = NULL; - char *ptr; + size_t len = 0; - do + if (!envr) { - allocSize += 100; - ptr = (char *) allocator.Realloc(retval, allocSize); - if (ptr == NULL) - { - if (retval != NULL) - allocator.Free(retval); - BAIL_MACRO(ERR_OUT_OF_MEMORY, NULL); - } /* if */ - - retval = ptr; - ptr = getcwd(retval, allocSize); - } while (ptr == NULL && errno == ERANGE); - - if (ptr == NULL && errno) - { - /* - * getcwd() failed for some reason, for example current - * directory not existing. - */ - if (retval != NULL) - allocator.Free(retval); - BAIL_MACRO(ERR_NO_SUCH_FILE, NULL); + /* You end up with "$HOME/.local/share/Game Name 2" */ + envr = __PHYSFS_getUserDir(); + BAIL_IF_MACRO(!envr, ERRPASS, NULL); /* oh well. */ + append = ".local/share/"; } /* if */ - return(retval); -} /* __PHYSFS_platformCurrentDir */ + len = strlen(envr) + strlen(append) + strlen(app) + 2; + retval = (char *) allocator.Malloc(len); + BAIL_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + snprintf(retval, len, "%s%s%s/", envr, append, app); + return retval; +} /* __PHYSFS_platformCalcPrefDir */ int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a) { - return(0); /* just use malloc() and friends. */ + return 0; /* just use malloc() and friends. */ } /* __PHYSFS_platformSetDefaultAllocator */ - -#if (defined PHYSFS_NO_THREAD_SUPPORT) - -void *__PHYSFS_platformGetThreadID(void) { return((void *) 0x0001); } -void *__PHYSFS_platformCreateMutex(void) { return((void *) 0x0001); } -void __PHYSFS_platformDestroyMutex(void *mutex) {} -int __PHYSFS_platformGrabMutex(void *mutex) { return(1); } -void __PHYSFS_platformReleaseMutex(void *mutex) {} - -#else - -typedef struct -{ - pthread_mutex_t mutex; - pthread_t owner; - PHYSFS_uint32 count; -} PthreadMutex; - -void *__PHYSFS_platformGetThreadID(void) -{ - return( (void *) ((size_t) pthread_self()) ); -} /* __PHYSFS_platformGetThreadID */ - - -void *__PHYSFS_platformCreateMutex(void) -{ - int rc; - PthreadMutex *m = (PthreadMutex *) allocator.Malloc(sizeof (PthreadMutex)); - BAIL_IF_MACRO(m == NULL, ERR_OUT_OF_MEMORY, NULL); - rc = pthread_mutex_init(&m->mutex, NULL); - if (rc != 0) - { - allocator.Free(m); - BAIL_MACRO(strerror(rc), NULL); - } /* if */ - - m->count = 0; - m->owner = (pthread_t) 0xDEADBEEF; - return((void *) m); -} /* __PHYSFS_platformCreateMutex */ - - -void __PHYSFS_platformDestroyMutex(void *mutex) -{ - PthreadMutex *m = (PthreadMutex *) mutex; - - /* Destroying a locked mutex is a bug, but we'll try to be helpful. */ - if ((m->owner == pthread_self()) && (m->count > 0)) - pthread_mutex_unlock(&m->mutex); - - pthread_mutex_destroy(&m->mutex); - allocator.Free(m); -} /* __PHYSFS_platformDestroyMutex */ - - -int __PHYSFS_platformGrabMutex(void *mutex) -{ - PthreadMutex *m = (PthreadMutex *) mutex; - pthread_t tid = pthread_self(); - if (m->owner != tid) - { - if (pthread_mutex_lock(&m->mutex) != 0) - return(0); - m->owner = tid; - } /* if */ - - m->count++; - return(1); -} /* __PHYSFS_platformGrabMutex */ - - -void __PHYSFS_platformReleaseMutex(void *mutex) -{ - PthreadMutex *m = (PthreadMutex *) mutex; - if (m->owner == pthread_self()) - { - if (--m->count == 0) - { - m->owner = (pthread_t) 0xDEADBEEF; - pthread_mutex_unlock(&m->mutex); - } /* if */ - } /* if */ -} /* __PHYSFS_platformReleaseMutex */ - -#endif /* !PHYSFS_NO_THREAD_SUPPORT */ - #endif /* PHYSFS_PLATFORM_UNIX */ /* end of unix.c ... */ diff --git a/jni/physfs-2.1.0/src/platform_windows.c b/jni/physfs-2.1.0/src/platform_windows.c new file mode 100644 index 00000000..e1ae2bfa --- /dev/null +++ b/jni/physfs-2.1.0/src/platform_windows.c @@ -0,0 +1,934 @@ +/* + * Windows support routines for PhysicsFS. + * + * Please see the file LICENSE.txt in the source's root directory. + * + * This file written by Ryan C. Gordon, and made sane by Gregory S. Read. + */ + +#define __PHYSICSFS_INTERNAL__ +#include "physfs_platforms.h" + +#ifdef PHYSFS_PLATFORM_WINDOWS + +/* Forcibly disable UNICODE macro, since we manage this ourselves. */ +#ifdef UNICODE +#undef UNICODE +#endif + +#define WIN32_LEAN_AND_MEAN 1 +#include +#include +#include +#include +#include +#include +#include + +#include "physfs_internal.h" + +#define LOWORDER_UINT64(pos) ((PHYSFS_uint32) (pos & 0xFFFFFFFF)) +#define HIGHORDER_UINT64(pos) ((PHYSFS_uint32) ((pos >> 32) & 0xFFFFFFFF)) + +/* + * Users without the platform SDK don't have this defined. The original docs + * for SetFilePointer() just said to compare with 0xFFFFFFFF, so this should + * work as desired. + */ +#define PHYSFS_INVALID_SET_FILE_POINTER 0xFFFFFFFF + +/* just in case... */ +#define PHYSFS_INVALID_FILE_ATTRIBUTES 0xFFFFFFFF + +/* Not defined before the Vista SDK. */ +#define PHYSFS_IO_REPARSE_TAG_SYMLINK 0xA000000C + + +#define UTF8_TO_UNICODE_STACK_MACRO(w_assignto, str) { \ + if (str == NULL) \ + w_assignto = NULL; \ + else { \ + const PHYSFS_uint64 len = (PHYSFS_uint64) ((strlen(str) + 1) * 2); \ + w_assignto = (WCHAR *) __PHYSFS_smallAlloc(len); \ + if (w_assignto != NULL) \ + PHYSFS_utf8ToUtf16(str, (PHYSFS_uint16 *) w_assignto, len); \ + } \ +} \ + +/* Note this counts WCHARs, not codepoints! */ +static PHYSFS_uint64 wStrLen(const WCHAR *wstr) +{ + PHYSFS_uint64 len = 0; + while (*(wstr++)) + len++; + return len; +} /* wStrLen */ + +static char *unicodeToUtf8Heap(const WCHAR *w_str) +{ + char *retval = NULL; + if (w_str != NULL) + { + void *ptr = NULL; + const PHYSFS_uint64 len = (wStrLen(w_str) * 4) + 1; + retval = allocator.Malloc(len); + BAIL_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + PHYSFS_utf8FromUtf16((const PHYSFS_uint16 *) w_str, retval, len); + ptr = allocator.Realloc(retval, strlen(retval) + 1); /* shrink. */ + if (ptr != NULL) + retval = (char *) ptr; + } /* if */ + return retval; +} /* unicodeToUtf8Heap */ + +/* !!! FIXME: do we really need readonly? If not, do we need this struct? */ +typedef struct +{ + HANDLE handle; + int readonly; +} WinApiFile; + +static HANDLE detectCDThreadHandle = NULL; +static HWND detectCDHwnd = 0; +static volatile int initialDiscDetectionComplete = 0; +static volatile DWORD drivesWithMediaBitmap = 0; + + +static PHYSFS_ErrorCode errcodeFromWinApiError(const DWORD err) +{ + /* + * win32 error codes are sort of a tricky thing; Microsoft intentionally + * doesn't list which ones a given API might trigger, there are several + * with overlapping and unclear meanings...and there's 16 thousand of + * them in Windows 7. It looks like the ones we care about are in the + * first 500, but I can't say this list is perfect; we might miss + * important values or misinterpret others. + * + * Don't treat this list as anything other than a work in progress. + */ + switch (err) + { + case ERROR_SUCCESS: return PHYSFS_ERR_OK; + case ERROR_ACCESS_DENIED: return PHYSFS_ERR_PERMISSION; + case ERROR_NETWORK_ACCESS_DENIED: return PHYSFS_ERR_PERMISSION; + case ERROR_NOT_READY: return PHYSFS_ERR_IO; + case ERROR_CRC: return PHYSFS_ERR_IO; + case ERROR_SEEK: return PHYSFS_ERR_IO; + case ERROR_SECTOR_NOT_FOUND: return PHYSFS_ERR_IO; + case ERROR_NOT_DOS_DISK: return PHYSFS_ERR_IO; + case ERROR_WRITE_FAULT: return PHYSFS_ERR_IO; + case ERROR_READ_FAULT: return PHYSFS_ERR_IO; + case ERROR_DEV_NOT_EXIST: return PHYSFS_ERR_IO; + /* !!! FIXME: ?? case ELOOP: return PHYSFS_ERR_SYMLINK_LOOP; */ + case ERROR_BUFFER_OVERFLOW: return PHYSFS_ERR_BAD_FILENAME; + case ERROR_INVALID_NAME: return PHYSFS_ERR_BAD_FILENAME; + case ERROR_BAD_PATHNAME: return PHYSFS_ERR_BAD_FILENAME; + case ERROR_DIRECTORY: return PHYSFS_ERR_BAD_FILENAME; + case ERROR_FILE_NOT_FOUND: return PHYSFS_ERR_NOT_FOUND; + case ERROR_PATH_NOT_FOUND: return PHYSFS_ERR_NOT_FOUND; + case ERROR_DELETE_PENDING: return PHYSFS_ERR_NOT_FOUND; + case ERROR_INVALID_DRIVE: return PHYSFS_ERR_NOT_FOUND; + case ERROR_HANDLE_DISK_FULL: return PHYSFS_ERR_NO_SPACE; + case ERROR_DISK_FULL: return PHYSFS_ERR_NO_SPACE; + /* !!! FIXME: ?? case ENOTDIR: return PHYSFS_ERR_NOT_FOUND; */ + /* !!! FIXME: ?? case EISDIR: return PHYSFS_ERR_NOT_A_FILE; */ + case ERROR_WRITE_PROTECT: return PHYSFS_ERR_READ_ONLY; + case ERROR_LOCK_VIOLATION: return PHYSFS_ERR_BUSY; + case ERROR_SHARING_VIOLATION: return PHYSFS_ERR_BUSY; + case ERROR_CURRENT_DIRECTORY: return PHYSFS_ERR_BUSY; + case ERROR_DRIVE_LOCKED: return PHYSFS_ERR_BUSY; + case ERROR_PATH_BUSY: return PHYSFS_ERR_BUSY; + case ERROR_BUSY: return PHYSFS_ERR_BUSY; + case ERROR_NOT_ENOUGH_MEMORY: return PHYSFS_ERR_OUT_OF_MEMORY; + case ERROR_OUTOFMEMORY: return PHYSFS_ERR_OUT_OF_MEMORY; + case ERROR_DIR_NOT_EMPTY: return PHYSFS_ERR_DIR_NOT_EMPTY; + default: return PHYSFS_ERR_OS_ERROR; + } /* switch */ +} /* errcodeFromWinApiError */ + +static inline PHYSFS_ErrorCode errcodeFromWinApi(void) +{ + return errcodeFromWinApiError(GetLastError()); +} /* errcodeFromWinApi */ + + +typedef BOOL (WINAPI *fnSTEM)(DWORD, LPDWORD b); + +static DWORD pollDiscDrives(void) +{ + /* Try to use SetThreadErrorMode(), which showed up in Windows 7. */ + HANDLE lib = LoadLibraryA("kernel32.dll"); + fnSTEM stem = NULL; + char drive[4] = { 'x', ':', '\\', '\0' }; + DWORD oldErrorMode = 0; + DWORD drives = 0; + DWORD i; + + if (lib) + stem = (fnSTEM) GetProcAddress(lib, "SetThreadErrorMode"); + + if (stem) + stem(SEM_FAILCRITICALERRORS, &oldErrorMode); + else + oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS); + + /* Do detection. This may block if a disc is spinning up. */ + for (i = 'A'; i <= 'Z'; i++) + { + DWORD tmp = 0; + drive[0] = (char) i; + if (GetDriveTypeA(drive) != DRIVE_CDROM) + continue; + + /* If this function succeeds, there's media in the drive */ + if (GetVolumeInformationA(drive, NULL, 0, NULL, NULL, &tmp, NULL, 0)) + drives |= (1 << (i - 'A')); + } /* for */ + + if (stem) + stem(oldErrorMode, NULL); + else + SetErrorMode(oldErrorMode); + + if (lib) + FreeLibrary(lib); + + return drives; +} /* pollDiscDrives */ + + +static LRESULT CALLBACK detectCDWndProc(HWND hwnd, UINT msg, + WPARAM wp, LPARAM lparam) +{ + PDEV_BROADCAST_HDR lpdb = (PDEV_BROADCAST_HDR) lparam; + PDEV_BROADCAST_VOLUME lpdbv = (PDEV_BROADCAST_VOLUME) lparam; + const int removed = (wp == DBT_DEVICEREMOVECOMPLETE); + + if (msg == WM_DESTROY) + return 0; + else if ((msg != WM_DEVICECHANGE) || + ((wp != DBT_DEVICEARRIVAL) && (wp != DBT_DEVICEREMOVECOMPLETE)) || + (lpdb->dbch_devicetype != DBT_DEVTYP_VOLUME) || + ((lpdbv->dbcv_flags & DBTF_MEDIA) == 0)) + { + return DefWindowProcW(hwnd, msg, wp, lparam); + } /* else if */ + + if (removed) + drivesWithMediaBitmap &= ~lpdbv->dbcv_unitmask; + else + drivesWithMediaBitmap |= lpdbv->dbcv_unitmask; + + return TRUE; +} /* detectCDWndProc */ + + +static DWORD WINAPI detectCDThread(LPVOID lpParameter) +{ + const char *classname = "PhysicsFSDetectCDCatcher"; + const char *winname = "PhysicsFSDetectCDMsgWindow"; + HINSTANCE hInstance = GetModuleHandleW(NULL); + ATOM class_atom = 0; + WNDCLASSEXA wce; + MSG msg; + + memset(&wce, '\0', sizeof (wce)); + wce.cbSize = sizeof (wce); + wce.lpfnWndProc = detectCDWndProc; + wce.lpszClassName = classname; + wce.hInstance = hInstance; + class_atom = RegisterClassExA(&wce); + if (class_atom == 0) + { + initialDiscDetectionComplete = 1; /* let main thread go on. */ + return 0; + } /* if */ + + detectCDHwnd = CreateWindowExA(0, classname, winname, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, HWND_DESKTOP, NULL, hInstance, NULL); + + if (detectCDHwnd == NULL) + { + initialDiscDetectionComplete = 1; /* let main thread go on. */ + UnregisterClassA(classname, hInstance); + return 0; + } /* if */ + + /* We'll get events when discs come and go from now on. */ + + /* Do initial detection, possibly blocking awhile... */ + drivesWithMediaBitmap = pollDiscDrives(); + initialDiscDetectionComplete = 1; /* let main thread go on. */ + + do + { + const BOOL rc = GetMessageW(&msg, detectCDHwnd, 0, 0); + if ((rc == 0) || (rc == -1)) + break; /* don't care if WM_QUIT or error break this loop. */ + TranslateMessage(&msg); + DispatchMessageW(&msg); + } while (1); + + /* we've been asked to quit. */ + DestroyWindow(detectCDHwnd); + + do + { + const BOOL rc = GetMessage(&msg, detectCDHwnd, 0, 0); + if ((rc == 0) || (rc == -1)) + break; + TranslateMessage(&msg); + DispatchMessageW(&msg); + } while (1); + + UnregisterClassA(classname, hInstance); + + return 0; +} /* detectCDThread */ + + +void __PHYSFS_platformDetectAvailableCDs(PHYSFS_StringCallback cb, void *data) +{ + char drive_str[4] = { 'x', ':', '\\', '\0' }; + DWORD drives = 0; + DWORD i; + + /* + * If you poll a drive while a user is inserting a disc, the OS will + * block this thread until the drive has spun up. So we swallow the risk + * once for initial detection, and spin a thread that will get device + * events thereafter, for apps that use this interface to poll for + * disc insertion. + */ + if (!detectCDThreadHandle) + { + initialDiscDetectionComplete = 0; + detectCDThreadHandle = CreateThread(NULL,0,detectCDThread,NULL,0,NULL); + if (detectCDThreadHandle == NULL) + return; /* oh well. */ + + while (!initialDiscDetectionComplete) + Sleep(50); + } /* if */ + + drives = drivesWithMediaBitmap; /* whatever the thread has seen, we take. */ + for (i = 'A'; i <= 'Z'; i++) + { + if (drives & (1 << (i - 'A'))) + { + drive_str[0] = (char) i; + cb(data, drive_str); + } /* if */ + } /* for */ +} /* __PHYSFS_platformDetectAvailableCDs */ + + +char *__PHYSFS_platformCalcBaseDir(const char *argv0) +{ + DWORD buflen = 64; + LPWSTR modpath = NULL; + char *retval = NULL; + + while (1) + { + DWORD rc; + void *ptr; + + if ( (ptr = allocator.Realloc(modpath, buflen*sizeof(WCHAR))) == NULL ) + { + allocator.Free(modpath); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + } /* if */ + modpath = (LPWSTR) ptr; + + rc = GetModuleFileNameW(NULL, modpath, buflen); + if (rc == 0) + { + allocator.Free(modpath); + BAIL_MACRO(errcodeFromWinApi(), NULL); + } /* if */ + + if (rc < buflen) + { + buflen = rc; + break; + } /* if */ + + buflen *= 2; + } /* while */ + + if (buflen > 0) /* just in case... */ + { + WCHAR *ptr = (modpath + buflen) - 1; + while (ptr != modpath) + { + if (*ptr == '\\') + break; + ptr--; + } /* while */ + + if ((ptr == modpath) && (*ptr != '\\')) + PHYSFS_setErrorCode(PHYSFS_ERR_OTHER_ERROR); /* oh well. */ + else + { + *(ptr+1) = '\0'; /* chop off filename. */ + retval = unicodeToUtf8Heap(modpath); + } /* else */ + } /* else */ + allocator.Free(modpath); + + return retval; /* w00t. */ +} /* __PHYSFS_platformCalcBaseDir */ + + +char *__PHYSFS_platformCalcPrefDir(const char *org, const char *app) +{ + /* + * Vista and later has a new API for this, but SHGetFolderPath works there, + * and apparently just wraps the new API. This is the new way to do it: + * + * SHGetKnownFolderPath(FOLDERID_RoamingAppData, KF_FLAG_CREATE, + * NULL, &wszPath); + */ + + WCHAR path[MAX_PATH]; + char *utf8 = NULL; + size_t len = 0; + char *retval = NULL; + + if (!SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, + NULL, 0, path))) + BAIL_MACRO(PHYSFS_ERR_OS_ERROR, NULL); + + utf8 = unicodeToUtf8Heap(path); + BAIL_IF_MACRO(!utf8, ERRPASS, NULL); + len = strlen(utf8) + strlen(org) + strlen(app) + 4; + retval = allocator.Malloc(len); + if (!retval) + { + allocator.Free(utf8); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + } /* if */ + + sprintf(retval, "%s\\%s\\%s\\", utf8, org, app); + allocator.Free(utf8); + return retval; +} /* __PHYSFS_platformCalcPrefDir */ + + +char *__PHYSFS_platformCalcUserDir(void) +{ + typedef BOOL (WINAPI *fnGetUserProfDirW)(HANDLE, LPWSTR, LPDWORD); + fnGetUserProfDirW pGetDir = NULL; + HANDLE lib = NULL; + HANDLE accessToken = NULL; /* Security handle to process */ + char *retval = NULL; + + lib = LoadLibraryA("userenv.dll"); + BAIL_IF_MACRO(!lib, errcodeFromWinApi(), NULL); + pGetDir=(fnGetUserProfDirW) GetProcAddress(lib,"GetUserProfileDirectoryW"); + GOTO_IF_MACRO(!pGetDir, errcodeFromWinApi(), done); + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &accessToken)) + GOTO_MACRO(errcodeFromWinApi(), done); + else + { + DWORD psize = 0; + WCHAR dummy = 0; + LPWSTR wstr = NULL; + BOOL rc = 0; + + /* + * Should fail. Will write the size of the profile path in + * psize. Also note that the second parameter can't be + * NULL or the function fails. + */ + rc = pGetDir(accessToken, &dummy, &psize); + assert(!rc); /* !!! FIXME: handle this gracefully. */ + (void) rc; + + /* Allocate memory for the profile directory */ + wstr = (LPWSTR) __PHYSFS_smallAlloc((psize + 1) * sizeof (WCHAR)); + if (wstr != NULL) + { + if (pGetDir(accessToken, wstr, &psize)) + { + /* Make sure it ends in a dirsep. We allocated +1 for this. */ + if (wstr[psize - 2] != '\\') + { + wstr[psize - 1] = '\\'; + wstr[psize - 0] = '\0'; + } /* if */ + retval = unicodeToUtf8Heap(wstr); + } /* if */ + __PHYSFS_smallFree(wstr); + } /* if */ + + CloseHandle(accessToken); + } /* if */ + +done: + FreeLibrary(lib); + return retval; /* We made it: hit the showers. */ +} /* __PHYSFS_platformCalcUserDir */ + + +void *__PHYSFS_platformGetThreadID(void) +{ + return ( (void *) ((size_t) GetCurrentThreadId()) ); +} /* __PHYSFS_platformGetThreadID */ + + +static int isSymlinkAttrs(const DWORD attr, const DWORD tag) +{ + return ( (attr & FILE_ATTRIBUTE_REPARSE_POINT) && + (tag == PHYSFS_IO_REPARSE_TAG_SYMLINK) ); +} /* isSymlinkAttrs */ + + +void __PHYSFS_platformEnumerateFiles(const char *dirname, + PHYSFS_EnumFilesCallback callback, + const char *origdir, + void *callbackdata) +{ + HANDLE dir = INVALID_HANDLE_VALUE; + WIN32_FIND_DATAW entw; + size_t len = strlen(dirname); + char *searchPath = NULL; + WCHAR *wSearchPath = NULL; + + /* Allocate a new string for path, maybe '\\', "*", and NULL terminator */ + searchPath = (char *) __PHYSFS_smallAlloc(len + 3); + if (searchPath == NULL) + return; + + /* Copy current dirname */ + strcpy(searchPath, dirname); + + /* if there's no '\\' at the end of the path, stick one in there. */ + if (searchPath[len - 1] != '\\') + { + searchPath[len++] = '\\'; + searchPath[len] = '\0'; + } /* if */ + + /* Append the "*" to the end of the string */ + strcat(searchPath, "*"); + + UTF8_TO_UNICODE_STACK_MACRO(wSearchPath, searchPath); + if (!wSearchPath) + return; /* oh well. */ + + dir = FindFirstFileW(wSearchPath, &entw); + + __PHYSFS_smallFree(wSearchPath); + __PHYSFS_smallFree(searchPath); + if (dir == INVALID_HANDLE_VALUE) + return; + + do + { + const DWORD attr = entw.dwFileAttributes; + const DWORD tag = entw.dwReserved0; + const WCHAR *fn = entw.cFileName; + char *utf8; + + if ((fn[0] == '.') && (fn[1] == '\0')) + continue; + if ((fn[0] == '.') && (fn[1] == '.') && (fn[2] == '\0')) + continue; + + utf8 = unicodeToUtf8Heap(fn); + if (utf8 != NULL) + { + callback(callbackdata, origdir, utf8); + allocator.Free(utf8); + } /* if */ + } while (FindNextFileW(dir, &entw) != 0); + + FindClose(dir); +} /* __PHYSFS_platformEnumerateFiles */ + + +int __PHYSFS_platformMkDir(const char *path) +{ + WCHAR *wpath; + DWORD rc; + UTF8_TO_UNICODE_STACK_MACRO(wpath, path); + rc = CreateDirectoryW(wpath, NULL); + __PHYSFS_smallFree(wpath); + BAIL_IF_MACRO(rc == 0, errcodeFromWinApi(), 0); + return 1; +} /* __PHYSFS_platformMkDir */ + + +int __PHYSFS_platformInit(void) +{ + return 1; /* It's all good */ +} /* __PHYSFS_platformInit */ + + +int __PHYSFS_platformDeinit(void) +{ + if (detectCDThreadHandle) + { + if (detectCDHwnd) + PostMessageW(detectCDHwnd, WM_QUIT, 0, 0); + CloseHandle(detectCDThreadHandle); + detectCDThreadHandle = NULL; + initialDiscDetectionComplete = 0; + drivesWithMediaBitmap = 0; + } /* if */ + + return 1; /* It's all good */ +} /* __PHYSFS_platformDeinit */ + + +static void *doOpen(const char *fname, DWORD mode, DWORD creation, int rdonly) +{ + HANDLE fileh; + WinApiFile *retval; + WCHAR *wfname; + + UTF8_TO_UNICODE_STACK_MACRO(wfname, fname); + BAIL_IF_MACRO(!wfname, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + fileh = CreateFileW(wfname, mode, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, creation, FILE_ATTRIBUTE_NORMAL, NULL); + __PHYSFS_smallFree(wfname); + + BAIL_IF_MACRO(fileh == INVALID_HANDLE_VALUE,errcodeFromWinApi(), NULL); + + retval = (WinApiFile *) allocator.Malloc(sizeof (WinApiFile)); + if (!retval) + { + CloseHandle(fileh); + BAIL_MACRO(PHYSFS_ERR_OUT_OF_MEMORY, NULL); + } /* if */ + + retval->readonly = rdonly; + retval->handle = fileh; + return retval; +} /* doOpen */ + + +void *__PHYSFS_platformOpenRead(const char *filename) +{ + return doOpen(filename, GENERIC_READ, OPEN_EXISTING, 1); +} /* __PHYSFS_platformOpenRead */ + + +void *__PHYSFS_platformOpenWrite(const char *filename) +{ + return doOpen(filename, GENERIC_WRITE, CREATE_ALWAYS, 0); +} /* __PHYSFS_platformOpenWrite */ + + +void *__PHYSFS_platformOpenAppend(const char *filename) +{ + void *retval = doOpen(filename, GENERIC_WRITE, OPEN_ALWAYS, 0); + if (retval != NULL) + { + HANDLE h = ((WinApiFile *) retval)->handle; + DWORD rc = SetFilePointer(h, 0, NULL, FILE_END); + if (rc == PHYSFS_INVALID_SET_FILE_POINTER) + { + const PHYSFS_ErrorCode err = errcodeFromWinApi(); + CloseHandle(h); + allocator.Free(retval); + BAIL_MACRO(err, NULL); + } /* if */ + } /* if */ + + return retval; +} /* __PHYSFS_platformOpenAppend */ + + +PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buf, PHYSFS_uint64 len) +{ + HANDLE Handle = ((WinApiFile *) opaque)->handle; + PHYSFS_sint64 totalRead = 0; + + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL_MACRO(PHYSFS_ERR_INVALID_ARGUMENT, -1); + + while (len > 0) + { + const DWORD thislen = (len > 0xFFFFFFFF) ? 0xFFFFFFFF : (DWORD) len; + DWORD numRead = 0; + if (!ReadFile(Handle, buf, thislen, &numRead, NULL)) + BAIL_MACRO(errcodeFromWinApi(), -1); + len -= (PHYSFS_uint64) numRead; + totalRead += (PHYSFS_sint64) numRead; + if (numRead != thislen) + break; + } /* while */ + + return totalRead; +} /* __PHYSFS_platformRead */ + + +PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, + PHYSFS_uint64 len) +{ + HANDLE Handle = ((WinApiFile *) opaque)->handle; + PHYSFS_sint64 totalWritten = 0; + + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL_MACRO(PHYSFS_ERR_INVALID_ARGUMENT, -1); + + while (len > 0) + { + const DWORD thislen = (len > 0xFFFFFFFF) ? 0xFFFFFFFF : (DWORD) len; + DWORD numWritten = 0; + if (!WriteFile(Handle, buffer, thislen, &numWritten, NULL)) + BAIL_MACRO(errcodeFromWinApi(), -1); + len -= (PHYSFS_uint64) numWritten; + totalWritten += (PHYSFS_sint64) numWritten; + if (numWritten != thislen) + break; + } /* while */ + + return totalWritten; +} /* __PHYSFS_platformWrite */ + + +int __PHYSFS_platformSeek(void *opaque, PHYSFS_uint64 pos) +{ + HANDLE Handle = ((WinApiFile *) opaque)->handle; + LONG HighOrderPos; + PLONG pHighOrderPos; + DWORD rc; + + /* Get the high order 32-bits of the position */ + HighOrderPos = HIGHORDER_UINT64(pos); + + /* + * MSDN: "If you do not need the high-order 32 bits, this + * pointer must be set to NULL." + */ + pHighOrderPos = (HighOrderPos) ? &HighOrderPos : NULL; + + /* Move pointer "pos" count from start of file */ + rc = SetFilePointer(Handle, LOWORDER_UINT64(pos), + pHighOrderPos, FILE_BEGIN); + + if ( (rc == PHYSFS_INVALID_SET_FILE_POINTER) && + (GetLastError() != NO_ERROR) ) + { + BAIL_MACRO(errcodeFromWinApi(), 0); + } /* if */ + + return 1; /* No error occured */ +} /* __PHYSFS_platformSeek */ + + +PHYSFS_sint64 __PHYSFS_platformTell(void *opaque) +{ + HANDLE Handle = ((WinApiFile *) opaque)->handle; + LONG HighPos = 0; + DWORD LowPos; + PHYSFS_sint64 retval; + + /* Get current position */ + LowPos = SetFilePointer(Handle, 0, &HighPos, FILE_CURRENT); + if ( (LowPos == PHYSFS_INVALID_SET_FILE_POINTER) && + (GetLastError() != NO_ERROR) ) + { + BAIL_MACRO(errcodeFromWinApi(), -1); + } /* if */ + else + { + /* Combine the high/low order to create the 64-bit position value */ + retval = (((PHYSFS_uint64) HighPos) << 32) | LowPos; + assert(retval >= 0); + } /* else */ + + return retval; +} /* __PHYSFS_platformTell */ + + +PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque) +{ + HANDLE Handle = ((WinApiFile *) opaque)->handle; + DWORD SizeHigh; + DWORD SizeLow; + PHYSFS_sint64 retval; + + SizeLow = GetFileSize(Handle, &SizeHigh); + if ( (SizeLow == PHYSFS_INVALID_SET_FILE_POINTER) && + (GetLastError() != NO_ERROR) ) + { + BAIL_MACRO(errcodeFromWinApi(), -1); + } /* if */ + else + { + /* Combine the high/low order to create the 64-bit position value */ + retval = (((PHYSFS_uint64) SizeHigh) << 32) | SizeLow; + assert(retval >= 0); + } /* else */ + + return retval; +} /* __PHYSFS_platformFileLength */ + + +int __PHYSFS_platformFlush(void *opaque) +{ + WinApiFile *fh = ((WinApiFile *) opaque); + if (!fh->readonly) + BAIL_IF_MACRO(!FlushFileBuffers(fh->handle), errcodeFromWinApi(), 0); + + return 1; +} /* __PHYSFS_platformFlush */ + + +void __PHYSFS_platformClose(void *opaque) +{ + HANDLE Handle = ((WinApiFile *) opaque)->handle; + (void) CloseHandle(Handle); /* ignore errors. You should have flushed! */ + allocator.Free(opaque); +} /* __PHYSFS_platformClose */ + + +static int doPlatformDelete(LPWSTR wpath) +{ + const int isdir = (GetFileAttributesW(wpath) & FILE_ATTRIBUTE_DIRECTORY); + const BOOL rc = (isdir) ? RemoveDirectoryW(wpath) : DeleteFileW(wpath); + BAIL_IF_MACRO(!rc, errcodeFromWinApi(), 0); + return 1; /* if you made it here, it worked. */ +} /* doPlatformDelete */ + + +int __PHYSFS_platformDelete(const char *path) +{ + int retval = 0; + LPWSTR wpath = NULL; + UTF8_TO_UNICODE_STACK_MACRO(wpath, path); + BAIL_IF_MACRO(!wpath, PHYSFS_ERR_OUT_OF_MEMORY, 0); + retval = doPlatformDelete(wpath); + __PHYSFS_smallFree(wpath); + return retval; +} /* __PHYSFS_platformDelete */ + + +void *__PHYSFS_platformCreateMutex(void) +{ + LPCRITICAL_SECTION lpcs; + lpcs = (LPCRITICAL_SECTION) allocator.Malloc(sizeof (CRITICAL_SECTION)); + BAIL_IF_MACRO(!lpcs, PHYSFS_ERR_OUT_OF_MEMORY, NULL); + InitializeCriticalSection(lpcs); + return lpcs; +} /* __PHYSFS_platformCreateMutex */ + + +void __PHYSFS_platformDestroyMutex(void *mutex) +{ + DeleteCriticalSection((LPCRITICAL_SECTION) mutex); + allocator.Free(mutex); +} /* __PHYSFS_platformDestroyMutex */ + + +int __PHYSFS_platformGrabMutex(void *mutex) +{ + EnterCriticalSection((LPCRITICAL_SECTION) mutex); + return 1; +} /* __PHYSFS_platformGrabMutex */ + + +void __PHYSFS_platformReleaseMutex(void *mutex) +{ + LeaveCriticalSection((LPCRITICAL_SECTION) mutex); +} /* __PHYSFS_platformReleaseMutex */ + + +static PHYSFS_sint64 FileTimeToPhysfsTime(const FILETIME *ft) +{ + SYSTEMTIME st_utc; + SYSTEMTIME st_localtz; + TIME_ZONE_INFORMATION tzi; + DWORD tzid; + PHYSFS_sint64 retval; + struct tm tm; + BOOL rc; + + BAIL_IF_MACRO(!FileTimeToSystemTime(ft, &st_utc), errcodeFromWinApi(), -1); + tzid = GetTimeZoneInformation(&tzi); + BAIL_IF_MACRO(tzid == TIME_ZONE_ID_INVALID, errcodeFromWinApi(), -1); + rc = SystemTimeToTzSpecificLocalTime(&tzi, &st_utc, &st_localtz); + BAIL_IF_MACRO(!rc, errcodeFromWinApi(), -1); + + /* Convert to a format that mktime() can grok... */ + tm.tm_sec = st_localtz.wSecond; + tm.tm_min = st_localtz.wMinute; + tm.tm_hour = st_localtz.wHour; + tm.tm_mday = st_localtz.wDay; + tm.tm_mon = st_localtz.wMonth - 1; + tm.tm_year = st_localtz.wYear - 1900; + tm.tm_wday = -1 /*st_localtz.wDayOfWeek*/; + tm.tm_yday = -1; + tm.tm_isdst = -1; + + /* Convert to a format PhysicsFS can grok... */ + retval = (PHYSFS_sint64) mktime(&tm); + BAIL_IF_MACRO(retval == -1, PHYSFS_ERR_OS_ERROR, -1); + return retval; +} /* FileTimeToPhysfsTime */ + + +int __PHYSFS_platformStat(const char *filename, PHYSFS_Stat *st) +{ + WIN32_FILE_ATTRIBUTE_DATA winstat; + WCHAR *wstr = NULL; + DWORD err = 0; + BOOL rc = 0; + + UTF8_TO_UNICODE_STACK_MACRO(wstr, filename); + BAIL_IF_MACRO(!wstr, PHYSFS_ERR_OUT_OF_MEMORY, 0); + rc = GetFileAttributesExW(wstr, GetFileExInfoStandard, &winstat); + err = (!rc) ? GetLastError() : 0; + __PHYSFS_smallFree(wstr); + BAIL_IF_MACRO(!rc, errcodeFromWinApiError(err), 0); + + st->modtime = FileTimeToPhysfsTime(&winstat.ftLastWriteTime); + st->accesstime = FileTimeToPhysfsTime(&winstat.ftLastAccessTime); + st->createtime = FileTimeToPhysfsTime(&winstat.ftCreationTime); + + if(winstat.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + st->filetype = PHYSFS_FILETYPE_DIRECTORY; + st->filesize = 0; + } /* if */ + + else if(winstat.dwFileAttributes & (FILE_ATTRIBUTE_OFFLINE | FILE_ATTRIBUTE_DEVICE)) + { + /* !!! FIXME: what are reparse points? */ + st->filetype = PHYSFS_FILETYPE_OTHER; + /* !!! FIXME: don't rely on this */ + st->filesize = 0; + } /* else if */ + + /* !!! FIXME: check for symlinks on Vista. */ + + else + { + st->filetype = PHYSFS_FILETYPE_REGULAR; + st->filesize = (((PHYSFS_uint64) winstat.nFileSizeHigh) << 32) | winstat.nFileSizeLow; + } /* else */ + + st->readonly = ((winstat.dwFileAttributes & FILE_ATTRIBUTE_READONLY) != 0); + + return 1; +} /* __PHYSFS_platformStat */ + + +/* !!! FIXME: Don't use C runtime for allocators? */ +int __PHYSFS_platformSetDefaultAllocator(PHYSFS_Allocator *a) +{ + return 0; /* just use malloc() and friends. */ +} /* __PHYSFS_platformSetDefaultAllocator */ + +#endif /* PHYSFS_PLATFORM_WINDOWS */ + +/* end of windows.c ... */ + + diff --git a/jni/physfs-2.0.3/test/test_physfs.c b/jni/physfs-2.1.0/test/test_physfs.c similarity index 76% rename from jni/physfs-2.0.3/test/test_physfs.c rename to jni/physfs-2.1.0/test/test_physfs.c index ca994b5f..b569d714 100644 --- a/jni/physfs-2.0.3/test/test_physfs.c +++ b/jni/physfs-2.1.0/test/test_physfs.c @@ -23,11 +23,14 @@ #include +/* Define this, so the compiler doesn't complain about using old APIs. */ +#define PHYSFS_DEPRECATED + #include "physfs.h" #define TEST_VERSION_MAJOR 2 -#define TEST_VERSION_MINOR 0 -#define TEST_VERSION_PATCH 3 +#define TEST_VERSION_MINOR 1 +#define TEST_VERSION_PATCH 0 static FILE *history_file = NULL; static PHYSFS_uint32 do_buffer_size = 0; @@ -64,6 +67,8 @@ static void output_archivers(void) printf(" * %s: %s\n Written by %s.\n %s\n", (*i)->extension, (*i)->description, (*i)->author, (*i)->url); + printf(" %s symbolic links.\n", + (*i)->supportsSymlinks ? "Supports" : "Does not support"); } /* for */ } /* else */ @@ -73,7 +78,7 @@ static void output_archivers(void) static int cmd_quit(char *args) { - return(0); + return 0; } /* cmd_quit */ @@ -90,7 +95,7 @@ static int cmd_init(char *args) else printf("Failure. reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* cmd_init */ @@ -101,7 +106,7 @@ static int cmd_deinit(char *args) else printf("Failure. reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* cmd_deinit */ @@ -119,20 +124,34 @@ static int cmd_addarchive(char *args) /*printf("[%s], [%d]\n", args, appending);*/ - if (PHYSFS_addToSearchPath(args, appending)) + if (PHYSFS_mount(args, NULL, appending)) printf("Successful.\n"); else printf("Failure. reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* cmd_addarchive */ -static int cmd_mount(char *args) +/* wrap free() to avoid calling convention wankery. */ +static void freeBuf(void *buf) +{ + free(buf); +} /* freeBuf */ + +typedef enum +{ + MNTTYPE_PATH, + MNTTYPE_MEMORY, + MNTTYPE_HANDLE +} MountType; + +static int cmd_mount_internal(char *args, const MountType mnttype) { char *ptr; char *mntpoint = NULL; int appending = 0; + int rc = 0; if (*args == '\"') { @@ -141,7 +160,7 @@ static int cmd_mount(char *args) if (ptr == NULL) { printf("missing string terminator in argument.\n"); - return(1); + return 1; } /* if */ *(ptr) = '\0'; } /* if */ @@ -159,7 +178,7 @@ static int cmd_mount(char *args) if (ptr == NULL) { printf("missing string terminator in argument.\n"); - return(1); + return 1; } /* if */ *(ptr) = '\0'; } /* if */ @@ -172,15 +191,101 @@ static int cmd_mount(char *args) /*printf("[%s], [%s], [%d]\n", args, mntpoint, appending);*/ - if (PHYSFS_mount(args, mntpoint, appending)) + if (mnttype == MNTTYPE_PATH) + rc = PHYSFS_mount(args, mntpoint, appending); + + else if (mnttype == MNTTYPE_HANDLE) + { + PHYSFS_File *f = PHYSFS_openRead(args); + if (f == NULL) + { + printf("PHYSFS_openRead('%s') failed. reason: %s.\n", args, PHYSFS_getLastError()); + return 1; + } /* if */ + + rc = PHYSFS_mountHandle(f, args, mntpoint, appending); + if (!rc) + PHYSFS_close(f); + } /* else if */ + + else if (mnttype == MNTTYPE_MEMORY) + { + FILE *in = fopen(args, "rb"); + void *buf = NULL; + long len = 0; + + if (in == NULL) + { + printf("Failed to open %s to read into memory: %s.\n", args, strerror(errno)); + return 1; + } /* if */ + + if ( (fseek(in, 0, SEEK_END) != 0) || ((len = ftell(in)) < 0) ) + { + printf("Failed to find size of %s to read into memory: %s.\n", args, strerror(errno)); + fclose(in); + return 1; + } /* if */ + + buf = malloc(len); + if (buf == NULL) + { + printf("Failed to allocate space to read %s into memory: %s.\n", args, strerror(errno)); + fclose(in); + return 1; + } /* if */ + + if ((fseek(in, 0, SEEK_SET) != 0) || (fread(buf, len, 1, in) != 1)) + { + printf("Failed to read %s into memory: %s.\n", args, strerror(errno)); + fclose(in); + free(buf); + return 1; + } /* if */ + + fclose(in); + + rc = PHYSFS_mountMemory(buf, len, freeBuf, args, mntpoint, appending); + } /* else */ + + if (rc) printf("Successful.\n"); else printf("Failure. reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; +} /* cmd_mount_internal */ + + +static int cmd_mount(char *args) +{ + return cmd_mount_internal(args, MNTTYPE_PATH); } /* cmd_mount */ +static int cmd_mount_mem(char *args) +{ + return cmd_mount_internal(args, MNTTYPE_MEMORY); +} /* cmd_mount_mem */ + + +static int cmd_mount_handle(char *args) +{ + return cmd_mount_internal(args, MNTTYPE_HANDLE); +} /* cmd_mount_handle */ + +static int cmd_getmountpoint(char *args) +{ + if (*args == '\"') + { + args++; + args[strlen(args) - 1] = '\0'; + } /* if */ + + printf("Dir [%s] is mounted at [%s].\n", args, PHYSFS_getMountPoint(args)); + return 1; +} /* cmd_getmountpoint */ + static int cmd_removearchive(char *args) { if (*args == '\"') @@ -189,12 +294,12 @@ static int cmd_removearchive(char *args) args[strlen(args) - 1] = '\0'; } /* if */ - if (PHYSFS_removeFromSearchPath(args)) + if (PHYSFS_unmount(args)) printf("Successful.\n"); else printf("Failure. reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* cmd_removearchive */ @@ -223,21 +328,21 @@ static int cmd_enumerate(char *args) PHYSFS_freeList(rc); } /* else */ - return(1); + return 1; } /* cmd_enumerate */ static int cmd_getdirsep(char *args) { printf("Directory separator is [%s].\n", PHYSFS_getDirSeparator()); - return(1); + return 1; } /* cmd_getdirsep */ static int cmd_getlasterror(char *args) { printf("last error is [%s].\n", PHYSFS_getLastError()); - return(1); + return 1; } /* cmd_getlasterror */ @@ -258,7 +363,7 @@ static int cmd_getcdromdirs(char *args) PHYSFS_freeList(rc); } /* else */ - return(1); + return 1; } /* cmd_getcdromdirs */ @@ -279,28 +384,41 @@ static int cmd_getsearchpath(char *args) PHYSFS_freeList(rc); } /* else */ - return(1); + return 1; } /* cmd_getcdromdirs */ static int cmd_getbasedir(char *args) { printf("Base dir is [%s].\n", PHYSFS_getBaseDir()); - return(1); + return 1; } /* cmd_getbasedir */ static int cmd_getuserdir(char *args) { printf("User dir is [%s].\n", PHYSFS_getUserDir()); - return(1); + return 1; } /* cmd_getuserdir */ +static int cmd_getprefdir(char *args) +{ + char *org; + char *appName; + char *ptr = args; + + org = ptr; + ptr = strchr(ptr, ' '); *ptr = '\0'; ptr++; appName = ptr; + printf("Pref dir is [%s].\n", PHYSFS_getPrefDir(org, appName)); + return 1; +} /* cmd_getprefdir */ + + static int cmd_getwritedir(char *args) { printf("Write dir is [%s].\n", PHYSFS_getWriteDir()); - return(1); + return 1; } /* cmd_getwritedir */ @@ -317,7 +435,7 @@ static int cmd_setwritedir(char *args) else printf("Failure. reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* cmd_setwritedir */ @@ -334,7 +452,7 @@ static int cmd_permitsyms(char *args) num = atoi(args); PHYSFS_permitSymbolicLinks(num); printf("Symlinks are now %s.\n", num ? "permitted" : "forbidden"); - return(1); + return 1; } /* cmd_permitsyms */ @@ -358,7 +476,7 @@ static int cmd_setbuffer(char *args) printf("Further tests will NOT use a buffer.\n"); } /* else */ - return(1); + return 1; } /* cmd_setbuffer */ @@ -395,7 +513,7 @@ static int cmd_stressbuffer(char *args) printf("PHYSFS_setBuffer() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); PHYSFS_delete("test.txt"); - return(1); + return 1; } /* if */ strcpy(buf, "abcdefghijklmnopqrstuvwxyz0123456789"); @@ -407,11 +525,11 @@ static int cmd_stressbuffer(char *args) { PHYSFS_uint32 right = 1 + (PHYSFS_uint32) (35.0 * rand() / (RAND_MAX + 1.0)); PHYSFS_uint32 left = 36 - right; - if (PHYSFS_write(f, buf, left, 1) != 1) + if (PHYSFS_writeBytes(f, buf, left) != left) { - printf("PHYSFS_write() failed: %s.\n", PHYSFS_getLastError()); + printf("PHYSFS_writeBytes() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ rndnum = 1 + (int) (1000.0 * rand() / (RAND_MAX + 1.0)); @@ -421,15 +539,15 @@ static int cmd_stressbuffer(char *args) { printf("PHYSFS_flush() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* if */ - if (PHYSFS_write(f, buf + left, 1, right) != right) + if (PHYSFS_writeBytes(f, buf + left, right) != right) { - printf("PHYSFS_write() failed: %s.\n", PHYSFS_getLastError()); + printf("PHYSFS_writeBytes() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ rndnum = 1 + (int) (1000.0 * rand() / (RAND_MAX + 1.0)); @@ -439,7 +557,7 @@ static int cmd_stressbuffer(char *args) { printf("PHYSFS_flush() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* if */ } /* for */ @@ -448,7 +566,7 @@ static int cmd_stressbuffer(char *args) { printf("PHYSFS_flush() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* for */ @@ -456,7 +574,7 @@ static int cmd_stressbuffer(char *args) if (!PHYSFS_close(f)) { printf("PHYSFS_close() failed: %s.\n", PHYSFS_getLastError()); - return(1); /* oh well. */ + return 1; /* oh well. */ } /* if */ printf(" ... test file written ...\n"); @@ -464,14 +582,14 @@ static int cmd_stressbuffer(char *args) if (f == NULL) { printf("Failed to reopen stress file for reading: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* if */ if (!PHYSFS_setBuffer(f, num)) { printf("PHYSFS_setBuffer() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ for (i = 0; i < 10; i++) @@ -480,11 +598,11 @@ static int cmd_stressbuffer(char *args) { PHYSFS_uint32 right = 1 + (PHYSFS_uint32) (35.0 * rand() / (RAND_MAX + 1.0)); PHYSFS_uint32 left = 36 - right; - if (PHYSFS_read(f, buf2, left, 1) != 1) + if (PHYSFS_readBytes(f, buf2, left) != left) { - printf("PHYSFS_read() failed: %s.\n", PHYSFS_getLastError()); + printf("PHYSFS_readBytes() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ rndnum = 1 + (int) (1000.0 * rand() / (RAND_MAX + 1.0)); @@ -494,15 +612,15 @@ static int cmd_stressbuffer(char *args) { printf("PHYSFS_flush() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* if */ - if (PHYSFS_read(f, buf2 + left, 1, right) != right) + if (PHYSFS_readBytes(f, buf2 + left, right) != right) { - printf("PHYSFS_read() failed: %s.\n", PHYSFS_getLastError()); + printf("PHYSFS_readBytes() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ rndnum = 1 + (int) (1000.0 * rand() / (RAND_MAX + 1.0)); @@ -512,7 +630,7 @@ static int cmd_stressbuffer(char *args) { printf("PHYSFS_flush() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* if */ @@ -529,7 +647,7 @@ static int cmd_stressbuffer(char *args) printf("%c", buf2[i]); printf("]\n"); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* for */ @@ -537,7 +655,7 @@ static int cmd_stressbuffer(char *args) { printf("PHYSFS_flush() failed: %s.\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* for */ @@ -550,7 +668,7 @@ static int cmd_stressbuffer(char *args) if (!PHYSFS_close(f)) { printf("PHYSFS_close() failed: %s.\n", PHYSFS_getLastError()); - return(1); /* oh well. */ + return 1; /* oh well. */ } /* if */ PHYSFS_delete("test.txt"); @@ -558,7 +676,7 @@ static int cmd_stressbuffer(char *args) } /* else */ } /* else */ - return(1); + return 1; } /* cmd_stressbuffer */ @@ -586,7 +704,7 @@ static int cmd_setsaneconfig(char *args) else printf("Failure. reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* cmd_setsaneconfig */ @@ -603,7 +721,7 @@ static int cmd_mkdir(char *args) else printf("Failure. reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* cmd_mkdir */ @@ -620,7 +738,7 @@ static int cmd_delete(char *args) else printf("Failure. reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* cmd_delete */ @@ -640,7 +758,7 @@ static int cmd_getrealdir(char *args) else printf("Not found.\n"); - return(1); + return 1; } /* cmd_getrealdir */ @@ -656,12 +774,13 @@ static int cmd_exists(char *args) rc = PHYSFS_exists(args); printf("File %sexists.\n", rc ? "" : "does not "); - return(1); + return 1; } /* cmd_exists */ static int cmd_isdir(char *args) { + PHYSFS_Stat statbuf; int rc; if (*args == '\"') @@ -670,14 +789,17 @@ static int cmd_isdir(char *args) args[strlen(args) - 1] = '\0'; } /* if */ - rc = PHYSFS_isDirectory(args); + rc = PHYSFS_stat(args, &statbuf); + if (rc) + rc = (statbuf.filetype == PHYSFS_FILETYPE_DIRECTORY); printf("File %s a directory.\n", rc ? "is" : "is NOT"); - return(1); + return 1; } /* cmd_isdir */ static int cmd_issymlink(char *args) { + PHYSFS_Stat statbuf; int rc; if (*args == '\"') @@ -686,9 +808,11 @@ static int cmd_issymlink(char *args) args[strlen(args) - 1] = '\0'; } /* if */ - rc = PHYSFS_isSymbolicLink(args); + rc = PHYSFS_stat(args, &statbuf); + if (rc) + rc = (statbuf.filetype == PHYSFS_FILETYPE_SYMLINK); printf("File %s a symlink.\n", rc ? "is" : "is NOT"); - return(1); + return 1; } /* cmd_issymlink */ @@ -714,7 +838,7 @@ static int cmd_cat(char *args) printf("failed to set file buffer. Reason: [%s].\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* if */ @@ -723,7 +847,7 @@ static int cmd_cat(char *args) char buffer[128]; PHYSFS_sint64 rc; PHYSFS_sint64 i; - rc = PHYSFS_read(f, buffer, 1, sizeof (buffer)); + rc = PHYSFS_readBytes(f, buffer, sizeof (buffer)); for (i = 0; i < rc; i++) fputc((int) buffer[i], stdout); @@ -737,15 +861,62 @@ static int cmd_cat(char *args) PHYSFS_getLastError()); } /* if */ PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* while */ } /* else */ - return(1); + return 1; } /* cmd_cat */ +#define CRC32_BUFFERSIZE 512 +static int cmd_crc32(char *args) +{ + PHYSFS_File *f; + + if (*args == '\"') + { + args++; + args[strlen(args) - 1] = '\0'; + } /* if */ + + f = PHYSFS_openRead(args); + if (f == NULL) + printf("failed to open. Reason: [%s].\n", PHYSFS_getLastError()); + else + { + PHYSFS_uint8 buffer[CRC32_BUFFERSIZE]; + PHYSFS_uint32 crc = -1; + PHYSFS_sint64 bytesread; + + while ((bytesread = PHYSFS_readBytes(f, buffer, CRC32_BUFFERSIZE)) > 0) + { + PHYSFS_uint32 i, bit; + for (i = 0; i < bytesread; i++) + { + for (bit = 0; bit < 8; bit++, buffer[i] >>= 1) + crc = (crc >> 1) ^ (((crc ^ buffer[i]) & 1) ? 0xEDB88320 : 0); + } /* for */ + } /* while */ + + if (bytesread < 0) + { + printf("error while reading. Reason: [%s].\n", + PHYSFS_getLastError()); + return 1; + } /* if */ + + PHYSFS_close(f); + + crc ^= -1; + printf("CRC32 for %s: 0x%08X\n", args, crc); + } /* else */ + + return 1; +} /* cmd_crc32 */ + + static int cmd_filelength(char *args) { PHYSFS_File *f; @@ -770,10 +941,9 @@ static int cmd_filelength(char *args) PHYSFS_close(f); } /* else */ - return(1); + return 1; } /* cmd_filelength */ - #define WRITESTR "The cat sat on the mat.\n\n" static int cmd_append(char *args) @@ -801,12 +971,12 @@ static int cmd_append(char *args) printf("failed to set file buffer. Reason: [%s].\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* if */ bw = strlen(WRITESTR); - rc = PHYSFS_write(f, WRITESTR, 1, bw); + rc = PHYSFS_writeBytes(f, WRITESTR, bw); if (rc != bw) { printf("Wrote (%d) of (%d) bytes. Reason: [%s].\n", @@ -820,7 +990,7 @@ static int cmd_append(char *args) PHYSFS_close(f); } /* else */ - return(1); + return 1; } /* cmd_append */ @@ -849,12 +1019,12 @@ static int cmd_write(char *args) printf("failed to set file buffer. Reason: [%s].\n", PHYSFS_getLastError()); PHYSFS_close(f); - return(1); + return 1; } /* if */ } /* if */ bw = strlen(WRITESTR); - rc = PHYSFS_write(f, WRITESTR, 1, bw); + rc = PHYSFS_writeBytes(f, WRITESTR, bw); if (rc != bw) { printf("Wrote (%d) of (%d) bytes. Reason: [%s].\n", @@ -868,34 +1038,79 @@ static int cmd_write(char *args) PHYSFS_close(f); } /* else */ - return(1); + return 1; } /* cmd_write */ -static void modTimeToStr(PHYSFS_sint64 modtime, char *modstr, size_t strsize) +static char* modTimeToStr(PHYSFS_sint64 modtime, char *modstr, size_t strsize) { - time_t t = (time_t) modtime; - char *str = ctime(&t); - strncpy(modstr, str, strsize); + if (modtime < 0) + strncpy(modstr, "Unknown\n", strsize); + else + { + time_t t = (time_t) modtime; + char *str = ctime(&t); + strncpy(modstr, str, strsize); + } /* else */ + modstr[strsize-1] = '\0'; + return modstr; } /* modTimeToStr */ static int cmd_getlastmodtime(char *args) { - PHYSFS_sint64 rc = PHYSFS_getLastModTime(args); - if (rc == -1) + PHYSFS_Stat statbuf; + if (!PHYSFS_stat(args, &statbuf)) printf("Failed to determine. Reason: [%s].\n", PHYSFS_getLastError()); else { char modstr[64]; - modTimeToStr(rc, modstr, sizeof (modstr)); - printf("Last modified: %s (%ld).\n", modstr, (long) rc); + modTimeToStr(statbuf.modtime, modstr, sizeof (modstr)); + printf("Last modified: %s (%ld).\n", modstr, (long) statbuf.modtime); } /* else */ - return(1); + return 1; } /* cmd_getLastModTime */ +static int cmd_stat(char *args) +{ + PHYSFS_Stat stat; + char timestring[65]; + + if (*args == '\"') + { + args++; + args[strlen(args) - 1] = '\0'; + } /* if */ + + if(!PHYSFS_stat(args, &stat)) + { + printf("failed to stat. Reason [%s].\n", PHYSFS_getLastError()); + return 1; + } /* if */ + + printf("Filename: %s\n", args); + printf("Size %d\n",(int) stat.filesize); + + if(stat.filetype == PHYSFS_FILETYPE_REGULAR) + printf("Type: File\n"); + else if(stat.filetype == PHYSFS_FILETYPE_DIRECTORY) + printf("Type: Directory\n"); + else if(stat.filetype == PHYSFS_FILETYPE_SYMLINK) + printf("Type: Symlink\n"); + else + printf("Type: Unknown\n"); + + printf("Created at: %s", modTimeToStr(stat.createtime, timestring, 64)); + printf("Last modified at: %s", modTimeToStr(stat.modtime, timestring, 64)); + printf("Last accessed at: %s", modTimeToStr(stat.accesstime, timestring, 64)); + printf("Readonly: %s\n", stat.readonly ? "true" : "false"); + + return 1; +} /* cmd_filelength */ + + /* must have spaces trimmed prior to this call. */ static int count_args(const char *str) @@ -915,7 +1130,7 @@ static int count_args(const char *str) retval++; } /* if */ - return(retval); + return retval; } /* count_args */ @@ -938,7 +1153,10 @@ static const command_info commands[] = { "deinit", cmd_deinit, 0, NULL }, { "addarchive", cmd_addarchive, 2, " " }, { "mount", cmd_mount, 3, " " }, + { "mountmem", cmd_mount_mem, 3, " " }, + { "mounthandle", cmd_mount_handle, 3, " " }, { "removearchive", cmd_removearchive, 1, "" }, + { "unmount", cmd_removearchive, 1, "" }, { "enumerate", cmd_enumerate, 1, "" }, { "ls", cmd_enumerate, 1, "" }, { "getlasterror", cmd_getlasterror, 0, NULL }, @@ -947,6 +1165,7 @@ static const command_info commands[] = { "getsearchpath", cmd_getsearchpath, 0, NULL }, { "getbasedir", cmd_getbasedir, 0, NULL }, { "getuserdir", cmd_getuserdir, 0, NULL }, + { "getprefdir", cmd_getprefdir, 2, " " }, { "getwritedir", cmd_getwritedir, 0, NULL }, { "setwritedir", cmd_setwritedir, 1, "" }, { "permitsymlinks", cmd_permitsyms, 1, "<1or0>" }, @@ -959,11 +1178,14 @@ static const command_info commands[] = { "issymlink", cmd_issymlink, 1, "" }, { "cat", cmd_cat, 1, "" }, { "filelength", cmd_filelength, 1, "" }, + { "stat", cmd_stat, 1, "" }, { "append", cmd_append, 1, "" }, { "write", cmd_write, 1, "" }, { "getlastmodtime", cmd_getlastmodtime, 1, "" }, { "setbuffer", cmd_setbuffer, 1, "" }, { "stressbuffer", cmd_stressbuffer, 1, "" }, + { "crc32", cmd_crc32, 1, "" }, + { "getmountpoint", cmd_getmountpoint, 1, "" }, { NULL, NULL, -1, NULL } }; @@ -985,7 +1207,7 @@ static int cmd_help(char *args) for (i = commands; i->cmd != NULL; i++) output_usage(" -", i); - return(1); + return 1; } /* output_cmd_help */ @@ -1037,14 +1259,14 @@ static int process_command(char *complete_cmd) if (complete_cmd == NULL) /* can happen if user hits CTRL-D, etc. */ { printf("\n"); - return(0); + return 0; } /* if */ cmd_copy = (char *) malloc(strlen(complete_cmd) + 1); if (cmd_copy == NULL) { printf("\n\n\nOUT OF MEMORY!\n\n\n"); - return(0); + return 0; } /* if */ trim_command(complete_cmd, cmd_copy); @@ -1084,7 +1306,7 @@ static int process_command(char *complete_cmd) } /* if */ free(cmd_copy); - return(rc); + return rc; } /* process_command */ @@ -1157,7 +1379,7 @@ int main(int argc, char **argv) if (!PHYSFS_init(argv[0])) { printf("PHYSFS_init() failed!\n reason: %s.\n", PHYSFS_getLastError()); - return(1); + return 1; } /* if */ output_versions(); @@ -1166,6 +1388,7 @@ int main(int argc, char **argv) open_history_file(); printf("Enter commands. Enter \"help\" for instructions.\n"); + fflush(stdout); do { @@ -1176,6 +1399,7 @@ int main(int argc, char **argv) buf = (char *) malloc(512); memset(buf, '\0', 512); printf("> "); + fflush(stdout); for (i = 0; i < 511; i++) { int ch = fgetc(stdin); @@ -1202,6 +1426,7 @@ int main(int argc, char **argv) #endif rc = process_command(buf); + fflush(stdout); if (buf != NULL) free(buf); } while (rc); @@ -1217,7 +1442,7 @@ int main(int argc, char **argv) printf(" it makes you shoot teh railgun bettar.\n"); */ - return(0); + return 0; } /* main */ /* end of test_physfs.c ... */ diff --git a/jni/physfs-2.1.0/test/test_physfs.pl b/jni/physfs-2.1.0/test/test_physfs.pl new file mode 100755 index 00000000..a7cdeec5 --- /dev/null +++ b/jni/physfs-2.1.0/test/test_physfs.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl -w + +use strict; +use warnings; +use physfs; + +print "testing PhysicsFS Perl bindings...\n"; + +print "init...\n"; +physfs::init("$0") or die("physfs::init('$0'): ".physfs::getLastError()."\n"); + +print "user dir: ", physfs::getUserDir(), "\n"; +print "base dir: ", physfs::getBaseDir(), "\n"; +print "pref dir: ", physfs::getPrefDir("icculus.org", "test_physfs"), "\n"; + +print "deinit...\n"; +physfs::deinit(); + +print "done!\n"; +exit 0; + diff --git a/jni/physfs-2.1.0/test/test_physfs.rb b/jni/physfs-2.1.0/test/test_physfs.rb new file mode 100755 index 00000000..9632c4b5 --- /dev/null +++ b/jni/physfs-2.1.0/test/test_physfs.rb @@ -0,0 +1,19 @@ +#!/usr/bin/ruby + +require 'physfs' + +puts "testing PhysicsFS Ruby bindings..." +puts "init..." + +Physfs.init($0) + +puts "user dir: " + Physfs.getUserDir() +puts "base dir: " + Physfs.getBaseDir() +puts "pref dir: " + Physfs.getPrefDir("icculus.org", "test_physfs") + +puts "deinit..." +Physfs.deinit() + +puts "done!" +exit(0) +