D50218.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50218.diff
View Options

	diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
	--- a/lib/libc/gen/fts.c
	+++ b/lib/libc/gen/fts.c
	@@ -743,14 +743,10 @@
	* Open the directory for reading. If this fails, we're done.
	* If being called from fts_read, set the fts_info field.
	*/
	-#ifdef FTS_WHITEOUT
	if (ISSET(FTS_WHITEOUT))
	oflag = DTF_NODUP;
	else
	oflag = DTF_HIDEW \| DTF_NODUP;
	-#else
	-#define __opendir2(path, flag) opendir(path)
	-#endif
	if ((dirp = __opendir2(cur->fts_accpath, oflag)) == NULL) {
	if (type == BREAD) {
	cur->fts_info = FTS_DNR;
	@@ -877,10 +873,8 @@
	p->fts_parent = sp->fts_cur;
	p->fts_pathlen = len + dnamlen;

	-#ifdef FTS_WHITEOUT
	if (dp->d_type == DT_WHT)
	p->fts_flags \|= FTS_ISW;
	-#endif

	if (cderrno) {
	if (nlinks) {
	@@ -889,12 +883,8 @@
	} else
	p->fts_info = FTS_NSOK;
	p->fts_accpath = cur->fts_accpath;
	- } else if (nlinks == 0
	-#ifdef DT_DIR
	- \|\| (nostat &&
	- dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
	-#endif
	- ) {
	+ } else if (nlinks == 0 \|\| (nostat &&
	+ dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)) {
	p->fts_accpath =
	ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
	p->fts_info = FTS_NSOK;
	@@ -1003,7 +993,6 @@
	/* If user needs stat info, stat buffer already allocated. */
	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;

	-#ifdef FTS_WHITEOUT
	/* Check for whiteout. */
	if (p->fts_flags & FTS_ISW) {
	if (sbp != &sb) {
	@@ -1012,7 +1001,6 @@
	}
	return (FTS_W);
	}
	-#endif

	/*
	* If doing a logical walk, or application requested FTS_FOLLOW, do