[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. 08ed00124d8b6b445d3b91a9aa15eec638b02f05
Clint Adams
schizo at debian.org
Sun Nov 15 03:17:47 UTC 2009
The following commit has been merged in the upstream branch:
commit 216a731ce697c1b097b3f30f881922496e94fc29
Author: Clint Adams <schizo at debian.org>
Date: Tue Oct 27 01:11:11 2009 -0400
Incorporate fts_children wrapper fixes from VMware version.
diff --git a/libfakeroot.c b/libfakeroot.c
index 7b2885c..b5a6515 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -1397,25 +1397,19 @@ FTSENT *fts_read(FTS *ftsp) {
#ifdef HAVE_FTS_CHILDREN
FTSENT *fts_children(FTS *ftsp, int options) {
- FTSENT *r;
+ FTSENT *first, *r;
- r=next_fts_children(ftsp, options);
- if(r && r->fts_statp) { /* Should we bother checking fts_info here? */
+ first=next_fts_children(ftsp, options);
+ for(r = first; r; r = r->fts_link) {
+ 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
+ SEND_GET_STAT64(r->fts_statp, _STAT_VER);
# else
-# ifndef STUPID_ALPHA_HACK
- send_get_stat(r->fts_statp);
-# else
- send_get_stat(r->fts_statp, _STAT_VER);
-# endif
+ SEND_GET_STAT(r->fts_statp, _STAT_VER);
# endif
+ }
}
- return r;
+ return first;
}
#endif /* HAVE_FTS_CHILDREN */
--
fakeroot
More information about the Fakeroot-commits
mailing list