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

Fixed symlink detection.

This commit is contained in:
Ryan C. Gordon 2002-07-15 13:20:34 +00:00
parent 68179ad30d
commit 2fab3d9da4
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
archivers/zip.c
View File

@ -94,6 +94,10 @@ typedef struct
/* ...and others... */ /* ...and others... */
#define UNIX_FILETYPE_MASK 0170000
#define UNIX_FILETYPE_SYMLINK 0120000
#define MAXZIPENTRYSIZE 256 /* !!! FIXME: get rid of this. */ #define MAXZIPENTRYSIZE 256 /* !!! FIXME: get rid of this. */
@ -617,15 +621,25 @@ static int version_does_symlinks(PHYSFS_uint32 version)
int retval = 0; int retval = 0;
PHYSFS_uint8 hosttype = (PHYSFS_uint8) ((version >> 8) & 0xFF); PHYSFS_uint8 hosttype = (PHYSFS_uint8) ((version >> 8) & 0xFF);
/*
* These are the platforms that can build an archive with symlinks,
* according to the Info-ZIP project.
*/
switch (hosttype) switch (hosttype)
{ {
case 3: /* Unix */ /*
case 16: /* BeOS */ * These are the platforms that can NOT build an archive with
case 5: /* Atari */ * symlinks, according to the Info-ZIP project.
*/
case 0: /* FS_FAT_ */
case 1: /* AMIGA_ */
case 2: /* VMS_ */
case 4: /* VM_CSM_ */
case 6: /* FS_HPFS_ */
case 11: /* FS_NTFS_ */
case 14: /* FS_VFAT_ */
case 13: /* ACORN_ */
case 15: /* MVS_ */
case 18: /* THEOS_ */
break; /* do nothing. */
default: /* assume the rest to be unix-like. */
retval = 1; retval = 1;
break; break;
} /* switch */ } /* switch */
@ -636,15 +650,12 @@ static int version_does_symlinks(PHYSFS_uint32 version)
static int entry_is_symlink(ZIPentry *entry, PHYSFS_uint32 extern_attr) static int entry_is_symlink(ZIPentry *entry, PHYSFS_uint32 extern_attr)
{ {
PHYSFS_uint16 xattr = ((extern_attr >> 16) & 0xFFFF);
return ( return (
(version_does_symlinks(entry->version)) && (version_does_symlinks(entry->version)) &&
(entry->uncompressed_size > 0) && (entry->uncompressed_size > 0) &&
((xattr & UNIX_FILETYPE_MASK) == UNIX_FILETYPE_SYMLINK)
#if 0 /* !!! FIXME ... this check is incorrect for some files! */
(extern_attr & 0x0120000) /* symlink flag. */
#else
0 /* always fail for now. Symlinks will just be small files. */
#endif
); );
} /* entry_is_symlink */ } /* entry_is_symlink */