Update.

1998-04-24  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* streams/Makefile (headers): Add sys/stropts.h.
	* streams/sys/stropts.h: New file.

1998-04-25  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/ttyname.c,
	sysdeps/unix/sysv/linux/ttyname_r.c: New files, like
	sysdeps/posix/ttyname*.c, but look in /dev/pts first.

1998-04-25  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/ptsname.c: Fix off-by-one bug in second
	argument of _itoa_word.

1998-04-24  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/syscalls.list (s_getcwd, s_getdents,
	s_pread64, s_pwrite64, s_reboot, s_sigpending, s_sigprocmask): Set
	caller to getcwd, getdents, pread64, pwrite64, reboot, sigpending,
	sigprocmask, resp., instead of EXTRA.

	* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Remove
	s_pread64 and s_pwrite64.

1 files changed, 182 insertions, 0 deletions

diff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c
new file mode 100644
index 0000000000..9f22f71f31
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/ttyname_r.c
@@ -0,0 +1,182 @@
+/* Copyright (C) 1991, 92, 93, 95, 96, 97, 98 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 <errno.h>
+#include <limits.h>
+#include <stddef.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+static int getttyname_r __P ((int fd, char *buf, size_t buflen,
+			      dev_t mydev, ino_t myino, int save,
+			      int *dostat)) internal_function;
+
+static int
+internal_function
+getttyname_r (fd, buf, buflen, mydev, myino, save, dostat)
+     int fd;
+     char *buf;
+     size_t buflen;
+     dev_t mydev;
+     ino_t myino;
+     int save;
+     int *dostat;
+{
+  struct stat st;
+  DIR *dirstream;
+  struct dirent *d;
+  size_t devlen = strlen (buf);
+
+  dirstream = opendir (buf);
+  if (dirstream == NULL)
+    {
+      *dostat = -1;
+      return errno;
+    }
+
+  while ((d = readdir (dirstream)) != NULL)
+    if (((ino_t) d->d_fileno == myino || *dostat)
+	&& strcmp (d->d_name, "stdin")
+	&& strcmp (d->d_name, "stdout")
+	&& strcmp (d->d_name, "stderr"))
+      {
+	char *cp;
+	size_t needed = _D_EXACT_NAMLEN (d) + 1;
+
+	if (needed > buflen)
+	  {
+	    *dostat = -1;
+	    (void) closedir (dirstream);
+	    __set_errno (ERANGE);
+	    return ERANGE;
+	  }
+
+	cp = __stpncpy (buf + devlen, d->d_name, needed);
+	cp[0] = '\0';
+
+	if (stat (buf, &st) == 0
+#ifdef _STATBUF_ST_RDEV
+	    && S_ISCHR (st.st_mode) && st.st_rdev == mydev
+#else
+	    && (ino_t) d->d_fileno == myino && st.st_dev == mydev
+#endif
+	   )
+	  {
+	    (void) closedir (dirstream);
+	    __set_errno (save);
+	    return 0;
+	  }
+      }
+
+  (void) closedir (dirstream);
+  __set_errno (save);
+  /* It is not clear what to return in this case.  `isatty' says FD
+     refers to a TTY but no entry in /dev has this inode.  */
+  return ENOTTY;
+}
+
+/* Store at most BUFLEN character of the pathname of the terminal FD is
+   open on in BUF.  Return 0 on success,  otherwise an error number.  */
+int
+__ttyname_r (fd, buf, buflen)
+     int fd;
+     char *buf;
+     size_t buflen;
+{
+  struct stat st, st1;
+  int dostat = 0;
+  int save = errno;
+  int ret;
+
+  /* Test for the absolute minimal size.  This makes life easier inside
+     the loop.  */
+  if (!buf)
+    {
+      __set_errno (EINVAL);
+      return EINVAL;
+    }
+
+  if (buflen < sizeof ("/dev/pts/"))
+    {
+      __set_errno (ERANGE);
+      return ERANGE;
+    }
+
+  if (!__isatty (fd))
+    {
+      __set_errno (ENOTTY);
+      return ENOTTY;
+    }
+
+  if (fstat (fd, &st) < 0)
+    return errno;
+
+  /* Prepare the result buffer.  */
+  memcpy (buf, "/dev/pts/", sizeof ("/dev/pts/"));
+  buflen -= sizeof ("/dev/pts/") - 1;
+
+  if (stat (buf, &st1) == 0 && S_ISDIR (st1.st_mode))
+    {
+#ifdef _STATBUF_ST_RDEV
+      ret = getttyname_r (fd, buf, buflen, st.st_rdev, st.st_ino, save,
+			  &dostat);
+#else
+      ret = getttyname_r (fd, buf, buflen, st.st_dev, st.st_ino, save,
+			  &dostat);
+#endif
+    }
+  else
+    {
+      __set_errno (save);
+      ret = ENOENT;
+    }
+
+  if (ret && dostat != -1)
+    {
+      buf[sizeof ("/dev/") - 1] = '\0';
+      buflen += sizeof ("pts/") - 1;
+#ifdef _STATBUF_ST_RDEV
+      ret = getttyname_r (fd, buf, buflen, st.st_rdev, st.st_ino, save,
+			  &dostat);
+#else
+      ret = getttyname_r (fd, buf, buflen, st.st_dev, st.st_ino, save,
+			  &dostat);
+#endif
+    }
+
+  if (ret && dostat != -1)
+    {
+      buf[sizeof ("/dev/") - 1] = '\0';
+      dostat = 1;
+#ifdef _STATBUF_ST_RDEV
+      ret = getttyname_r (fd, buf, buflen, st.st_rdev, st.st_ino,
+			  save, &dostat);
+#else
+      ret = getttyname_r (fd, buf, buflen, st.st_dev, st.st_ino,
+			  save, &dostat);
+#endif
+    }
+
+  return ret;
+}
+
+weak_alias (__ttyname_r, ttyname_r)