d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a -v (verbose) option.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 2004-03-21 04:56:06 +00:00
parent efc4d24dd6
commit 1afaec9ae4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=127257
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/rmdir/rmdir.1
View File

@ -35,7 +35,7 @@
.\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93
.\" $FreeBSD$
.\"
.Dd May 31, 1993
.Dd March 21, 2004
.Dt RMDIR 1
.Os
.Sh NAME
@ -43,7 +43,7 @@
.Nd remove directories
.Sh SYNOPSIS
.Nm
.Op Fl p
.Op Fl pv
.Ar directory ...
.Sh DESCRIPTION
The
@ -72,6 +72,8 @@ starting with the last most component.
(See
.Xr rm 1
for fully non-discriminant recursive removal.)
.It Fl v
Be verbose, listing each directory as it is removed.
.El
.Pp
The

33
bin/rmdir/rmdir.c
View File

@ -52,21 +52,25 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
int rm_path(char *);
void usage(void);
static int rm_path(char *);
static void usage(void);
static int pflag;
static int vflag;
int
main(int argc, char *argv[])
{
int ch, errors;
int pflag;
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();
@ -78,17 +82,22 @@ main(int argc, char *argv[])
usage();
for (errors = 0; *argv; argv++) {
if (rmdir(*argv) < 0) {
warn("%s", *argv);
errors = 1;
} else if (pflag)
if (pflag) {
errors |= rm_path(*argv);
} else {
if (rmdir(*argv) < 0) {
warn("%s", *argv);
errors = 1;
}
if (vflag)
printf("%s\n", *argv);
}
}
exit(errors);
}
int
static int
rm_path(char *path)
{
char *p;
@ -107,12 +116,14 @@ rm_path(char *path)
warn("%s", path);
return (1);
}
if (vflag)
printf("%s\n", path);
}
return (0);
}
void
static void
usage(void)
{