diff options
Diffstat (limited to 'sysdeps/posix')
-rw-r--r-- | sysdeps/posix/getcwd.c | 12 | ||||
-rw-r--r-- | sysdeps/posix/getdtsz.c | 16 | ||||
-rw-r--r-- | sysdeps/posix/sigsetmask.c | 17 | ||||
-rw-r--r-- | sysdeps/posix/sysconf.c | 117 | ||||
-rw-r--r-- | sysdeps/posix/ttyname_r.c | 3 |
5 files changed, 142 insertions, 23 deletions
diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c index af858a2..2d8011e 100644 --- a/sysdeps/posix/getcwd.c +++ b/sysdeps/posix/getcwd.c @@ -286,10 +286,10 @@ __getcwd (buf, size) mount_point = dotdev != thisdev; /* Search for the last directory. */ - dirstream = opendir (dotp); + dirstream = __opendir (dotp); if (dirstream == NULL) goto lose; - while ((d = readdir (dirstream)) != NULL) + while ((d = __readdir (dirstream)) != NULL) { if (d->d_name[0] == '.' && (d->d_name[1] == '\0' || @@ -304,7 +304,7 @@ __getcwd (buf, size) if (__lstat (name, &st) < 0) { int save = errno; - (void) closedir (dirstream); + (void) __closedir (dirstream); errno = save; goto lose; } @@ -315,7 +315,7 @@ __getcwd (buf, size) if (d == NULL) { int save = errno; - (void) closedir (dirstream); + (void) __closedir (dirstream); errno = save; goto lose; } @@ -336,7 +336,7 @@ __getcwd (buf, size) buf = realloc (path, size); if (buf == NULL) { - (void) closedir (dirstream); + (void) __closedir (dirstream); free (path); errno = ENOMEM; /* closedir might have changed it. */ return NULL; @@ -348,7 +348,7 @@ __getcwd (buf, size) pathp -= namlen; (void) memcpy (pathp, d->d_name, namlen); *--pathp = '/'; - (void) closedir (dirstream); + (void) __closedir (dirstream); } thisdev = dotdev; diff --git a/sysdeps/posix/getdtsz.c b/sysdeps/posix/getdtsz.c index 2080dc7..22ecb4f 100644 --- a/sysdeps/posix/getdtsz.c +++ b/sysdeps/posix/getdtsz.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 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 @@ -16,17 +16,21 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> +#include <limits.h> #include <unistd.h> - -extern long int EXFUN(__sysconf, (int)); +#include <sys/resource.h> /* Return the maximum number of file descriptors the current process could possibly have. */ int -DEFUN_VOID(__getdtablesize) +__getdtablesize (void) { - return __sysconf (_SC_OPEN_MAX); + struct rlimit ru; + + /* This should even work if `getrlimit' is not implemented. POSIX.1 + does not define this function but we will generate a stub which + returns -1. */ + return __getrlimit (RLIMIT_NOFILE, &ru) < 0 ? OPEN_MAX : ru.rlim_cur; } weak_alias (__getdtablesize, getdtablesize) diff --git a/sysdeps/posix/sigsetmask.c b/sysdeps/posix/sigsetmask.c index 12e77a6..8775627 100644 --- a/sysdeps/posix/sigsetmask.c +++ b/sysdeps/posix/sigsetmask.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1994, 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 @@ -16,29 +16,28 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> #include <errno.h> #include <signal.h> /* Set the mask of blocked signals to MASK, returning the old mask. */ int -DEFUN(__sigsetmask, (mask), int mask) +__sigsetmask (int mask) { register int sig; sigset_t set, oset; - if (__sigemptyset(&set) < 0) + if (__sigemptyset (&set) < 0) return -1; - + if (sizeof (mask) == sizeof (set)) *(int *) &set = mask; else for (sig = 1; sig < NSIG; ++sig) if ((mask & sigmask(sig)) && - __sigaddset(&set, sig) < 0) + __sigaddset (&set, sig) < 0) return -1; - if (sigprocmask(SIG_SETMASK, &set, &oset) < 0) + if (__sigprocmask (SIG_SETMASK, &set, &oset) < 0) return -1; mask = 0; @@ -46,8 +45,8 @@ DEFUN(__sigsetmask, (mask), int mask) mask = *(int *) &oset; else for (sig = 1; sig < NSIG; ++sig) - if (__sigismember(&oset, sig)) - mask |= sigmask(sig); + if (__sigismember (&oset, sig)) + mask |= sigmask (sig); return mask; } diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c index dda72a3..5b2caf6 100644 --- a/sysdeps/posix/sysconf.c +++ b/sysdeps/posix/sysconf.c @@ -18,10 +18,12 @@ Cambridge, MA 02139, USA. */ #include <errno.h> #include <limits.h> -#include <unistd.h> +#include <grp.h> +#include <pwd.h> #include <stddef.h> #include <stdio.h> #include <time.h> +#include <unistd.h> extern int __getdtablesize __P ((void)); extern size_t __getpagesize __P ((void)); @@ -480,6 +482,119 @@ __sysconf (name) #else return -1; #endif + + /* POSIX 1003.1c (POSIX Threads). */ + case _SC_THREADS: +#ifdef _POSIX_THREADS + return 1; +#else + return -1; +#endif + + case _SC_THREAD_SAFE_FUNCTIONS: +#ifdef _POSIX_THREAD_SAFE_FUNCTIONS + return 1; +#else + return -1; +#endif + + case _SC_GETGR_R_SIZE_MAX: +#ifdef NSS_BUFLEN_GROUP + return NSS_BUFLEN_GROUP; +#else + return -1; +#endif + + case _SC_GETPW_R_SIZE_MAX: +#ifdef NSS_BUFLEN_PASSWD + return NSS_BUFLEN_PASSWD; +#else + return -1; +#endif + + case _SC_LOGIN_NAME_MAX: +#ifdef _POSIX_LOGIN_NAME_MAX + return _POSIX_LOGIN_NAME_MAX; +#else + return -1; +#endif + + case _SC_TTY_NAME_MAX: +#ifdef _POSIX_TTY_NAME_MAX + return _POSIX_TTY_NAME_MAX; +#else + return -1; +#endif + + case _SC_THREAD_DESTRUCTOR_ITERATIONS: +#ifdef PTHREAD_DESTRUCTOR_ITERATIONS + return PTHREAD_DESTRUCTOR_ITERATIONS; +#else + return -1; +#endif + + case _SC_THREAD_KEYS_MAX: +#ifdef PTHREAD_KEYS_MAX + return PTHREAD_KEYS_MAX; +#else + return -1; +#endif + + case _SC_THREAD_STACK_MIN: +#ifdef PTHREAD_STACK_MIN + return PTHREAD_STACK_MIN; +#else + return -1; +#endif + + case _SC_THREAD_THREADS_MAX: +#ifdef PTHREAD_THREADS_MAX + return PTHREAD_THREADS_MAX; +#else + return -1; +#endif + + case _SC_THREAD_ATTR_STACKADDR: +#ifdef _POSIX_THREAD_ATTR_STACKADDR + return 1; +#else + return -1; +#endif + + case _SC_THREAD_ATTR_STACKSIZE: +#ifdef _POSIX_THREAD_ATTR_STACKSIZE + return 1; +#else + return -1; +#endif + + case _SC_THREAD_PRIORITY_SCHEDULING: +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING + return 1; +#else + return -1; +#endif + + case _SC_THREAD_PRIO_INHERIT: +#ifdef _POSIX_THREAD_PRIO_INHERIT + return 1; +#else + return -1; +#endif + + case _SC_THREAD_PRIO_PROTECT: +#ifdef _POSIX_THREAD_PRIO_PROTECT + return 1; +#else + return -1; +#endif + + case _SC_THREAD_PROCESS_SHARED: +#ifdef _POSIX_THREAD_PROCESS_SHARED + return 1; +#else + return -1; +#endif } } diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c index 4450a83..a05dbd5 100644 --- a/sysdeps/posix/ttyname_r.c +++ b/sysdeps/posix/ttyname_r.c @@ -33,7 +33,7 @@ Cambridge, MA 02139, USA. */ /* Store at most BUFLEN character of the pathname of the terminal FD is open on in BUF. Return 0 on success, -1 otherwise. */ int -ttyname_r (fd, buf, buflen) +__ttyname_r (fd, buf, buflen) int fd; char *buf; int buflen; @@ -89,3 +89,4 @@ ttyname_r (fd, buf, buflen) errno = save; return -1; } +weak_alias (__ttyname_r, ttyname_r) |