diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | malloc/Makefile | 2 | ||||
| -rw-r--r-- | malloc/tst-malloc.c | 68 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getpt.c | 30 |
4 files changed, 109 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 4bec35b94c..f73f31eca2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +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. + 1999-07-06 Ulrich Drepper <drepper@cygnus.com> * libio/oldtmpfile.c: Adjust call of __gen_tempname to match new @@ -9,7 +20,7 @@ * sysdeps/unix/sysv/linux/configure.in: Don't test for libc4 in ldd for SPARC. - * /sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed: New file. + * sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed: New file. Patch by Cristian Gafton. 1999-07-02 Cristian Gafton <gafton@redhat.com> diff --git a/malloc/Makefile b/malloc/Makefile index 9fd4e2c9f0..4cd76cf680 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -25,7 +25,7 @@ all: dist-headers := malloc.h headers := $(dist-headers) obstack.h mcheck.h -tests := mallocbug +tests := mallocbug tst-malloc distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h diff --git a/malloc/tst-malloc.c b/malloc/tst-malloc.c new file mode 100644 index 0000000000..68e25766c8 --- /dev/null +++ b/malloc/tst-malloc.c @@ -0,0 +1,68 @@ +/* Copyright (C) 1999 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1999. + + 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 <malloc.h> +#include <stdio.h> + +static int errors = 0; + +static void +merror (const char *msg) +{ + ++errors; + printf ("Error: %s\n", msg); +} + +int +main (void) +{ + void *p; + int save; + + errno = 0; + + p = malloc (-1); + save = errno; + + if (p != NULL) + merror ("malloc (-1) succeeded."); + + if (p == NULL && save != ENOMEM) + merror ("errno is not set correctly"); + + p = malloc (10); + if (p == NULL) + merror ("malloc (10) failed."); + + /* realloc (p, 0) == free (p). */ + p = realloc (p, 0); + if (p != NULL) + merror ("realloc (p, 0) failed."); + + p = malloc (0); + if (p == NULL) + merror ("malloc (0) failed."); + + p = realloc (p, 0); + if (p != NULL) + merror ("realloc (p, 0) failed."); + + return errors != 0; +} diff --git a/sysdeps/unix/sysv/linux/getpt.c b/sysdeps/unix/sysv/linux/getpt.c index d2e0f1a7b8..511b9004c0 100644 --- a/sysdeps/unix/sysv/linux/getpt.c +++ b/sysdeps/unix/sysv/linux/getpt.c @@ -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) |