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

Disabled shitty enumeration code. Will fix soon.

This commit is contained in:
Ryan C. Gordon 2002-07-23 22:55:47 +00:00
parent a4d586e41b
commit 7c80bcf537
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
archivers/zip.c
View File

@ -1253,8 +1253,11 @@ static LinkedStringList *ZIP_enumerateFiles(DirHandle *h,
const char *dirname, const char *dirname,
int omitSymLinks) int omitSymLinks)
{ {
#if 1
return(NULL); /* !!! FIXME */
#else
ZIPinfo *info = ((ZIPinfo *) h->opaque); ZIPinfo *info = ((ZIPinfo *) h->opaque);
PHYSFS_sint32 i, max = (PHYSFS_sint32) info->entryCount; PHYSFS_sint32 i, tmp, max;
LinkedStringList *retval = NULL, *p = NULL; LinkedStringList *retval = NULL, *p = NULL;
PHYSFS_uint32 dlen = strlen(dirname); PHYSFS_uint32 dlen = strlen(dirname);
@ -1264,46 +1267,46 @@ static LinkedStringList *ZIP_enumerateFiles(DirHandle *h,
i = zip_find_start_of_dir(info, dirname, 0); i = zip_find_start_of_dir(info, dirname, 0);
BAIL_IF_MACRO(i == -1, ERR_NO_SUCH_FILE, NULL); BAIL_IF_MACRO(i == -1, ERR_NO_SUCH_FILE, NULL);
while (1) for (max = (PHYSFS_sint32) info->entryCount; i < max; i++)
{ {
ZIPentry *entry = &info->entries[i]; ZIPentry *entry = &info->entries[i];
const char *add_file; const char *add_file;
size_t strsize; size_t strsize;
char *slash; char *slash;
if ((dlen > 0) && (strncmp(entry->name, dirname, dlen) != 0))
break; /* we're past this dir's entries. */
add_file = entry->name + dlen + ((dlen > 0) ? 1 : 0); add_file = entry->name + dlen + ((dlen > 0) ? 1 : 0);
if ( ((omitSymLinks) && (zip_entry_is_symlink(entry))) || if ( ((omitSymLinks) && (zip_entry_is_symlink(entry))) ||
(*add_file == '\0') ) /* skip links and the dir entry itself. */ (*add_file == '\0') ) /* skip links and the dir entry itself. */
{ {
if (++i >= max) break; else continue; continue;
} /* if */ } /* if */
slash = strchr(add_file, '/'); /* handle subdirs under dirname... */ slash = strchr(add_file, '/'); /* handle subdirs under dirname... */
strsize = (size_t) ((slash) ? (slash - add_file) : strlen(add_file)); strsize = (size_t) ((slash) ? (slash - add_file) : strlen(add_file));
retval = __PHYSFS_addToLinkedStringList(retval, &p, add_file, strsize); retval = __PHYSFS_addToLinkedStringList(retval, &p, add_file, strsize);
if (++i >= max) tmp = i;
break; /* we're at the end of the entries array. */
if ((dlen > 0) && (strncmp(info->entries[i].name, dirname, dlen) != 0))
break; /* we're past this dir's entries. */
/* We added a subdir? Skip its children. */ /* We added a subdir? Skip its children. */
while (slash != NULL) while ((slash != NULL) && (i < max))
{ {
if (strncmp(info->entries[i].name, dirname, dlen) == 0) if (strncmp(info->entries[i].name, info->entries[tmp].name, dlen + strsize + 1) == 0)
{ {
if (info->entries[i].name[dlen] == '/') if (info->entries[i].name[dlen + strsize + 1] == '/')
{ {
if (++i >= max) break; else continue; i++;
continue;
} /* if */ } /* if */
} /* if */ } /* if */
i--; /* for loop will increment. */
slash = NULL; slash = NULL;
} /* while */ } /* while */
} /* while */ } /* while */
return(retval); return(retval);
#endif
} /* ZIP_enumerateFiles */ } /* ZIP_enumerateFiles */