walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More corrections to lzma support from Dennis.

This commit is contained in:
Ryan C. Gordon 2006-09-27 09:21:56 +00:00
parent f9b8dec5cc
commit 64cb8c260e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archivers/lzma.c
View File

@ -3,7 +3,7 @@
* *
* Please see the file LICENSE in the source's root directory. * Please see the file LICENSE in the source's root directory.
* *
* This file written by Dennis Schridde, with some peeking at "7zMain.c" * This file is written by Dennis Schridde, with some peeking at "7zMain.c"
* by Igor Pavlov. * by Igor Pavlov.
*/ */
@ -384,7 +384,7 @@ static int LZMA_isArchive(const char *filename, int forWriting)
static void *LZMA_openArchive(const char *name, int forWriting) static void *LZMA_openArchive(const char *name, int forWriting)
{ {
LZMAarchive *archive; LZMAarchive *archive = NULL;
ISzAlloc allocImp; ISzAlloc allocImp;
ISzAlloc allocTempImp; ISzAlloc allocTempImp;
@ -528,14 +528,15 @@ static int LZMA_isSymLink(dvoid *opaque, const char *name, int *fileExists)
static fvoid *LZMA_openRead(dvoid *opaque, const char *name, int *fileExists) static fvoid *LZMA_openRead(dvoid *opaque, const char *name, int *fileExists)
{ {
LZMAarchive *archive = (LZMAarchive *) opaque; LZMAarchive *archive = (LZMAarchive *) opaque;
LZMAentry *entry = NULL;
PHYSFS_uint32 index = 0; PHYSFS_uint32 index = 0;
LZMAentry *entry;
*fileExists = lzma_find_entry(archive, name, &index); *fileExists = lzma_find_entry(archive, name, &index);
BAIL_IF_MACRO(!*fileExists, ERR_NO_SUCH_FILE, NULL); BAIL_IF_MACRO(!*fileExists, ERR_NO_SUCH_FILE, NULL);
entry = (LZMAentry *) allocator.Malloc(sizeof (LZMAentry)); entry = (LZMAentry *) allocator.Malloc(sizeof (LZMAentry));
BAIL_IF_MACRO(entry == NULL, ERR_OUT_OF_MEMORY, NULL); BAIL_IF_MACRO(entry == NULL, ERR_OUT_OF_MEMORY, NULL);
entry->index = index; entry->index = index;
entry->archive = archive; entry->archive = archive;
entry->file = archive->db.Database.Files + entry->index; entry->file = archive->db.Database.Files + entry->index;

8
lzma/LZMA-LICENSE.txt
View File

@ -1,3 +1,11 @@
(These are the licensing details for this directory, taken from lzma.txt in
the original source distribution. The basic gist is you can do what you want
with this code, including sell it in a closed-source app...changes to LZMA
itself must be released as source code, which in the case of PhysicsFS, you
can just point people to our source code repository unless you make further
changes yourself. --ryan.)
LZMA SDK 4.43 LZMA SDK 4.43
------------- -------------