summaryrefslogtreecommitdiff
path: root/usr.bin/paste/paste.c
diff options
context:
space:
mode:
authortls <tls@NetBSD.org>1997-01-09 14:39:10 +0000
committertls <tls@NetBSD.org>1997-01-09 14:39:10 +0000
commit5445d0188bcbd59fd2fdc0d5e8dc8963f6514b54 (patch)
tree3e9cf4b3352999aa6d422a30b72bd371784e3c94 /usr.bin/paste/paste.c
parent20d490585f8fb29ea642e969d84ca9933f1a732c (diff)
Sync to 4.4BSD-Lite2
Diffstat (limited to 'usr.bin/paste/paste.c')
-rw-r--r--usr.bin/paste/paste.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 014d9fb97dd..fc031765012 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,6 +1,8 @@
+/* $NetBSD: paste.c,v 1.3 1997/01/09 14:43:21 tls Exp $ */
+
/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Adam S. Moskowitz of Menlo Consulting.
@@ -35,14 +37,14 @@
*/
#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char 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[] = "from: @(#)paste.c 5.7 (Berkeley) 10/30/90";*/
-static char rcsid[] = "$Id: paste.c,v 1.2 1993/08/01 18:10:14 mycroft Exp $";
+/*static char sccsid[] = "from: @(#)paste.c 8.1 (Berkeley) 6/6/93";*/
+static char rcsid[] = "$NetBSD: paste.c,v 1.3 1997/01/09 14:43:21 tls Exp $";
#endif /* not lint */
#include <sys/types.h>