lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Update

Browse Source 
1999-07-07  Andreas Schwab  <schwab@suse.de>

	* sysdeps/unix/sysv/linux/getpt.c: Check that /dev/pts is mounted.
	(_PATH_DEVPTS, DEVPTS_SUPER_MAGIC): New definitions.
	(_PATH_DEVPTMX): Use _PATH_DEV.

1999-07-07  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* malloc/tst-malloc.c: New file.  Tests some basic functionality.
	* malloc/Makefile (tests): Add tst-malloc.

	* sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed: New file.
This commit is contained in:
Ulrich Drepper
1999-07-07 12:14:17 +00:00
parent a381d207f5
commit d7807bfa57
4 changed files with 109 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sysdeps/unix/sysv/linux/getpt.c
View File

@ -20,9 +20,17 @@
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
#include <paths.h>
#include <sys/statfs.h>
/* Constant that identifies the `devpts' filesystem. */
#define DEVPTS_SUPER_MAGIC 0x1cd1
/* Path to the master pseudo terminal cloning device. */
#define _PATH_DEVPTMX "/dev/ptmx"
#define _PATH_DEVPTMX _PATH_DEV "ptmx"
/* Directory containing the UNIX98 pseudo terminals. */
#define _PATH_DEVPTS _PATH_DEV "pts"
/* Prototype for function that opens BSD-style master pseudo-terminals. */
int __bsd_getpt (void);
@ -38,7 +46,25 @@ __getpt (void)
{
fd = __open (_PATH_DEVPTMX, O_RDWR);
if (fd != -1)
return fd;
{
struct statfs fsbuf;
static int devpts_mounted;
/* Check that the /dev/pts filesystem is mounted. */
if (devpts_mounted
|| (__statfs (_PATH_DEVPTS, &fsbuf) == 0
&& fsbuf.f_type == DEVPTS_SUPER_MAGIC))
{
/* Everything is ok. */
devpts_mounted = 1;
return fd;
}
/* If /dev/pts is not mounted then the UNIX98 pseudo terminals
are not usable. */
__close (fd);
have_no_dev_ptmx = 1;
}
else
{
if (errno == ENOENT || errno == ENODEV)