* misc/Makefile (headers): Add utmp.h.

	* misc/utmp.h: New file, incorporated from 4.4-Lite.

5 files changed, 74 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e02c2004c9..fa446ed509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Fri Mar 24 02:35:37 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* misc/Makefile (headers): Add utmp.h.
+	* misc/utmp.h: New file, incorporated from 4.4-Lite.
+
 	* stdio/printf-parse.h: New file, mostly written by drepper.
 	* stdio/vfprintf.c: Rewritten, mostly by drepper.
 	* stdio/printf-prs.c: Rewritten.
diff --git a/NEWS b/NEWS
index 0e8cea02d0..49cfc032e7 100644
--- a/NEWS
+++ b/NEWS
@@ -48,10 +48,10 @@ Version 1.10
   for the `printf' and `scanf' families of functions.  For example,
   `printf ("Number %2$d, Mr %1$s\n", "Jones", 6);'' prints
   ``Number 6, Mr Jones''.  This is mainly useful when providing different
-  format strings for different languages, whose grammar may dictate
-  a different ordering of the values being printed.  To support this
+  format strings for different languages, whose grammars may dictate
+  different orderings of the values being printed.  To support this
   feature, the interface for `register_printf_handler' has changed; see
-  the header file <printf.h>.
+  the header file <printf.h> for details.
 
 * The `printf' and `scanf' families of functions now understand a new
   formatting flag for numeric conversions: the ' flag (e.g. %'d or %'f) says
diff --git a/misc/Makefile b/misc/Makefile
index 8638c08676..e4f9786cf9 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -25,7 +25,7 @@ subdir	:= misc
 headers	:= sys/uio.h sys/ioctl.h sys/ptrace.h ioctls.h sys/file.h	\
 	   a.out.h nlist.h stab.h stab.def sgtty.h sys/dir.h sys/cdefs.h \
 	   ttyent.h syscall.h syslog.h sys/syslog.h paths.h sys/reboot.h \
-	   sys/mman.h sys/param.h fstab.h search.h
+	   sys/mman.h sys/param.h fstab.h search.h utmp.h
 
 routines := brk sbrk sstk ioctl \
 	    readv writev \
diff --git a/misc/utmp.h b/misc/utmp.h
new file mode 100644
index 0000000000..15c4e4fd3d
--- /dev/null
+++ b/misc/utmp.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
+ */
+
+#ifndef	_UTMP_H_
+#define	_UTMP_H_
+
+#define	_PATH_UTMP	"/var/run/utmp"
+#define	_PATH_WTMP	"/var/log/wtmp"
+#define	_PATH_LASTLOG	"/var/log/lastlog"
+
+#define	UT_NAMESIZE	8
+#define	UT_LINESIZE	8
+#define	UT_HOSTSIZE	16
+
+struct lastlog {
+	time_t	ll_time;
+	char	ll_line[UT_LINESIZE];
+	char	ll_host[UT_HOSTSIZE];
+};
+
+struct utmp {
+	char	ut_line[UT_LINESIZE];
+	char	ut_name[UT_NAMESIZE];
+	char	ut_host[UT_HOSTSIZE];
+	long	ut_time;
+};
+
+#endif /* !_UTMP_H_ */
diff --git a/stdlib/.cvsignore b/stdlib/.cvsignore
index 1f69fd919a..fd9dc4ea03 100644
--- a/stdlib/.cvsignore
+++ b/stdlib/.cvsignore
@@ -2,3 +2,5 @@
 =*
 TODO COPYING* AUTHORS copyr-* copying.*
 glibc-*
+
+mpn-copy.mk