aboutsummaryrefslogtreecommitdiff
path: root/dirent
diff options
context:
space:
mode:
Diffstat (limited to 'dirent')
-rw-r--r--dirent/alphasort64.c27
-rw-r--r--dirent/scandir.c28
-rw-r--r--dirent/scandir64.c93
-rw-r--r--dirent/versionsort64.c27
4 files changed, 17 insertions, 158 deletions
diff --git a/dirent/alphasort64.c b/dirent/alphasort64.c
deleted file mode 100644
index d48004f2c4..0000000000
--- a/dirent/alphasort64.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1992, 1997, 1998 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 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <dirent.h>
-#include <string.h>
-
-int
-alphasort64 (const void *a, const void *b)
-{
- return strcoll ((*(const struct dirent64 **) a)->d_name,
- (*(const struct dirent64 **) b)->d_name);
-}
diff --git a/dirent/scandir.c b/dirent/scandir.c
index 9b4548cd16..da94ed3690 100644
--- a/dirent/scandir.c
+++ b/dirent/scandir.c
@@ -21,17 +21,23 @@
#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) (const struct dirent *);
+ DIRENT_TYPE ***namelist;
+ int (*select) (const DIRENT_TYPE *);
int (*cmp) (const void *, const void *);
{
DIR *dp = __opendir (dir);
- struct dirent **v = NULL;
+ DIRENT_TYPE **v = NULL;
size_t vsize = 0, i;
- struct dirent *d;
+ DIRENT_TYPE *d;
int save;
if (dp == NULL)
@@ -41,10 +47,10 @@ 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 */
@@ -52,23 +58,23 @@ scandir (dir, namelist, select, cmp)
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 (__builtin_expect (errno, 0) != 0)
diff --git a/dirent/scandir64.c b/dirent/scandir64.c
deleted file mode 100644
index 1fdff2c64d..0000000000
--- a/dirent/scandir64.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright (C) 1992,93,94,95,96,97,98,2000 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 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-int
-scandir64 (dir, namelist, select, cmp)
- const char *dir;
- struct dirent64 ***namelist;
- int (*select) (const struct dirent64 *);
- int (*cmp) (const void *, const void *);
-{
- DIR *dp = __opendir (dir);
- struct dirent64 **v = NULL;
- size_t vsize = 0, i;
- struct dirent64 *d;
- int save;
-
- if (dp == NULL)
- return -1;
-
- save = errno;
- __set_errno (0);
-
- i = 0;
- while ((d = __readdir64 (dp)) != NULL)
- if (select == NULL || (*select) (d))
- {
- struct dirent64 *vnew;
- size_t dsize;
-
- /* Ignore errors from select or readdir */
- __set_errno (0);
-
- if (i == vsize)
- {
- struct dirent64 **new;
- if (vsize == 0)
- vsize = 10;
- else
- vsize *= 2;
- new = (struct dirent64 **) realloc (v, vsize * sizeof (*v));
- if (new == NULL)
- break;
- v = new;
- }
-
- dsize = &d->d_name[_D_ALLOC_NAMLEN (d)] - (char *) d;
- vnew = (struct dirent64 *) malloc (dsize);
- if (vnew == NULL)
- break;
-
- v[i++] = (struct dirent64 *) memcpy (vnew, d, dsize);
- }
-
- if (errno != 0)
- {
- save = errno;
- (void) __closedir (dp);
- while (i > 0)
- free (v[--i]);
- free (v);
- __set_errno (save);
- return -1;
- }
-
- (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;
-}
diff --git a/dirent/versionsort64.c b/dirent/versionsort64.c
deleted file mode 100644
index dab34d66ae..0000000000
--- a/dirent/versionsort64.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1992, 1997, 1998 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 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <dirent.h>
-#include <string.h>
-
-int
-versionsort64 (const void *a, const void *b)
-{
- return __strverscmp ((*(const struct dirent64 **) a)->d_name,
- (*(const struct dirent64 **) b)->d_name);
-}