From 503054c0dd57109017b36870c430dab00fccaa8b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 4 Jul 1996 00:07:18 +0000 Subject: Wed Jul 3 16:29:41 1996 Roland McGrath * nss/getXXbyYY_r.c (REENTRANT_NAME): Cast FCT in __nss_next call. * sysdeps/generic/sbrk.c: Always call __brk (0) to update __curbrk. * malloc/malloc-size.c (malloc_usable_size): Renamed from malloc_object_allocation_size. * malloc/malloc.h: Fix decl. * sys/select.h: New file, wrapper header. * posix/sys/types.h [__USE_BSD]: Include ; remove fd_set, associated macros, and select decl. * sysdeps/posix/isfdtype.c: New file. Tue Jul 2 23:45:14 1996 Ulrich Drepper The latest Japanese proposal for POSIX locales renames the CHARMAP keyword in locale definition files to CHARCONV. * locale/programs/ld-ctype.c, locale/programs/locales.h: Rename function ctype_is_charmap to ctype_is_charconv. * locale/programs/locfile-kw.gperf: Replace charmap keyword with charconv. * locale/programs/locfile-token.h: Add definition of token charconv. * locale/programs/locfile.c: Recognize charconv keyword. Rename lables according to this. * locale/weight.h (get_weight): Cast constants to prevent warnings. * stdlib/strtod.c, stdlib/strtol.c, string/strcoll.c, string/strxfrm.c: Add some more casts to prevent signed<->unsigned warnings. New stuff described in P1003.1g. * misc/Makefile (headers): Add sys/select.h. (routines): Add pselect. * misc/sys/select.h: New file. Declare select functions and needed data types and macros. * sysdeps/generic/pselect.c: New file. Add generic implementation of pselect() function which uses select(). * posix/getconf.c: Recognize new variables from P1003.1g. * posix/posix1_lim.h: Define _POSIX_FD_SETSIZE, _POSIX_QLIMIT, _POSIX_HIWAT, and _POSIX_UIO_MAXIOV. * posix/unistd.h: Add description of the P1003.1g variables. * sysdeps/generic/confname.h: Define _SC_* values for new variables. * sysdeps/posix/fpathconf.c (fpathconf): Add handling of _PC_SOCK_MAXBUF. * sysdeps/stub/fpathconf.c (fpathconf): Ditto. * sysdeps/posix/sysconf.c (sysconf): Add handling of new P1003.1g variables. * sysdeps/stub/sysconf.c (sysconf): Ditto. * sysdeps/unix/sysv/linux/posix_opt.h: Define _POSIX_POLL and _POSIX_SELECT since Linux has this. * socket/Makefile (routines): Add isfdtype. * sysdeps/generic/sys/socket.h: Add prototype for isfdtype. * sysdeps/stub/isfdtype.c: New file. Stub implementation of isfdtype. * wcsmbs/wcrtomb.c (wcrtomb): Fix typo. --- sysdeps/generic/confname.h | 36 +++++++++++++- sysdeps/generic/pselect.c | 55 +++++++++++++++++++++ sysdeps/generic/sbrk.c | 8 ++- sysdeps/generic/sys/socket.h | 4 ++ sysdeps/posix/fpathconf.c | 8 +++ sysdeps/posix/isfdtype.c | 37 ++++++++++++++ sysdeps/posix/sysconf.c | 98 +++++++++++++++++++++++++++++++++++++ sysdeps/stub/fpathconf.c | 3 +- sysdeps/stub/isfdtype.c | 29 +++++++++++ sysdeps/stub/sysconf.c | 14 ++++++ sysdeps/unix/sysv/linux/posix_opt.h | 6 +++ 11 files changed, 293 insertions(+), 5 deletions(-) create mode 100644 sysdeps/generic/pselect.c create mode 100644 sysdeps/posix/isfdtype.c create mode 100644 sysdeps/stub/isfdtype.c (limited to 'sysdeps') diff --git a/sysdeps/generic/confname.h b/sysdeps/generic/confname.h index 717229a3ab..3bc6b27652 100644 --- a/sysdeps/generic/confname.h +++ b/sysdeps/generic/confname.h @@ -41,8 +41,10 @@ enum #define _PC_SYNC_IO _PC_SYNC_IO _PC_ASYNC_IO, #define _PC_ASYNC_IO _PC_ASYNC_IO - _PC_PRIO_IO + _PC_PRIO_IO, #define _PC_PRIO_IO _PC_PRIO_IO + _PC_SOCK_MAXBUF +#define _PC_SOCK_MAXBUF _PC_SOCK_MAXBUF }; /* Values for the argument to `sysconf'. */ @@ -156,7 +158,37 @@ enum #define _SC_2_FORT_RUN _SC_2_FORT_RUN _SC_2_SW_DEV, #define _SC_2_SW_DEV _SC_2_SW_DEV - _SC_2_LOCALEDEF + _SC_2_LOCALEDEF, +#define _SC_2_LOCALEDEF _SC_2_LOCALEDEF + + _SC_PII, +#define _SC_PII _SC_PII + _SC_PII_XTI, +#define _SC_PII_XTI _SC_PII_XTI + _SC_PII_SOCKET, +#define _SC_PII_SOCKET _SC_PII_SOCKET + _SC_PII_INTERNET, +#define _SC_PII_INTERNET _SC_PII_INTERNET + _SC_PII_OSI, +#define _SC_PII_OSI _SC_PII_OSI + _SC_POLL, +#define _SC_POLL _SC_POLL + _SC_SELECT, +#define _SC_SELECT _SC_SELECT + _SC_UIO_MAXIOV, +#define _SC_UIO_MAXIOV _SC_UIO_MAXIOV + _SC_PII_INTERNET_STREAM, +#define _SC_PII_INTERNET_STREAM _SC_PII_INTERNET_STREAM + _SC_PII_INTERNET_DGRAM, +#define _SC_PII_INTERNET_DGRAM _SC_PII_INTERNET_DGRAM + _SC_PII_OSI_COTS, +#define _SC_PII_OSI_COTS _SC_PII_OSI_COTS + _SC_PII_OSI_CLTS, +#define _SC_PII_OSI_CLTS _SC_PII_OSI_CLTS + _SC_PII_OSI_M, +#define _SC_PII_OSI_M _SC_PII_OSI_M + _SC_T_IOV_MAX +#define _SC_T_IOV_MAX _SC_T_IOV_MAX }; #ifdef __USE_POSIX2 diff --git a/sysdeps/generic/pselect.c b/sysdeps/generic/pselect.c new file mode 100644 index 0000000000..165fd32148 --- /dev/null +++ b/sysdeps/generic/pselect.c @@ -0,0 +1,55 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper , 1996. + +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 + +/* Check the first NFDS descriptors each in READFDS (if not NULL) for read + readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS + (if not NULL) for exceptional conditions. If TIMEOUT is not NULL, time out + after waiting the interval specified therein. Returns the number of ready + descriptors, or -1 for errors. */ +int +__pselect (nfds, readfds, writefds, exceptfds, timeout) + int nfds; + fd_set *readfds; + fd_set *writefds; + fd_set *exceptfds; + struct timespec *timeout; +{ + struct timeval tval; + int retval; + + /* Change nanosecond number to microseconds. This may loose + precision and therefore the `pselect` should be available. But + for now it is hardly found. */ + if (timeout != NULL) + TIMESPEC_TO_TIMEVAL (&tval, timeout); + + retval = __select (nfds, readfds, writefds, exceptfds, + timeout != NULL ? &tval : NULL); + + /* Change the result back. The remaining time must be made + available to the caller. */ + if (timeout != NULL) + TIMEVAL_TO_TIMESPEC (&tval, timeout); + + return retval; +} +weak_alias (__pselect, pselect) diff --git a/sysdeps/generic/sbrk.c b/sysdeps/generic/sbrk.c index de7794697d..698f814e2b 100644 --- a/sysdeps/generic/sbrk.c +++ b/sysdeps/generic/sbrk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 @@ -30,7 +30,11 @@ __sbrk (ptrdiff_t increment) { void *oldbrk; - if (__curbrk == 0 && __brk (0) < 0) + /* Always update __curbrk from the kernel's brk value. That way two + separate instances of __brk and __sbrk can share the heap, returning + interleaved pieces of it. This happens when libc.so is loaded by + dlopen in a statically-linked program that already uses __brk. */ + if (__brk (0) < 0) return (void *) -1; if (increment == 0) diff --git a/sysdeps/generic/sys/socket.h b/sysdeps/generic/sys/socket.h index 759ff3b9b2..6ee3ebe52e 100644 --- a/sysdeps/generic/sys/socket.h +++ b/sysdeps/generic/sys/socket.h @@ -321,6 +321,10 @@ extern int accept __P ((int __fd, __SOCKADDR_ARG __addr, extern int shutdown __P ((int __fd, int __how)); +/* Determine whether FILDES if the property identified by the value if + FDTYPE. */ +extern int isfdtype __P ((int __fildes, int __fdtype)); + __END_DECLS #endif /* sys/socket.h */ diff --git a/sysdeps/posix/fpathconf.c b/sysdeps/posix/fpathconf.c index 649a2a4c49..9b54b5f04a 100644 --- a/sysdeps/posix/fpathconf.c +++ b/sysdeps/posix/fpathconf.c @@ -136,6 +136,14 @@ DEFUN(__fpathconf, (fd, name), int fd AND int name) #else return -1; #endif + + case _PC_SOCK_MAXBUF: +#ifdef SOCK_MAXBUF + return SOCK_MAXBUF; +#else + errno = ENOSYS; + return -1; +#endif } errno = ENOSYS; diff --git a/sysdeps/posix/isfdtype.c b/sysdeps/posix/isfdtype.c new file mode 100644 index 0000000000..9ac38a8b9f --- /dev/null +++ b/sysdeps/posix/isfdtype.c @@ -0,0 +1,37 @@ +/* isfdtype - Determine whether descriptor has given property. +Copyright (C) 1996 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 + +int +isfdtype (int fildes, int fdtype) +{ + struct stat st; + int result; + + { + int save_error = errno; + result = fstat (fildes, &st); + errno = save_error; + } + + return result ?: (st.st_mode & S_IFMT) == fdtype; +} diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c index a52258fee2..f0dbc23606 100644 --- a/sysdeps/posix/sysconf.c +++ b/sysdeps/posix/sysconf.c @@ -336,6 +336,104 @@ DEFUN(__sysconf, (name), int name) return -1; #endif + case _SC_PII: +#ifdef _POSIX_PII + return 1; +#else + return -1; +#endif + + case _SC_PII_XTI: +#ifdef _POSIX_PII_XTI + return 1; +#else + return -1; +#endif + + case _SC_PII_SOCKET: +#ifdef _POSIX_PII_SOCKET + return 1; +#else + return -1; +#endif + + case _SC_PII_INTERNET: +#ifdef _POSIX_PII_INTERNET + return 1; +#else + return -1; +#endif + + case _SC_PII_OSI: +#ifdef _POSIX_PII_OSI + return 1; +#else + return -1; +#endif + + case _SC_POLL: +#ifdef _POSIX_POLL + return 1; +#else + return -1; +#endif + + case _SC_SELECT: +#ifdef _POSIX_SELECT + return 1; +#else + return -1; +#endif + + case _SC_UIO_MAXIOV: +#ifdef UIO_MAXIOV + return UIO_MAXIOV; +#else + return -1; +#endif + + case _SC_PII_INTERNET_STREAM: +#ifdef _POSIX_PII_INTERNET_STREAM + return 1; +#else + return -1; +#endif + + case _SC_PII_INTERNET_DGRAM: +#ifdef _POSIX_PII_INTERNET_DGRAM + return 1; +#else + return -1; +#endif + + case _SC_PII_OSI_COTS: +#ifdef _POSIX_PII_OSI_COTS + return 1; +#else + return -1; +#endif + + case _SC_PII_OSI_CLTS: +#ifdef _POSIX_PII_OSI_CLTS + return 1; +#else + return -1; +#endif + + case _SC_PII_OSI_M: +#ifdef _POSIX_PII_OSI_M + return 1; +#else + return -1; +#endif + + case _SC_T_IOV_MAX: +#ifdef _T_IOV_MAX + return _T_IOV_MAX; +#else + return -1; +#endif + case _SC_2_VERSION: /* This is actually supposed to return the version of the 1003.2 utilities on the system {POSIX2_VERSION}. */ diff --git a/sysdeps/stub/fpathconf.c b/sysdeps/stub/fpathconf.c index 4f1f1d4a1d..75880fd647 100644 --- a/sysdeps/stub/fpathconf.c +++ b/sysdeps/stub/fpathconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 @@ -44,6 +44,7 @@ DEFUN(__fpathconf, (fd, name), int fd AND int name) case _PC_NAME_MAX: case _PC_PATH_MAX: case _PC_PIPE_BUF: + case _PC_SOCK_MAXBUF: case _PC_CHOWN_RESTRICTED: case _PC_NO_TRUNC: case _PC_VDISABLE: diff --git a/sysdeps/stub/isfdtype.c b/sysdeps/stub/isfdtype.c new file mode 100644 index 0000000000..560efd83fc --- /dev/null +++ b/sysdeps/stub/isfdtype.c @@ -0,0 +1,29 @@ +/* isfdtype - Determine whether descriptor has given property. Stub version. +Copyright (C) 1996 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 + + +int +isfdtype (int fildes, int fdtype) +{ + errno = ENOSYS; + return -1; +} +stub_warning (isfdtype) diff --git a/sysdeps/stub/sysconf.c b/sysdeps/stub/sysconf.c index fc9ee84d13..816724ef52 100644 --- a/sysdeps/stub/sysconf.c +++ b/sysdeps/stub/sysconf.c @@ -59,6 +59,20 @@ DEFUN(__sysconf, (name), int name) case _SC_SHARED_MEMORY_OBJECTS: case _SC_VERSION: + case _SC_PII: + case _SC_PII_XTI: + case _SC_PII_SOCKET: + case _SC_PII_OSI: + case _SC_POLL: + case _SC_SELECT: + case _SC_UIO_MAXIOV: + case _SC_PII_INTERNET_STREAM: + case _SC_PII_INTERNET_DGRAM: + case _SC_PII_OSI_COTS: + case _SC_PII_OSI_CLTS: + case _SC_PII_OSI_M: + case _SC_T_IOV_MAX: + case _SC_BC_BASE_MAX: case _SC_BC_DIM_MAX: case _SC_BC_SCALE_MAX: diff --git a/sysdeps/unix/sysv/linux/posix_opt.h b/sysdeps/unix/sysv/linux/posix_opt.h index d336335fc3..c1ff431fc9 100644 --- a/sysdeps/unix/sysv/linux/posix_opt.h +++ b/sysdeps/unix/sysv/linux/posix_opt.h @@ -47,6 +47,12 @@ Boston, MA 02111-1307, USA. */ /* Setting of memory protections is supported. */ #define _POSIX_MEMORY_PROTECTION 1 +/* Implementation supports `poll' function. */ +#define _POSIX_POLL 1 + +/* Implementation supports `select' and `pselect' functions. */ +#define _POSIX_SELECT 1 + /* Only root can change owner of file. */ #define _POSIX_CHOWN_RESTRICTED 1 -- cgit v1.2.3