hedgewars: comparison misc/libphysfs/archiver

equal deleted inserted replaced

-:ea891871f481
+:bb5522e88ab2
 int pos = 0;
 int lastfound = -1;
 for(;pos < descriptor->filenamelen; pos++)
 if (descriptor->filename[pos] == ';')
 lastfound = pos;
-BAIL_IF_MACRO(lastfound < 1, PHYSFS_ERR_NO_SUCH_PATH /* !!! FIXME: PHYSFS_ERR_BAD_FILENAME */, -1);
+BAIL_IF_MACRO(lastfound < 1, PHYSFS_ERR_NOT_FOUND /* !!! FIXME: PHYSFS_ERR_BAD_FILENAME */, -1);
-BAIL_IF_MACRO(lastfound == (descriptor->filenamelen -1), PHYSFS_ERR_NO_SUCH_PATH /* !!! PHYSFS_ERR_BAD_FILENAME */, -1);
+BAIL_IF_MACRO(lastfound == (descriptor->filenamelen -1), PHYSFS_ERR_NOT_FOUND /* !!! PHYSFS_ERR_BAD_FILENAME */, -1);
 strncpy(filename, descriptor->filename, lastfound);
 if (filename[lastfound - 1] == '.')
 filename[lastfound - 1] = '\0'; /* consume trailing ., as done in all implementations */
 else
 filename[lastfound] = '\0';
 * Don't use path tables, they are not necessarily faster, but more complicated
 * to implement as they store only directories and not files, so searching for
 * a file needs to branch to the directory extent sooner or later.
 */
 static int iso_find_dir_entry(ISO9660Handle *handle,const char *path,
-ISO9660FileDescriptor *descriptor, int *exists)
+ISO9660FileDescriptor *descriptor)
 {
 char *subpath = 0;
 PHYSFS_uint64 readpos, end_of_dir;
 char filename[255];
 char pathcopy[256];
 char *mypath;
 int version = 0;
 strcpy(pathcopy, path);
 mypath = pathcopy;
-*exists = 0;
 readpos = handle->rootdirstart;
 end_of_dir = handle->rootdirstart + handle->rootdirsize;
 iso_extractsubpath(mypath, &subpath);
 while (1)
 ERRPASS, -1);
 if (strcmp(filename, mypath) == 0)
 {
 if ( (subpath == 0) || (subpath[0] == 0) )
-{
-*exists = 1;
 return 0;  /* no subpaths left and we found the entry */
-} /* if */
 if (descriptor->flags.directory)
 {
 /* shorten the path to the subpath */
 mypath = subpath;
 readpos = descriptor->extentpos * 2048;
 end_of_dir = readpos + descriptor->datalen;
 } /* if */
 else
 {
+/* !!! FIXME: set PHYSFS_ERR_NOT_FOUND? */
 /* we're at a file but have a remaining subpath -> no match */
 return 0;
 } /* else */
 } /* if */
 } /* while */
+/* !!! FIXME: set PHYSFS_ERR_NOT_FOUND? */
 return 0;
 } /* iso_find_dir_entry */
 static int iso_read_ext_attributes(ISO9660Handle *handle, int block,
 BAIL_IF_MACRO(forWriting, PHYSFS_ERR_READ_ONLY, NULL);
 /* Skip system area to magic number in Volume descriptor */
 BAIL_IF_MACRO(!io->seek(io, 32769), ERRPASS, NULL);
-BAIL_IF_MACRO(!io->read(io, magicnumber, 5) != 5, ERRPASS, NULL);
+BAIL_IF_MACRO(io->read(io, magicnumber, 5) != 5, ERRPASS, NULL);
 if (memcmp(magicnumber, "CD001", 6) != 0)
 BAIL_MACRO(PHYSFS_ERR_UNSUPPORTED, NULL);
 handle = allocator.Malloc(sizeof(ISO9660Handle));
 GOTO_IF_MACRO(!handle, PHYSFS_ERR_OUT_OF_MEMORY, errorcleanup);
 } /* if */
 return NULL;
 } /* ISO9660_openArchive */
-static void ISO9660_closeArchive(PHYSFS_Dir *opaque)
+static void ISO9660_closeArchive(void *opaque)
 {
 ISO9660Handle *handle = (ISO9660Handle*) opaque;
 handle->io->destroy(handle->io);
 __PHYSFS_platformDestroyMutex(handle->mutex);
 allocator.Free(handle->path);
 fhandle->io->destroy(fhandle->io);
 return -1;
 } /* iso_file_open_foreign */
-static PHYSFS_Io *ISO9660_openRead(PHYSFS_Dir *opaque, const char *filename,
+static PHYSFS_Io *ISO9660_openRead(void *opaque, const char *filename)
-int *exists)
 {
 PHYSFS_Io *retval = NULL;
 ISO9660Handle *handle = (ISO9660Handle*) opaque;
 ISO9660FileHandle *fhandle;
 ISO9660FileDescriptor descriptor;
 retval = allocator.Malloc(sizeof(PHYSFS_Io));
 GOTO_IF_MACRO(retval == 0, PHYSFS_ERR_OUT_OF_MEMORY, errorhandling);
 /* find file descriptor */
-rc = iso_find_dir_entry(handle, filename, &descriptor, exists);
+rc = iso_find_dir_entry(handle, filename, &descriptor);
 GOTO_IF_MACRO(rc, ERRPASS, errorhandling);
-GOTO_IF_MACRO(!*exists, PHYSFS_ERR_NO_SUCH_PATH, errorhandling);
 fhandle->startblock = descriptor.extentpos + descriptor.extattributelen;
 fhandle->filesize = descriptor.datalen;
 fhandle->currpos = 0;
 fhandle->isohandle = handle;
 /*******************************************************************************
 * Information gathering functions
 ******************************************************************************/
-static void ISO9660_enumerateFiles(PHYSFS_Dir *opaque, const char *dname,
+static void ISO9660_enumerateFiles(void *opaque, const char *dname,
-int omitSymLinks,
 PHYSFS_EnumFilesCallback cb,
 const char *origdir, void *callbackdata)
 {
 ISO9660Handle *handle = (ISO9660Handle*) opaque;
 ISO9660FileDescriptor descriptor;
 end_of_dir = readpos + handle->rootdirsize;
 } /* if */
 else
 {
 printf("pfad %s\n",dname);
-int exists = 0;
+BAIL_IF_MACRO(iso_find_dir_entry(handle,dname, &descriptor), ERRPASS,);
-BAIL_IF_MACRO(iso_find_dir_entry(handle,dname, &descriptor, &exists), ERRPASS,);
-BAIL_IF_MACRO(!exists, ERRPASS, );
 BAIL_IF_MACRO(!descriptor.flags.directory, ERRPASS,);
 readpos = descriptor.extentpos * 2048;
 end_of_dir = readpos + descriptor.datalen;
 } /* else */
 cb(callbackdata, origdir,filename);
 } /* while */
 } /* ISO9660_enumerateFiles */
-static int ISO9660_stat(PHYSFS_Dir *opaque, const char *name, int *exists,
+static int ISO9660_stat(void *opaque, const char *name, PHYSFS_Stat *stat)
-PHYSFS_Stat *stat)
 {
 ISO9660Handle *handle = (ISO9660Handle*) opaque;
 ISO9660FileDescriptor descriptor;
 ISO9660ExtAttributeRec extattr;
-BAIL_IF_MACRO(iso_find_dir_entry(handle, name, &descriptor, exists), ERRPASS, -1);
+BAIL_IF_MACRO(iso_find_dir_entry(handle, name, &descriptor), ERRPASS, -1);
-if (!*exists)
-return 0;
 stat->readonly = 1;
 /* try to get extended info */
 if (descriptor.extattributelen)
 /*******************************************************************************
 * Not supported functions
 ******************************************************************************/
-static PHYSFS_Io *ISO9660_openWrite(PHYSFS_Dir *opaque, const char *name)
+static PHYSFS_Io *ISO9660_openWrite(void *opaque, const char *name)
 {
 BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL);
 } /* ISO9660_openWrite */
-static PHYSFS_Io *ISO9660_openAppend(PHYSFS_Dir *opaque, const char *name)
+static PHYSFS_Io *ISO9660_openAppend(void *opaque, const char *name)
 {
 BAIL_MACRO(PHYSFS_ERR_READ_ONLY, NULL);
 } /* ISO9660_openAppend */
-static int ISO9660_remove(PHYSFS_Dir *opaque, const char *name)
+static int ISO9660_remove(void *opaque, const char *name)
 {
 BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0);
 } /* ISO9660_remove */
-static int ISO9660_mkdir(PHYSFS_Dir *opaque, const char *name)
+static int ISO9660_mkdir(void *opaque, const char *name)
 {
 BAIL_MACRO(PHYSFS_ERR_READ_ONLY, 0);
 } /* ISO9660_mkdir */
 const PHYSFS_Archiver __PHYSFS_Archiver_ISO9660 =
 {
+CURRENT_PHYSFS_ARCHIVER_API_VERSION,
 {
 "ISO",
 "ISO9660 image file",
 "Christoph Nelles <evilazrael@evilazrael.de>",
-"http://www.evilazrael.de/",
+"https://www.evilazrael.de/",
+0,  /* supportsSymlinks */
 },
-ISO9660_openArchive,        /* openArchive() method    */
+ISO9660_openArchive,
-ISO9660_enumerateFiles,     /* enumerateFiles() method */
+ISO9660_enumerateFiles,
-ISO9660_openRead,           /* openRead() method       */
+ISO9660_openRead,
-ISO9660_openWrite,          /* openWrite() method      */
+ISO9660_openWrite,
-ISO9660_openAppend,         /* openAppend() method     */
+ISO9660_openAppend,
-ISO9660_remove,             /* remove() method         */
+ISO9660_remove,
-ISO9660_mkdir,              /* mkdir() method          */
+ISO9660_mkdir,
-ISO9660_closeArchive,       /* closeArchive() method   */
+ISO9660_stat,
-ISO9660_stat                /* stat() method           */
+ISO9660_closeArchive
 };
 #endif  /* defined PHYSFS_SUPPORTS_ISO9660 */
 /* end of archiver_iso9660.c ... */

changeset 12213	bb5522e88ab2
parent 8524	a65e9bcf0a03