X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Freaddir.m4;h=a20117c9ea4b35182cef8fc2eab8b5405137492d;hb=ca228dfaa975f52317ac7c7cd64ed7175bc0c31d;hp=d6da048252ca546643420261eaf711e81256c554;hpb=1787be8861172ecc7e09b70b0047cd6f92eeb0e0;p=gnulib.git

diff --git a/m4/readdir.m4 b/m4/readdir.m4
index d6da04825..a20117c9e 100644
--- a/m4/readdir.m4
+++ b/m4/readdir.m4
@@ -1,22 +1,31 @@
-#serial 4
+#serial 9
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2006 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 dnl SunOS's readdir is broken in such a way that rm.c has to add extra code
 dnl to test whether a NULL return value really means there are no more files
 dnl in the directory.
 dnl
-dnl Detect the problem by creating a directory containing 300 files (254 not
-dnl counting . and .. is the minimum) and see if a loop doing `readdir; unlink'
-dnl removes all of them.
+dnl And the rm from coreutils-5.0 exposes a similar problem when there
+dnl are 338 or more files in a directory on a Darwin-6.5 system
+dnl
+dnl Detect the problem by creating a directory containing 500 files (254 not
+dnl counting . and .. is the minimum for SunOS, 338 for Darwin) and see
+dnl if a loop doing `readdir; unlink' removes all of them.
 dnl
 dnl Define HAVE_WORKING_READDIR if readdir does *not* have this problem.
 
 dnl Written by Jim Meyering.
 
-AC_DEFUN([jm_FUNC_READDIR],
+AC_DEFUN([GL_FUNC_READDIR],
 [dnl
 AC_REQUIRE([AC_HEADER_DIRENT])
-AC_CHECK_HEADERS(string.h)
-AC_CACHE_CHECK([for working readdir], jm_cv_func_working_readdir,
+AC_CACHE_CHECK([for working readdir], gl_cv_func_working_readdir,
   [dnl
   # Arrange for deletion of the temporary directory this test creates, in
   # case the test itself fails to delete everything -- as happens on Sunos.
@@ -24,10 +33,9 @@ AC_CACHE_CHECK([for working readdir], jm_cv_func_working_readdir,
 
   AC_TRY_RUN(
 [#   include <stdio.h>
+#   include <stdlib.h>
 #   include <sys/types.h>
-#   if HAVE_STRING_H
-#    include <string.h>
-#   endif
+#   include <string.h>
 
 #   ifdef HAVE_DIRENT_H
 #    include <dirent.h>
@@ -50,20 +58,20 @@ AC_CACHE_CHECK([for working readdir], jm_cv_func_working_readdir,
      (Basename[0] == '.' && (Basename[1] == '\0' \
 			     || (Basename[1] == '.' && Basename[2] == '\0')))
 
-/* Don't try to use replacement rmdir; it wouldn't resolve at link time.  */
-#   undef rmdir
+/* Don't try to use replacement mkdir; it wouldn't resolve at link time.  */
+#   undef mkdir
 
     static void
-    create_300_file_dir (const char *dir)
+    create_N_file_dir (const char *dir, size_t n_files)
     {
-      int i;
+      unsigned int i;
 
       if (mkdir (dir, 0700))
 	abort ();
       if (chdir (dir))
 	abort ();
 
-      for (i = 0; i < 300; i++)
+      for (i = 0; i < n_files; i++)
 	{
 	  char file_name[4];
 	  FILE *out;
@@ -117,16 +125,16 @@ AC_CACHE_CHECK([for working readdir], jm_cv_func_working_readdir,
     main ()
     {
       const char *dir = "conf-dir";
-      create_300_file_dir (dir);
+      create_N_file_dir (dir, 500);
       remove_dir (dir);
       exit (0);
     }],
-  jm_cv_func_working_readdir=yes,
-  jm_cv_func_working_readdir=no,
-  jm_cv_func_working_readdir=no)])
+  gl_cv_func_working_readdir=yes,
+  gl_cv_func_working_readdir=no,
+  gl_cv_func_working_readdir=no)])
 
-  if test $jm_cv_func_working_readdir = yes; then
+  if test $gl_cv_func_working_readdir = yes; then
     AC_DEFINE(HAVE_WORKING_READDIR, 1,
-[Define if readdir is found to work properly in some unusual cases. ])
+      [Define if readdir is found to work properly in some unusual cases. ])
   fi
 ])