Added removeCallback passing

raszi · Jul 3, 2014 · 1bc5c91 · weaverryan · Jul 11, 2014 · petebacondarwin
1 parent a18d15d
commit 1bc5c91
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules/
+.idea/
diff --git a/lib/tmp.js b/lib/tmp.js
@@ -167,9 +167,21 @@ function _createTmpFile(options, callback) {
     fs.open(name, _c.O_CREAT | _c.O_EXCL | _c.O_RDWR, opts.mode || 0600, function _fileCreated(err, fd) {
       if (err) return cb(err);
 
-      if (!opts.keep) _removeObjects.unshift([ fs.unlinkSync, name ]);
+      var removed = false;
+      var removeCallback = function() {
+        if (removed) {
+          return;
+        }
+
+        fs.unlinkSync(name);
+        removed = true;
+      };
+
+      if (!opts.keep) {
+        _removeObjects.unshift(removeCallback);
+      }
 
-      cb(null, name, fd);
+      cb(null, name, fd, removeCallback);
     });
   });
 }
@@ -218,15 +230,25 @@ function _createTmpDir(options, callback) {
     fs.mkdir(name, opts.mode || 0700, function _dirCreated(err) {
       if (err) return cb(err);
 
-      if (!opts.keep) {
+      var removed = false;
+      var removeCallback = function() {
+        if (removed) {
+          return;
+        }
+
         if (opts.unsafeCleanup) {
-          _removeObjects.unshift([ _rmdirRecursiveSync, name ]);
+          _rmdirRecursiveSync(name);
         } else {
-          _removeObjects.unshift([ fs.rmdirSync, name ]);
+          fs.rmdirSync(name);
         }
+        removed = true;
+      };
+
+      if (!opts.keep) {
+        _removeObjects.unshift(removeCallback);
       }
 
-      cb(null, name);
+      cb(null, name, removeCallback);
     });
   });
 }
@@ -243,7 +265,7 @@ function _garbageCollector() {
 
   for (var i = 0, length = _removeObjects.length; i < length; i++) {
     try {
-      _removeObjects[i][0].call(null, _removeObjects[i][1]);
+      _removeObjects[i].call(null);
     } catch (e) {
       // already removed?
     }