update from main archive 960927

diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index 1b118ae..6f961b6 100644 (file)
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -548,11 +548,11 @@ time_output (struct localedef_t *locale, const char *output_path)
   ++last_idx;
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-# define ERA_B1 time->era_entries
-# define ERA_B2 time->era_entries_ob
-#else
 # define ERA_B1 time->era_entries_ob
 # define ERA_B2 time->era_entries
+#else
+# define ERA_B1 time->era_entries
+# define ERA_B2 time->era_entries_ob
 #endif
   idx[1 + last_idx] = idx[last_idx];
   for (num = 0; num < time->cur_num_era; ++num)

diff --git a/login/Makefile b/login/Makefile
index 9968743..56a6aeb 100644 (file)
--- a/login/Makefile
+++ b/login/Makefile
@@ -22,7 +22,7 @@
 
 subdir := login
 
-headers        := utmp.h utmpbits.h lastlog.h
+headers        := utmp.h utmpbits.h lastlog.h pty.h
 
 routines := setutent endutent getutent getutid getutline pututline     \
            setutent_r endutent_r getutent_r getutid_r getutline_r      \

diff --git a/login/pty.h b/login/pty.h
new file mode 100644 (file)
index 0000000..da78742
--- /dev/null
+++ b/login/pty.h
@@ -0,0 +1,43 @@
+/* pty.h - Functions for pseudo TTY handlung.
+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., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifndef _PTY_H
+
+#define _PTY_H 1
+#include <features.h>
+
+#include <termios.h>
+
+
+__BEGIN_DECLS
+
+/* Create pseudo tty master slave pair with NAME and set terminal
+   attributes according to TERMP and WINP and return handles for both
+   ends in AMASTER and ASLAVE.  */
+extern int openpty __P ((int *__amaster, int *__aslave, char *__name,
+                        struct termios *__termp, struct winsize *__winp));
+
+/* Create child process and establish the slave pseudo terminal as the
+   child's controlling terminal.  */
+extern int forkpty __P ((int *__amaster, char *__name,
+                        struct termios *__termp, struct winsize *__winp));
+
+__END_DECLS
+
+#endif /* pty.h */

diff --git a/login/pututline_r.c b/login/pututline_r.c
index 42ea3cd..33ba96f 100644 (file)
--- a/login/pututline_r.c
+++ b/login/pututline_r.c
@@ -96,7 +96,7 @@ __pututline_r (const struct utmp *id, struct utmp_data *utmp_data)
   if (result >= 0)
     /* Position file correctly.  */
     if (utmp_data->loc_utmp < (off_t) sizeof (struct utmp)
-       || utmp_data->loc_utmp - sizeof (struct utmp) > st.st_size)
+       || (off_t) (utmp_data->loc_utmp - sizeof (struct utmp)) > st.st_size)
       /* Not located at any valid entry.  Add at the end.  */
       {
        result = lseek (utmp_data->ut_fd, 0L, SEEK_END);