summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorgavin <gavin@FreeBSD.org>2010-01-17 09:37:31 +0000
committergavin <gavin@FreeBSD.org>2010-01-17 09:37:31 +0000
commitb89a432ee1889ec29b188c301b5171234c9247bc (patch)
tree73f412a60e3f3b398602ff339d9c2ead04632a9c /bin
parenta59ae58903333ab970f619900c812a3159a80a37 (diff)
downloadFreeBSD-src-b89a432ee1889ec29b188c301b5171234c9247bc.zip
FreeBSD-src-b89a432ee1889ec29b188c301b5171234c9247bc.tar.gz
Implement an "-x" option to cp(1), for compatibility with Linux and
feature parity with du(1) and similar: When set, cp(1) will not traverse mount points. Initial patch by: Graham J Lee leeg teaching.physics.ox.ac.uk PR: bin/88056 Initial patch by: Graham J Lee leeg teaching.physics.ox.ac.uk Approved by: ed (mentor) MFC after: 1 month
Diffstat (limited to 'bin')
-rw-r--r--bin/cp/cp.18
-rw-r--r--bin/cp/cp.c7
-rw-r--r--bin/cp/utils.c4
3 files changed, 12 insertions, 7 deletions
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 7329b64..fc5a9f7 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -32,7 +32,7 @@
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd October 27, 2006
+.Dd January 17, 2010
.Dt CP 1
.Os
.Sh NAME
@@ -45,7 +45,7 @@
.Op Fl H | Fl L | Fl P
.Oc
.Op Fl f | i | n
-.Op Fl alpv
+.Op Fl alpvx
.Ar source_file target_file
.Nm
.Oo
@@ -53,7 +53,7 @@
.Op Fl H | Fl L | Fl P
.Oc
.Op Fl f | i | n
-.Op Fl alpv
+.Op Fl alpvx
.Ar source_file ... target_directory
.Sh DESCRIPTION
In the first synopsis form, the
@@ -183,6 +183,8 @@ permissions.
Cause
.Nm
to be verbose, showing files as they are copied.
+.It Fl x
+File system mount points are not traversed.
.El
.Pp
For each destination file that already exists, its contents are
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index feba50f..0ae57eb 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -101,8 +101,9 @@ main(int argc, char *argv[])
int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash;
char *target;
+ fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
Hflag = Lflag = Pflag = 0;
- while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1)
+ while ((ch = getopt(argc, argv, "HLPRafilnprvx")) != -1)
switch (ch) {
case 'H':
Hflag = 1;
@@ -150,6 +151,9 @@ main(int argc, char *argv[])
case 'v':
vflag = 1;
break;
+ case 'x':
+ fts_options |= FTS_XDEV;
+ break;
default:
usage();
break;
@@ -160,7 +164,6 @@ main(int argc, char *argv[])
if (argc < 2)
usage();
- fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
if (Rflag && rflag)
errx(1, "the -R and -r options may not be specified together");
if (rflag)
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 63eba42..b075eac 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -518,8 +518,8 @@ usage(void)
{
(void)fprintf(stderr, "%s\n%s\n",
-"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file",
-" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... "
+"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file target_file",
+" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file ... "
"target_directory");
exit(EX_USAGE);
}
OpenPOWER on IntegriCloud