diff options
| author | steve <steve@FreeBSD.org> | 1996-12-14 05:51:58 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1996-12-14 05:51:58 +0000 |
| commit | 78e21244f4320b39d29f1831a9cbadcc24312997 (patch) | |
| tree | 447afd24de0cc1372c018635be4f5a093235e666 /bin/cat | |
| parent | 151124272c853e06368681c41bd6ace057d45df7 (diff) | |
| download | FreeBSD-src-78e21244f4320b39d29f1831a9cbadcc24312997.zip FreeBSD-src-78e21244f4320b39d29f1831a9cbadcc24312997.tar.gz | |
Merge Lite2 mods and -Wall cleaning.
Diffstat (limited to 'bin/cat')
| -rw-r--r-- | bin/cat/cat.1 | 15 | ||||
| -rw-r--r-- | bin/cat/cat.c | 6 |
2 files changed, 10 insertions, 11 deletions
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1 index b5f4696..8121c94 100644 --- a/bin/cat/cat.1 +++ b/bin/cat/cat.1 @@ -32,10 +32,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)cat.1 8.1 (Berkeley) 6/29/93 -.\" $Id: cat.1,v 1.2 1994/09/24 02:53:25 davidg Exp $ +.\" @(#)cat.1 8.3 (Berkeley) 5/2/95 +.\" $Id: cat.1,v 1.3 1996/08/22 16:54:12 wosch Exp $ .\" -.Dd June 29, 1993 +.Dd May 2, 1995 .Dt CAT 1 .Os BSD 3 .Sh NAME @@ -69,9 +69,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. @@ -79,7 +77,7 @@ single spaced. Implies the .Fl v option, and displays tab characters as -.Pq Ql ^I +.Ql ^I as well. .It Fl u The @@ -109,7 +107,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" diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 73d77ef..f69bdbb 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -33,17 +33,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cat.c,v 1.4 1996/09/28 21:19:27 imp Exp $ + * $Id: cat.c,v 1.5 1996/09/30 15:45:36 ache Exp $ */ #ifndef lint -static char copyright[] = +static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; +static char const sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #endif /* not lint */ #include <sys/param.h> |
