From bef4efb18c54f4b2285557a1b5a5a037f3dce019 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Wed, 16 Mar 2011 21:07:18 +0100 Subject: scandir,readdir[_t]: use one common source for X() and X64() Since the sources differ only minimally, use only scandir.c,readdir[_t].c and redefine the used functions accordingly. Use a strong_alias instead of compiling *64.c if __WORDSIZE = 64 Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libc/misc/dirent/scandir64.c | 117 ++++--------------------------------------- 1 file changed, 11 insertions(+), 106 deletions(-) (limited to 'libc/misc/dirent/scandir64.c') diff --git a/libc/misc/dirent/scandir64.c b/libc/misc/dirent/scandir64.c index 3d2a250a4..634c5d886 100644 --- a/libc/misc/dirent/scandir64.c +++ b/libc/misc/dirent/scandir64.c @@ -1,111 +1,16 @@ -/* Copyright (C) 1992-1998, 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 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 - Lesser General Public License for more details. - - 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. - */ - -/* Modified for uClibc by Erik Andersen - */ +/* + * Copyright (C) 2000-2011 Erik Andersen + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + */ #include <_lfs_64.h> - #include -#include -#include -#include -#include -#include -#include "dirstream.h" - -int scandir64(const char *dir, struct dirent64 ***namelist, - int (*selector) (const struct dirent64 *), - int (*compar) (const struct dirent64 **, const struct dirent64 **)) -{ - DIR *dp = opendir (dir); - struct dirent64 *current; - struct dirent64 **names = NULL; - size_t names_size = 0, pos; - int save; - - if (dp == NULL) - return -1; - - save = errno; - __set_errno (0); - - pos = 0; - while ((current = readdir64 (dp)) != NULL) { - int use_it = selector == NULL; - - if (! use_it) - { - use_it = (*selector) (current); - /* The selector function might have changed errno. - * It was zero before and it need to be again to make - * the latter tests work. */ - if (! use_it) - __set_errno (0); - } - if (use_it) - { - struct dirent64 *vnew; - size_t dsize; - - /* Ignore errors from selector or readdir64 */ - __set_errno (0); - - if (unlikely(pos == names_size)) - { - struct dirent64 **new; - if (names_size == 0) - names_size = 10; - else - names_size *= 2; - new = (struct dirent64 **) realloc (names, - names_size * sizeof (struct dirent64 *)); - if (new == NULL) - break; - names = new; - } - - dsize = ¤t->d_name[_D_ALLOC_NAMLEN(current)] - (char*)current; - vnew = (struct dirent64 *) malloc (dsize); - if (vnew == NULL) - break; - - names[pos++] = (struct dirent64 *) memcpy (vnew, current, dsize); - } - } - if (unlikely(errno != 0)) - { - save = errno; - closedir (dp); - while (pos > 0) - free (names[--pos]); - free (names); - __set_errno (save); - return -1; - } - closedir (dp); - __set_errno (save); +#if __WORDSIZE != 64 +# define __SCANDIR scandir64 +# define __DIRENT_TYPE struct dirent64 +# define __READDIR readdir64 - /* Sort the list if we have a comparison function to sort with. */ - if (compar != NULL) - qsort (names, pos, sizeof (struct dirent64 *), (comparison_fn_t) compar); - *namelist = names; - return pos; -} +# include "scandir.c" +#endif -- cgit v1.2.3