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/posix/fpathconf.c | 8 ++++ sysdeps/posix/isfdtype.c | 37 ++++++++++++++++++ sysdeps/posix/sysconf.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 sysdeps/posix/isfdtype.c (limited to 'sysdeps/posix') 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}. */ -- cgit v1.2.3