From 6c3ba4c4c7771a91f179ee8b7d604e82ce60a8a4 Mon Sep 17 00:00:00 2001
From: FRIGN <dev@frign.de>
Date: Mon, 2 Mar 2015 15:39:39 +0100
Subject: [PATCH] Audit rmdir(1)

1) style fix (don't arrange local variables)
2) BUGFIX: Previously, if ret was turned 1 for some folder, it
   would disable the p-flag for every following folders, which
   is not desired.
   Instead, the "else if" makes sure that the p-flag-section is
   only entered when the initial rmdir succeeds.
3) BUGFIX: Previously, the program would cancel with eprintf if
   it failed to remove one folder in the parent-pathname.
   This is not desired, as we have other folders pending.
   Instead, print a warning for the current failing parent-folder,
   set ret to 1 and break off the loop at this point.
   This allows to finish the other pending folders without issues.
---
 README  |  2 +-
 rmdir.c | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/README b/README
index ce1e072..266dee3 100644
--- a/README
+++ b/README
@@ -57,7 +57,7 @@ The following tools are implemented ('*' == finished, '#' == UTF-8 support,
 =   readlink        non-posix                    none
 =*  renice          yes                          none
 =*| rm              yes                          none (-i)
-=*  rmdir           yes                          none
+=*| rmdir           yes                          none
 #   sed
     seq             non-posix                    none
 =*| setsid          non-posix                    none
diff --git a/rmdir.c b/rmdir.c
index e5ad2b9..e0936ae 100644
--- a/rmdir.c
+++ b/rmdir.c
@@ -14,7 +14,7 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-	int   pflag = 0, ret = 0;
+	int pflag = 0, ret = 0;
 	char *d;
 
 	ARGBEGIN {
@@ -25,22 +25,25 @@ main(int argc, char *argv[])
 		usage();
 	} ARGEND;
 
-	if (argc < 1)
+	if (!argc)
 		usage();
 
-	for (; argc > 0; argc--, argv++) {
-		if (rmdir(argv[0]) < 0) {
-			weprintf("rmdir %s:", argv[0]);
+	for (; *argv; argc--, argv++) {
+		if (rmdir(*argv) < 0) {
+			weprintf("rmdir %s:", *argv);
 			ret = 1;
-		}
-		if (pflag && !ret) {
-			d = dirname(argv[0]);
+		} else if (pflag) {
+			d = dirname(*argv);
 			for (; strcmp(d, "/") && strcmp(d, ".") ;) {
-				if (rmdir(d) < 0)
-					eprintf("rmdir %s:", d);
+				if (rmdir(d) < 0) {
+					weprintf("rmdir %s:", d);
+					ret = 1;
+					break;
+				}
 				d = dirname(d);
 			}
 		}
 	}
+
 	return ret;
 }