fix: Set correct unix file type in external attributes

Author: obayer

lib/archivers/zip/constants.js

@@ -52,6 +52,7 @@ module.exports = {
   EXT_FILE_ATTR_FILE: 020151000040, // 644 -rw-r--r-- = (((S_IFREG | 0644) << 16) | S_DOS_A) >>> 0
 
   // Unix file types
+  S_IFMT: 0170000, /* type of file mask */  
   S_IFIFO: 010000, // named pipe (fifo)
   S_IFCHR: 020000, // character special
   S_IFDIR: 040000, // directory

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

@@ -199,14 +199,10 @@ ZipArchiveEntry.prototype.setTime = function(time) {
 };
 
 ZipArchiveEntry.prototype.setUnixMode = function(mode) {
-  mode &= ~constants.S_IFDIR;
-  var extattr = 0;
-
-  if (!this.isDirectory()) {
-    mode |= constants.S_IFREG;
-  }
+  mode &= ~constants.S_IFMT;
+  mode |= this.isDirectory() ? constants.S_IFDIR : constants.S_IFREG;
 
-  extattr &= ~this.getExternalAttributes();
+  var extattr = 0;
   extattr |= (mode << constants.SHORT_SHIFT) | (this.isDirectory() ? constants.S_DOS_D : constants.S_DOS_A);
 
   this.setExternalAttributes(extattr);

test/zip-archive-entry.js

@@ -132,6 +132,17 @@ describe('ZipArchiveEntry', function() {
       entry.platform = 3;
       assert.equal(entry.getUnixMode(), 0777);
     });
+
+    it('should set proper external attributes for an unix directory', function () {
+      entry = new ZipArchiveEntry('directory/');
+      entry.setUnixMode(0777);
+
+      assert.ok(entry.getPlatform(), 3);
+      assert.ok(entry.isDirectory());
+
+      var exattr = entry.getExternalAttributes() >> 16;
+      assert.equal(exattr & 040000, 040000);
+    });
   });
 
   describe('#getVersionNeededToExtract', function() {
@@ -263,5 +274,4 @@ describe('ZipArchiveEntry', function() {
       assert.ok(entry.isDirectory());
     });
   });
-
 });