[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. 08ed00124d8b6b445d3b91a9aa15eec638b02f05

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 688216cd30f479573019bafae9b0ced8509e356d
Author: Clint Adams <schizo at debian.org>
Date:   Fri Oct 9 00:14:11 2009 -0400

    Wrap fts_children.

diff --git a/configure.ac b/configure.ac
index 8ae90d5..faf057e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,7 +422,7 @@ AC_SUBST(LDPRELOADABS)
 AC_SUBST(LDEXTRAVAR)
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(strdup strstr getresuid setresuid getresgid setresgid setfsuid setfsgid fts_read)
+AC_CHECK_FUNCS(strdup strstr getresuid setresuid getresgid setresgid setfsuid setfsgid fts_read fts_children)
 
 AC_CHECK_DECLS([setenv, unsetenv])
 AC_REPLACE_FUNCS([setenv])
diff --git a/libfakeroot.c b/libfakeroot.c
index c72f6c1..43e2448 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -1514,3 +1514,28 @@ FTSENT *fts_read(FTS *ftsp) {
   return r;
 }
 #endif /* HAVE_FTS_READ */
+
+#ifdef HAVE_FTS_CHILDREN
+FTSENT *fts_children(FTS *ftsp, int options) {
+  FTSENT *r;
+
+  r=next_fts_children(ftsp, options);
+  if(r && r->fts_statp) {  /* Should we bother checking fts_info here? */
+# ifdef STAT64_SUPPORT
+#  ifndef STUPID_ALPHA_HACK
+    send_get_stat64(r->fts_statp);
+#  else
+    send_get_stat64(r->fts_statp, _STAT_VER);
+#  endif
+# else
+#  ifndef STUPID_ALPHA_HACK
+    send_get_stat(r->fts_statp);
+#  else
+    send_get_stat(r->fts_statp, _STAT_VER);
+#  endif
+# endif
+  }
+
+  return r;
+}
+#endif /* HAVE_FTS_CHILDREN */
diff --git a/wrapfunc.inp b/wrapfunc.inp
index 83d0367..4ccec0a 100644
--- a/wrapfunc.inp
+++ b/wrapfunc.inp
@@ -131,3 +131,6 @@ acl_set_file;int;(const char *path_p, acl_type_t type, acl_t acl);(path_p, type,
 #ifdef HAVE_FTS_READ
 fts_read;FTSENT *;(FTS *ftsp);(ftsp)
 #endif /* HAVE_FTS_READ */
+#ifdef HAVE_FTS_CHILDREN
+fts_children;FTSENT *;(FTS *ftsp, int options);(ftsp, options)
+#endif /* HAVE_FTS_CHILDREN */

-- 
fakeroot