From: Karel Zak <kzak@redhat.com>
Date: Mon, 23 Apr 2012 12:00:18 +0000 (+0200)
Subject: libuuid: use get_fd_tabsize()
X-Git-Tag: v2.22-rc1~493
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94988fc902dc159b6ba13fe25261730ccb11d64b;p=thirdparty%2Futil-linux.git

libuuid: use get_fd_tabsize()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libuuid/src/Makefile.am b/libuuid/src/Makefile.am
index 8e872100bb..1df282ede5 100644
--- a/libuuid/src/Makefile.am
+++ b/libuuid/src/Makefile.am
@@ -26,6 +26,7 @@ libuuid_la_SOURCES = \
 	uuidP.h \
 	uuid_time.c \
 	$(uuidinc_HEADERS) \
+	$(top_srcdir)/lib/fileutils.c \
 	$(top_srcdir)/lib/randutils.c
 
 libuuid_la_DEPENDENCIES = uuid.sym
diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index 9bcd62c21b..caa240e4be 100644
--- a/libuuid/src/gen_uuid.c
+++ b/libuuid/src/gen_uuid.c
@@ -94,6 +94,7 @@
 #include "uuidP.h"
 #include "uuidd.h"
 #include "randutils.h"
+#include "fileutils.h"
 
 #ifdef HAVE_TLS
 #define THREAD_LOCAL static __thread
@@ -368,20 +369,7 @@ static ssize_t read_all(int fd, char *buf, size_t count)
  */
 static void close_all_fds(void)
 {
-	int i, max;
-
-#if defined(HAVE_SYSCONF) && defined(_SC_OPEN_MAX)
-	max = sysconf(_SC_OPEN_MAX);
-#elif defined(HAVE_GETDTABLESIZE)
-	max = getdtablesize();
-#elif defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
-	struct rlimit rl;
-
-	getrlimit(RLIMIT_NOFILE, &rl);
-	max = rl.rlim_cur;
-#else
-	max = OPEN_MAX;
-#endif
+	int i, max = get_fd_tabsize();
 
 	for (i=0; i < max; i++) {
 		close(i);