rimraf 2.1.0 → 2.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rimraf",
-  "version": "2.1.0",
+  "version": "2.1.4",
   "main": "rimraf.js",
   "description": "A deep deletion module for node (like `rm -rf`)",
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
@@ -9,7 +9,7 @@
     "url": "https://github.com/isaacs/rimraf/raw/master/LICENSE"
   },
   "optionalDependencies": {
-    "graceful-fs": "~1.1"
+    "graceful-fs": "~1"
   },
   "repository": "git://github.com/isaacs/rimraf.git",
   "scripts": {

package/rimraf.js

@@ -48,7 +48,7 @@ function rimraf (p, cb) {
 }
 
 // Two possible strategies.
-// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM
+// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
 // 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
 //
 // Both result in an extra syscall when you guess wrong.  However, there
@@ -62,13 +62,27 @@ function rimraf_ (p, cb) {
   fs.unlink(p, function (er) {
     if (er && er.code === "ENOENT")
       return cb()
-    if (er && er.code === "EPERM")
-      return rmdir(p, cb)
+    if (er && (er.code === "EPERM" || er.code === "EISDIR"))
+      return rmdir(p, er, cb)
     return cb(er)
   })
 }
 
-function rmdir (p, cb) {
+function rmdir (p, originalEr, cb) {
+  // try to rmdir first, and only readdir on ENOTEMPTY or EEXIST (SunOS)
+  // if we guessed wrong, and it's not a directory, then
+  // raise the original error.
+  fs.rmdir(p, function (er) {
+    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST"))
+      rmkids(p, cb)
+    else if (er && er.code === "ENOTDIR")
+      cb(originalEr)
+    else
+      cb(er)
+  })
+}
+
+function rmkids(p, cb) {
   fs.readdir(p, function (er, files) {
     if (er)
       return cb(er)
@@ -98,11 +112,21 @@ function rimrafSync (p) {
   } catch (er) {
     if (er.code === "ENOENT")
       return
-    if (er.code !== "EPERM")
+    if (er.code !== "EPERM" && er.code !== "EISDIR")
       throw er
-    fs.readdirSync(p).forEach(function (f) {
-      rimrafSync(path.join(p, f))
-    })
-    fs.rmdirSync(p)
+    try {
+      fs.rmdirSync(p)
+    } catch (er2) {
+      if (er2.code === "ENOENT")
+        return
+      if (er2.code === "ENOTDIR")
+        throw er
+      if (er2.code === "ENOTEMPTY") {
+        fs.readdirSync(p).forEach(function (f) {
+          rimrafSync(path.join(p, f))
+        })
+        fs.rmdirSync(p)
+      }
+    }
   }
 }