about summary refs log tree commit diff
path: root/sysdeps/mach/hurd/getdtsz.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-05-04 09:00:10 +0000
committerRoland McGrath <roland@gnu.org>1995-05-04 09:00:10 +0000
commite4448b6f58406744ff1a5f400b492ba27e466b56 (patch)
tree84725f363a935ae8498d5f0eaa3a44239af3b5df /sysdeps/mach/hurd/getdtsz.c
parentd66e34cd423425c348bcc83df127dd19711b0b9a (diff)
downloadglibc-e4448b6f58406744ff1a5f400b492ba27e466b56.tar.gz
glibc-e4448b6f58406744ff1a5f400b492ba27e466b56.tar.xz
glibc-e4448b6f58406744ff1a5f400b492ba27e466b56.zip
Wed May 3 11:56:35 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
	* sysdeps/mach/hurd/dup2.c: Fixed broken test in last change.

	* elf/dl-error.c (_dl_catch_error): Actually call the OPERATE
 	function.  Duh.

	* hurd/Makefile (distribute): Added hurdstartup.h.
	* hurd/hurd.h: Remove _hurd_startup decl.

	* hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS): Use __attribute__
 	((__unused__)) instead of gratuitous self reference.

	* sysdeps/mach/hurd/dup2.c: Call _hurd_alloc_fd to expand the
 	table if FD2 doesn't fit.

	* sysdeps/mach/hurd/getdtsz.c: Return the RLIM_NOFILE soft limit,
 	not the current table size.

	* sysdeps/i386/init-first.c: New file.
	* sysdeps/stub/init-first.c: New file.
	
Diffstat (limited to 'sysdeps/mach/hurd/getdtsz.c')
-rw-r--r--sysdeps/mach/hurd/getdtsz.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/getdtsz.c b/sysdeps/mach/hurd/getdtsz.c
index e506963ac3..3e6385f64e 100644
--- a/sysdeps/mach/hurd/getdtsz.c
+++ b/sysdeps/mach/hurd/getdtsz.c
@@ -29,9 +29,9 @@ DEFUN_VOID(__getdtablesize)
 {
   int size;
   HURD_CRITICAL_BEGIN;
-  __mutex_lock (&_hurd_dtable_lock);
-  size = _hurd_dtablesize;
-  __mutex_unlock (&_hurd_dtable_lock);
+  __mutex_lock (&_hurd_rlimits_lock);
+  size = _hurd_rlimits[RLIM_NOFILE].rlim_cur; /* XXX RLIM_INFINITY?? */
+  __mutex_unlock (&_hurd_rlimits_lock);
   HURD_CRITICAL_END;
   return size;
 }