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

Enough fixes to get the Build engine working with ZIP files instead of 

GRPs. Currently does case-insensitive searching, which will change.
This commit is contained in:
Ryan C. Gordon 2001-07-23 09:24:59 +00:00
parent c83a82497c
commit bb35ebed98
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
archivers/zip.c
View File

@ -96,7 +96,7 @@ static int ZIP_seek(FileHandle *handle, int offset)
{ {
/* this blows. */ /* this blows. */
unzFile fh = ((ZIPfileinfo *) (handle->opaque))->handle; unzFile fh = ((ZIPfileinfo *) (handle->opaque))->handle;
char *buf; char *buf = NULL;
int bufsize = 4096 * 2; int bufsize = 4096 * 2;
BAIL_IF_MACRO(unztell(fh) == offset, NULL, 1); BAIL_IF_MACRO(unztell(fh) == offset, NULL, 1);
@ -342,7 +342,7 @@ static LinkedStringList *ZIP_enumerateFiles(DirHandle *h,
continue; continue;
buf[dlen] = '\0'; buf[dlen] = '\0';
if (strcmp(d, buf) != 0) /* not same directory? */ if (__PHYSFS_platformStricmp(d, buf) != 0) /* not same directory? */
continue; continue;
add_file = buf + dlen + 1; add_file = buf + dlen + 1;
@ -356,7 +356,7 @@ static LinkedStringList *ZIP_enumerateFiles(DirHandle *h,
*ptr = '\0'; *ptr = '\0';
for (j = retval; j != NULL; j = j->next) for (j = retval; j != NULL; j = j->next)
{ {
if (strcmp(j->str, ptr) == 0) if (__PHYSFS_platformStricmp(j->str, ptr) == 0)
break; break;
} /* for */ } /* for */
@ -521,14 +521,23 @@ static FileHandle *ZIP_openRead(DirHandle *h, const char *filename)
f = unzOpen(name); f = unzOpen(name);
BAIL_IF_MACRO(f == NULL, ERR_IO_ERROR, NULL); BAIL_IF_MACRO(f == NULL, ERR_IO_ERROR, NULL);
if ( (unzLocateFile(f, filename, 1) != UNZ_OK) || if ( (unzLocateFile(f, filename, 2) != UNZ_OK) ||
( (finfo = (ZIPfileinfo *) malloc(sizeof (ZIPfileinfo))) == NULL ) || (unzOpenCurrentFile(f) != UNZ_OK) ||
(unzOpenCurrentFile(f) != UNZ_OK) ) ( (finfo = (ZIPfileinfo *) malloc(sizeof (ZIPfileinfo))) == NULL ) )
{ {
unzClose(f); unzClose(f);
BAIL_IF_MACRO(1, ERR_IO_ERROR, NULL); BAIL_IF_MACRO(1, ERR_IO_ERROR, NULL);
} /* if */ } /* if */
if ( (!(retval = (FileHandle *) malloc(sizeof (FileHandle)))) ||
(!(retval->opaque = (ZIPfileinfo *) malloc(sizeof (ZIPfileinfo)))) )
{
if (retval)
free(retval);
unzClose(f);
BAIL_IF_MACRO(1, ERR_OUT_OF_MEMORY, NULL);
} /* if */
finfo->handle = f; finfo->handle = f;
retval->opaque = (void *) finfo; retval->opaque = (void *) finfo;
retval->funcs = &__PHYSFS_FileFunctions_ZIP; retval->funcs = &__PHYSFS_FileFunctions_ZIP;