Properly handle rm -r on links to dirs with a trailing slash

freitagbr · freitagbr · commit 80002560b3fb · 2021-03-09T18:56:08.000-08:00
diff --git a/src/rm.js b/src/rm.js
@@ -44,7 +44,12 @@ function rmdirSyncRecursive(dir, force, fromSymlink) {
 
   // if was directory was referenced through a symbolic link,
   // the contents should be removed, but not the directory itself
-  if (fromSymlink) return;
+  if (fromSymlink) {
+    if (!force) {
+      common.error("cannot remove '" + dir + "': Not a directory");
+    }
+    return;
+  }
 
   // Now that we know everything in the sub-tree has been deleted, we can delete the main directory.
   // Huzzah for the shopkeep.
diff --git a/test/rm.js b/test/rm.js
@@ -305,6 +305,7 @@ test('rm -r, symlink to a dir, trailing slash', t => {
     const result = shell.rm('-r', `${t.context.tmp}/rm/link_to_a_dir/`);
     t.truthy(shell.error());
     t.is(result.code, 1);
+    t.is(result.stderr, `rm: cannot remove '${t.context.tmp}/rm/link_to_a_dir/': Not a directory`);
     // Both the link and original dir should remain, but contents are deleted
     t.truthy(fs.existsSync(`${t.context.tmp}/rm/link_to_a_dir`));
     t.truthy(fs.existsSync(`${t.context.tmp}/rm/a_dir`));
