Use basename() where appropriate.

1 files changed, 9 insertions, 4 deletions

diff --git a/toys/posix/rmdir.c b/toys/posix/rmdir.c
index 289b0156..fec3ce98 100644
--- a/toys/posix/rmdir.c
+++ b/toys/posix/rmdir.c
@@ -20,16 +20,21 @@ config RMDIR
 
 static void do_rmdir(char *name)
 {
-  for (;;) {
-    char *temp;
+  char *temp;
 
+  for (;;) {
     if (rmdir(name)) {
       perror_msg("%s",name);
       return;
     }
+
+    // Each -p cycle back up one slash, ignoring trailing and repeated /.
+
     if (!toys.optflags) return;
-    if (!(temp=strrchr(name,'/'))) return;
-    *temp=0;
+    do {
+      if (!(temp = strrchr(name, '/'))) return;
+      *temp = 0;
+    } while (!temp[1]);
   }
 }