c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

added unzGoToFirstFile2 and unzGoToNextFile2 to reduce backward disk seeking

Browse Source 
added opening of second stream to zip for non-spanned zip files so there isn't constant seeking between the CD and the content
This commit is contained in:
Nathan Moinvaziri 2012-06-29 00:08:22 -07:00
parent cc50072ee2
commit b9be238542
2 changed files with 102 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
unzip.c
View File

@ -564,9 +564,9 @@ local unzFile unzOpenInternal (const void *path,
unz64_s *s;
ZPOS64_T central_pos;
uLong uL;
voidpf filestream = NULL;
ZPOS64_T number_entry_CD; /* total number of entries in the central dir
(same than number_entry on nospan) */
int err=UNZ_OK;
if (unz_copyright[0]!=' ')
@ -714,6 +714,14 @@ local unzFile unzOpenInternal (const void *path,
return NULL;
}
if (us.gi.number_disk_with_CD == 0)
{
/* If there is only one disk open another stream so we don't have to seek between the CD and the file headers constantly */
filestream = ZOPEN64(us.z_filefunc, path, ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_EXISTING);
if (filestream != NULL)
us.filestream = filestream;
}
us.byte_before_the_zipfile = central_pos -
(us.offset_central_dir+us.size_central_dir);
us.central_pos = central_pos;
@ -1188,32 +1196,61 @@ extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
}
return err;
}
/*
Set the current file of the zipfile to the first file.
return UNZ_OK if there is no problem
*/
extern int ZEXPORT unzGoToFirstFile (unzFile file)
{
int err=UNZ_OK;
unz64_s* s;
if (file==NULL)
return UNZ_PARAMERROR;
s=(unz64_s*)file;
s->pos_in_central_dir=s->offset_central_dir;
s->num_file=0;
/*
Set the current file of the zipfile to the first file and returns the current
info on success.
return UNZ_OK if there is no problem
*/
extern int ZEXPORT unzGoToFirstFile2 (unzFile file,
unz_file_info64 *pfile_info,
char *szFileName,
uLong fileNameBufferSize,
void *extraField,
uLong extraFieldBufferSize,
char *szComment,
uLong commentBufferSize)
{
int err=UNZ_OK;
unz64_s* s;
if (file==NULL)
return UNZ_PARAMERROR;
s=(unz64_s*)file;
s->pos_in_central_dir=s->offset_central_dir;
s->num_file=0;
err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
&s->cur_file_info_internal,
NULL,0,NULL,0,NULL,0);
&s->cur_file_info_internal,
szFileName,fileNameBufferSize,
extraField,extraFieldBufferSize,
szComment,commentBufferSize);
s->current_file_ok = (err == UNZ_OK);
return err;
}
if ((err == UNZ_OK) && (pfile_info != NULL))
memcpy(pfile_info, &s->cur_file_info, sizeof(unz_file_info64));
return err;
}
/*
Set the current file of the zipfile to the first file.
return UNZ_OK if there is no problem
*/
extern int ZEXPORT unzGoToFirstFile (unzFile file)
{
return unzGoToFirstFile2(file, NULL, NULL, 0, NULL, 0, NULL, 0);
}
/*
Set the current file of the zipfile to the next file.
Set the current file of the zipfile to the next file.and retrieve the current info on success
return UNZ_OK if there is no problem
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
*/
extern int ZEXPORT unzGoToNextFile (unzFile file)
extern int ZEXPORT unzGoToNextFile2 (unzFile file,
unz_file_info64 *pfile_info,
char *szFileName,
uLong fileNameBufferSize,
void *extraField,
uLong extraFieldBufferSize,
char *szComment,
uLong commentBufferSize)
{
unz64_s* s;
int err;
@ -1231,12 +1268,25 @@ extern int ZEXPORT unzGoToNextFile (unzFile file)
s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
s->num_file++;
err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
&s->cur_file_info_internal,
NULL,0,NULL,0,NULL,0);
&s->cur_file_info_internal,
szFileName,fileNameBufferSize,
extraField,extraFieldBufferSize,
szComment,commentBufferSize);
s->current_file_ok = (err == UNZ_OK);
if ((err == UNZ_OK) && (pfile_info != NULL))
memcpy(pfile_info, &s->cur_file_info, sizeof(unz_file_info64));
return err;
}
/*
Set the current file of the zipfile to the next file.
return UNZ_OK if there is no problem
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
*/
extern int ZEXPORT unzGoToNextFile (unzFile file)
{
return unzGoToNextFile2(file, NULL, NULL, 0, NULL, 0, NULL, 0);
}
/*
Try locate the file szFileName in the zipfile.
@ -1394,7 +1444,7 @@ local int unzGoToNextDisk(unzFile file)
int number_disk_next;
s=(unz64_s*)file;
s=(unz64_s*)file;
pfile_in_zip_read_info=s->pfile_in_zip_read;
number_disk_next = s->number_disk;

29
unzip.h
View File

@ -239,6 +239,20 @@ extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
return UNZ_OK if there is no problem
*/
extern int ZEXPORT unzGoToFirstFile2 OF((unzFile file,
unz_file_info64 *pfile_info,
char *szFileName,
uLong fileNameBufferSize,
void *extraField,
uLong extraFieldBufferSize,
char *szComment,
uLong commentBufferSize));
/*
Set the current file of the zipfile to the first file and retrieves the current
info on success. Does less seeking around than unzGoToFirstFile + unzGetCurrentFileInfo.
return UNZ_OK if there is no problem
*/
extern int ZEXPORT unzGoToNextFile OF((unzFile file));
/*
Set the current file of the zipfile to the next file.
@ -246,6 +260,21 @@ extern int ZEXPORT unzGoToNextFile OF((unzFile file));
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
*/
extern int ZEXPORT unzGoToNextFile2 OF((unzFile file,
unz_file_info64 *pfile_info,
char *szFileName,
uLong fileNameBufferSize,
void *extraField,
uLong extraFieldBufferSize,
char *szComment,
uLong commentBufferSize));
/*
Set the current file of the zipfile to the next file and retrieves the current
info on success. Does less seeking around than unzGotoNextFile + unzGetCurrentFileInfo.
return UNZ_OK if there is no problem
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
*/
extern int ZEXPORT unzLocateFile OF((unzFile file,
const char *szFileName,
int iCaseSensitivity));