New module 'getdtablesize'.

diff --git a/ChangeLog b/ChangeLog
index d6f6d9b2b23337d66d9d0594f69bfb260aa70273..2388852b184f04320b9f4db5e970ba14a8d2bfc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-10-05  Bruno Haible  <bruno@clisp.org>
+
+       New module 'getdtablesize'.
+       * lib/unistd.in.h (getdtablesize): New declaration.
+       * lib/getdtablesize.c: New file.
+       * m4/getdtablesize.m4: New file.
+       * modules/getdtablesize: New file.
+       * m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize
+       GNULIB_GETDTABLESIZE, HAVE_GETDTABLESIZE.
+       * modules/unistd (Makefile.am): Substitute GNULIB_GETDTABLESIZE,
+       HAVE_GETDTABLESIZE.
+       * doc/glibc-functions/getdtablesize.texi: Mention the new module.
+
 2008-10-05  Bruno Haible  <bruno@clisp.org>
 
        * modules/sched (Makefile.am): Fix typo.

diff --git a/doc/glibc-functions/getdtablesize.texi b/doc/glibc-functions/getdtablesize.texi
index 10ff699c19b3adb2dde3d5da96a8e9fad9777cf5..26776df62f04fea3eb22e3c26e21789fdb2b6ee1 100644 (file)
--- a/doc/glibc-functions/getdtablesize.texi
+++ b/doc/glibc-functions/getdtablesize.texi
@@ -2,15 +2,15 @@
 @subsection @code{getdtablesize}
 @findex getdtablesize
 
-Gnulib module: ---
+Gnulib module: getdtablesize
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+mingw.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
-@item
-This function is missing on some platforms:
-mingw.
 @end itemize

diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c
new file mode 100644 (file)
index 0000000..a348cdd
--- /dev/null
+++ b/lib/getdtablesize.c
@@ -0,0 +1,33 @@
+/* getdtablesize() function for platforms that don't have it.
+   Copyright (C) 2008 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2008.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <unistd.h>
+
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+
+#include <stdio.h>
+
+int
+getdtablesize (void)
+{
+  return _getmaxstdio ();
+}
+
+#endif

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 71eaa4d7f9b4e06f336ee09c6db39aedc7ffe787..82b1f0a8130e6d0fb972048008e32ce722fa33a2 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -201,6 +201,20 @@ extern char * getcwd (char *buf, size_t size);
 #endif
 
 
+#if @GNULIB_GETDTABLESIZE@
+# if !@HAVE_GETDTABLESIZE@
+/* Return the maximum number of file descriptors in the current process.  */
+extern int getdtablesize (void);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getdtablesize
+# define getdtablesize() \
+    (GL_LINK_WARNING ("getdtablesize is unportable - " \
+                      "use gnulib module getdtablesize for portability"), \
+     getdtablesize ())
+#endif
+
+
 #if @GNULIB_GETLOGIN_R@
 /* Copies the user's login name to NAME.
    The array pointed to by NAME has room for SIZE bytes.

diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4
new file mode 100644 (file)
index 0000000..3237744
--- /dev/null
+++ b/m4/getdtablesize.m4
@@ -0,0 +1,15 @@
+# getdtablesize.m4 serial 1
+dnl Copyright (C) 2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_GETDTABLESIZE],
+[
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([getdtablesize])
+  if test $ac_cv_func_getdtablesize != yes; then
+    HAVE_GETDTABLESIZE=0
+    AC_LIBOBJ([getdtablesize])
+  fi
+])

diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 9e9a56b3383762851ce34eeff8e829cdb6b50df3..e6eb045cade7491ca4c23140089a48535d3494df 100644 (file)
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 12
+# unistd_h.m4 serial 13
 dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -39,6 +39,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   GNULIB_FSYNC=0;            AC_SUBST([GNULIB_FSYNC])
   GNULIB_FTRUNCATE=0;        AC_SUBST([GNULIB_FTRUNCATE])
   GNULIB_GETCWD=0;           AC_SUBST([GNULIB_GETCWD])
+  GNULIB_GETDTABLESIZE=0;    AC_SUBST([GNULIB_GETDTABLESIZE])
   GNULIB_GETLOGIN_R=0;       AC_SUBST([GNULIB_GETLOGIN_R])
   GNULIB_GETPAGESIZE=0;      AC_SUBST([GNULIB_GETPAGESIZE])
   GNULIB_LCHOWN=0;           AC_SUBST([GNULIB_LCHOWN])
@@ -51,6 +52,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_DUP2=1;            AC_SUBST([HAVE_DUP2])
   HAVE_FSYNC=1;           AC_SUBST([HAVE_FSYNC])
   HAVE_FTRUNCATE=1;       AC_SUBST([HAVE_FTRUNCATE])
+  HAVE_GETDTABLESIZE=1;   AC_SUBST([HAVE_GETDTABLESIZE])
   HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
   HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
   HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])

diff --git a/modules/getdtablesize b/modules/getdtablesize
new file mode 100644 (file)
index 0000000..dd7f855
--- /dev/null
+++ b/modules/getdtablesize
@@ -0,0 +1,25 @@
+Description:
+getdtablesize() function: return maximum number of file descriptors.
+
+Files:
+lib/getdtablesize.c
+m4/getdtablesize.m4
+
+Depends-on:
+unistd
+
+configure.ac:
+gl_FUNC_GETDTABLESIZE
+gl_UNISTD_MODULE_INDICATOR([getdtablesize])
+
+Makefile.am:
+
+Include:
+<unistd.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

diff --git a/modules/unistd b/modules/unistd
index efd97b5947cf5eb7a269cbb63571527f31e58ba7..492f88f12ce4114d47b30464e6b9a28e708e4ee6 100644 (file)
--- a/modules/unistd
+++ b/modules/unistd
@@ -31,6 +31,7 @@ unistd.h: unistd.in.h
              -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
              -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
              -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+             -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
              -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
              -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
              -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
@@ -42,6 +43,7 @@ unistd.h: unistd.in.h
              -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
              -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
              -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+             -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
              -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
              -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
              -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \