[Fakeroot-commits] [SCM] fakeroot branch, master, updated. debian/1.12.1

[Clint Adams]

The following commit has been merged in the master branch:
commit 035294c1ac42f0a65a677d7e4c8b1aea7e8e3a51
Author: Clint Adams <schizo at debian.org>
Date:   Sun Jan 4 00:55:05 2009 -0500

    Wrap fts_read.

diff --git a/configure.ac b/configure.ac
index 4be182e..8ae90d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ AC_SUBST(signal)
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h features.h sys/feature_tests.h pthread.h stdint.h inttypes.h grp.h endian.h sys/sysmacros.h sys/socket.h sys/acl.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h features.h sys/feature_tests.h pthread.h stdint.h inttypes.h grp.h endian.h sys/sysmacros.h sys/socket.h sys/acl.h fts.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -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)
+AC_CHECK_FUNCS(strdup strstr getresuid setresuid getresgid setresgid setfsuid setfsgid fts_read)
 
 AC_CHECK_DECLS([setenv, unsetenv])
 AC_REPLACE_FUNCS([setenv])
diff --git a/libfakeroot.c b/libfakeroot.c
index 5a4c4be..7ef9779 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -61,6 +61,9 @@
 #ifdef HAVE_SYS_ACL_H
 #include <sys/acl.h>
 #endif /* HAVE_SYS_ACL_H */
+#if HAVE_FTS_H
+#include <fts.h>
+#endif /* HAVE_FTS_H */
 
 #if !HAVE_DECL_SETENV
 extern int setenv (const char *name, const char *value, int replace);
@@ -662,9 +665,6 @@ int WRAP_FSTATAT64 FSTATAT64_ARG(int ver,
 
 #endif /* STAT64_SUPPORT */
 
-
-
-
 /*************************************************************/
 /*
   Wrapped functions general info:
@@ -1489,3 +1489,20 @@ int acl_set_file(const char *path_p, acl_type_t type, acl_t acl) {
   return -1;
 }
 #endif /* HAVE_SYS_ACL_H */
+
+#ifdef HAVE_FTS_READ
+FTSENT *fts_read(FTS *ftsp) {
+  FTSENT *r;
+
+  r=next_fts_read(ftsp);
+  if(r) {
+#ifndef STUPID_ALPHA_HACK
+  send_get_stat64(r->fts_statp);
+#else
+  send_get_stat64(r->fts_statp,ver);
+#endif
+  }
+
+  return r;
+}
+#endif /* HAVE_FTS_READ */
diff --git a/wrapfunc.inp b/wrapfunc.inp
index 247fb25..83d0367 100644
--- a/wrapfunc.inp
+++ b/wrapfunc.inp
@@ -127,3 +127,7 @@ unlinkat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, fl
 acl_set_fd;int;(int fd, acl_t acl);(fd, acl)
 acl_set_file;int;(const char *path_p, acl_type_t type, acl_t acl);(path_p, type, acl)
 #endif /* HAVE_SYS_ACL_H */
+
+#ifdef HAVE_FTS_READ
+fts_read;FTSENT *;(FTS *ftsp);(ftsp)
+#endif /* HAVE_FTS_READ */

-- 
fakeroot