Merge Lite2 changes onto mainline:

 - declare opendir2(), which is used to control how readdir() handles
 whiteouts etc.

1 files changed, 9 insertions, 1 deletions

diff --git a/include/dirent.h b/include/dirent.h
index 81f10863c78b..39fae878d7c0 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)dirent.h	8.1 (Berkeley) 6/8/93
+ *	@(#)dirent.h	8.2 (Berkeley) 7/28/94
  */
 
 #ifndef _DIRENT_H_
@@ -60,10 +60,17 @@ typedef struct _dirdesc {
 	int	dd_len;		/* size of data buffer */
 	long	dd_seek;	/* magic cookie returned by getdirentries */
 	long	dd_rewind;	/* magic cookie for rewinding */
+	int	dd_flags;	/* flags for readdir */
 } DIR;
 
 #define	dirfd(dirp)	((dirp)->dd_fd)
 
+/* flags for opendir2 */
+#define DTF_HIDEW	0x0001	/* hide whiteout entries */
+#define DTF_NODUP	0x0002	/* don't return duplicate names */
+#define DTF_REWIND	0x0004	/* rewind after reading union stack */
+#define __DTF_READALL	0x0008	/* everything has been read */
+
 #ifndef NULL
 #define	NULL	0
 #endif
@@ -80,6 +87,7 @@ struct dirent *readdir __P((DIR *));
 void rewinddir __P((DIR *));
 int closedir __P((DIR *));
 #ifndef _POSIX_SOURCE
+DIR *__opendir2 __P((const char *, int));
 long telldir __P((const DIR *));
 void seekdir __P((DIR *, long));
 int scandir __P((const char *, struct dirent ***,