summaryrefslogtreecommitdiff
path: root/usr.sbin/config
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/config')
-rw-r--r--usr.sbin/config/Makefile3
-rw-r--r--usr.sbin/config/config.84
-rw-r--r--usr.sbin/config/config.h4
-rw-r--r--usr.sbin/config/files.c4
-rw-r--r--usr.sbin/config/gram.y3
-rw-r--r--usr.sbin/config/hash.c4
-rw-r--r--usr.sbin/config/main.c4
-rw-r--r--usr.sbin/config/mkheaders.c4
-rw-r--r--usr.sbin/config/mkioconf.c4
-rw-r--r--usr.sbin/config/mkmakefile.c8
-rw-r--r--usr.sbin/config/mkswap.c4
-rw-r--r--usr.sbin/config/pack.c4
-rw-r--r--usr.sbin/config/scan.l4
-rw-r--r--usr.sbin/config/sem.c4
-rw-r--r--usr.sbin/config/sem.h4
-rw-r--r--usr.sbin/config/util.c4
16 files changed, 48 insertions, 18 deletions
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index 0728d13d1ba..bb77cdf432e 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -1,5 +1,6 @@
+# $OpenBSD: Makefile,v 1.2 1996/03/25 15:55:00 niklas Exp $
+# $NetBSD: Makefile,v 1.11 1996/03/03 17:28:02 thorpej Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/19/94
-# $Id: Makefile,v 1.1 1995/10/18 08:48:33 deraadt Exp $
PROG= config
BINDIR= /usr/sbin
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index a5a13f5281a..b93276db33d 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -1,3 +1,6 @@
+.\" $OpenBSD: config.8,v 1.2 1996/03/25 15:55:01 niklas Exp $
+.\" $NetBSD: config.8,v 1.8 1996/03/03 17:28:05 thorpej Exp $
+.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -30,7 +33,6 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)config.8 8.2 (Berkeley) 4/19/94
-.\" $Id: config.8,v 1.1 1995/10/18 08:48:33 deraadt Exp $
.\"
.Dd April 19, 1994
.Dt CONFIG 8
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index bb4dafd52bb..116503b51a8 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -1,3 +1,6 @@
+/* $OpenBSD: config.h,v 1.2 1996/03/25 15:55:02 niklas Exp $ */
+/* $NetBSD: config.h,v 1.19 1996/03/03 17:28:08 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)config.h 8.1 (Berkeley) 6/6/93
- * $Id: config.h,v 1.1 1995/10/18 08:48:33 deraadt Exp $
*/
/*
diff --git a/usr.sbin/config/files.c b/usr.sbin/config/files.c
index a010ee37400..61574f5b004 100644
--- a/usr.sbin/config/files.c
+++ b/usr.sbin/config/files.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: files.c,v 1.3 1996/03/25 15:55:03 niklas Exp $ */
+/* $NetBSD: files.c,v 1.3 1996/03/03 17:28:10 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)files.c 8.1 (Berkeley) 6/6/93
- * $Id: files.c,v 1.2 1996/02/22 00:32:55 niklas Exp $
*/
#include <sys/param.h>
diff --git a/usr.sbin/config/gram.y b/usr.sbin/config/gram.y
index 459b6f0aa5b..3b197a85745 100644
--- a/usr.sbin/config/gram.y
+++ b/usr.sbin/config/gram.y
@@ -1,4 +1,6 @@
%{
+/* $OpenBSD: gram.y,v 1.2 1996/03/25 15:55:04 niklas Exp $ */
+/* $NetBSD: gram.y,v 1.3 1996/03/03 17:28:13 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -42,7 +44,6 @@
* SUCH DAMAGE.
*
* from: @(#)gram.y 8.1 (Berkeley) 6/6/93
- * $Id: gram.y,v 1.1 1995/10/18 08:48:33 deraadt Exp $
*/
#include <sys/param.h>
diff --git a/usr.sbin/config/hash.c b/usr.sbin/config/hash.c
index cfe130ee42c..e1290fd9456 100644
--- a/usr.sbin/config/hash.c
+++ b/usr.sbin/config/hash.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: hash.c,v 1.2 1996/03/25 15:55:05 niklas Exp $ */
+/* $NetBSD: hash.c,v 1.2 1996/03/03 17:28:15 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)hash.c 8.1 (Berkeley) 6/6/93
- * $Id: hash.c,v 1.1 1995/10/18 08:48:33 deraadt Exp $
*/
#include <sys/param.h>
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 0830434a5ce..5a2539a6e5b 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: main.c,v 1.3 1996/03/25 15:55:06 niklas Exp $ */
+/* $NetBSD: main.c,v 1.13 1996/03/03 17:28:17 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)main.c 8.1 (Berkeley) 6/6/93
- * $Id: main.c,v 1.2 1995/12/15 18:54:35 deraadt Exp $
*/
#ifndef lint
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index d3aa0c0443d..91ddb8c28ac 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: mkheaders.c,v 1.2 1996/03/25 15:55:07 niklas Exp $ */
+/* $NetBSD: mkheaders.c,v 1.8 1996/03/03 17:28:20 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)mkheaders.c 8.1 (Berkeley) 6/6/93
- * $Id: mkheaders.c,v 1.1 1995/10/18 08:48:33 deraadt Exp $
*/
#include <sys/param.h>
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index a8545f4a812..56c40015a2e 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: mkioconf.c,v 1.2 1996/03/25 15:55:08 niklas Exp $ */
+/* $NetBSD: mkioconf.c,v 1.36 1996/03/03 17:28:23 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)mkioconf.c 8.1 (Berkeley) 6/6/93
- * $Id: mkioconf.c,v 1.1 1995/10/18 08:48:34 deraadt Exp $
*/
#include <sys/param.h>
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 5fe766b01e2..237ea6c1a17 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: mkmakefile.c,v 1.2 1996/03/25 15:55:09 niklas Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.27 1996/03/03 17:28:26 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)mkmakefile.c 8.1 (Berkeley) 6/6/93
- * $Id: mkmakefile.c,v 1.1 1995/10/18 08:48:34 deraadt Exp $
*/
#include <sys/param.h>
@@ -194,7 +196,7 @@ emitobjs(fp)
lpos += len + 1;
sp = ' ';
}
- if (lpos != 7 && putc('\n', fp) < 0)
+ if (putc('\n', fp) < 0)
return (1);
return (0);
}
@@ -276,7 +278,7 @@ emitfiles(fp, suffix)
sp = ' ';
}
}
- if (lpos != 7 && putc('\n', fp) < 0)
+ if (putc('\n', fp) < 0)
return (1);
return (0);
}
diff --git a/usr.sbin/config/mkswap.c b/usr.sbin/config/mkswap.c
index 1994da1f4b0..83e86bb106c 100644
--- a/usr.sbin/config/mkswap.c
+++ b/usr.sbin/config/mkswap.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: mkswap.c,v 1.2 1996/03/25 15:55:10 niklas Exp $ */
+/* $NetBSD: mkswap.c,v 1.2 1996/03/03 17:28:29 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)mkswap.c 8.1 (Berkeley) 6/6/93
- * $Id: mkswap.c,v 1.1 1995/10/18 08:48:34 deraadt Exp $
*/
#include <sys/param.h>
diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c
index 17a09127846..9e0b6330004 100644
--- a/usr.sbin/config/pack.c
+++ b/usr.sbin/config/pack.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: pack.c,v 1.2 1996/03/25 15:55:11 niklas Exp $ */
+/* $NetBSD: pack.c,v 1.2 1996/03/03 17:28:32 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)pack.c 8.1 (Berkeley) 6/6/93
- * $Id: pack.c,v 1.1 1995/10/18 08:48:34 deraadt Exp $
*/
#include <sys/param.h>
diff --git a/usr.sbin/config/scan.l b/usr.sbin/config/scan.l
index 88a3645d7c5..9f211c640b1 100644
--- a/usr.sbin/config/scan.l
+++ b/usr.sbin/config/scan.l
@@ -1,4 +1,7 @@
%{
+/* $OpenBSD: scan.l,v 1.2 1996/03/25 15:55:12 niklas Exp $ */
+/* $NetBSD: scan.l,v 1.2 1996/03/03 17:28:34 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +44,6 @@
* SUCH DAMAGE.
*
* from: @(#)scan.l 8.1 (Berkeley) 6/6/93
- * $Id: scan.l,v 1.1 1995/10/18 08:48:34 deraadt Exp $
*/
#include <sys/param.h>
diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c
index 2e29da33505..d0a69b5bfb1 100644
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: sem.c,v 1.2 1996/03/25 15:55:13 niklas Exp $ */
+/* $NetBSD: sem.c,v 1.2 1996/03/03 17:28:37 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)sem.c 8.1 (Berkeley) 6/6/93
- * $Id: sem.c,v 1.1 1995/10/18 08:48:34 deraadt Exp $
*/
#include <sys/param.h>
diff --git a/usr.sbin/config/sem.h b/usr.sbin/config/sem.h
index d1440d43b6f..131762f7a47 100644
--- a/usr.sbin/config/sem.h
+++ b/usr.sbin/config/sem.h
@@ -1,3 +1,6 @@
+/* $OpenBSD: sem.h,v 1.2 1996/03/25 15:55:14 niklas Exp $ */
+/* $NetBSD: sem.h,v 1.2 1996/03/03 17:28:39 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)sem.h 8.1 (Berkeley) 6/6/93
- * $Id: sem.h,v 1.1 1995/10/18 08:48:34 deraadt Exp $
*/
void enddefs __P((const char *));
diff --git a/usr.sbin/config/util.c b/usr.sbin/config/util.c
index 38274d4c9ed..ca6b2eddb22 100644
--- a/usr.sbin/config/util.c
+++ b/usr.sbin/config/util.c
@@ -1,3 +1,6 @@
+/* $OpenBSD: util.c,v 1.2 1996/03/25 15:55:16 niklas Exp $ */
+/* $NetBSD: util.c,v 1.2 1996/03/03 17:28:41 thorpej Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -40,7 +43,6 @@
* SUCH DAMAGE.
*
* from: @(#)util.c 8.1 (Berkeley) 6/6/93
- * $Id: util.c,v 1.1 1995/10/18 08:48:34 deraadt Exp $
*/
#include <ctype.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 04:00:54 +0000