diff options
author | charnier <charnier@FreeBSD.org> | 1998-05-06 06:51:42 +0000 |
---|---|---|
committer | charnier <charnier@FreeBSD.org> | 1998-05-06 06:51:42 +0000 |
commit | c4d26d7f835032c231da4c6219c73b2679691222 (patch) | |
tree | a83653b0a70dcb5e787512cfa4954591689bf876 /bin/cp | |
parent | 32338c8e0512ee1c5643fd65a793a21fabadfcfa (diff) | |
download | FreeBSD-src-c4d26d7f835032c231da4c6219c73b2679691222.zip FreeBSD-src-c4d26d7f835032c231da4c6219c73b2679691222.tar.gz |
Correct use of .Nm and other cosmetics. Add rcsid. Remove unused #inc.
Diffstat (limited to 'bin/cp')
-rw-r--r-- | bin/cp/cp.1 | 22 | ||||
-rw-r--r-- | bin/cp/cp.c | 12 | ||||
-rw-r--r-- | bin/cp/utils.c | 11 |
3 files changed, 21 insertions, 24 deletions
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1 index fb6079d..91bfcd7 100644 --- a/bin/cp/cp.1 +++ b/bin/cp/cp.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $Id$ +.\" $Id: cp.1,v 1.9 1997/02/22 14:01:32 peter Exp $ .\" .Dd April 18, 1994 .Dt CP 1 @@ -60,7 +60,7 @@ .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the -.Nm cp +.Nm utility copies the contents of the .Ar source_file to the @@ -72,7 +72,7 @@ is copied to the destination .Ar target_directory . The names of the files themselves are not changed. If -.Nm cp +.Nm detects an attempt to copy a file to itself, the copy will fail. .Pp The following options are available: @@ -94,11 +94,11 @@ option is specified, no symbolic links are followed. If .Ar source_file designates a directory, -.Nm cp +.Nm copies the directory and the entire subtree connected at that point. This option also causes symbolic links to be copied, rather than indirected through, and for -.Nm cp +.Nm to create special files rather than copying them as normal files. Created directories have the same mode as the corresponding source directory, unmodified by the process' umask. @@ -112,8 +112,8 @@ option overrides any previous .Fl i options.) .It Fl i -Causes -.Nm cp +Cause +.Nm to write a prompt to the standard error output before copying a file that would overwrite an existing file. If the response from the standard input begins with the character @@ -127,8 +127,8 @@ option overrides any previous .Fl f options.) .It Fl p -Causes -.Nm cp +Cause +.Nm to preserve in the copy as many of the modification time, access time, file flags, file mode, user ID, and group ID as allowed by permissions. .Pp @@ -200,7 +200,7 @@ command's actions are determined by the last one specified. exits 0 on success, >0 if an error occurred. .Sh COMPATIBILITY Historic versions of the -.Nm cp +.Nm utility had a .Fl r option. @@ -215,7 +215,7 @@ or fifo's. .Xr symlink 7 .Sh STANDARDS The -.Nm cp +.Nm command is expected to be .St -p1003.2 compatible. diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 6143c10..df60ffc 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -32,8 +32,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: cp.c,v 1.13 1997/02/22 14:01:33 peter Exp $ */ #ifndef lint @@ -43,7 +41,11 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint +#if 0 static char const sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; +#endif +static const char rcsid[] = + "$Id$"; #endif /* not lint */ /* @@ -63,16 +65,10 @@ static char const sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; #include <sys/param.h> #include <sys/stat.h> -#include <sys/mman.h> -#include <sys/time.h> -#include <dirent.h> #include <err.h> #include <errno.h> -#include <fcntl.h> #include <fts.h> -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include <unistd.h> diff --git a/bin/cp/utils.c b/bin/cp/utils.c index f3e55b7..a38329b 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -29,26 +29,27 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: utils.c,v 1.15 1998/01/16 07:37:05 bde Exp $ */ #ifndef lint +#if 0 static char const sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94"; +#endif +static const char rcsid[] = + "$Id$"; #endif /* not lint */ #include <sys/param.h> #include <sys/stat.h> +#ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED #include <sys/mman.h> -#include <sys/time.h> +#endif #include <err.h> #include <errno.h> #include <fcntl.h> #include <fts.h> #include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <unistd.h> #include "extern.h" |