diff options
| author | eadler <eadler@FreeBSD.org> | 2013-04-26 17:45:37 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2013-04-26 17:45:37 +0000 |
| commit | d2cd9ce7faccebf8c0de57a4ea21de56d831d1fb (patch) | |
| tree | 0d3fef2f82c013299e606fdef340357ec54864d8 /bin/rm | |
| parent | 594af1b98e64c7663ed2257c2f832383914eac96 (diff) | |
| download | FreeBSD-src-d2cd9ce7faccebf8c0de57a4ea21de56d831d1fb.zip FreeBSD-src-d2cd9ce7faccebf8c0de57a4ea21de56d831d1fb.tar.gz | |
Add -x option to avoid crossing mount points when removing a hierarchy.
Discussed on: -hackers
Inspired by: DragonflyBSD
MFC After: 1 week
Diffstat (limited to 'bin/rm')
| -rw-r--r-- | bin/rm/rm.1 | 6 | ||||
| -rw-r--r-- | bin/rm/rm.c | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1 index 3588f38..824b627 100644 --- a/bin/rm/rm.1 +++ b/bin/rm/rm.1 @@ -32,7 +32,7 @@ .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 .\" $FreeBSD$ .\" -.Dd March 15, 2013 +.Dd April 25, 2013 .Dt RM 1 .Os .Sh NAME @@ -42,7 +42,7 @@ .Sh SYNOPSIS .Nm .Op Fl f | i -.Op Fl dIPRrvW +.Op Fl dIPRrvWx .Ar .Nm unlink .Ar file @@ -132,6 +132,8 @@ Attempt to undelete the named files. Currently, this option can only be used to recover files covered by whiteouts in a union file system (see .Xr undelete 2 ) . +.It Fl x +When removing a hierarchy, do not cross mount points. .El .Pp The diff --git a/bin/rm/rm.c b/bin/rm/rm.c index a450057..1014921 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include <unistd.h> static int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; -static int rflag, Iflag; +static int rflag, Iflag, xflag; static uid_t uid; static volatile sig_atomic_t info; @@ -106,8 +106,8 @@ main(int argc, char *argv[]) exit(eval); } - Pflag = rflag = 0; - while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1) + Pflag = rflag = xflag = 0; + while ((ch = getopt(argc, argv, "dfiIPRrvWx")) != -1) switch(ch) { case 'd': dflag = 1; @@ -136,6 +136,9 @@ main(int argc, char *argv[]) case 'W': Wflag = 1; break; + case 'x': + xflag = 1; + break; default: usage(); } @@ -196,6 +199,8 @@ rm_tree(char **argv) flags |= FTS_NOSTAT; if (Wflag) flags |= FTS_WHITEOUT; + if (xflag) + flags |= FTS_XDEV; if (!(fts = fts_open(argv, flags, NULL))) { if (fflag && errno == ENOENT) return; @@ -624,7 +629,7 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n", - "usage: rm [-f | -i] [-dIPRrvW] file ...", + "usage: rm [-f | -i] [-dIPRrvWx] file ...", " unlink file"); exit(EX_USAGE); } |
