Move the declaration of the DIR structure into its own header.

libc/dirent/dir.cpp

@@ -25,6 +25,7 @@
 #include <sys/types.h>
 
 #include <dirent.h>
+#include <DIR.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

libc/dirent/fddir-sortix.cpp

@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <dirent.h>
+#include <DIR.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdint.h>

libc/include/DIR.h

@@ -0,0 +1,69 @@
+/*******************************************************************************
+
+    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014.
+
+    This file is part of the Sortix C Library.
+
+    The Sortix C Library is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
+
+    The Sortix C Library is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+    License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with the Sortix C Library. If not, see <http://www.gnu.org/licenses/>.
+
+    DIR.h
+    The DIR structure from <dirent.h>
+
+*******************************************************************************/
+
+#ifndef INCLUDE_DIR_H
+#define INCLUDE_DIR_H
+
+#include <sys/cdefs.h>
+
+#include <sys/__/types.h>
+
+__BEGIN_DECLS
+
+#ifndef __size_t_defined
+#define __size_t_defined
+#define __need_size_t
+#include <stddef.h>
+#endif
+
+struct dirent;
+
+#ifndef __DIR_defined
+#define __DIR_defined
+typedef struct DIR DIR;
+#endif
+
+#define _DIR_REGISTERED (1<<0)
+#define _DIR_ERROR (1<<1)
+#define _DIR_EOF (1<<2)
+
+struct DIR
+{
+	void* user;
+	int (*read_func)(void* user, struct dirent* dirent, size_t* size);
+	int (*rewind_func)(void* user);
+	int (*fd_func)(void* user);
+	int (*close_func)(void* user);
+	void (*free_func)(DIR* dir);
+	/* Application writers shouldn't use anything beyond this point. */
+	DIR* prev;
+	DIR* next;
+	struct dirent* entry;
+	size_t entrysize;
+	int flags;
+};
+
+__END_DECLS
+
+#endif

libc/include/dirent.h

@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013.
+    Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013, 2014.
 
     This file is part of the Sortix C Library.
 
@@ -44,26 +44,7 @@ typedef __ino_t ino_t;
 
 #ifndef __DIR_defined
 #define __DIR_defined
-struct dirent;
-
-#define _DIR_REGISTERED (1<<0)
-#define _DIR_ERROR (1<<1)
-#define _DIR_EOF (1<<2)
-typedef struct _DIR
-{
-	void* user;
-	int (*read_func)(void* user, struct dirent* dirent, size_t* size);
-	int (*rewind_func)(void* user);
-	int (*fd_func)(void* user);
-	int (*close_func)(void* user);
-	void (*free_func)(struct _DIR* dir);
-	/* Application writers shouldn't use anything beyond this point. */
-	struct _DIR* prev;
-	struct _DIR* next;
-	struct dirent* entry;
-	size_t entrysize;
-	int flags;
-} DIR;
+typedef struct DIR DIR;
 #endif
 
 struct dirent
@@ -76,7 +57,7 @@ struct dirent
 #undef  _DIRENT_HAVE_D_NAMLEN
 #define _DIRENT_HAVE_D_RECLEN
 #define _DIRENT_HAVE_D_OFF
-#undef _DIRENT_HAVE_D_TYPE
+#undef  _DIRENT_HAVE_D_TYPE
 
 #define _D_EXACT_NAMLEN(d) ((d)->d_reclen - __builtin_offsetof(struct dirent, d_name) - 1)
 #define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN(d) + 1)
@@ -87,9 +68,12 @@ int dirfd(DIR* dir);
 DIR* fdopendir(int fd);
 DIR* opendir(const char* path);
 struct dirent* readdir(DIR* dir);
+/* TODO: readdir_r */
 void rewinddir(DIR* dir);
 int scandir(const char*, struct dirent***, int (*)(const struct dirent*),
             int (*)(const struct dirent**, const struct dirent**));
+/* TODO: seekdir */
+/* TODO: telldir */
 int versionsort(const struct dirent**, const struct dirent**);
 
 #if defined(_SORTIX_SOURCE)