mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
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.
This commit is contained in:
@ -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>
|
||||
|
Reference in New Issue
Block a user