From 4bae55673314ecad6127cc156b1e5e5bb3c88b57 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 8 Jul 1998 22:53:56 +0000 Subject: Update. 1998-07-08 22:18 Ulrich Drepper * elf/Versions: Add _dl_mcount_wrapper_check. * elf/dlfcn.h (DL_CALL_FCT): Don't test _dl_profile_map, simply use _dl_mcount_wrapper_check. * iconv/skeleton.c: Use DL_CALL_FCT, not _CALL_DL_FCT. * elf/dl-reloc.c (_dl_relocate_object): Don't declare using internal_function. * elf/ldsodefs.h: Likewise. * io/fcntl.h: Define SEEK_SET, SEEK_CUR, and SEEK_END. * libio/stdio.h: Make sure va_list is defined for X/Open. Define P_tmpdir for X/Open. * posix/regex.h: Fix typo. * posix/unistd.h: Define intptr_t if not already happened. Add pthread_atfork prototype. * sysdeps/generic/bits/types.h: Define __intptr_t. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/mips/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/sparc/sparc64/types.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise. * sysdeps/wordsize-32/stdint.h: Don't define intptr_t if already done. * sysdeps/wordsize-64/stdint.h: Likewise. * posix/bits/posix1_lim.h: Define _POSIX_CLOCKRES_MIN. * signal/Makefile (headers): Add bits/sigthread.h. * signal/signal.h: Include bits/sigthread.h. * sysdeps/generic/bits/sigthread.h: New file. * stdlib/stdlib.h: Declare rand_r use __USE_POSIX. * sysdeps/generic/bits/confname.h: Define _PC_FILESIZEBITS. * sysdeps/posix/pathconf.c: Handle _PC_FILESIZEBITS. * sysdeps/unix/sysv/linux/alpha/fpathconf.c: New file. * sysdeps/unix/sysv/linux/alpha/pathconf.c: New file. * sysdeps/generic/bits/dlfcn.h: Define RTLD_LOCAL. * elf/rtld.c: Remove preloading and loadpath variables in SUID programs. * sysdeps/generic/dl-sysdep.c: Define unsetenv. * sysdeps/unix/sysv/linux/i386/dl-librecon.h: Define other envvar names. * sysdeps/unix/sysv/linux/bits/errno.h: Define ECANCELED. * sysdeps/unix/sysv/linux/bits/fcntl.h: Define O_RSYNC and O_DSYNC. Remove O_READ and O_WRITE definition. * sysdeps/unix/sysv/linux/bits/resource.h: Define RLIM_SAVED_MAX and RLIM_SAVED_CUR. * sysdeps/unix/sysv/linux/fstatvfs.h: Handle UFS filesystem. 1998-07-06 Andreas Schwab * Makerules ($(common-objpfx)sysd-versions): Expect awk script in scripts directory. Pass move-if-change to awk. (common-generated): Add $(version-maps) and sysd-versions. * versions.awk: Moved to... * scripts/versions.awk: ... here. Use move-if-change to void touching unchanged files. Print "version-maps = ..." instead of "all-version-maps = ..." and without $(common-objpfx). Explain expected variable names. * Makefile (distribute): Updated. 1998-07-06 Andreas Schwab * misc/getttyent.c (getttyent): Don't return with locked stream. * misc/mntent_r.c (__getmntent_r): Likewise. 1998-07-07 18:24 Ulrich Drepper * libio/fileops.c (_IO_do_write): Don't shrink wwrite buffer to zero if stream is line buffered. (_io_file_overflow): Likewise. * libio/libio.h (_IO_putc_unlocked): Make sure that for line-buffered streams writing '\n' flushes the string. --- sysdeps/generic/bits/confname.h | 6 +- sysdeps/generic/bits/dlfcn.h | 7 ++- sysdeps/generic/bits/sigthread.h | 24 ++++++++ sysdeps/generic/bits/types.h | 3 + sysdeps/generic/dl-sysdep.c | 20 +++++++ sysdeps/posix/pathconf.c | 11 +++- sysdeps/unix/sysv/linux/alpha/bits/types.h | 3 + sysdeps/unix/sysv/linux/alpha/fpathconf.c | 64 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/alpha/pathconf.c | 57 +++++++++++++++++++ sysdeps/unix/sysv/linux/bits/errno.h | 4 ++ sysdeps/unix/sysv/linux/bits/fcntl.h | 14 +++-- sysdeps/unix/sysv/linux/bits/resource.h | 4 ++ sysdeps/unix/sysv/linux/bits/types.h | 3 + sysdeps/unix/sysv/linux/fstatvfs.c | 4 ++ sysdeps/unix/sysv/linux/i386/dl-librecon.h | 3 + sysdeps/unix/sysv/linux/mips/bits/types.h | 3 + sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h | 3 + sysdeps/unix/sysv/sysv4/solaris2/bits/types.h | 3 + sysdeps/wordsize-32/stdint.h | 3 + sysdeps/wordsize-64/stdint.h | 3 + 20 files changed, 232 insertions(+), 10 deletions(-) create mode 100644 sysdeps/generic/bits/sigthread.h create mode 100644 sysdeps/unix/sysv/linux/alpha/fpathconf.c create mode 100644 sysdeps/unix/sysv/linux/alpha/pathconf.c (limited to 'sysdeps') diff --git a/sysdeps/generic/bits/confname.h b/sysdeps/generic/bits/confname.h index 8aac5cb..229088d 100644 --- a/sysdeps/generic/bits/confname.h +++ b/sysdeps/generic/bits/confname.h @@ -1,5 +1,5 @@ /* `sysconf', `pathconf', and `confstr' NAME values. Generic version. - Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1993, 1995, 1996, 1997, 1998 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 @@ -48,8 +48,10 @@ enum #define _PC_ASYNC_IO _PC_ASYNC_IO _PC_PRIO_IO, #define _PC_PRIO_IO _PC_PRIO_IO - _PC_SOCK_MAXBUF + _PC_SOCK_MAXBUF, #define _PC_SOCK_MAXBUF _PC_SOCK_MAXBUF + _PC_FILESIZEBITS +#define _PC_FILESIZEBITS _PC_FILESIZEBITS }; /* Values for the argument to `sysconf'. */ diff --git a/sysdeps/generic/bits/dlfcn.h b/sysdeps/generic/bits/dlfcn.h index 7c33694..c2b1c9a 100644 --- a/sysdeps/generic/bits/dlfcn.h +++ b/sysdeps/generic/bits/dlfcn.h @@ -1,5 +1,5 @@ /* System dependand definitions for run-time dynamic loading. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 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 @@ -30,3 +30,8 @@ the symbols of the loaded object and its dependencies are made visible as if the object were linked directly into the program. */ #define RTLD_GLOBAL 0x100 + +/* Unix98 demands the following flag which is the inverse to RTLD_GLOBAL. + The implementation does this by default and so we can define the + value to zero. */ +#define RTLD_LOCAL 0 diff --git a/sysdeps/generic/bits/sigthread.h b/sysdeps/generic/bits/sigthread.h new file mode 100644 index 0000000..de6f2dc --- /dev/null +++ b/sysdeps/generic/bits/sigthread.h @@ -0,0 +1,24 @@ +/* Signal handling function for threaded programs. + Copyright (C) 1998 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 + 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. */ + +#ifndef _SIGNAL_H +# error "Never include this file directly. Use instead" +#endif + +/* There are none available in this configuration. */ diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h index b985a3a..c6b7b88 100644 --- a/sysdeps/generic/bits/types.h +++ b/sysdeps/generic/bits/types.h @@ -115,4 +115,7 @@ typedef __u_quad_t __fsfilcnt64_t; typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* This definition makes this file kind of architecture dependent. */ +typedef long int __intptr_t; + #endif /* bits/types.h */ diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 758fb75..6516ba9 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -279,6 +279,26 @@ _dl_next_ld_env_entry (char ***position) return result; } +void +unsetenv (const char *name) +{ + const size_t len = strlen (name); + char **ep; + + for (ep = __environ; *ep != NULL; ++ep) + if (!strncmp (*ep, name, len) && (*ep)[len] == '=') + { + /* Found it. Remove this pointer by moving later ones back. */ + char **dp = ep; + + do + dp[0] = dp[1]; + while (*dp++); + /* Continue the loop in case NAME appears again. */ + } +} + + /* Return an array of useful/necessary hardware capability names. */ const struct r_strlenpair * internal_function diff --git a/sysdeps/posix/pathconf.c b/sysdeps/posix/pathconf.c index fe2ac8d..2032afe 100644 --- a/sysdeps/posix/pathconf.c +++ b/sysdeps/posix/pathconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1998 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 @@ -144,7 +144,16 @@ __pathconf (const char *path, int name) #else return -1; #endif + + case _PC_FILESIZEBITS: +#ifdef FILESIZEBITS + return FILESIZEBITS; +#else + /* We let platforms with larger file sizes overwrite this value. */ + return 32; +#endif } } +#undef __pathconf weak_alias (__pathconf, pathconf) diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h index 276236d..d4f2217 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/types.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h @@ -110,6 +110,9 @@ typedef struct typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* Duplicates info from stdint.h but this is used in unistd.h. */ +typedef long int __intptr_t; + /* Now add the thread types. */ #include diff --git a/sysdeps/unix/sysv/linux/alpha/fpathconf.c b/sysdeps/unix/sysv/linux/alpha/fpathconf.c new file mode 100644 index 0000000..d8c428d --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/fpathconf.c @@ -0,0 +1,64 @@ +/* Copyright (C) 1991, 1995, 1996, 1998 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 + 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 +#include +#include +#include +#include + +#define EXT2_SUPER_MAGIC 0xef53 +#define UFS_MAGIC 0x00011954 +#define UFS_CIGAM 0x54190100 /* byteswapped MAGIC */ + +static long int default_fpathconf (int fd, int name); + +/* Get file-specific information about descriptor FD. */ +long int +__fpathconf (fd, name) + int fd; + int name; +{ + if (fd < 0) + { + __set_errno (EBADF); + return -1; + } + + if (name == _PC_FILESIZEBITS) + { + /* Test whether this is on a ext2 filesystem which supports large + files. */ + struct statfs fs; + + if (__fstatfs (fd, &fs) < 0 + || (fs.f_type != EXT2_SUPER_MAGIC + && fs.f_type != UFS_MAGIC + && fs.f_type != UFS_CIGAM)) + return 32; + + /* This filesystem supported files >2GB. */ + return 64; + } + + /* Fallback to the generic version. */ + return default_fpathconf (fd, name); +} + +#define __fpathconf static default_fpathconf +#include diff --git a/sysdeps/unix/sysv/linux/alpha/pathconf.c b/sysdeps/unix/sysv/linux/alpha/pathconf.c new file mode 100644 index 0000000..91ca094 --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/pathconf.c @@ -0,0 +1,57 @@ +/* Copyright (C) 1991, 1995, 1996, 1998 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 + 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 +#include +#include +#include +#include +#include + +#define EXT2_SUPER_MAGIC 0xef53 +#define UFS_MAGIC 0x00011954 +#define UFS_CIGAM 0x54190100 /* byteswapped MAGIC */ + +static long int default_pathconf (const char *path, int name); + +/* Get file-specific information about PATH. */ +long int +__pathconf (const char *path, int name) +{ + if (name == _PC_FILESIZEBITS) + { + /* Test whether this is on a ext2 or UFS filesystem which + support large files. */ + struct statfs fs; + + if (__statfs (path, &fs) < 0 + || (fs.f_type != EXT2_SUPER_MAGIC + && fs.f_type != UFS_MAGIC + && fs.f_type != UFS_CIGAM)) + return 32; + + /* This filesystem supported files >2GB. */ + return 64; + } + + /* Fallback to the generic version. */ + return default_pathconf (path, name); +} + +#define __pathconf static default_pathconf +#include diff --git a/sysdeps/unix/sysv/linux/bits/errno.h b/sysdeps/unix/sysv/linux/bits/errno.h index 5976c25..e3e8b32 100644 --- a/sysdeps/unix/sysv/linux/bits/errno.h +++ b/sysdeps/unix/sysv/linux/bits/errno.h @@ -27,6 +27,10 @@ /* Linux has no ENOTSUP error code. */ # define ENOTSUP EOPNOTSUPP +/* Linux also has no ECANCELED error code. Since it is not used here + we define it to an invalid value. */ +# define ECANCELED (-1) + # ifndef __ASSEMBLER__ /* We now need a declaration of the `errno' variable. */ extern int errno; diff --git a/sysdeps/unix/sysv/linux/bits/fcntl.h b/sysdeps/unix/sysv/linux/bits/fcntl.h index 4222631..f63e8ce 100644 --- a/sysdeps/unix/sysv/linux/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/bits/fcntl.h @@ -24,12 +24,6 @@ #include - -/* In GNU, read and write are bits (unlike BSD). */ -#ifdef __USE_GNU -# define O_READ O_RDONLY /* Open for reading. */ -# define O_WRITE O_WRONLY /* Open for writing. */ -#endif /* open/fcntl - O_SYNC is only implemented on blocks devices and on files located on an ext2 file system */ #define O_ACCMODE 0003 @@ -47,6 +41,14 @@ #define O_FSYNC O_SYNC #define O_ASYNC 020000 +/* For now Linux has synchronisity options for data and read operations. + We define the symbols here but let them do the same as O_SYNS since + this is a superset. */ +#ifdef __USE_UNIX98 +# define O_DSYNC O_SYNC /* Synchronize data. */ +# define O_RSYNC O_SYNC /* Synchronize read operations. */ +#endif + /* XXX missing */ #ifdef __USE_LARGEFILE64 # define O_LARGEFILE 0 diff --git a/sysdeps/unix/sysv/linux/bits/resource.h b/sysdeps/unix/sysv/linux/bits/resource.h index faa493e..7b188b9 100644 --- a/sysdeps/unix/sysv/linux/bits/resource.h +++ b/sysdeps/unix/sysv/linux/bits/resource.h @@ -115,6 +115,10 @@ enum __rlimit_resource # define RLIM64_INFINITY 0x7fffffffffffffffLL #endif +/* We can represent all limits. */ +#define RLIM_SAVED_MAX RLIM_INFINITY +#define RLIM_SAVED_CUR RLIM_INFINITY + /* Type for resource quantity measurement. */ #ifndef __USE_FILE_OFFSET64 diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h index 9169109..30dc5e2 100644 --- a/sysdeps/unix/sysv/linux/bits/types.h +++ b/sysdeps/unix/sysv/linux/bits/types.h @@ -134,6 +134,9 @@ typedef __loff_t __off64_t; typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* Duplicates info from stdint.h but this is used in unistd.h. */ +typedef int __intptr_t; + /* Now add the thread types. */ #include diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c index de926f4..43bab44 100644 --- a/sysdeps/unix/sysv/linux/fstatvfs.c +++ b/sysdeps/unix/sysv/linux/fstatvfs.c @@ -49,6 +49,8 @@ #define SYSV4_SUPER_MAGIC 0x012ff7b5 #define SYSV2_SUPER_MAGIC 0x012ff7b6 #define COH_SUPER_MAGIC 0x012ff7b7 +#define UFS_MAGIC 0x00011954 +#define UFS_CIGAM 0x54190100 /* byteswapped MAGIC */ int @@ -99,6 +101,8 @@ fstatvfs (int fd, struct statvfs *buf) case SYSV4_SUPER_MAGIC: case SYSV2_SUPER_MAGIC: case COH_SUPER_MAGIC: + case UFS_MAGIC: + case UFS_CIGAM: default: /* I hope it's safe to assume no fragmentation. */ buf->f_frsize = buf->f_bsize; diff --git a/sysdeps/unix/sysv/linux/i386/dl-librecon.h b/sysdeps/unix/sysv/linux/i386/dl-librecon.h index ef2c4bb..b9ef9af 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-librecon.h +++ b/sysdeps/unix/sysv/linux/i386/dl-librecon.h @@ -54,4 +54,7 @@ break; \ } +/* Extra unsecure variables. */ +#define EXTRA_UNSECURE_ENVVARS "LD_AOUT_LIBRARY_PATH", "LD_AOUT_PRELOAD" + #endif /* dl-librecon.h */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h index 313e96b..2bb8a2a 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/types.h +++ b/sysdeps/unix/sysv/linux/mips/bits/types.h @@ -134,6 +134,9 @@ typedef __loff_t __off64_t; typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* Duplicates info from stdint.h but this is used in unistd.h. */ +typedef int __intptr_t; + /* Now add the thread types. */ #include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h index 8863814..c147dbe 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h @@ -122,6 +122,9 @@ typedef __u_quad_t __fsfilcnt64_t; typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* Duplicates info from stdint.h but this is used in unistd.h. */ +typedef long int __intptr_t; + /* Now add the thread types. */ #include diff --git a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h index 44e343a..e25dec9 100644 --- a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h +++ b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h @@ -115,4 +115,7 @@ typedef __u_quad_t __fsfilcnt64_t; typedef int __t_scalar_t; typedef unsigned int __t_uscalar_t; +/* Duplicates info from stdint.h but this is used in unistd.h. */ +typedef long int __intptr_t; + #endif /* bits/types.h */ diff --git a/sysdeps/wordsize-32/stdint.h b/sysdeps/wordsize-32/stdint.h index c3a9e30..2f693e8 100644 --- a/sysdeps/wordsize-32/stdint.h +++ b/sysdeps/wordsize-32/stdint.h @@ -78,7 +78,10 @@ typedef unsigned long long int uint_fast64_t; /* Types for `void *' pointers. */ +#ifndef intptr_t typedef int intptr_t; +# define intptr_t intptr_t +#endif typedef unsigned int uintptr_t; diff --git a/sysdeps/wordsize-64/stdint.h b/sysdeps/wordsize-64/stdint.h index c0e521a..743fb43 100644 --- a/sysdeps/wordsize-64/stdint.h +++ b/sysdeps/wordsize-64/stdint.h @@ -78,7 +78,10 @@ typedef unsigned long int uint_fast64_t; /* Types for `void *' pointers. */ +#ifndef intptr_t typedef long int intptr_t; +# define intptr_t intptr_t +#endif typedef unsigned long int uintptr_t; -- cgit v1.1