Page MenuHomeFreeBSD
Files F102199547

D30012.diff
No OneTemporary
Actions

D30012.diff
View Options

diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -32,7 +32,7 @@
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd June 6, 2015
+.Dd February 23, 2022
.Dt CP 1
.Os
.Sh NAME
@@ -55,6 +55,14 @@
.Op Fl f | i | n
.Op Fl alpsvx
.Ar source_file ... target_directory
+.Nm
+.Op Fl f | i | n
+.Op Fl alPpsvx
+.Ar source_file target_file
+.Nm
+.Op Fl f | i | n
+.Op Fl alPpsvx
+.Ar source_file ... target_directory
.Sh DESCRIPTION
In the first synopsis form, the
.Nm
@@ -84,10 +92,10 @@
.Fl R
option is specified, all symbolic links are followed.
.It Fl P
-If the
+No symbolic links are followed.
+This is the default if the
.Fl R
-option is specified, no symbolic links are followed.
-This is the default.
+option is specified.
.It Fl R
If
.Ar source_file
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -100,21 +100,23 @@
{
struct stat to_stat, tmp_stat;
enum op type;
- int ch, fts_options, r, have_trailing_slash;
+ int Pflag, ch, fts_options, r, have_trailing_slash;
char *target;
fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
+ Pflag = 0;
while ((ch = getopt(argc, argv, "HLPRafilnprsvx")) != -1)
switch (ch) {
case 'H':
Hflag = 1;
- Lflag = 0;
+ Lflag = Pflag = 0;
break;
case 'L':
Lflag = 1;
- Hflag = 0;
+ Hflag = Pflag = 0;
break;
case 'P':
+ Pflag = 1;
Hflag = Lflag = 0;
break;
case 'R':
@@ -123,6 +125,7 @@
case 'a':
pflag = 1;
Rflag = 1;
+ Pflag = 1;
Hflag = Lflag = 0;
break;
case 'f':
@@ -145,7 +148,7 @@
break;
case 'r':
rflag = Lflag = 1;
- Hflag = 0;
+ Hflag = Pflag = 0;
break;
case 's':
sflag = 1;
@@ -179,7 +182,7 @@
fts_options &= ~FTS_PHYSICAL;
fts_options |= FTS_LOGICAL;
}
- } else {
+ } else if (!Pflag) {
fts_options &= ~FTS_PHYSICAL;
fts_options |= FTS_LOGICAL | FTS_COMFOLLOW;
}
diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh
--- a/bin/cp/tests/cp_test.sh
+++ b/bin/cp/tests/cp_test.sh
@@ -190,6 +190,16 @@
'(' ! -L foo-mirror/foo/baz ')'
}
+atf_test_case standalone_Pflag
+standalone_Pflag_body()
+{
+ echo "foo" > bar
+ ln -s bar foo
+
+ atf_check cp -P foo baz
+ atf_check -o inline:'Symbolic Link\n' stat -f %SHT baz
+}
+
atf_init_test_cases()
{
atf_add_test_case basic
@@ -202,4 +212,5 @@
atf_add_test_case recursive_link_dflt
atf_add_test_case recursive_link_Hflag
atf_add_test_case recursive_link_Lflag
+ atf_add_test_case standalone_Pflag
}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 9, 8:57 PM (18 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14565675
Default Alt Text
D30012.diff (2 KB)

Event Timeline