From d4af5f325030eae72bb7c6c54592e02b1b8f7af0 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Sat, 20 Nov 2004 00:12:08 +0000
Subject: [PATCH] Fixed "rmdir -p" that got broken by rev. 1.15. (This also
 fixes "rmdir -v /nonexistent".)

---
 bin/rmdir/rmdir.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 0317d07eae94..85dfde140b1e 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -78,15 +78,14 @@ main(int argc, char *argv[])
 		usage();
 
 	for (errors = 0; *argv; argv++) {
-		if (pflag) {
-			errors |= rm_path(*argv);
+		if (rmdir(*argv) < 0) {
+			warn("%s", *argv);
+			errors = 1;
 		} else {
-			if (rmdir(*argv) < 0) {
-				warn("%s", *argv);
-				errors = 1;
-			}
 			if (vflag)
 				printf("%s\n", *argv);
+			if (pflag)
+				errors |= rm_path(*argv);
 		}
 	}