From: Roland McGrath <roland@gnu.org>
Date: Sun, 26 Mar 2000 19:17:23 +0000 (+0000)
Subject: * hurd/hurdrlimit.c (init_rlimit): Give the RLIMIT_NOFILE soft limit
X-Git-Tag: cvs/glibc_2-1-91~800
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e6f096fd925850d489df069fb016f7aef35585c;p=thirdparty%2Fglibc.git

* 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.
---

diff --git a/ChangeLog b/ChangeLog
index 795c6b79044..86ff40ddda6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-03-26  Roland McGrath  <roland@baalperazim.frob.com>
+
+	* 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.
+
 2000-03-24  Andreas Jaeger  <aj@suse.de>
 
 	* Makefile (postclean): Added soversions.i.
diff --git a/Versions.def b/Versions.def
index b038115fdb6..31674d4bc30 100644
--- a/Versions.def
+++ b/Versions.def
@@ -22,17 +22,11 @@ libdl {
   GLIBC_2.0
   GLIBC_2.1
 }
-libhurduser {
-  GLIBC_2.0
-}
 libm {
   GLIBC_2.0
   GLIBC_2.1
   GLIBC_2.2
 }
-libmachuser {
-  GLIBC_2.0
-}
 libnsl {
   GLIBC_2.0
   GLIBC_2.1
diff --git a/sysdeps/mach/hurd/getdtsz.c b/sysdeps/mach/hurd/getdtsz.c
index 572ac5fd0ea..f99f0c11ea9 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)