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

Symlink fixes. Still broken, though.

This commit is contained in:
Ryan C. Gordon 2002-07-15 02:22:52 +00:00
parent 52e3c3f0c7
commit 2ec465ffc4
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
archivers/zip.c
View File

@ -577,7 +577,7 @@ static char *get_zip_realpath(void *in, ZIPentry *entry)
else /* symlink target path is compressed... */ else /* symlink target path is compressed... */
{ {
z_stream stream; z_stream stream;
PHYSFS_uint32 compsize = entry->uncompressed_size; PHYSFS_uint32 compsize = entry->compressed_size;
PHYSFS_uint8 *compressed = (PHYSFS_uint8 *) malloc(compsize); PHYSFS_uint8 *compressed = (PHYSFS_uint8 *) malloc(compsize);
if (compressed != NULL) if (compressed != NULL)
{ {
@ -590,8 +590,11 @@ static char *get_zip_realpath(void *in, ZIPentry *entry)
stream.avail_out = size; stream.avail_out = size;
if (zlib_err(inflateInit2(&stream, -MAX_WBITS)) == Z_OK) if (zlib_err(inflateInit2(&stream, -MAX_WBITS)) == Z_OK)
{ {
rc = (zlib_err(inflate(&stream, Z_FINISH)) == Z_OK); rc = zlib_err(inflate(&stream, Z_FINISH));
inflateEnd(&stream); inflateEnd(&stream);
/* both are acceptable outcomes... */
rc = ((rc == Z_OK) || (rc == Z_STREAM_END));
} /* if */ } /* if */
} /* if */ } /* if */
free(compressed); free(compressed);
@ -636,7 +639,12 @@ static int entry_is_symlink(ZIPentry *entry, PHYSFS_uint32 extern_attr)
return ( return (
(version_does_symlinks(entry->version)) && (version_does_symlinks(entry->version)) &&
(entry->uncompressed_size > 0) && (entry->uncompressed_size > 0) &&
(extern_attr & 0x00120000) /* symlink flag. */
#if 0 /* !!! FIXME ... this check is incorrect for some files! */
(extern_attr & 0x0120000) /* symlink flag. */
#else
0 /* always fail for now. Symlinks will just be small files. */
#endif
); );
} /* entry_is_symlink */ } /* entry_is_symlink */