From b21bbf2505b8950d2ca9c6254fb772cd5534bb0d Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 17 Jul 2007 09:45:10 +0000
Subject: Remove unused scandir() check and fallback implementation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23799 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 osdep/Makefile  |   1 -
 osdep/scandir.c | 133 --------------------------------------------------------
 2 files changed, 134 deletions(-)
 delete mode 100644 osdep/scandir.c

(limited to 'osdep')

diff --git a/osdep/Makefile b/osdep/Makefile
index 89820a7aa9..be05a06998 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -7,7 +7,6 @@ SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
 
 SRCS_COMMON-$(NEED_GETTIMEOFDAY)     += gettimeofday.c
 SRCS_COMMON-$(NEED_GLOB)             += glob-win.c
-SRCS_COMMON-$(NEED_SCANDIR)          += scandir.c
 SRCS_COMMON-$(NEED_SETENV)           += setenv.c
 SRCS_COMMON-$(NEED_SHMEM)            += shmem.c
 SRCS_COMMON-$(NEED_STRSEP)           += strsep.c
diff --git a/osdep/scandir.c b/osdep/scandir.c
deleted file mode 100644
index 4d2e7556c3..0000000000
--- a/osdep/scandir.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * scandir, alphasort - scan a directory
- *
- * implementation for systems that do not have it in libc
- */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-
-/*
- * convenience helper function for scandir's |compar()| function: 
- * sort directory entries using strcoll(3)
- */
-int
-alphasort(const void *_a, const void *_b)
-{
-    struct dirent **a = (struct dirent **)_a;
-    struct dirent **b = (struct dirent **)_b;
-    return strcoll((*a)->d_name, (*b)->d_name);
-}
-
-
-#define strverscmp(a,b) strcoll(a,b) /* for now */
-
-/*
- * convenience helper function for scandir's |compar()| function: 
- * sort directory entries using GNU |strverscmp()|
- */
-int
-versionsort(const void *_a, const void *_b)
-{
-    struct dirent **a = (struct dirent **)_a;
-    struct dirent **b = (struct dirent **)_b;
-    return strverscmp((*a)->d_name, (*b)->d_name);
-}
-
-/*
- * The scandir() function reads the directory dirname and builds an
- * array of pointers to directory entries using malloc(3).  It returns
- * the number of entries in the array.  A pointer to the array of
- * directory entries is stored in the location referenced by namelist.
- *
- * The select parameter is a pointer to a user supplied subroutine
- * which is called by scandir() to select which entries are to be
- * included in the array.  The select routine is passed a pointer to
- * a directory entry and should return a non-zero value if the
- * directory entry is to be included in the array.  If select is null,
- * then all the directory entries will be included.
- *
- * The compar parameter is a pointer to a user supplied subroutine
- * which is passed to qsort(3) to sort the completed array.  If this
- * pointer is null, the array is not sorted.
- */
-int
-scandir(const char *dirname,
-	struct dirent ***ret_namelist,
-	int (*select)(const struct dirent *),
-	int (*compar)(const struct dirent **, const struct dirent **))
-{
-    int i, len;
-    int used, allocated;
-    DIR *dir;
-    struct dirent *ent, *ent2;
-    struct dirent **namelist = NULL;
-
-    if ((dir = opendir(dirname)) == NULL)
-	return -1;
-
-    used = 0;
-    allocated = 2;
-    namelist = malloc(allocated * sizeof(struct dirent *));
-    if (!namelist)
-	goto error;
-
-    while ((ent = readdir(dir)) != NULL) {
-
-	if (select != NULL && !select(ent))
-	    continue;
-
-	/* duplicate struct direct for this entry */
-	len = offsetof(struct dirent, d_name) + strlen(ent->d_name) + 1;
-	if ((ent2 = malloc(len)) == NULL)
-	    goto error;
-	
-	if (used >= allocated) {
-	    allocated *= 2;
-	    namelist = realloc(namelist, allocated * sizeof(struct dirent *));
-	    if (!namelist)
-		goto error;
-	}
-	memcpy(ent2, ent, len);
-	namelist[used++] = ent2;
-    }
-    closedir(dir);
-
-    if (compar)
-	qsort(namelist, used, sizeof(struct dirent *),
-	      (int (*)(const void *, const void *)) compar);
-
-    *ret_namelist = namelist;
-    return used;
-
-
-error:
-    closedir(dir);
-
-    if (namelist) {
-	for (i = 0; i < used; i++) 
-	    free(namelist[i]);
-	free(namelist);
-    }
-    return -1;
-}
-
-
-#if	STANDALONE_MAIN
-int
-main(int argc, char **argv)
-{
-	struct dirent **namelist;
-	int i, n;
-
-	n = scandir("/etc", &namelist, NULL, alphasort);
-
-	for (i = 0; i < n; i++)
-		printf("%s\n", namelist[i]->d_name);
-}
-#endif
-- 
cgit v1.2.3