Merge branch 'master' of https://github.com/soffes/ssziparchive

# By Adam Yanalunas (2) and Landon Fuller (1)
# Via Adam Yanalunas
* 'master' of https://github.com/soffes/ssziparchive:
  Updated podspec for v0.3.2
  Relative symlink fixture for new symlink detection in #91
  Replace symlink heuristic with a well-defined test.

SSZipArchive.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'SSZipArchive'
-  s.version      = '0.3.1'
+  s.version      = '0.3.2'
   s.summary      = 'Utility class for zipping and unzipping files on iOS and Mac.'
   s.description  = 'SSZipArchive is a simple utility class for zipping and unzipping files on iOS and Mac.'
   s.homepage     = 'https://github.com/soffes/ssziparchive'
@@ -11,4 +11,5 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.6'
   s.source_files = 'SSZipArchive/**/*',
   s.library = 'z'
+  s.requires_arc = true
 end

SSZipArchive/SSZipArchive.m

@@ -170,28 +170,22 @@
 			filename[fileInfo.size_filename] = '\0';
 
 	        //
-	        // NOTE
-	        // I used the ZIP spec from here:
-	        // http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+	        // Determine whether this is a symbolic link:
+	        // - File is stored with 'version made by' value of UNIX (3),
+	        //   as per http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+	        //   in the upper byte of the version field.
+	        // - BSD4.4 st_mode constants are stored in the high 16 bits of the
+	        //   external file attributes (defacto standard, verified against libarchive)
 	        //
-	        // ...to deduce this method of detecting whether the file in the ZIP is a symbolic link.
-	        // If it is, it is listed as a directory but has a data size greater than zero (real
-	        // directories have it equal to 0) and the included, uncompressed data is the symbolic link path.
+	        // The original constants can be found here:
+	        //    http://minnie.tuhs.org/cgi-bin/utree.pl?file=4.4BSD/usr/include/sys/stat.h
 	        //
-	        // ZIP files did not originally include support for symbolic links so the specification
-	        // doesn't include anything in them that isn't part of a unix extension that isn't being used
-	        // by the archivers we're testing. Most of this is figured out through trial and error and
-	        // reading ZIP headers in hex editors. This seems to do the trick though.
-	        //
-
-	        const uLong ZipCompressionMethodStore = 0;
+	        const uLong ZipUNIXVersion = 3;
+	        const uLong BSD_SFMT = 0170000;
+	        const uLong BSD_IFLNK = 0120000;
 
 	        BOOL fileIsSymbolicLink = NO;
-
-	        if((fileInfo.compression_method == ZipCompressionMethodStore) && // Is it compressed?
-	           (S_ISDIR(fileInfo.external_fa)) && // Is it marked as a directory
-	           (fileInfo.compressed_size > 0)) // Is there any data?
-	        {
+	        if (((fileInfo.version >> 8) == ZipUNIXVersion) && BSD_IFLNK == (BSD_SFMT & (fileInfo.external_fa >> 16))) {
 	            fileIsSymbolicLink = YES;
 	        }
 

Tests/SSZipArchiveTests.m

@@ -153,7 +153,7 @@
 
     // Determine where the symlinks are
     NSString *subfolderName = @"symlinks";
-    NSString *testBasePath = [NSString pathWithComponents:@[outputPath, resourceName]];
+    NSString *testBasePath = [NSString pathWithComponents:@[outputPath]];
     NSString *testSymlinkFolder = [NSString pathWithComponents:@[testBasePath, subfolderName, @"folderSymlink"]];
     NSString *testSymlinkFile = [NSString pathWithComponents:@[testBasePath, subfolderName, @"fileSymlink"]];