Preserve unix mode and fix symlinks

Author: TimBeyer

lib/archivers/zip/constants.js

@@ -68,4 +68,4 @@ module.exports = {
   S_DOS_S: 4,  // 04 System
   S_DOS_H: 2,  // 02 Hidden
   S_DOS_R: 1   // 01 Read Only
-};
+};

lib/archivers/zip/zip-archive-entry.js

@@ -110,7 +110,7 @@ ZipArchiveEntry.prototype.getTimeDos = function() {
 };
 
 ZipArchiveEntry.prototype.getUnixMode = function() {
-  return this.platform !== constants.PLATFORM_UNIX ? 0 : ((this.getExternalAttributes() >> constants.SHORT_SHIFT) & constants.SHORT_MASK) & constants.MODE_MASK;
+  return this.platform !== constants.PLATFORM_UNIX ? 0 : ((this.getExternalAttributes() >> constants.SHORT_SHIFT) & constants.SHORT_MASK);
 };
 
 ZipArchiveEntry.prototype.getVersionNeededToExtract = function() {
@@ -200,7 +200,6 @@ ZipArchiveEntry.prototype.setTime = function(time, forceLocalTime) {
 };
 
 ZipArchiveEntry.prototype.setUnixMode = function(mode) {
-  mode &= ~constants.S_IFMT;
   mode |= this.isDirectory() ? constants.S_IFDIR : constants.S_IFREG;
 
   var extattr = 0;
@@ -220,9 +219,9 @@ ZipArchiveEntry.prototype.isDirectory = function() {
 };
 
 ZipArchiveEntry.prototype.isUnixSymlink = function() {
-  return (this.getUnixMode() & constants.S_IFLINK) === constants.S_IFLINK;
+  return (this.getUnixMode() & constants.S_IFMT) === constants.S_IFLNK;
 };
 
 ZipArchiveEntry.prototype.isZip64 = function() {
   return this.csize > constants.ZIP64_MAGIC || this.size > constants.ZIP64_MAGIC;
-};
+};

test/zip-archive-entry.js

@@ -131,7 +131,7 @@ describe('ZipArchiveEntry', function() {
       entry.mode = 0777;
       entry.exattr = 2180972576;
       entry.platform = 3;
-      assert.equal(entry.getUnixMode(), 0777);
+      assert.equal(entry.getUnixMode(), 0100777);
     });
 
     it('should set proper external attributes for an unix directory', function () {
@@ -269,6 +269,15 @@ describe('ZipArchiveEntry', function() {
       entry.setUnixMode(0777);
       assert.propertyVal(entry, 'exattr', 2180972576);
       assert.propertyVal(entry, 'mode', 0777);
+      assert.equal(entry.getUnixMode(), 0100777);
+
+    });
+
+    it('should also preserve filetype information', function() {
+      entry.setUnixMode(0120755);
+      assert.propertyVal(entry, 'exattr', 2716663840);
+      assert.propertyVal(entry, 'mode', 0755);
+      assert.equal(entry.getUnixMode(), 0120755);
     });
   });
 
@@ -286,4 +295,4 @@ describe('ZipArchiveEntry', function() {
       assert.ok(entry.isDirectory());
     });
   });
-});
+});