(test): Return error value.

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

diff --git a/dirent/dirent.h b/dirent/dirent.h
index 06e92cb..01c44a2 100644 (file)
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -1,33 +1,33 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.

 
 

-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.

 
 

-The GNU 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
-Library General Public License for more details.
+   The GNU 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
+   Library General Public License for more details.

 
 

-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 /*
  *     POSIX Standard: 5.1.2 Directory Operations      <dirent.h>
  */
 
 #ifndef        _DIRENT_H
 
 /*
  *     POSIX Standard: 5.1.2 Directory Operations      <dirent.h>
  */
 
 #ifndef        _DIRENT_H

-

 #define        _DIRENT_H       1
 #define        _DIRENT_H       1

+

 #include <features.h>
 
 __BEGIN_DECLS
 
 #include <features.h>
 
 __BEGIN_DECLS
 

-#include <gnu/types.h>
+#include <bits/types.h>

 
 /* This file defines `struct dirent'.
 
 
 /* This file defines `struct dirent'.
 


@@ -39,12 +39,15 @@ __BEGIN_DECLS
 
    It defines the macro `_DIRENT_HAVE_D_OFF' iff there is a `d_off'
    member that gives the file offset of the next directory entry.
 
    It defines the macro `_DIRENT_HAVE_D_OFF' iff there is a `d_off'
    member that gives the file offset of the next directory entry.

+
+   It defines the macro `_DIRENT_HAVE_D_TYPE' iff there is a `d_type'
+   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.  */
+#if (defined __USE_BSD || defined __USE_MISC) && !defined d_fileno
+# define d_ino d_fileno                 /* Backward compatibility.  */

 #endif
 
 /* These macros extract size information from a `struct dirent *'.
 #endif
 
 /* These macros extract size information from a `struct dirent *'.


@@ -62,16 +65,16 @@ __BEGIN_DECLS
    */
 
 #ifdef _DIRENT_HAVE_D_NAMLEN
    */
 
 #ifdef _DIRENT_HAVE_D_NAMLEN

-#define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
-#define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1)
-#else
-#define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name))
-#ifdef _DIRENT_HAVE_D_RECLEN
-#define _D_ALLOC_NAMLEN(d) (((char *) (d) + (d)->d_reclen) - &(d)->d_name[0])
+# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
+# define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1)

 #else
 #else

-#define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \
-                           _D_EXACT_NAMLEN (d) + 1)
-#endif
+# define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name))
+# ifdef _DIRENT_HAVE_D_RECLEN
+#  define _D_ALLOC_NAMLEN(d) (((char *) (d) + (d)->d_reclen) - &(d)->d_name[0])
+# else
+#  define _D_ALLOC_NAMLEN(d) (sizeof (d)->d_name > 1 ? sizeof (d)->d_name : \
+                             _D_EXACT_NAMLEN (d) + 1)
+# endif

 #endif
 
 
 #endif
 
 


@@ -80,18 +83,26 @@ __BEGIN_DECLS
 enum
   {
     DT_UNKNOWN = 0,
 enum
   {
     DT_UNKNOWN = 0,

+# define DT_UNKNOWN    DT_UNKNOWN

     DT_FIFO = 1,
     DT_FIFO = 1,

+# define DT_FIFO       DT_FIFO

     DT_CHR = 2,
     DT_CHR = 2,

+# define DT_CHR                DT_CHR

     DT_DIR = 4,
     DT_DIR = 4,

+# define DT_DIR                DT_DIR

     DT_BLK = 6,
     DT_BLK = 6,

+# define DT_BLK                DT_BLK

     DT_REG = 8,
     DT_REG = 8,

+# define DT_REG                DT_REG

     DT_LNK = 10,
     DT_LNK = 10,

+# define DT_LNK                DT_LNK

     DT_SOCK = 12
     DT_SOCK = 12

+# define DT_SOCK       DT_SOCK

   };
 
 /* Convert between stat structure types and directory types.  */
   };
 
 /* Convert between stat structure types and directory types.  */

-#define        IFTODT(mode)    (((mode) & 0170000) >> 12)
-#define        DTTOIF(dirtype) ((dirtype) << 12)
+# define IFTODT(mode)  (((mode) & 0170000) >> 12)
+# define DTTOIF(dirtype)       ((dirtype) << 12)

 #endif
 
 
 #endif
 
 


@@ -106,70 +117,101 @@ extern DIR *opendir __P ((__const char *__name));
 
 /* Close the directory stream DIRP.
    Return 0 if successful, -1 if not.  */
 
 /* Close the directory stream DIRP.
    Return 0 if successful, -1 if not.  */

-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.  */
-extern struct dirent *__readdir __P ((DIR * __dirp));
-extern struct dirent *readdir __P ((DIR * __dirp));
-
-#ifdef __USE_REENTRANT
-/* Reentrant versio of `readdir'.  Return in RESULT a pointer to the
-   next entry.  */
-extern int readdir_r __P ((DIR *__dirp, struct dirent *entry,
-                          struct dirent **result));
+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.
+
+   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
 
 #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.  */
 /* Rewind DIRP to the beginning of the directory.  */

-extern void rewinddir __P ((DIR * __dirp));
+extern void rewinddir __P ((DIR *__dirp));
+
+#if defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN
+# include <bits/types.h>

 
 

-#if defined(__USE_BSD) || defined(__USE_MISC)
+/* 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.  */
 extern int dirfd __P ((DIR *__dirp));
 
 
 /* Return the file descriptor used by DIRP.  */
 extern int dirfd __P ((DIR *__dirp));
 

-#if defined (__OPTIMIZE__) && defined (_DIR_dirfd)
-#define dirfd(dirp)    _DIR_dirfd (dirp)
-#endif
+# if defined __OPTIMIZE__ && defined _DIR_dirfd
+#  define dirfd(dirp)  _DIR_dirfd (dirp)
+# endif

 
 

-#ifndef        MAXNAMLEN
+# ifndef MAXNAMLEN

 /* Get the definitions of the POSIX.1 limits.  */
 /* 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'.  */
 
 /* `MAXNAMLEN' is the BSD name for what POSIX calls `NAME_MAX'.  */

-#ifdef NAME_MAX
-#define        MAXNAMLEN       NAME_MAX
-#else
-#define        MAXNAMLEN       255
-#endif
-#endif
-
-#include <gnu/types.h>
-#define __need_size_t
-#include <stddef.h>
+#  ifdef NAME_MAX
+#   define MAXNAMLEN   NAME_MAX
+#  else
+#   define MAXNAMLEN   255
+#  endif
+# endif

 
 

-/* 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));
+# define __need_size_t
+# include <stddef.h>

 
 

-/* Scan the directory DIR, calling SELECT on each directory entry.
+/* 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
    *NAMELIST.  Returns the number of entries selected, or -1 on error.  */
 extern int scandir __P ((__const char *__dir,
                         struct dirent ***__namelist,
    Entries for which SELECT returns nonzero are individually malloc'd,
    sorted using qsort with CMP, and collected in a malloc'd array in
    *NAMELIST.  Returns the number of entries selected, or -1 on error.  */
 extern int scandir __P ((__const char *__dir,
                         struct dirent ***__namelist,

-                        int (*__select) __P ((struct dirent *)),
+                        int (*__selector) __P ((struct dirent *)),

                         int (*__cmp) __P ((__const __ptr_t,
                                            __const __ptr_t))));
 
 /* Function to compare two `struct dirent's alphabetically.  */
 extern int alphasort __P ((__const __ptr_t, __const __ptr_t));
 
                         int (*__cmp) __P ((__const __ptr_t,
                                            __const __ptr_t))));
 
 /* 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
 
 /* Read directory entries from FD into BUF, reading at most NBYTES.
    Reading starts at offset *BASEP, and *BASEP is updated with the new