aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2000-03-26 19:17:23 +0000
committerRoland McGrath <roland@gnu.org>2000-03-26 19:17:23 +0000
commit2e6f096fd925850d489df069fb016f7aef35585c (patch)
tree8f6c9b4330f729dbad4ec454888f04b966da8421 /sysdeps
parent8acd0bf21b6092706447a72fc8d39951872d7a2b (diff)
downloadglibc-2e6f096fd925850d489df069fb016f7aef35585c.zip
glibc-2e6f096fd925850d489df069fb016f7aef35585c.tar.gz
glibc-2e6f096fd925850d489df069fb016f7aef35585c.tar.bz2
* hurd/hurdrlimit.c (init_rlimit): Give the RLIMIT_NOFILE soft limit
an initial value of 1024 instead of RLIM_INFINITY. * Versions.def (libmachuser, libhurduser): Remove these sections, since these libraries do not presently use symbol versions. * sysdeps/mach/hurd/getdtsz.c (__getdtablesize): If the resource limit is RLIM_INFINITY, return -1 instead.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/mach/hurd/getdtsz.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/sysdeps/mach/hurd/getdtsz.c b/sysdeps/mach/hurd/getdtsz.c
index 572ac5f..f99f0c1 100644
--- a/sysdeps/mach/hurd/getdtsz.c
+++ b/sysdeps/mach/hurd/getdtsz.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,97,2000 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
@@ -27,13 +27,18 @@
int
__getdtablesize ()
{
- int size;
+ rlim_t limit;
+
HURD_CRITICAL_BEGIN;
__mutex_lock (&_hurd_rlimit_lock);
- size = _hurd_rlimits[RLIMIT_NOFILE].rlim_cur;
+ limit = _hurd_rlimits[RLIMIT_NOFILE].rlim_cur;
__mutex_unlock (&_hurd_rlimit_lock);
HURD_CRITICAL_END;
- return size;
+
+ /* RLIM_INFINITY is not meaningful to our caller. -1 is a good choice
+ because `sysconf (_SC_OPEN_MAX)' calls us, and -1 from sysconf means
+ "no determinable limit". */
+ return limit == RLIM_INFINITY ? -1 : (int) limit;
}
weak_alias (__getdtablesize, getdtablesize)