Sync with 4.4lite2
This commit is contained in:
jtc
parent
f269c3f49e
commit
5fc5415e25
@ -1,4 +1,4 @@
|
||||
.\" $NetBSD: cat.1,v 1.10 1995/07/25 19:36:36 jtc Exp $
|
||||
.\" $NetBSD: cat.1,v 1.11 1995/09/07 06:12:53 jtc Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1989, 1990, 1993
|
||||
.\" The Regents of the University of California. All rights reserved.
|
||||
@ -34,9 +34,9 @@
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" @(#)cat.1 8.1 (Berkeley) 6/29/93
|
||||
.\" @(#)cat.1 8.3 (Berkeley) 5/2/95
|
||||
.\"
|
||||
.Dd June 29, 1993
|
||||
.Dd May 2, 1995
|
||||
.Dt CAT 1
|
||||
.Os BSD 3
|
||||
.Sh NAME
|
||||
@ -70,9 +70,7 @@ option, and displays a dollar sign
|
||||
at the end of each line
|
||||
as well.
|
||||
.It Fl n
|
||||
Number the
|
||||
.Ar output
|
||||
lines, starting at 1.
|
||||
Number the output lines, starting at 1.
|
||||
.It Fl s
|
||||
Squeeze multiple adjacent empty lines, causing the output to be
|
||||
single spaced.
|
||||
@ -110,7 +108,8 @@ will cause the original data in file1 to be destroyed!
|
||||
.Xr head 1 ,
|
||||
.Xr more 1 ,
|
||||
.Xr pr 1 ,
|
||||
.Xr tail 1
|
||||
.Xr tail 1 ,
|
||||
.Xr vis 1
|
||||
.Rs
|
||||
.%A Rob Pike
|
||||
.%T "UNIX Style, or cat -v Considered Harmful"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cat.c,v 1.10 1995/03/21 09:02:02 cgd Exp $ */
|
||||
/* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
@ -44,9 +44,9 @@ static char copyright[] =
|
||||
|
||||
#ifndef lint
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)cat.c 8.1 (Berkeley) 7/19/93";
|
||||
static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: cat.c,v 1.10 1995/03/21 09:02:02 cgd Exp $";
|
||||
static char rcsid[] = "$NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cp.c,v 1.13 1995/04/02 01:45:25 mycroft Exp $ */
|
||||
/* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1993, 1994
|
||||
@ -44,9 +44,9 @@ static char copyright[] =
|
||||
|
||||
#ifndef lint
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94";
|
||||
static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: cp.c,v 1.13 1995/04/02 01:45:25 mycroft Exp $";
|
||||
static char rcsid[] = "$NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
@ -349,7 +349,7 @@ copy(argv, type, fts_options)
|
||||
}
|
||||
if (!S_ISDIR(curr->fts_statp->st_mode) &&
|
||||
S_ISDIR(to_stat.st_mode)) {
|
||||
warnx("cannot overwrite directory %s with non-directory %s.",
|
||||
warnx("cannot overwrite directory %s with non-directory %s",
|
||||
to.p_path, curr->fts_path);
|
||||
rval = 1;
|
||||
continue;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.\" $NetBSD: date.1,v 1.9 1995/07/25 19:36:49 jtc Exp $
|
||||
.\" $NetBSD: date.1,v 1.10 1995/09/07 06:21:04 jtc Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1980, 1990, 1993
|
||||
.\" The Regents of the University of California. All rights reserved.
|
||||
@ -34,9 +34,9 @@
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" @(#)date.1 8.2 (Berkeley) 11/17/93
|
||||
.\" @(#)date.1 8.3 (Berkeley) 4/28/95
|
||||
.\"
|
||||
.Dd November 17, 1993
|
||||
.Dd April 28, 1995
|
||||
.Dt DATE 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -106,6 +106,8 @@ The format string may contain any of the conversion specifications described
|
||||
in the
|
||||
.Xr strftime 3
|
||||
manual page, as well as any arbitrary text.
|
||||
A <newline> character is always output after the characters specified by
|
||||
the format string.
|
||||
The format string for the default display is:
|
||||
.Bd -literal -offset indent
|
||||
``%a %b %e %H:%M:%S %Z %Y''.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: date.c,v 1.10 1995/04/23 10:07:25 cgd Exp $ */
|
||||
/* $NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1985, 1987, 1988, 1993
|
||||
@ -41,9 +41,9 @@ static char copyright[] =
|
||||
|
||||
#ifndef lint
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)date.c 8.1 (Berkeley) 5/31/93";
|
||||
static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: date.c,v 1.10 1995/04/23 10:07:25 cgd Exp $";
|
||||
static char rcsid[] = "$NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: netdate.c,v 1.9 1995/06/03 22:24:45 mycroft Exp $ */
|
||||
/* $NetBSD: netdate.c,v 1.10 1995/09/07 06:21:06 jtc Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990, 1993
|
||||
@ -35,9 +35,9 @@
|
||||
|
||||
#ifndef lint
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)netdate.c 8.1 (Berkeley) 5/31/93";
|
||||
static char sccsid[] = "@(#)netdate.c 8.2 (Berkeley) 4/28/95";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: netdate.c,v 1.9 1995/06/03 22:24:45 mycroft Exp $";
|
||||
static char rcsid[] = "$NetBSD: netdate.c,v 1.10 1995/09/07 06:21:06 jtc Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user