about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--resource/Makefile5
-rw-r--r--resource/bug-ulimit1.c21
3 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index af8cabbead..d789003b03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	[BZ #6947]
 	* sysdeps/unix/sysv/linux/ulimit.c (__ulimit): Fix return value
 	for UL_SETFSIZE.
+	* resource/Makefile (tests): Add bug-ulimit1.
+	* resource/bug-ulimit1.c: New file.
 
 	[BZ #6974]
 	* sunrpc/rpc_main.c (mkfile_output): Properly handle filename
diff --git a/resource/Makefile b/resource/Makefile
index 68f9ff65a3..705c73608c 100644
--- a/resource/Makefile
+++ b/resource/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1991,1992,1994,1995,1997,2005 Free Software Foundation, Inc.
+# Copyright (C) 1991,1992,1994,1995,1997,2005,2008
+# 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
@@ -24,6 +25,6 @@ headers	  := sys/resource.h bits/resource.h sys/vlimit.h sys/vtimes.h	\
 routines := getrlimit setrlimit getrlimit64 setrlimit64 getrusage ulimit      \
 	    vlimit vtimes getpriority setpriority nice
 
-tests = tst-getrlimit
+tests = tst-getrlimit bug-ulimit1
 
 include ../Rules
diff --git a/resource/bug-ulimit1.c b/resource/bug-ulimit1.c
new file mode 100644
index 0000000000..334d7fff04
--- /dev/null
+++ b/resource/bug-ulimit1.c
@@ -0,0 +1,21 @@
+#include <ulimit.h>
+#include <stdio.h>
+
+int
+main (void)
+{
+  int retval = 0;
+  long int res;
+
+  res = ulimit (UL_SETFSIZE, 10000);
+  printf ("Result of ulimit (UL_SETFSIZE, 10000): %ld\n", res);
+  if (res != 10000)
+    retval = 1;
+
+  res = ulimit (UL_GETFSIZE);
+  printf ("Result of ulimit(UL_GETFSIZE): %ld\n", res);
+  if (res != 10000)
+    retval = 1;
+
+  return retval;
+}