summaryrefslogtreecommitdiff
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
parent3e4b73c5a65cdeab6b3a6ec62732f9d1381e3f4a (diff)
Sync with 4.4lite2
-rw-r--r--usr.bin/ctags/ctags.c13
-rw-r--r--usr.bin/cut/cut.c8
-rw-r--r--usr.bin/dirname/dirname.c8
-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
-rw-r--r--usr.bin/expand/Makefile4
-rw-r--r--usr.bin/expand/expand.111
-rw-r--r--usr.bin/expand/expand.c18
16 files changed, 102 insertions, 71 deletions
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index f67887580b3..480760b15f3 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,7 +1,7 @@
-/* $NetBSD: ctags.c,v 1.3 1995/03/26 20:14:05 glass Exp $ */
+/* $NetBSD: ctags.c,v 1.4 1995/09/02 05:57:23 jtc Exp $ */
/*
- * Copyright (c) 1987, 1993, 1994
+ * Copyright (c) 1987, 1993, 1994, 1995
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,16 +35,15 @@
#ifndef lint
static char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994\n\
+"@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
#if 0
-static char sccsid[] = "@(#)ctags.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$NetBSD: ctags.c,v 1.3 1995/03/26 20:14:05 glass Exp $";
+static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95";
#endif
+static char rcsid[] = "$NetBSD: ctags.c,v 1.4 1995/09/02 05:57:23 jtc Exp $";
#endif /* not lint */
#include <err.h>
@@ -137,7 +136,7 @@ main(argc, argv)
argc -= optind;
if (!argc) {
usage: (void)fprintf(stderr,
- "usage: ctags [-BFadtuwvx] [-f tagsfile] file ...");
+ "usage: ctags [-BFadtuwvx] [-f tagsfile] file ...\n");
exit(1);
}
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index 0975b9b0ec6..7d820b182d8 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cut.c,v 1.8 1995/03/26 20:51:27 glass Exp $ */
+/* $NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -44,10 +44,9 @@ static char copyright[] =
#ifndef lint
#if 0
-static char sccsid[] = "@(#)cut.c 8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$NetBSD: cut.c,v 1.8 1995/03/26 20:51:27 glass Exp $";
+static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
#endif
+static char rcsid[] = "$NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $";
#endif /* not lint */
#include <ctype.h>
@@ -58,6 +57,7 @@ static char rcsid[] = "$NetBSD: cut.c,v 1.8 1995/03/26 20:51:27 glass Exp $";
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
int cflag;
char dchar;
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index 701fe50aff1..09c5c258b46 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dirname.c,v 1.5 1995/03/28 16:50:12 glass Exp $ */
+/* $NetBSD: dirname.c,v 1.6 1995/09/02 06:02:25 jtc Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -41,15 +41,15 @@ static char copyright[] =
#ifndef lint
#if 0
-static char sccsid[] = "@(#)dirname.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$NetBSD: dirname.c,v 1.5 1995/03/28 16:50:12 glass Exp $";
+static char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95";
#endif
+static char rcsid[] = "$NetBSD: dirname.c,v 1.6 1995/09/02 06:02:25 jtc Exp $";
#endif /* not lint */
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
+#include <unistd.h>
static void usage __P((void));
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>
diff --git a/usr.bin/expand/Makefile b/usr.bin/expand/Makefile
index bfd022685a9..3ba1372d468 100644
--- a/usr.bin/expand/Makefile
+++ b/usr.bin/expand/Makefile
@@ -1,5 +1,5 @@
-# from: @(#)Makefile 5.4 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.2 1993/07/31 15:23:35 mycroft Exp $
+# @(#)Makefile 8.1 (Berkeley) 6/9/93
+# $NetBSD: Makefile,v 1.3 1995/09/02 06:19:43 jtc Exp $
PROG= expand
MLINKS= expand.1 unexpand.1
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index d3cb0d22988..17213649bfe 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1990 The Regents of the University of California.
-.\" All rights reserved.
+.\" $NetBSD: expand.1,v 1.3 1995/09/02 06:19:45 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: @(#)expand.1 6.7 (Berkeley) 7/26/91
-.\" $Id: expand.1,v 1.2 1993/08/01 07:33:04 mycroft Exp $
+.\" @(#)expand.1 8.1 (Berkeley) 6/9/93
.\"
-.Dd July 26, 1991
+.Dd June 9, 1993
.Dt EXPAND 1
.Os BSD 4
.Sh NAME
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 63f14cdb131..2c61fc20c26 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -1,6 +1,8 @@
+/* $NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $ */
+
/*
- * Copyright (c) 1980 The 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 The 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: @(#)expand.c 5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: expand.c,v 1.4 1993/10/13 18:34:09 jtc Exp $";
+#if 0
+static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93";
+#endif
+static char rcsid[] = "$NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $";
#endif /* not lint */
#include <stdio.h>