diff options
| author | Karel Zak | 2012-04-23 14:00:18 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-04-23 14:00:18 +0200 |
| commit | 94988fc902dc159b6ba13fe25261730ccb11d64b (patch) | |
| tree | 06a879e5e758f117e2c657a2067c644b4fdf57c4 /libuuid | |
| parent | lib/fileutils: add get_fd_tabsize() (diff) | |
| download | kernel-qcow2-util-linux-94988fc902dc159b6ba13fe25261730ccb11d64b.tar.gz kernel-qcow2-util-linux-94988fc902dc159b6ba13fe25261730ccb11d64b.tar.xz kernel-qcow2-util-linux-94988fc902dc159b6ba13fe25261730ccb11d64b.zip | |
libuuid: use get_fd_tabsize()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libuuid')
| -rw-r--r-- | libuuid/src/Makefile.am | 1 | ||||
| -rw-r--r-- | libuuid/src/gen_uuid.c | 16 |
2 files changed, 3 insertions, 14 deletions
diff --git a/libuuid/src/Makefile.am b/libuuid/src/Makefile.am index 8e872100b..1df282ede 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 9bcd62c21..caa240e4b 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); |