This commit was manufactured by cvs2svn to create tag

'RELENG_2_2_2_RELEASE'.
Well, I've gotten enough "go for it!" responses from core that I guess
2026-10-30 12:25:10 +01:00 · 1997-05-19 10:35:55 +00:00 · 1997-05-16 09:03:14 +00:00 · 1997-05-16 08:15:43 +00:00 · 1997-05-16 07:46:59 +00:00 · 1997-05-15 09:03:18 +00:00
5516 changed files with 163676 additions and 108454 deletions
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.109.2.2 1996/12/20 08:20:06 asami Exp $
+#	$Id: Makefile,v 1.109.2.3 1997/04/11 16:57:40 asami Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -18,6 +18,7 @@
 #	-DNOSECURE do not go into secure subdir
 #	-DNOGAMES do not go into games subdir
 #	-DNOSHARE do not go into share subdir
+#	-DNOINFO do not make or install info files

 #
 # The intended user-driven targets are:
@@ -119,7 +120,7 @@ SUPFLAGS?=      -v
 # While building tools for bootstrapping, we dont need to waste time on
 # profiled libraries or man pages.  This speeds things up somewhat.
 #
-MK_FLAGS=	-DNOMAN -DNOPROFILE
+MK_FLAGS=	-DNOINFO -DNOMAN -DNOPROFILE

 #
 # world
@@ -454,6 +455,10 @@ lib-tools:
 # libraries - build and install the libraries
 #
 libraries:
+.if exists(lib/csu/i386)
+	cd ${.CURDIR}/lib/csu/i386 && ${MAKE} depend && \
+		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
+.endif
 .if exists(lib/libcompat)
 	cd ${.CURDIR}/lib/libcompat && ${MAKE} depend && \
 		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
@@ -466,10 +471,6 @@ libraries:
 	cd ${.CURDIR}/lib/libtermcap && ${MAKE} depend && \
 		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
 .endif
-.if exists(lib)
-	cd ${.CURDIR}/lib/csu/i386 && ${MAKE} depend && \
-		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
-.endif
 .if exists(gnu)
 	cd ${.CURDIR}/gnu/lib && ${MAKE} depend && \
 		${MAKE} ${MK_FLAGS} all install ${CLEANDIR} ${OBJDIR}
@@ -501,6 +502,8 @@ libraries:
 #
 build-tools:
 .for d in				\
+		share/info		\
+		gnu/usr.bin/texinfo	\
 		usr.bin/symorder	\
 		usr.bin/sgmls		\
 		usr.bin/sgmlfmt		\
@@ -1,5 +1,5 @@
 This is the top level of the FreeBSD source directory.  This file
-was last revised on: $Id: README,v 1.7 1997/01/01 14:06:29 jkh Exp $
+was last revised on: $Id$

 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.4.2.1 1997/03/07 09:39:06 joerg Exp $
+#	$Id: Makefile,v 1.4 1995/10/01 14:24:01 markm Exp $

 SUBDIR= cat chio chmod cp csh date dd df domainname echo ed expr hostname \
 	kill ln ls mkdir mv pax ps pwd rcp rm rmail rmdir sh sleep \
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile.inc,v 1.7 1996/09/22 21:51:04 wosch Exp $
+#	$Id$

 BINDIR?=	/bin
 NOSHARED?=	YES
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.2 1994/09/24 02:53:25 davidg Exp $
+#	$Id$

 PROG=	cat

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\"	$Id: cat.1,v 1.3.2.1 1997/02/28 07:54:20 mpp Exp $
+.\"	$Id: cat.1,v 1.6 1997/02/22 14:01:26 peter Exp $
 .\"
 .Dd May 2, 1995
 .Dt CAT 1
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: cat.c,v 1.5 1996/09/30 15:45:36 ache Exp $
+ *	$Id: cat.c,v 1.4 1996/09/28 21:19:27 imp Exp $
 */

 #ifndef lint
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/03/06 15:30:06 joerg Exp $
+#	$Id: $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93

 PROG=	chio
@@ -1,4 +1,4 @@
-/*	$Id: chio.c,v 1.1.1.1 1997/03/06 15:30:06 joerg Exp $	*/
+/*	$Id: $	*/

 /*
 * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
@@ -1,4 +1,4 @@
-/*	$Id: defs.h,v 1.1.1.1 1997/03/06 15:30:06 joerg Exp $	*/
+/*	$Id: $	*/

 /*
 * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
@@ -1,4 +1,4 @@
-/*	$Id: pathnames.h,v 1.1.1.1 1997/03/06 15:30:06 joerg Exp $	*/
+/*	$Id: $	*/

 /*
 * Copyright (c) 1996 Jason R. Thorpe <[email protected]>
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.2 1994/09/24 02:53:36 davidg Exp $
+#	$Id$

 PROG=	chmod

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id: chmod.1,v 1.4.2.1 1997/02/28 07:54:25 mpp Exp $
+.\"	$Id: chmod.1,v 1.7 1997/02/22 14:01:29 peter Exp $
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: chmod.c,v 1.5 1996/08/10 15:05:26 adam Exp $
+ *	$Id: chmod.c,v 1.4 1995/03/19 13:27:43 joerg Exp $
 */

 #ifndef lint
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.2 1994/09/24 02:53:39 davidg Exp $
+#	$Id$

 PROG=	cp
 SRCS=	cp.c utils.c
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: cp.1,v 1.6.2.1 1997/02/28 07:54:27 mpp Exp $
+.\"	$Id: cp.1,v 1.9 1997/02/22 14:01:32 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt CP 1
@@ -33,7 +33,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: cp.c,v 1.10 1996/03/08 06:58:06 wosch Exp $
+ *	$Id: cp.c,v 1.9 1996/02/19 05:56:33 pst Exp $
 */

 #ifndef lint
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id: extern.h,v 1.5 1996/03/08 06:58:07 wosch Exp $
+ *	$Id: extern.h,v 1.3 1996/02/18 18:48:26 wosch Exp $
 */

 typedef struct {
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: utils.c,v 1.9 1996/03/08 06:58:08 wosch Exp $
+ *	$Id: utils.c,v 1.6 1996/02/18 18:48:26 wosch Exp wosch $
 */

 #ifndef lint
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.5 1994/09/24 02:53:44 davidg Exp $
+#	$Id$
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id: Makefile,v 1.2 1994/09/24 02:54:22 davidg Exp $
+#	$Id$

 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.1,v 1.3 1996/10/05 22:25:45 wosch Exp $
+.\"	$Id: csh.1,v 1.2 1994/09/24 02:54:23 davidg Exp $
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.2,v 1.3 1996/10/05 22:25:46 wosch Exp $
+.\"	$Id: csh.2,v 1.2 1994/09/24 02:54:24 davidg Exp $
 .\"
 .nr H1 1
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.3,v 1.2 1994/09/24 02:54:26 davidg Exp $
+.\"	$Id$
 .\"
 .nr H1 2
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.4,v 1.2 1994/09/24 02:54:27 davidg Exp $
+.\"	$Id$
 .\"
 .nr H1 3
 .NH
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.a,v 1.2 1994/09/24 02:54:28 davidg Exp $
+.\"	$Id$
 .\"
 .SH
 Appendix \- Special characters
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	$Id: csh.g,v 1.2 1994/09/24 02:54:31 davidg Exp $
+.\"	$Id$
 .\"
 .SH
 Glossary
@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\"	$Id: tabs,v 1.2 1994/09/24 02:54:32 davidg Exp $
+.\"	$Id$
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: alloc.c,v 1.4 1995/05/30 00:06:28 rgrimes Exp $
+ *	$Id: alloc.c,v 1.3 1995/03/19 13:28:10 joerg Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: char.c,v 1.2 1994/09/24 02:53:46 davidg Exp $
+ *	$Id$
 */

 #ifndef lint
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)char.h	8.1 (Berkeley) 5/31/93
- *	$Id: char.h,v 1.2 1994/09/24 02:53:47 davidg Exp $
+ *	$Id$
 */

 #include <ctype.h>
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: const.c,v 1.4 1995/10/23 23:08:24 ache Exp $
+ *	$Id: const.c,v 1.3 1995/05/30 00:06:29 rgrimes Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	$Id: csh.1,v 1.5.2.1 1997/02/28 07:54:29 mpp Exp $
+.\"	$Id: csh.1,v 1.8 1997/02/22 14:01:40 peter Exp $
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: csh.c,v 1.6 1995/10/23 23:08:25 ache Exp $
+ *	$Id: csh.c,v 1.5 1995/07/07 23:14:36 ache Exp $
 */

 #ifndef lint
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- *	$Id: csh.h,v 1.2 1994/09/24 02:53:52 davidg Exp $
+ *	$Id$
 */

 /*
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: dir.c,v 1.4 1995/06/18 14:34:48 ache Exp $
+ *	$Id: dir.c,v 1.3 1995/05/30 00:06:30 rgrimes Exp $
 */

 #ifndef lint
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- *	$Id: dir.h,v 1.2 1994/09/24 02:53:55 davidg Exp $
+ *	$Id$
 */

 /*
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: dol.c,v 1.3 1995/05/30 00:06:31 rgrimes Exp $
+ *	$Id: dol.c,v 1.2 1994/09/24 02:53:56 davidg Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: err.c,v 1.2 1994/09/24 02:53:57 davidg Exp $
+ *	$Id$
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: exec.c,v 1.4 1995/06/18 14:20:16 ache Exp $
+ *	$Id: exec.c,v 1.3 1995/05/30 00:06:32 rgrimes Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: exp.c,v 1.2 1994/09/24 02:54:00 davidg Exp $
+ *	$Id$
 */

 #ifndef lint
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id: extern.h,v 1.2 1994/09/24 02:54:02 davidg Exp $
+ *	$Id$
 */

 #include <sys/cdefs.h>
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: file.c,v 1.4 1995/06/18 14:08:44 ache Exp $
+ *	$Id: file.c,v 1.3 1995/05/30 00:06:33 rgrimes Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: func.c,v 1.5 1996/08/11 23:10:38 ache Exp $
+ *	$Id: func.c,v 1.4 1995/10/23 23:08:26 ache Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: glob.c,v 1.6 1996/10/31 07:22:48 ache Exp $
+ *	$Id: glob.c,v 1.5 1996/08/12 21:32:15 ache Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: hist.c,v 1.2 1994/09/24 02:54:06 davidg Exp $
+ *	$Id$
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: init.c,v 1.2 1994/09/24 02:54:07 davidg Exp $
+ *	$Id$
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: lex.c,v 1.4 1995/08/10 05:13:42 ache Exp $
+ *	$Id: lex.c,v 1.3 1995/05/30 00:06:35 rgrimes Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: misc.c,v 1.3 1996/09/28 14:32:01 bde Exp $
+ *	$Id: misc.c,v 1.2 1994/09/24 02:54:10 davidg Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: parse.c,v 1.3 1995/05/30 00:06:37 rgrimes Exp $
+ *	$Id: parse.c,v 1.2 1994/09/24 02:54:11 davidg Exp $
 */

 #ifndef lint
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id: pathnames.h,v 1.2 1994/09/24 02:54:12 davidg Exp $
+ *	$Id$
 */

 #define	_PATH_BIN		"/bin"
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: proc.c,v 1.2 1994/09/24 02:54:13 davidg Exp $
+ *	$Id$
 */

 #ifndef lint
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)proc.h	8.1 (Berkeley) 5/31/93
- *	$Id: proc.h,v 1.2 1994/09/24 02:54:14 davidg Exp $
+ *	$Id$
 */

 /*
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: sem.c,v 1.3 1995/05/30 00:06:37 rgrimes Exp $
+ *	$Id: sem.c,v 1.2 1994/09/24 02:54:15 davidg Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: set.c,v 1.4 1995/07/07 23:13:11 ache Exp $
+ *	$Id: set.c,v 1.3 1995/05/30 00:06:38 rgrimes Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: str.c,v 1.3 1995/05/30 00:06:39 rgrimes Exp $
+ *	$Id: str.c,v 1.2 1994/09/24 02:54:18 davidg Exp $
 */

 #ifndef lint
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: time.c,v 1.5 1995/05/30 00:06:40 rgrimes Exp $
+ *	$Id: time.c,v 1.4 1995/03/19 13:28:12 joerg Exp $
 */

 #ifndef lint
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.2 1994/09/24 02:54:33 davidg Exp $
+#	$Id$

 PROG=	date
 SRCS=	date.c netdate.c
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\"	$Id: date.1,v 1.8.2.1 1997/02/28 07:54:32 mpp Exp $
+.\"	$Id: date.1,v 1.11 1997/02/22 14:02:31 peter Exp $
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: date.c,v 1.7 1996/04/06 01:42:09 ache Exp $
+ *	$Id: date.c,v 1.6 1995/10/23 20:26:53 ache Exp $
 */

 #ifndef lint
@@ -31,7 +31,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id: extern.h,v 1.2 1994/09/24 02:54:37 davidg Exp $
+ *	$Id$
 */

 int	netsettime __P((time_t));
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: netdate.c,v 1.3.6.1 1997/03/10 19:51:16 guido Exp $
+ *	$Id: netdate.c,v 1.3 1995/05/30 00:06:41 rgrimes Exp $
 */

 #ifndef lint
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.2 1994/09/24 02:54:40 davidg Exp $
+#	$Id$

 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: args.c,v 1.3.8.1 1996/11/21 16:30:28 phk Exp $
+ *	$Id: args.c,v 1.3 1994/09/24 02:54:42 davidg Exp $
 */

 #ifndef lint
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: conv.c,v 1.3.8.1 1996/11/21 16:30:30 phk Exp $
+ *	$Id: conv.c,v 1.3 1994/09/24 02:54:44 davidg Exp $
 */

 #ifndef lint
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: conv_tab.c,v 1.3 1995/01/17 23:04:28 ache Exp $
+ *	$Id: conv_tab.c,v 1.2 1994/09/24 02:54:47 davidg Exp $
 */

 #ifndef lint
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: dd.1,v 1.2.8.1 1997/02/28 07:54:33 mpp Exp $
+.\"	$Id: dd.1,v 1.4 1997/02/22 14:02:43 peter Exp $
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: dd.c,v 1.5.2.1 1996/11/21 16:30:32 phk Exp $
+ *	$Id: dd.c,v 1.5 1995/10/23 21:31:48 ache Exp $
 */

 #ifndef lint
@@ -35,7 +35,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- *	$Id: dd.h,v 1.2.8.1 1996/11/21 16:30:33 phk Exp $
+ *	$Id: dd.h,v 1.2 1994/09/24 02:54:54 davidg Exp $
 */

 /* Input/output stream state. */
@@ -35,7 +35,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id: extern.h,v 1.2 1994/09/24 02:54:57 davidg Exp $
+ *	$Id$
 */

 #include <sys/cdefs.h>
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: misc.c,v 1.2.8.1 1996/11/21 16:30:35 phk Exp $
+ *	$Id: misc.c,v 1.2 1994/09/24 02:55:01 davidg Exp $
 */

 #ifndef lint
@@ -34,7 +34,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: position.c,v 1.2 1994/09/24 02:55:03 davidg Exp $
+ *	$Id$
 */

 #ifndef lint
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/1/94
-#	$Id: Makefile,v 1.2 1994/09/24 02:55:06 davidg Exp $
+#	$Id$

 PROG=	df
 BINGRP=	operator
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: df.1,v 1.4.2.1 1996/12/13 17:15:10 joerg Exp $
+.\"	$Id: df.1,v 1.4 1996/08/29 18:05:48 wosch Exp $
 .\"
 .Dd January 13, 1994
 .Dt DF 1
@@ -35,7 +35,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: df.c,v 1.8.2.1 1996/12/13 17:15:11 joerg Exp $
+ *	$Id: df.c,v 1.8 1996/01/14 18:55:09 bde Exp $
 */

 #ifndef lint
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1994/09/18 21:23:35 wollman Exp $
+#	$Id$

 PROG=	domainname

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: domainname.1,v 1.2 1995/01/14 17:02:33 ats Exp $
+.\"	$Id: domainname.1,v 1.1 1994/09/18 21:23:36 wollman Exp $
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
@@ -40,7 +40,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93"; */
 static const char rcsid[] =
-	"$Id: domainname.c,v 1.5 1995/03/19 13:28:17 joerg Exp $";
+	"$Id: domainname.c,v 1.4 1994/09/26 02:14:27 wollman Exp $";
 #endif /* not lint */

 #include <sys/param.h>
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.2 1994/09/24 02:55:15 davidg Exp $
+#	$Id$

 PROG=	echo

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id: echo.1,v 1.3 1995/08/31 17:25:54 jkh Exp $
+.\"	$Id: echo.1,v 1.2 1994/09/24 02:55:17 davidg Exp $
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
@@ -30,7 +30,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: echo.c,v 1.3 1995/08/31 17:25:55 jkh Exp $
+ *	$Id: echo.c,v 1.2 1994/09/24 02:55:18 davidg Exp $
 */

 #ifndef lint
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13 1995/10/22 20:14:13 ache Exp $
+#	$Id: Makefile,v 1.12 1995/10/03 15:44:50 markm Exp $

 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
@@ -1,4 +1,4 @@
-$Id: POSIX,v 1.4 1994/09/24 02:55:20 davidg Exp $
+$Id$

 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,
@@ -1,4 +1,4 @@
-$Id: README,v 1.4 1994/09/24 02:55:21 davidg Exp $
+$Id$

 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface
@@ -198,14 +198,18 @@ char sfn[15] = "";				/* scratch file name */
 int
 open_sbuf()
 {
+	int fd = -1;
 	int u;

 	isbinary = newline_added = 0;
 	u = umask(077);
 	strcpy(sfn, "/tmp/ed.XXXXXX");
-	if (mktemp(sfn) == NULL || (sfp = fopen(sfn, "w+")) == NULL) {
-		fprintf(stderr, "%s: %s\n", sfn, strerror(errno));
-		sprintf(errmsg, "cannot open temp file");
+	if ((fd = mkstemp(sfn)) == -1 ||
+	    (sfp = fdopen(fd, "w+")) == NULL) {
+		if (fd != -1)
+			close(fd);
+		perror(sfn);
+		strcpy(errmsg, "cannot open temp file");
 		umask(u);
 		return ERR;
 	}
@@ -35,7 +35,7 @@
 * SUCH DAMAGE.
 *
 *	from: @(#)bdes.c	5.5 (Berkeley) 6/27/91
- *	$Id: cbc.c,v 1.6 1996/08/11 16:48:11 ache Exp $
+ *	$Id: cbc.c,v 1.5 1995/03/19 13:28:24 joerg Exp $
 */

 #ifndef lint
@@ -1,4 +1,4 @@
-.\"	$Id: ed.1,v 1.8 1996/10/05 22:26:02 wosch Exp $
+.\"	$Id: ed.1,v 1.7 1996/08/29 18:05:50 wosch Exp $
 .TH ED 1 "21 May 1993"
 .SH NAME
 .\" ed, red \- text editor
@@ -25,7 +25,7 @@
 * SUCH DAMAGE.
 *
 *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- *	$Id: ed.h,v 1.8 1994/11/03 21:46:55 davidg Exp $
+ *	$Id: ed.h,v 1.7 1994/09/24 02:55:25 davidg Exp $
 */

 #include <sys/types.h>
@@ -25,7 +25,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: glbl.c,v 1.4 1995/05/30 00:06:46 rgrimes Exp $
+ *	$Id: glbl.c,v 1.3 1995/03/19 13:28:27 joerg Exp $
 */

 #ifndef lint
@@ -24,7 +24,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: io.c,v 1.5 1996/05/23 06:36:34 tg Exp $
+ *	$Id: io.c,v 1.4 1995/03/19 13:28:32 joerg Exp $
 */

 #ifndef lint
@@ -25,7 +25,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: main.c,v 1.6 1996/08/11 16:48:11 ache Exp $
+ *	$Id: main.c,v 1.5 1995/05/30 00:06:47 rgrimes Exp $
 */

 #ifndef lint
@@ -25,7 +25,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: re.c,v 1.10 1995/05/30 00:06:47 rgrimes Exp $
+ *	$Id: re.c,v 1.9 1995/03/19 13:28:36 joerg Exp $
 */

 #ifndef lint
@@ -25,7 +25,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: sub.c,v 1.6 1995/05/30 00:06:48 rgrimes Exp $
+ *	$Id: sub.c,v 1.5 1995/03/19 13:28:38 joerg Exp $
 */

 #ifndef lint
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1996/06/24 04:22:19 jkh Exp $
+#	$Id: Makefile,v 1.5 1994/09/24 02:55:35 davidg Exp $

 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed
@@ -1,4 +1,4 @@
-#	$Id: README,v 1.4 1996/09/22 21:51:28 wosch Exp $
+#	$Id$

 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
 used for testing ed.  To run the tests, set the ED variable in the Makefile
@@ -3,7 +3,7 @@
 # and compares their output against the .r files, which contain
 # the correct output
 #
-#	$Id: ckscripts.sh,v 1.3 1996/09/22 21:51:29 wosch Exp $
+#	$Id$

 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
@@ -1,7 +1,7 @@
 #!/bin/sh -
 # This script generates ed test scripts (.ed) from .t files
 #	
-#	$Id: mkscripts.sh,v 1.3 1996/09/22 21:51:30 wosch Exp $
+#	$Id$

 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
@@ -24,7 +24,7 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- *	$Id: undo.c,v 1.3 1994/09/24 02:55:32 davidg Exp $
+ *	$Id$
 */

 #ifndef lint
@@ -1,5 +1,5 @@
 #	/b/source/CVS/src/bin/expr/Makefile,v 1.5 1993/06/14 19:56:06 jtc Exp
-#	$Id: Makefile,v 1.10 1996/06/02 17:05:48 phk Exp $
+#	$Id: Makefile,v 1.8 1996/05/07 23:14:17 wosch Exp $

 PROG=		expr
 SRCS=		expr.c
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: expr.1,v 1.4 1996/01/29 22:53:24 mpp Exp $
+.\"	$Id: expr.1,v 1.3 1994/04/24 01:18:46 jkh Exp $
 .\"
 .Dd July 3, 1993
 .Dt EXPR 1