canonicalize-lgpl: use eloop-threshold
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 24 Dec 2020 19:38:48 +0000 (11:38 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 24 Dec 2020 20:06:49 +0000 (12:06 -0800)
* lib/canonicalize-lgpl.c [!_LIBC]: Include eloop-threshold.h.
(MAXSYMLINKS, __eloop_threshold): Remove.
* modules/canonicalize-lgpl (Depends-on): Add eloop-threshold.

ChangeLog
lib/canonicalize-lgpl.c
modules/canonicalize-lgpl

index b119360f349de95171c830e30bdb02fe2da7d145..edca84874ceffd3332ce2abc4a5f3cf10ae8476f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2020-12-24  Paul Eggert  <eggert@cs.ucla.edu>
 
+       canonicalize-lgpl: use eloop-threshold
+       * lib/canonicalize-lgpl.c [!_LIBC]: Include eloop-threshold.h.
+       (MAXSYMLINKS, __eloop_threshold): Remove.
+       * modules/canonicalize-lgpl (Depends-on): Add eloop-threshold.
+
        eloop-threshold: new module
        * config/srclist.txt: Add a comment about it.
        * lib/eloop-threshold.h, modules/eloop-threshold: New files.
index 3d4218516958625f695ed4aa315ef831b845e939..c6cb506307a792cd001d66834ca7928b754808dd 100644 (file)
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <eloop-threshold.h>
 #include <scratch_buffer.h>
 
 #ifdef _LIBC
-# include <eloop-threshold.h>
 # include <shlib-compat.h>
 typedef ptrdiff_t idx_t;
 # define IDX_MAX PTRDIFF_MAX
@@ -85,14 +85,6 @@ typedef ptrdiff_t idx_t;
 # define __rawmemchr rawmemchr
 # define __readlink readlink
 # define __stat stat
-# ifndef MAXSYMLINKS
-#  ifdef SYMLOOP_MAX
-#   define MAXSYMLINKS SYMLOOP_MAX
-#  else
-#   define MAXSYMLINKS 20
-#  endif
-# endif
-# define __eloop_threshold() MAXSYMLINKS
 #endif
 
 #ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
index dfad9202fb1b2d3f795efcf79517d5506da8fef6..b5f3e7f697b8c1de0a1c28fed2fd16db0ae6493c 100644 (file)
@@ -13,6 +13,7 @@ extensions
 stdlib
 nocrash
 double-slash-root [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+eloop-threshold   [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 errno             [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 fcntl-h           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 filename          [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]