Eric applied this patch from Ralf Wildenhues on 2010-03-02:
> Remove fts-lgpl module.
>
> * modules/fts-lgpl: Remove.
> * MODULES.html.sh (func_all_modules): Adjust.
> * check-module (find_included_lib_files): Adjust.
> * m4/fts.m4 (gl_FUNC_FTS_LGPL): Remove.
There is no use for the GNULIB_FTS macro now. It is always 1.
Here's a proposed patch to remove it:
2010-03-27 Bruno Haible <br...@clisp.org>
Remove vestiges of fts-lgpl module.
* lib/fts_.h: Assume GNULIB_FTS is 1.
* lib/fts.c: Likewise.
* modules/fts (configure.ac): Remove gl_MODULE_INDICATOR invocation.
--- lib/fts_.h.orig Sun Mar 28 03:08:37 2010
+++ lib/fts_.h Sun Mar 28 01:39:21 2010
@@ -143,7 +143,6 @@
# define FTS_STOP 0x2000 /* (private) unrecoverable error */
int fts_options; /* fts_open options, global flags */
-# if GNULIB_FTS
/* Map a directory's device number to a boolean. The boolean is
true if for that file system (type determined by a single fstatfs
call per FS) st_nlink can be used to calculate the number of
@@ -175,7 +174,6 @@
struct cycle_check_state *state;
} fts_cycle;
-# endif
/* A stack of the file descriptors corresponding to the
most-recently traversed parent directories.
Currently used only in FTS_CWDFD mode. */
--- lib/fts.c.orig Sun Mar 28 03:08:37 2010
+++ lib/fts.c Sun Mar 28 01:39:21 2010
@@ -205,14 +205,7 @@
static int fts_safe_changedir (FTS *, FTSENT *, int, const char *)
internal_function;
-#if GNULIB_FTS
-# include "fts-cycle.c"
-#else
-static bool enter_dir (FTS *fts, FTSENT *ent) { return true; }
-static void leave_dir (FTS *fts, FTSENT *ent) {}
-static bool setup_dir (FTS *fts) { return true; }
-static void free_dir (FTS *fts) {}
-#endif
+#include "fts-cycle.c"
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -614,10 +607,8 @@
fd_ring_clear (&sp->fts_fd_ring);
-#if GNULIB_FTS
if (sp->fts_leaf_optimization_works_ht)
hash_free (sp->fts_leaf_optimization_works_ht);
-#endif
free_dir (sp);
@@ -717,7 +708,6 @@
leaf_optimization_applies (int dir_fd _GL_UNUSED) { return false; }
#endif
-#if GNULIB_FTS
/* link-count-optimization entry:
map an stat.st_dev number to a boolean: leaf_optimization_works */
struct LCO_ent
@@ -799,7 +789,6 @@
return opt_ok;
}
-#endif
/*
* Special case of "/" at the end of the file name so that slashes aren't
@@ -1731,27 +1720,6 @@
return (p->fts_level == FTS_ROOTLEVEL ? FTS_D :
FTS_DOT);
}
-#if !GNULIB_FTS
- {
- /*
- * Cycle detection is done by brute force when the directory
- * is first encountered. If the tree gets deep enough or the
- * number of symbolic links to directories is high enough,
- * something faster might be worthwhile.
- */
- FTSENT *t;
-
- for (t = p->fts_parent;
- t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
- if (sbp->st_ino == t->fts_statp->st_ino
- && sbp->st_dev == t->fts_statp->st_dev)
- {
- p->fts_cycle = t;
- return (FTS_DC);
- }
- }
-#endif
-
return (FTS_D);
}
if (S_ISLNK(sbp->st_mode))
--- modules/fts.orig Sun Mar 28 03:08:37 2010
+++ modules/fts Sun Mar 28 01:39:21 2010
@@ -27,7 +27,6 @@
configure.ac:
gl_FUNC_FTS
-gl_MODULE_INDICATOR([fts])
Makefile.am:
