summaryrefslogtreecommitdiff
path: root/usr.bin/error
diff options
context:
space:
mode:
authorjtc <jtc@NetBSD.org>1995-09-02 05:57:23 +0000
committerjtc <jtc@NetBSD.org>1995-09-02 05:57:23 +0000
commit71bb6dda25e7dc3175caab5000e4af4200fe44de (patch)
tree29358261c6bb6ba0edc1982670402b9ad65222bd /usr.bin/error
parent3e4b73c5a65cdeab6b3a6ec62732f9d1381e3f4a (diff)
Sync with 4.4lite2
Diffstat (limited to 'usr.bin/error')
-rw-r--r--usr.bin/error/Makefile4
-rw-r--r--usr.bin/error/error.111
-rw-r--r--usr.bin/error/error.h9
-rw-r--r--usr.bin/error/filter.c12
-rw-r--r--usr.bin/error/input.c12
-rw-r--r--usr.bin/error/main.c18
-rw-r--r--usr.bin/error/pathnames.h9
-rw-r--r--usr.bin/error/pi.c12
-rw-r--r--usr.bin/error/subr.c12
-rw-r--r--usr.bin/error/touch.c12
10 files changed, 69 insertions, 42 deletions
diff --git a/usr.bin/error/Makefile b/usr.bin/error/Makefile
index 4d2113b4ad7..2728ff58625 100644
--- a/usr.bin/error/Makefile
+++ b/usr.bin/error/Makefile
@@ -1,5 +1,5 @@
-# from: @(#)Makefile 5.9 (Berkeley) 2/26/91
-# $Id: Makefile,v 1.2 1993/07/31 15:23:40 mycroft Exp $
+# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $NetBSD: Makefile,v 1.3 1995/09/02 06:15:10 jtc Exp $
PROG= error
SRCS= main.c input.c pi.c subr.c filter.c touch.c
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index 0395cf1843a..b254f65c3a4 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1990 The Regents of the University of California.
-.\" All rights reserved.
+.\" $NetBSD: error.1,v 1.3 1995/09/02 06:15:20 jtc Exp $
+.\"
+.\" Copyright (c) 1980, 1990, 1993
+.\" The Regents of the University of California. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" from: @(#)error.1 6.7 (Berkeley) 7/24/91
-.\" $Id: error.1,v 1.2 1993/08/01 07:33:08 mycroft Exp $
+.\" @(#)error.1 8.1 (Berkeley) 6/6/93
.\"
-.Dd July 24, 1991
+.Dd June 6, 1993
.Dt ERROR 1
.Os BSD 4
.Sh NAME
diff --git a/usr.bin/error/error.h b/usr.bin/error/error.h
index dece0086002..37af8e0fd12 100644
--- a/usr.bin/error/error.h
+++ b/usr.bin/error/error.h
@@ -1,6 +1,8 @@
+/* $NetBSD: error.h,v 1.3 1995/09/02 06:15:25 jtc Exp $ */
+
/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)error.h 5.5 (Berkeley) 6/1/90
- * $Id: error.h,v 1.2 1993/08/01 18:16:46 mycroft Exp $
+ * @(#)error.h 8.1 (Berkeley) 6/6/93
*/
typedef int boolean;
diff --git a/usr.bin/error/filter.c b/usr.bin/error/filter.c
index 1c882c9e604..47181cfb2f2 100644
--- a/usr.bin/error/filter.c
+++ b/usr.bin/error/filter.c
@@ -1,6 +1,8 @@
+/* $NetBSD: filter.c,v 1.3 1995/09/02 06:15:28 jtc Exp $ */
+
/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,8 +34,10 @@
*/
#ifndef lint
-/*static char sccsid[] = "from: @(#)filter.c 5.7 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: filter.c,v 1.2 1993/08/01 18:16:45 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)filter.c 8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: filter.c,v 1.3 1995/09/02 06:15:28 jtc Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index 6c5a857e954..c779b8ec414 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -1,6 +1,8 @@
+/* $NetBSD: input.c,v 1.3 1995/09/02 06:15:32 jtc Exp $ */
+
/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,8 +34,10 @@
*/
#ifndef lint
-/*static char sccsid[] = "from: @(#)input.c 5.5 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: input.c,v 1.2 1993/08/01 18:16:44 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: input.c,v 1.3 1995/09/02 06:15:32 jtc Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index 7bbec1aefcf..995efade9d4 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -1,6 +1,8 @@
+/* $NetBSD: main.c,v 1.3 1995/09/02 06:15:37 jtc Exp $ */
+
/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,14 +34,16 @@
*/
#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1980, 1993\n\
+ The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
-/*static char sccsid[] = "from: @(#)main.c 5.6 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: main.c,v 1.2 1993/08/01 18:16:43 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: main.c,v 1.3 1995/09/02 06:15:37 jtc Exp $";
#endif /* not lint */
#include <signal.h>
diff --git a/usr.bin/error/pathnames.h b/usr.bin/error/pathnames.h
index d294033191a..42ca04ebb33 100644
--- a/usr.bin/error/pathnames.h
+++ b/usr.bin/error/pathnames.h
@@ -1,6 +1,8 @@
+/* $NetBSD: pathnames.h,v 1.3 1995/09/02 06:15:40 jtc 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.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * from: @(#)pathnames.h 5.2 (Berkeley) 6/1/90
- * $Id: pathnames.h,v 1.2 1993/08/01 18:16:46 mycroft Exp $
+ * @(#)pathnames.h 8.1 (Berkeley) 6/6/93
*/
#include <paths.h>
diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c
index 9f3c4d934d5..ca7eae71aa8 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -1,6 +1,8 @@
+/* $NetBSD: pi.c,v 1.3 1995/09/02 06:15:44 jtc Exp $ */
+
/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,8 +34,10 @@
*/
#ifndef lint
-/*static char sccsid[] = "from: @(#)pi.c 5.5 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: pi.c,v 1.2 1993/08/01 18:16:42 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pi.c 8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: pi.c,v 1.3 1995/09/02 06:15:44 jtc Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/subr.c b/usr.bin/error/subr.c
index d332d36c718..54e670dc9eb 100644
--- a/usr.bin/error/subr.c
+++ b/usr.bin/error/subr.c
@@ -1,6 +1,8 @@
+/* $NetBSD: subr.c,v 1.3 1995/09/02 06:15:49 jtc Exp $ */
+
/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,8 +34,10 @@
*/
#ifndef lint
-/*static char sccsid[] = "from: @(#)subr.c 5.5 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: subr.c,v 1.2 1993/08/01 18:16:41 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: subr.c,v 1.3 1995/09/02 06:15:49 jtc Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c
index 7df35d997d0..03809f7752b 100644
--- a/usr.bin/error/touch.c
+++ b/usr.bin/error/touch.c
@@ -1,6 +1,8 @@
+/* $NetBSD: touch.c,v 1.3 1995/09/02 06:15:54 jtc Exp $ */
+
/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,8 +34,10 @@
*/
#ifndef lint
-/*static char sccsid[] = "from: @(#)touch.c 5.7 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$Id: touch.c,v 1.2 1993/08/01 18:16:39 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)touch.c 8.1 (Berkeley) 6/6/93";
+#endif
+static char rcsid[] = "$NetBSD: touch.c,v 1.3 1995/09/02 06:15:54 jtc Exp $";
#endif /* not lint */
#include <sys/types.h>