1 diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c
5 +++ b/gzip/lib/getdtablesize.c
7 +/* getdtablesize() function for platforms that don't have it.
8 + Copyright (C) 2008-2010 Free Software Foundation, Inc.
9 + Written by Bruno Haible <bruno@clisp.org>, 2008.
11 + This program is free software: you can redistribute it and/or modify
12 + it under the terms of the GNU General Public License as published by
13 + the Free Software Foundation; either version 3 of the License, or
14 + (at your option) any later version.
16 + This program is distributed in the hope that it will be useful,
17 + but WITHOUT ANY WARRANTY; without even the implied warranty of
18 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 + GNU General Public License for more details.
21 + You should have received a copy of the GNU General Public License
22 + along with this program. If not, see <http://www.gnu.org/licenses/>. */
29 +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
33 +/* Cache for the previous getdtablesize () result. */
34 +static int dtablesize;
39 + if (dtablesize == 0)
41 + /* We are looking for the number N such that the valid file descriptors
42 + are 0..N-1. It can be obtained through a loop as follows:
45 + for (fd = 3; fd < 65536; fd++)
46 + if (dup2 (0, fd) == -1)
50 + On Windows XP, the result is 2048.
51 + The drawback of this loop is that it allocates memory for a libc
52 + internal array that is never freed.
54 + The number N can also be obtained as the upper bound for
55 + _getmaxstdio (). _getmaxstdio () returns the maximum number of open
56 + FILE objects. The sanity check in _setmaxstdio reveals the maximum
57 + number of file descriptors. This too allocates memory, but it is
58 + freed when we call _setmaxstdio with the original value. */
59 + int orig_max_stdio = _getmaxstdio ();
61 + for (bound = 0x10000; _setmaxstdio (bound) < 0; bound = bound / 2)
63 + _setmaxstdio (orig_max_stdio);
70 diff --git a/lib/Makefile.in b/lib/Makefile.in
71 index 1b42ddb..d71b78f 100644
74 @@ -95,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
75 $(top_srcdir)/m4/ftello.m4 \
76 $(top_srcdir)/m4/getcwd-abort-bug.m4 \
77 $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \
78 + $(top_srcdir)/m4/getdtablesize.m4 \
79 $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettime.m4 \
80 $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \
81 $(top_srcdir)/m4/gnu-make.m4 $(top_srcdir)/m4/gnulib-common.m4 \
82 @@ -901,7 +902,7 @@ EXTRA_DIST = alloca.in.h $(top_srcdir)/build-aux/announce-gen \
83 fpucw.h fpurge.c stdio-impl.h freadahead.h stdio-impl.h \
84 freading.h stdio-impl.h frexp.c frexp.c frexpl.c fseeko.c \
85 stdio-impl.h fseterr.h stdio-impl.h ftello.c \
86 - $(top_srcdir)/build-aux/gendocs.sh getcwd.c getopt.c \
87 + $(top_srcdir)/build-aux/gendocs.sh getcwd.c getopt.c getdtablesize.c \
88 getopt.in.h getopt1.c getopt_int.h gettime.c gettimeofday.c \
89 $(top_srcdir)/build-aux/git-version-gen \
90 $(top_srcdir)/build-aux/gitlog-to-changelog \
91 @@ -975,6 +976,7 @@ EXTRA_libgzip_a_SOURCES = calloc.c calloc.c chdir-long.c chown.c \
92 error.c exitfail.c fchdir.c fclose.c fcntl.c creat-safer.c \
93 open-safer.c fdopendir.c openat-proc.c fflush.c fpending.c \
94 fprintf.c fpurge.c frexp.c frexp.c frexpl.c fseeko.c ftello.c \
96 getcwd.c getopt.c getopt1.c gettime.c gettimeofday.c isnan.c \
97 isnand.c isnan.c isnanf.c isnan.c isnanl.c lchown.c lseek.c \
98 lstat.c malloc.c malloc.c mbrtowc.c mbsinit.c memchr.c \
99 diff --git a/gzip/m4/getdtablesize.m4 b/gzip/m4/getdtablesize.m4
101 index 0000000..d238628
103 +++ b/gzip/m4/getdtablesize.m4
105 +# getdtablesize.m4 serial 1
106 +dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
107 +dnl This file is free software; the Free Software Foundation
108 +dnl gives unlimited permission to copy and/or distribute it,
109 +dnl with or without modifications, as long as this notice is preserved.
111 +AC_DEFUN([gl_FUNC_GETDTABLESIZE],
113 + AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
114 + AC_CHECK_FUNCS_ONCE([getdtablesize])
115 + if test $ac_cv_func_getdtablesize != yes; then
116 + HAVE_GETDTABLESIZE=0
117 + AC_LIBOBJ([getdtablesize])