Index: rmdir.1 =================================================================== RCS file: /cvsroot/src/bin/rmdir/rmdir.1,v retrieving revision 1.17 diff -u -p -r1.17 rmdir.1 --- rmdir.1 3 Jul 2017 21:33:23 -0000 1.17 +++ rmdir.1 12 May 2025 06:11:15 -0000 @@ -32,7 +32,7 @@ .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 .\" -.Dd August 12, 2016 +.Dd May 12, 2025 .Dt RMDIR 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd remove directories .Sh SYNOPSIS .Nm -.Op Fl p +.Op Fl pv .Ar directory ... .Sh DESCRIPTION The rmdir utility removes the directory entry specified by @@ -56,7 +56,7 @@ is empty when .Nm tries to remove it. .Pp -The following option is available: +The following options are available: .Bl -tag -width Ds .It Fl p Each @@ -67,6 +67,10 @@ starting with the last most component. (See .Xr rm 1 for fully non-discriminant recursive removal.) +.It Fl v +Cause +.Nm +to be verbose, showing directories as they are processed. .El .Sh EXIT STATUS The Index: rmdir.c =================================================================== RCS file: /cvsroot/src/bin/rmdir/rmdir.c,v retrieving revision 1.27 diff -u -p -r1.27 rmdir.c --- rmdir.c 10 Aug 2017 22:52:13 -0000 1.27 +++ rmdir.c 12 May 2025 06:11:15 -0000 @@ -52,6 +52,8 @@ __RCSID("$NetBSD: rmdir.c,v 1.27 2017/08 #include #include +static int vflag; + static int rm_path(char *); __dead static void usage(void); @@ -64,11 +66,14 @@ main(int argc, char *argv[]) (void)setlocale(LC_ALL, ""); pflag = 0; - while ((ch = getopt(argc, argv, "p")) != -1) + while ((ch = getopt(argc, argv, "pv")) != -1) switch(ch) { case 'p': pflag = 1; break; + case 'v': + vflag = 1; + break; case '?': default: usage(); @@ -84,8 +89,12 @@ main(int argc, char *argv[]) if (rmdir(*argv) < 0) { warn("%s", *argv); errors = 1; - } else if (pflag) - errors |= rm_path(*argv); + } else { + if (vflag) + (void)printf("%s\n", *argv); + if (pflag) + errors |= rm_path(*argv); + } } exit(errors); @@ -110,7 +119,8 @@ rm_path(char *path) if (rmdir(path) < 0) { warn("%s", path); return (1); - } + } else if (vflag) + (void)printf("%s\n", path); } return (0); @@ -119,7 +129,7 @@ rm_path(char *path) static void usage(void) { - (void)fprintf(stderr, "usage: %s [-p] directory ...\n", getprogname()); + (void)fprintf(stderr, "usage: %s [-pv] directory ...\n", getprogname()); exit(1); /* NOTREACHED */ }