From 0101a56fd61979c3905421e31931071b251042ba Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 9 Jan 2001 01:59:17 +0000 Subject: 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. --- sysdeps/unix/sysv/linux/getpt.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'sysdeps/unix/sysv/linux/getpt.c') 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 , 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 -- cgit v1.1