8 files changed, 195 insertions, 24 deletions
diff --git a/sysdeps/generic/utmpbits.h b/sysdeps/generic/utmpbits.h
new file mode 100644
index 0000000000..3189ff0fdf
--- /dev/null
+++ b/sysdeps/generic/utmpbits.h
@@ -0,0 +1,52 @@
+/* The `struct utmp' type, describing entries in the utmp file.  Generic/BSDish
+Copyright (C) 1993, 1996 Free Software Foundation, Inc.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifndef _UTMPBITS_H
+
+#define _UTMPBITS_H	1
+#include <features.h>
+
+#include <time.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
+
+__BEGIN_DECLS
+
+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;
+};
+
+__END_DECLS
+
+#endif /* utmpbits.h */
+
diff --git a/sysdeps/gnu/utmpbits.h b/sysdeps/gnu/utmpbits.h
new file mode 100644
index 0000000000..8b939cee86
--- /dev/null
+++ b/sysdeps/gnu/utmpbits.h
@@ -0,0 +1,83 @@
+/* The `struct utmp' type, describing entries in the utmp file.  GNU version.
+Copyright (C) 1993, 1996 Free Software Foundation, Inc.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifndef _UTMPBITS_H
+
+#define _UTMPBITS_H	1
+#include <features.h>
+
+#include <sys/time.h>
+#include <sys/types.h>
+
+#define _PATH_UTMP	"/var/run/utmp"
+#define _PATH_WTMP	"/var/log/wtmp"
+#define _PATH_LASTLOG	"/var/log/lastlog"
+
+#define UTMP_FILE	_PATH_UTMP
+#define WTMP_FILE	_PATH_WTMP
+#define UTMP_FILENAME	UTMP_FILE
+#define WTMP_FILENAME	WTMP_FILE
+
+#define UT_UNKNOWN	0	/* for ut_type field */
+
+#define RUN_LVL		1
+#define BOOT_TIME	2
+#define NEW_TIME	3
+#define OLD_TIME	4
+
+#define INIT_PROCESS	5
+#define LOGIN_PROCESS	6
+#define USER_PROCESS	7
+#define DEAD_PROCESS	8
+
+#define ut_name	ut_user
+
+#define UT_LINESIZE	32
+#define UT_NAMESIZE	32
+#define UT_HOSTSIZE	256
+
+__BEGIN_DECLS
+
+struct lastlog
+{
+  time_t ll_time;
+  char ll_line[UT_LINESIZE];
+  char ll_host[UT_HOSTSIZE];
+};
+
+struct utmp
+{
+  short int ut_type;		/* Type of login.  */
+  pid_t ut_pid;			/* Pid of login process.  */
+  char ut_line[UT_LINESIZE];	/* NUL-terminated devicename of tty.  */
+  char ut_id[4];		/* Inittab id. */
+  char ut_user[UT_NAMESIZE];	/* Username (not NUL terminated).  */
+  char ut_host[UT_HOSTSIZE];	/* Hostname for remote login.  */
+  int ut_exit;			/* Process termination/exit status.  */
+  struct timeval ut_tv;		/* Time entry was made.  */
+  long ut_session;		/* Session ID, used for windowing.  */
+  int32_t ut_addr;		/* Internet address of remote host.  */
+  char pad[32];			/* Reserved for future use.  */
+};
+
+#define ut_time	ut_tv.tv_sec	/* Backwards compatibility.  */
+
+__END_DECLS
+
+#endif /* !_UTMP_H_ */
+
diff --git a/sysdeps/mach/hurd/Implies b/sysdeps/mach/hurd/Implies
index b6e4d864d5..b6063463ce 100644
--- a/sysdeps/mach/hurd/Implies
+++ b/sysdeps/mach/hurd/Implies
@@ -1,2 +1,5 @@
+# The gnu subdirectory exists for things common to both Linux-based and
+# Hurd-based GNU systems.
+gnu
 # The Hurd provides a rough superset of the functionality of 4.4 BSD.
 unix/bsd/bsd4.4
diff --git a/sysdeps/posix/euidaccess.c b/sysdeps/posix/euidaccess.c
index feaa9a2ed3..e50bdfbb8c 100644
--- a/sysdeps/posix/euidaccess.c
+++ b/sysdeps/posix/euidaccess.c
@@ -78,6 +78,16 @@ extern int errno;
 #define R_OK 4
 #endif
 
+#if !defined (S_IROTH) && defined (R_OK)
+# define S_IROTH R_OK
+#endif
+#if !defined (S_IWOTH) && defined (W_OK)
+# define S_IWOTH W_OK
+#endif
+#if !defined (S_IXOTH) && defined (X_OK)
+# define S_IXOTH X_OK
+#endif
+
 
 #ifdef _LIBC
 
diff --git a/sysdeps/unix/sysv/linux/Implies b/sysdeps/unix/sysv/linux/Implies
index 41c26f20f9..4deb1c6245 100644
--- a/sysdeps/unix/sysv/linux/Implies
+++ b/sysdeps/unix/sysv/linux/Implies
@@ -1,3 +1,7 @@
+# The gnu subdirectory exists for things common to both Linux-based and
+# Hurd-based GNU systems.
+gnu
+
 # Linux shares most of the syscalls which are also common to BSD and SVR4.
 unix/common
 
diff --git a/sysdeps/unix/sysv/linux/i386/sys/vm86.h b/sysdeps/unix/sysv/linux/i386/sys/vm86.h
index 32e0055ce8..fd3c2b34f8 100644
--- a/sysdeps/unix/sysv/linux/i386/sys/vm86.h
+++ b/sysdeps/unix/sysv/linux/i386/sys/vm86.h
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <features.h>
 
 /* Get constants and data types from kernel header file.  */
-#include <linux/vm86.h>
+#include <asm/vm86.h>
 
 __BEGIN_DECLS
 
diff --git a/sysdeps/unix/sysv/utmp.h b/sysdeps/unix/sysv/utmp.h
deleted file mode 100644
index 4c3d33e987..0000000000
--- a/sysdeps/unix/sysv/utmp.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _UTMP_H
-
-#define _UTMP_H	1
-
-#include <time.h>
-
-struct utmp
-  {
-#define	ut_name	ut_user
-    char ut_user[8];
-    char ut_id[4];
-    char ut_line[12];
-    short ut_pid;
-    short ut_type;
-    struct exit_status
-      {
-	short e_termination;
-	short e_exit;
-      } ut_exit;
-    time_t ut_time;
-  };
-
-#endif /* utmp.h.  */
diff --git a/sysdeps/unix/sysv/utmpbits.h b/sysdeps/unix/sysv/utmpbits.h
new file mode 100644
index 0000000000..e8d9334af1
--- /dev/null
+++ b/sysdeps/unix/sysv/utmpbits.h
@@ -0,0 +1,42 @@
+/* The `struct utmp' type, describing entries in the utmp file.  System V.
+Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#ifndef _UTMPBITS_H
+
+#define _UTMPBITS_H	1
+
+#include <time.h>
+
+struct utmp
+  {
+#define	ut_name	ut_user
+    char ut_user[8];
+    char ut_id[4];
+    char ut_line[12];
+    short ut_pid;
+    short ut_type;
+    struct exit_status
+      {
+	short e_termination;
+	short e_exit;
+      } ut_exit;
+    time_t ut_time;
+  };
+
+#endif /* utmpbits.h  */