hedgewars-draft: comparison misc/libphysfs/archiver

equal deleted inserted replaced

-:ea891871f481
+:bb5522e88ab2
 *  formats that can just hand back a list of files and the offsets of their
 *  uncompressed data. There are an alarming number of formats like this.
 *
 * RULES: Archive entries must be uncompressed, must not have separate subdir
 *  entries (but can have subdirs), must be case insensitive LOW ASCII
-*  filenames <= 56 bytes. No symlinks, etc. We can relax some of these rules
+*  filenames <= 64 bytes. No symlinks, etc. We can relax some of these rules
 *  as necessary.
 *
 * Please see the file LICENSE.txt in the source's root directory.
 *
 *  This file written by Ryan C. Gordon.
 UNPKentry *entry;
 PHYSFS_uint32 curPos;
 } UNPKfileinfo;
-void UNPK_closeArchive(PHYSFS_Dir *opaque)
+void UNPK_closeArchive(void *opaque)
 {
 UNPKinfo *info = ((UNPKinfo *) opaque);
 info->io->destroy(info->io);
 allocator.Free(info->entries);
 allocator.Free(info);
 char ch = name[dlen];
 if (ch < '/') /* make sure this isn't just a substr match. */
 rc = -1;
 else if (ch > '/')
 rc = 1;
 else
 {
 if (stop_on_first_find) /* Just checking dir's existance? */
 return middle;
 if (name[dlen + 1] == '\0') /* Skip initial dir entry. */
 cb(callbackdata, odir, newstr);
 __PHYSFS_smallFree(newstr);
 } /* doEnumCallback */
-void UNPK_enumerateFiles(PHYSFS_Dir *opaque, const char *dname,
+void UNPK_enumerateFiles(void *opaque, const char *dname,
-int omitSymLinks, PHYSFS_EnumFilesCallback cb,
+PHYSFS_EnumFilesCallback cb,
 const char *origdir, void *callbackdata)
 {
 UNPKinfo *info = ((UNPKinfo *) opaque);
 PHYSFS_sint32 dlen, dlen_inc, max, i;
 } /* UNPK_enumerateFiles */
 /*
 * This will find the UNPKentry associated with a path in platform-independent
 *  notation. Directories don't have UNPKentries associated with them, but
 *  (*isDir) will be set to non-zero if a dir was hit.
 */
 static UNPKentry *findEntry(const UNPKinfo *info, const char *path, int *isDir)
 {
 UNPKentry *a = info->entries;
 } /* while */
 if (isDir != NULL)
 *isDir = 0;
-BAIL_MACRO(PHYSFS_ERR_NO_SUCH_PATH, NULL);
+BAIL_MACRO(PHYSFS_ERR_NOT_FOUND, NULL);
 } /* findEntry */
-PHYSFS_Io *UNPK_openRead(PHYSFS_Dir *opaque, const char *fnm, int *fileExists)
+PHYSFS_Io *UNPK_openRead(void *opaque, const char *name)
 {
 PHYSFS_Io *retval = NULL;
 UNPKinfo *info = (UNPKinfo *) opaque;
 UNPKfileinfo *finfo = NULL;
 int isdir = 0;
-UNPKentry *entry = findEntry(info, fnm, &isdir);
+UNPKentry *entry = findEntry(info, name, &isdir);
-*fileExists = (entry != NULL);
 GOTO_IF_MACRO(isdir, PHYSFS_ERR_NOT_A_FILE, UNPK_openRead_failed);
 GOTO_IF_MACRO(!entry, ERRPASS, UNPK_openRead_failed);
 retval = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io));
 GOTO_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, UNPK_openRead_failed);
 return NULL;
 } /* UNPK_openRead */
-PHYSFS_Io *UNPK_openWrite(PHYSFS_Dir *opaque, const char *name)
+PHYSFS_Io *UNPK_openWrite(void *opaque, const char *name)
 {
 BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL);
 } /* UNPK_openWrite */
-PHYSFS_Io *UNPK_openAppend(PHYSFS_Dir *opaque, const char *name)
+PHYSFS_Io *UNPK_openAppend(void *opaque, const char *name)
 {
 BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL);
 } /* UNPK_openAppend */
-int UNPK_remove(PHYSFS_Dir *opaque, const char *name)
+int UNPK_remove(void *opaque, const char *name)
 {
 BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0);
 } /* UNPK_remove */
-int UNPK_mkdir(PHYSFS_Dir *opaque, const char *name)
+int UNPK_mkdir(void *opaque, const char *name)
 {
 BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0);
 } /* UNPK_mkdir */
-int UNPK_stat(PHYSFS_Dir *opaque, const char *filename,
+int UNPK_stat(void *opaque, const char *filename, PHYSFS_Stat *stat)
-int *exists, PHYSFS_Stat *stat)
 {
 int isDir = 0;
 const UNPKinfo *info = (const UNPKinfo *) opaque;
 const UNPKentry *entry = findEntry(info, filename, &isDir);
 if (isDir)
 {
-*exists = 1;
 stat->filetype = PHYSFS_FILETYPE_DIRECTORY;
 stat->filesize = 0;
 } /* if */
 else if (entry != NULL)
 {
-*exists = 1;
 stat->filetype = PHYSFS_FILETYPE_REGULAR;
 stat->filesize = entry->size;
 } /* else if */
 else
 {
-*exists = 0;
 return 0;
 } /* else */
 stat->modtime = -1;
 stat->createtime = -1;
 return 1;
 } /* UNPK_stat */
-PHYSFS_Dir *UNPK_openArchive(PHYSFS_Io *io, UNPKentry *e,
+void *UNPK_openArchive(PHYSFS_Io *io, UNPKentry *e, const PHYSFS_uint32 num)
-const PHYSFS_uint32 num)
 {
 UNPKinfo *info = (UNPKinfo *) allocator.Malloc(sizeof (UNPKinfo));
 if (info == NULL)
 {
 allocator.Free(e);

changeset 12213	bb5522e88ab2
parent 10017	de822cd3df3a