(test): Return error value.

[kopensolaris-gnu/glibc.git] / dirent / dirent.h

diff --git a/dirent/dirent.h b/dirent/dirent.h
index 3d187e1..01c44a2 100644 (file)
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -21,13 +21,13 @@
  */
 
 #ifndef        _DIRENT_H
-
 #define        _DIRENT_H       1
+
 #include <features.h>
 
 __BEGIN_DECLS
 
-#include <gnu/types.h>
+#include <bits/types.h>
 
 /* This file defines `struct dirent'.
 
@@ -44,7 +44,7 @@ __BEGIN_DECLS
    member that gives the type of the file.
  */
 
-#include <direntry.h>
+#include <bits/dirent.h>
 
 #if (defined __USE_BSD || defined __USE_MISC) && !defined d_fileno
 # define d_ino d_fileno                 /* Backward compatibility.  */
@@ -83,13 +83,21 @@ __BEGIN_DECLS
 enum
   {
     DT_UNKNOWN = 0,
+# define DT_UNKNOWN    DT_UNKNOWN
     DT_FIFO = 1,
+# define DT_FIFO       DT_FIFO
     DT_CHR = 2,
+# define DT_CHR                DT_CHR
     DT_DIR = 4,
+# define DT_DIR                DT_DIR
     DT_BLK = 6,
+# define DT_BLK                DT_BLK
     DT_REG = 8,
+# define DT_REG                DT_REG
     DT_LNK = 10,
+# define DT_LNK                DT_LNK
     DT_SOCK = 12
+# define DT_SOCK       DT_SOCK
   };
 
 /* Convert between stat structure types and directory types.  */
@@ -112,25 +120,57 @@ extern DIR *opendir __P ((__const char *__name));
 extern int __closedir __P ((DIR *__dirp));
 extern int closedir __P ((DIR *__dirp));
 
-/* Read a directory entry from DIRP.
-   Return a pointer to a `struct dirent' describing the entry,
-   or NULL for EOF or error.  The storage returned may be overwritten
-   by a later readdir call on the same DIR stream.  */
+/* Read a directory entry from DIRP.  Return a pointer to a `struct
+   dirent' describing the entry, or NULL for EOF or error.  The
+   storage returned may be overwritten by a later readdir call on the
+   same DIR stream.
+
+   If the Large File Support API is selected we have to use the
+   appropriate interface.  */
 extern struct dirent *__readdir __P ((DIR *__dirp));
+#ifndef __USE_FILE_OFFSET64
 extern struct dirent *readdir __P ((DIR *__dirp));
+#else
+extern struct dirent *readdir __P ((DIR *__dirp)) __asm__ ("readdir64");
+#endif
+
+#ifdef __USE_LARGEFILE64
+extern struct dirent64 *readdir64 __P ((DIR *__dirp));
+#endif
 
 #if defined __USE_POSIX || defined __USE_MISC
 /* Reentrant version of `readdir'.  Return in RESULT a pointer to the
    next entry.  */
 extern int __readdir_r __P ((DIR *__dirp, struct dirent *__entry,
                             struct dirent **__result));
+# ifndef __USE_FILE_OFFSET64
 extern int readdir_r __P ((DIR *__dirp, struct dirent *__entry,
                           struct dirent **__result));
+# else
+extern int readdir_r __P ((DIR *__dirp, struct dirent *__entry,
+                          struct dirent **__result))
+     __asm__ ("readdir64_r");
+# endif
+
+# ifdef __USE_LARGEFILE64
+extern int readdir64_r __P ((DIR *__dirp, struct dirent64 *__entry,
+                            struct dirent64 **__result));
+# endif
 #endif /* POSIX or misc */
 
 /* Rewind DIRP to the beginning of the directory.  */
 extern void rewinddir __P ((DIR *__dirp));
 
+#if defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN
+# include <bits/types.h>
+
+/* Seek to position POS on DIRP.  */
+extern void seekdir __P ((DIR *__dirp, __off_t __pos));
+
+/* Return the current position of DIRP.  */
+extern __off_t telldir __P ((DIR *__dirp));
+#endif
+
 #if defined __USE_BSD || defined __USE_MISC
 
 /* Return the file descriptor used by DIRP.  */
@@ -142,7 +182,7 @@ extern int dirfd __P ((DIR *__dirp));
 
 # ifndef MAXNAMLEN
 /* Get the definitions of the POSIX.1 limits.  */
-#  include <posix1_lim.h>
+#  include <bits/posix1_lim.h>
 
 /* `MAXNAMLEN' is the BSD name for what POSIX calls `NAME_MAX'.  */
 #  ifdef NAME_MAX
@@ -152,16 +192,9 @@ extern int dirfd __P ((DIR *__dirp));
 #  endif
 # endif
 
-# include <gnu/types.h>
 # define __need_size_t
 # include <stddef.h>
 
-/* Seek to position POS on DIRP.  */
-extern void seekdir __P ((DIR *__dirp, __off_t __pos));
-
-/* Return the current position of DIRP.  */
-extern __off_t telldir __P ((DIR *__dirp));
-
 /* Scan the directory DIR, calling SELECTOR on each directory entry.
    Entries for which SELECT returns nonzero are individually malloc'd,
    sorted using qsort with CMP, and collected in a malloc'd array in
@@ -175,6 +208,10 @@ extern int scandir __P ((__const char *__dir,
 /* Function to compare two `struct dirent's alphabetically.  */
 extern int alphasort __P ((__const __ptr_t, __const __ptr_t));
 
+# ifdef __USE_GNU
+/* Function to compare two `struct dirent's by name & version.  */
+extern int versionsort __P ((__const __ptr_t, __const __ptr_t));
+# endif
 
 /* Read directory entries from FD into BUF, reading at most NBYTES.
    Reading starts at offset *BASEP, and *BASEP is updated with the new