Merge pull request #2 from yves-del-medico/permissions

Added retries on fs.chmod to avoid errors while restoring permissions.

Author: yves-del-medico

lib/parse.js

@@ -243,6 +243,20 @@ Parse.prototype._readCentralDirectoryFileHeader = function () {
       }
       fileName = fileName.toString('utf8');
 
+      var processNextData = function() {
+        self._untilStream.pull(vars.extraFieldLength, function (err, extraField) {
+          if (err) {
+            return self.emit('error', err);
+          }
+          self._untilStream.pull(vars.fileCommentLength, function (err, fileComment) {
+            if (err) {
+              return self.emit('error', err);
+            }
+            return self._readRecord();
+          });
+        });
+      };
+
       /*
         Apply the permissions from the "externalFileAttributes" only if the
         zip file was made on UNIX and we are extracting a file onto an
@@ -257,27 +271,31 @@ Parse.prototype._readCentralDirectoryFileHeader = function () {
           if (self._opts.verbose) {
             console.log('Applying mode: 0' + mode.toString(8) + " to file " + fname);
           }
-          fs.chmod(fname, mode, function(err) {
-            if (err) {
-              // This appear when the file is not yet fully written to disk
-              // while starting to process central directory entries
-              console.log('Unable to apply mode: 0' + mode.toString(8) + " to file " + fname);
+          var retryNeeded = 10;
+          var performChmodThenProcessData = function() {
+            try {
+              if ((retryNeeded !== 10) && (self._opts.verbose)) {
+                console.log(retryNeeded + ' - Applying mode: 0' + mode.toString(8) + " to file " + fname);
+              }
+              fs.chmodSync(fname, mode);
+              processNextData();
+            } catch(error) {
+              if (retryNeeded-- > 0) {
+                setTimeout(performChmodThenProcessData, 100);
+              } else {
+                console.log('Unable to apply mode: 0' + mode.toString(8) + " to file " + fname);
+                processNextData();
+              }
             }
-          });
-        }
-      }
+          };
 
-      self._untilStream.pull(vars.extraFieldLength, function (err, extraField) {
-        if (err) {
-          return self.emit('error', err);
+          performChmodThenProcessData();
+        } else {
+          processNextData();
         }
-        self._untilStream.pull(vars.fileCommentLength, function (err, fileComment) {
-          if (err) {
-            return self.emit('error', err);
-          }
-          return self._readRecord();
-        });
-      });
+      } else {
+        processNextData();
+      }
     });
   });
 };