Update.

[thirdparty/glibc.git] / dirent / scandir.c

diff --git a/dirent/scandir.c b/dirent/scandir.c
index cffc8a98cbfccb88913f1d05b854e2b4c0c78300..9f3cc8424f281ea539b07921b736670e99e3f566 100644 (file)
--- a/dirent/scandir.c
+++ b/dirent/scandir.c
@@ -1,37 +1,43 @@
-/* Copyright (C) 1992, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1992-1998, 2000, 2002 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.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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.
+   Lesser 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #include <dirent.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
+#ifndef SCANDIR
+#define SCANDIR scandir
+#define READDIR __readdir
+#define DIRENT_TYPE struct dirent
+#endif
+
 int
-scandir (dir, namelist, select, cmp)
+SCANDIR (dir, namelist, select, cmp)
      const char *dir;
-     struct dirent ***namelist;
-     int (*select) __P ((const struct dirent *));
-     int (*cmp) __P ((const void *, const void *));
+     DIRENT_TYPE ***namelist;
+     int (*select) (const DIRENT_TYPE *);
+     int (*cmp) (const void *, const void *);
 {
-  DIR *dp = opendir (dir);
-  struct dirent **v = NULL;
+  DIR *dp = __opendir (dir);
+  DIRENT_TYPE **v = NULL;
   size_t vsize = 0, i;
-  struct dirent *d;
+  DIRENT_TYPE *d;
   int save;
 
   if (dp == NULL)
@@ -41,53 +47,57 @@ scandir (dir, namelist, select, cmp)
   __set_errno (0);
 
   i = 0;
-  while ((d = __readdir (dp)) != NULL)
+  while ((d = READDIR (dp)) != NULL)
     if (select == NULL || (*select) (d))
       {
-       struct dirent *vnew;
+       DIRENT_TYPE *vnew;
        size_t dsize;
 
        /* Ignore errors from select or readdir */
        __set_errno (0);
 
-       if (i == vsize)
+       if (__builtin_expect (i == vsize, 0))
          {
-           struct dirent **new;
+           DIRENT_TYPE **new;
            if (vsize == 0)
              vsize = 10;
            else
              vsize *= 2;
-           new = (struct dirent **) realloc (v, vsize * sizeof (*v));
+           new = (DIRENT_TYPE **) realloc (v, vsize * sizeof (*v));
            if (new == NULL)
              break;
            v = new;
          }
 
        dsize = &d->d_name[_D_ALLOC_NAMLEN (d)] - (char *) d;
-       vnew = (struct dirent *) malloc (dsize);
+       vnew = (DIRENT_TYPE *) malloc (dsize);
        if (vnew == NULL)
          break;
 
-       v[i++] = (struct dirent *) memcpy (vnew, d, dsize);
+       v[i++] = (DIRENT_TYPE *) memcpy (vnew, d, dsize);
       }
 
-  if (errno != 0)
+  if (__builtin_expect (errno, 0) != 0)
     {
       save = errno;
-      (void) closedir (dp);
+
       while (i > 0)
        free (v[--i]);
       free (v);
-      __set_errno (save);
-      return -1;
+
+      i = -1;
+    }
+  else
+    {
+      /* Sort the list if we have a comparison function to sort with.  */
+      if (cmp != NULL)
+       qsort (v, i, sizeof (*v), cmp);
+
+      *namelist = v;
     }
 
-  (void) closedir (dp);
+  (void) __closedir (dp);
   __set_errno (save);
 
-  /* Sort the list if we have a comparison function to sort with.  */
-  if (cmp != NULL)
-    qsort (v, i, sizeof (*v), cmp);
-  *namelist = v;
   return i;
 }