summaryrefslogtreecommitdiffstats
path: root/bin/cp
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2006-08-25 09:58:13 +0000
committerru <ru@FreeBSD.org>2006-08-25 09:58:13 +0000
commita48b0e122846af20fc8b1f7558b4ccce5432be00 (patch)
treed256eee39ef821aa17b8f4743cfac5bc0e191502 /bin/cp
parent1f50dbf4f2fd5b41f4cf3a7a641f62be83d6ee1b (diff)
downloadFreeBSD-src-a48b0e122846af20fc8b1f7558b4ccce5432be00.zip
FreeBSD-src-a48b0e122846af20fc8b1f7558b4ccce5432be00.tar.gz
- Fix options order.
- Touch manpage's document date.
Diffstat (limited to 'bin/cp')
-rw-r--r--bin/cp/cp.110
-rw-r--r--bin/cp/utils.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index 3730423..76d7859 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 February 23, 2005
+.Dd August 24, 2006
.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 plv
+.Op Fl lpv
.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 plv
+.Op Fl lpv
.Ar source_file ... target_directory
.Sh DESCRIPTION
In the first synopsis form, the
@@ -116,8 +116,6 @@ If you need to preserve hard links, consider using
or
.Xr pax 1
instead.
-.It Fl l
-Create hard links to regular files in a hierarchy instead of copying.
.It Fl f
For each existing destination pathname, remove it and
create a new file, without prompting for confirmation
@@ -146,6 +144,8 @@ option overrides any previous
or
.Fl n
options.)
+.It Fl l
+Create hard links to regular files in a hierarchy instead of copying.
.It Fl n
Do not overwrite an existing file.
(The
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index e4c11fe..d9e40b2 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -426,8 +426,8 @@ usage(void)
{
(void)fprintf(stderr, "%s\n%s\n",
-"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-plv] source_file target_file",
-" cp [-R [-H | -L | -P]] [-f | -i | -n] [-plv] source_file ... "
+"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file",
+" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... "
"target_directory");
exit(EX_USAGE);
}
OpenPOWER on IntegriCloud