Add callbacks to fs.close

This also fixes an issue that using fd = 0 is not closed in case Windows is used and a `EPERM` error is triggered.
paulmillr · Feb 24, 2018 · df88ff0 · df88ff0
1 parent a95a1f8
commit df88ff0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/lib/fsevents-handler.js b/lib/fsevents-handler.js
@@ -213,9 +213,15 @@ function(watchPath, realPath, transform, globFilter) {
     }
     function checkFd() {
       fs.open(path, 'r', function(error, fd) {
-        if (fd) fs.close(fd);
-        error && error.code !== 'EACCES' ?
-          handleEvent('unlink') : addOrChange();
+        if (error) {
+          error.code !== 'EACCES' ?
+            handleEvent('unlink') : addOrChange();
+        } else {
+          fs.close(fd, function(err) {
+            err && err.code !== 'EACCES' ?
+              handleEvent('unlink') : addOrChange();
+          });
+        }
       });
     }
     // correct for wrong events emitted

diff --git a/lib/nodefs-handler.js b/lib/nodefs-handler.js
@@ -90,8 +90,9 @@ function setFsWatchListener(path, fullPath, options, handlers) {
       // Workaround for https://github.com/joyent/node/issues/4337
       if (process.platform === 'win32' && error.code === 'EPERM') {
         fs.open(path, 'r', function(err, fd) {
-          if (fd) fs.close(fd);
-          if (!err) broadcastErr(error);
+          if (!err) fs.close(fd, function(err) {
+            if (!err) broadcastErr(error);
+          });
         });
       } else {
         broadcastErr(error);