aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-09 01:59:17 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-09 01:59:17 +0000
commit0101a56fd61979c3905421e31931071b251042ba (patch)
tree46f1f67a73095c0c2dadb4bc8ad749b6c8b25a63
parent354e6102a11f6ce2e39462c158b039a07f18ac7c (diff)
downloadglibc-0101a56fd61979c3905421e31931071b251042ba.zip
glibc-0101a56fd61979c3905421e31931071b251042ba.tar.gz
glibc-0101a56fd61979c3905421e31931071b251042ba.tar.bz2
Update.
* include/stdlib.h: Add __posix_openpt declaration. * stdlib/stdlib.h: Add posix_openpt declaration. * login/Versions: Add posix_openpt for GLIBC_2.2.1. * sysdeps/generic/getpt.c: Define posix_openpt. * sysdeps/unix/bsd/getpt.c: Likewise. * sysdeps/unix/sysv/linux/getpt.c: Likewise.
-rw-r--r--ChangeLog7
-rw-r--r--include/stdlib.h1
-rw-r--r--login/Versions4
-rw-r--r--stdlib/stdlib.h11
-rw-r--r--sysdeps/generic/getpt.c13
-rw-r--r--sysdeps/unix/bsd/getpt.c17
-rw-r--r--sysdeps/unix/sysv/linux/getpt.c24
7 files changed, 68 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f4b570..25c3b56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2001-01-08 Ulrich Drepper <drepper@redhat.com>
+ * include/stdlib.h: Add __posix_openpt declaration.
+ * stdlib/stdlib.h: Add posix_openpt declaration.
+ * login/Versions: Add posix_openpt for GLIBC_2.2.1.
+ * sysdeps/generic/getpt.c: Define posix_openpt.
+ * sysdeps/unix/bsd/getpt.c: Likewise.
+ * sysdeps/unix/sysv/linux/getpt.c: Likewise.
+
* time/Makefile (tests): Add tst-mktime.
* time/tst-mktime.c: New file.
diff --git a/include/stdlib.h b/include/stdlib.h
index f57df69..d3c8779 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -46,6 +46,7 @@ extern char *__canonicalize_file_name (__const char *__name);
extern char *__realpath (__const char *__name, char *__resolved);
extern int __ptsname_r (int __fd, char *__buf, size_t __buflen);
extern int __getpt (void);
+extern int __posix_openpt (int __oflag);
extern int __add_to_environ (const char *name, const char *value,
const char *combines, int replace);
diff --git a/login/Versions b/login/Versions
index 11a069a..401fc0e 100644
--- a/login/Versions
+++ b/login/Versions
@@ -36,6 +36,10 @@ libc {
# g*
getutmpx; getutmp;
}
+ GLIBC_2.2.1 {
+ # p*
+ posix_openpt;
+ }
}
libutil {
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index a9577e3..de12734 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2000, 2001 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
@@ -812,12 +812,19 @@ extern int getsubopt (char **__restrict __optionp,
#ifdef __USE_XOPEN
-
/* Setup DES tables according KEY. */
extern void setkey (__const char *__key) __THROW;
+#endif
+
/* X/Open pseudo terminal handling. */
+#ifdef __USE_XOPEN2K
+/* Return a master pseudo-terminal handle. */
+extern int posix_openpt (int __oflag) __THROW;
+#endif
+
+#ifdef __USE_XOPEN
/* The next four functions all take a master pseudo-tty fd and
perform an operation on the associated slave: */
diff --git a/sysdeps/generic/getpt.c b/sysdeps/generic/getpt.c
index 4260d5f..2a4511c 100644
--- a/sysdeps/generic/getpt.c
+++ b/sysdeps/generic/getpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
@@ -30,5 +30,16 @@ __getpt ()
}
weak_alias (__getpt, getpt)
+/* We cannot define posix_openpt in general for BSD systems. */
+int
+__posix_openpt (oflag)
+ int oflag;
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+weak_alias (__posix_openpt, posix_openpt)
+
stub_warning (getpt)
+stub_warning (posix_openpt)
#include <stub-tag.h>
diff --git a/sysdeps/unix/bsd/getpt.c b/sysdeps/unix/bsd/getpt.c
index 42615ba..6bd1804 100644
--- a/sysdeps/unix/bsd/getpt.c
+++ b/sysdeps/unix/bsd/getpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
@@ -77,3 +77,18 @@ __getpt (void)
#undef __getpt
weak_alias (__getpt, getpt)
+
+#ifndef HAVE_POSIX_OPENPT
+/* We cannot define posix_openpt in general for BSD systems. */
+int
+__posix_openpt (oflag)
+ int oflag;
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+weak_alias (__posix_openpt, posix_openpt)
+
+stub_warning (posix_openpt)
+# include <stub-tag.h>
+#endif
diff --git a/sysdeps/unix/sysv/linux/getpt.c b/sysdeps/unix/sysv/linux/getpt.c
index 3b01ef5..30f7f30 100644
--- a/sysdeps/unix/sysv/linux/getpt.c
+++ b/sysdeps/unix/sysv/linux/getpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
@@ -36,14 +36,15 @@ int __bsd_getpt (void);
/* Open a master pseudo terminal and return its file descriptor. */
int
-__getpt (void)
+__posix_openpt (oflag)
+ int oflag;
{
static int have_no_dev_ptmx;
int fd;
if (!have_no_dev_ptmx)
{
- fd = __open (_PATH_DEVPTMX, O_RDWR);
+ fd = __open (_PATH_DEVPTMX, oflag);
if (fd != -1)
{
struct statfs fsbuf;
@@ -54,7 +55,7 @@ __getpt (void)
if (devpts_mounted
|| (__statfs (_PATH_DEVPTS, &fsbuf) == 0
&& fsbuf.f_type == DEVPTS_SUPER_MAGIC)
- || (__statfs (_PATH_DEV, &fsbuf) == 0
+ || (__statfs (_PATH_DEV, &fsbuf) == 0
&& fsbuf.f_type == DEVFS_SUPER_MAGIC))
{
/* Everything is ok. */
@@ -76,11 +77,24 @@ __getpt (void)
}
}
- return __bsd_getpt ();
+ return -1;
+}
+weak_alias (__posix_openpt, posix_openpt)
+
+
+int
+__getpt (void)
+{
+ int fd = __posix_openpt (O_RDWR);
+ if (fd == -1)
+ fd = __bsd_getpt ();
+ return fd;
}
+
#define PTYNAME1 "pqrstuvwxyzabcde";
#define PTYNAME2 "0123456789abcdef";
#define __getpt __bsd_getpt
+#define HAVE_POSIX_OPENPT
#include <sysdeps/unix/bsd/getpt.c>