summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-10-14 22:37:11 +0000
committerUlrich Drepper <drepper@redhat.com>1998-10-14 22:37:11 +0000
commit8d5166fb539a4b50ecf2602cdb7f6bb105ef1d1c (patch)
treebd669a7fb5665ced5db0eaa9e93f89c6362d1ecc
parent6f100d04b0faec0d809e5d244493cb56ba9de348 (diff)
downloadglibc-8d5166fb539a4b50ecf2602cdb7f6bb105ef1d1c.tar.gz
Update.
1998-10-08 Paul Eggert <eggert@twinsun.com> * time/mktime.c (my_mktime_localtime_r): Renamed from localtime_r. Define also if HAVE_LOCALTIME_R && defined localtime_r, with a body that merely expands localtime_r; this works around a bug in Digital Unix 4.0A and 4.0D. 1998-10-14 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/powerpc/syscalls.list: Add s_ioctl. * sysdeps/unix/sysv/linux/powerpc/tcgetattr.c: New file. Define __ioctl to __syscall_ioctl and include Linux version of this file. * sysdeps/unix/sysv/linux/powerpc/tcsetattr.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/ioctl.c: New file. Redirect ioctl calls which handle struct termios. Based on a patch by Dan Jacobowitz <drow@false.org>.
-rw-r--r--ChangeLog17
-rw-r--r--README4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/ioctl.c66
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/syscalls.list1
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/tcgetattr.c4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/tcsetattr.c4
-rw-r--r--time/mktime.c23
7 files changed, 111 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index e18e4585c6..59ec54123a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+1998-10-08 Paul Eggert <eggert@twinsun.com>
+
+ * time/mktime.c (my_mktime_localtime_r): Renamed from localtime_r.
+ Define also if HAVE_LOCALTIME_R && defined localtime_r, with
+ a body that merely expands localtime_r; this works around a
+ bug in Digital Unix 4.0A and 4.0D.
+
+1998-10-14 Ulrich Drepper <drepper@cygnus.com>
+
+ * sysdeps/unix/sysv/linux/powerpc/syscalls.list: Add s_ioctl.
+ * sysdeps/unix/sysv/linux/powerpc/tcgetattr.c: New file. Define
+ __ioctl to __syscall_ioctl and include Linux version of this file.
+ * sysdeps/unix/sysv/linux/powerpc/tcsetattr.c: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/ioctl.c: New file. Redirect
+ ioctl calls which handle struct termios.
+ Based on a patch by Dan Jacobowitz <drow@false.org>.
+
1998-10-14 Ulrich Drepper <drepper@cygnus.com>
* version.h (VERSION): Bump to 2.0.98.
diff --git a/README b/README
index ad0a8f1f7d..3313322693 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory contains the version 2.0.97 test release of the GNU C Library.
+This directory contains the version 2.0.98 test release of the GNU C Library.
Many bugs have been fixed since the last release.
Some bugs surely remain.
@@ -53,7 +53,7 @@ provides the Unix `crypt' function, plus some other entry points.
Because of the United States export restriction on DES implementations,
we are distributing this code separately from the rest of the C
library. There is an extra distribution tar file just for crypt; it is
-called `glibc-crypt-2.0.97.tar.gz'. You can just unpack the crypt
+called `glibc-crypt-2.0.98.tar.gz'. You can just unpack the crypt
distribution along with the rest of the C library and build; you can
also build the library without getting crypt. Users outside the USA
can get the crypt distribution via anonymous FTP from ftp.ifi.uio.no
diff --git a/sysdeps/unix/sysv/linux/powerpc/ioctl.c b/sysdeps/unix/sysv/linux/powerpc/ioctl.c
new file mode 100644
index 0000000000..8d1ea4457e
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/ioctl.c
@@ -0,0 +1,66 @@
+/* Copyright (C) 1998 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. */
+
+#include <stdarg.h>
+#include <termios.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+/* The user-visible size of struct termios has changed. Catch ioctl calls
+ using the new-style struct termios, and translate them to old-style. */
+
+extern int __syscall_ioctl (int fd, unsigned long int request, ...);
+
+int
+__ioctl (int fd, unsigned long int request, ...)
+{
+ void *arg;
+ va_list ap;
+ int result;
+
+ va_start (ap, request);
+ arg = va_arg (ap, void *);
+
+ switch (request)
+ {
+ case TCGETS:
+ result = tcgetattr (fd, (struct termios *) arg);
+ break;
+
+ case TCSETS:
+ result = tcsetattr (fd, TCSANOW, (struct termios *) arg);
+ break;
+
+ case TCSETSW:
+ result = tcsetattr (fd, TCSADRAIN, (struct termios *) arg);
+ break;
+
+ case TCSETSF:
+ result = tcsetattr (fd, TCSAFLUSH, (struct termios *) arg);
+ break;
+
+ default:
+ result = __syscall_ioctl (fd, request, arg);
+ break;
+ }
+
+ va_end (ap);
+
+ return result;
+}
+weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/unix/sysv/linux/powerpc/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/syscalls.list
index 3af0c5b6f8..8d1a7e3378 100644
--- a/sysdeps/unix/sysv/linux/powerpc/syscalls.list
+++ b/sysdeps/unix/sysv/linux/powerpc/syscalls.list
@@ -1,4 +1,5 @@
# File name Caller Syscall name # args Strong name Weak names
+s_ioctl ioctl ioctl 3 __syscall_ioctl
s_llseek llseek _llseek 5 __sys_llseek
s_chown chown chown 3 __syscall_chown
diff --git a/sysdeps/unix/sysv/linux/powerpc/tcgetattr.c b/sysdeps/unix/sysv/linux/powerpc/tcgetattr.c
new file mode 100644
index 0000000000..400539f387
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/tcgetattr.c
@@ -0,0 +1,4 @@
+/* We must use __syscall_ioctl since __ioctl does some extra work. */
+extern int __syscall_ioctl (int __fd, unsigned long int __request, ...);
+#define __ioctl __syscall_ioctl
+#include <sysdeps/unix/sysv/linux/tcgetattr.c>
diff --git a/sysdeps/unix/sysv/linux/powerpc/tcsetattr.c b/sysdeps/unix/sysv/linux/powerpc/tcsetattr.c
new file mode 100644
index 0000000000..cfb8149ba1
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/tcsetattr.c
@@ -0,0 +1,4 @@
+/* We must use __syscall_ioctl since __ioctl does some extra work. */
+extern int __syscall_ioctl (int __fd, unsigned long int __request, ...);
+#define __ioctl __syscall_ioctl
+#include <sysdeps/unix/sysv/linux/tcsetattr.c>
diff --git a/time/mktime.c b/time/mktime.c
index 7b93f1d42e..ab4c0ad2f0 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -124,22 +124,33 @@ time_t __mktime_internal __P ((struct tm *,
#ifdef _LIBC
# define localtime_r __localtime_r
#else
-# if ! HAVE_LOCALTIME_R && ! defined localtime_r
-/* Approximate localtime_r as best we can in its absence. */
-# define localtime_r my_mktime_localtime_r
-static struct tm *localtime_r __P ((const time_t *, struct tm *));
+# if HAVE_LOCALTIME_R == defined localtime_r
+/* Provide our own substitute for a missing or possibly broken localtime_r. */
+static struct tm *my_mktime_localtime_r __P ((const time_t *, struct tm *));
static struct tm *
-localtime_r (t, tp)
+my_mktime_localtime_r (t, tp)
const time_t *t;
struct tm *tp;
{
+# ifdef localtime_r
+ /* Digital Unix 4.0A and 4.0D have a macro localtime_r with the
+ standard meaning, along with an unwanted, nonstandard function
+ localtime_r. The placeholder function my_mktime_localtime_r
+ invokes the macro; use that instead of the system's bogus
+ localtime_r. */
+ return localtime_r (t, tp);
+# undef localtime_r
+# else /* ! defined (localtime_r) */
+ /* Approximate localtime_r as best we can in its absence. */
struct tm *l = localtime (t);
if (! l)
return 0;
*tp = *l;
return tp;
+# endif /* ! defined localtime_r */
}
-# endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */
+# define localtime_r my_mktime_localtime_r
+# endif /* HAVE_LOCALTIME_R == defined localtime_r */
#endif /* ! _LIBC */