hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* eina: fix usage of eina_file_*ls in thread. 

SVN revision: 53948
This commit is contained in:
Cedric BAIL 2010-10-28 09:59:27 +00:00
parent 788a3357e9
commit 2794a9afc9
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
legacy/eina/src/lib/eina_file.c
View File

@ -38,6 +38,7 @@ void *alloca (size_t);
#endif #endif
#include <string.h> #include <string.h>
#include <stddef.h>
#include <dirent.h> #include <dirent.h>
#ifndef _WIN32 #ifndef _WIN32
@ -87,11 +88,14 @@ _eina_file_ls_iterator_next(Eina_File_Iterator *it, void **data)
char *name; char *name;
size_t length; size_t length;
dp = alloca(offsetof(struct dirent, d_name) + pathconf(it->dir, _PC_NAME_MAX) + 1);
do do
{ {
dp = readdir(it->dirp); if (readdir_r(it->dirp, dp, &dp))
if (!dp) return EINA_FALSE;
return EINA_FALSE; if (dp == NULL)
return EINA_FALSE;
} }
while ((dp->d_name[0] == '.') && while ((dp->d_name[0] == '.') &&
((dp->d_name[1] == '\0') || ((dp->d_name[1] == '\0') ||
@ -142,9 +146,12 @@ _eina_file_direct_ls_iterator_next(Eina_File_Direct_Iterator *it, void **data)
struct dirent *dp; struct dirent *dp;
size_t length; size_t length;
dp = alloca(offsetof(struct dirent, d_name) + pathconf(it->dir, _PC_NAME_MAX) + 1);
do do
{ {
dp = readdir(it->dirp); if (readdir_r(it->dirp, dp, &dp))
return EINA_FALSE;
if (!dp) if (!dp)
return EINA_FALSE; return EINA_FALSE;
@ -239,7 +246,9 @@ eina_file_dir_list(const char *dir,
if (!d) if (!d)
return EINA_FALSE; return EINA_FALSE;
while ((de = readdir(d))) de = alloca(offsetof(struct dirent, d_name) + pathconf(dir, _PC_NAME_MAX) + 1);
while ((!readdir_r(d, de, &de) && de))
{ {
if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, ".."))
continue; continue;
@ -400,7 +409,7 @@ eina_file_split(char *path)
* *
* Iterators are cheap to be created and allow interruption at any * Iterators are cheap to be created and allow interruption at any
* iteration. At each iteration, only the next directory entry is read * iteration. At each iteration, only the next directory entry is read
* from the filesystem with readdir(). * from the filesystem with readdir_r().
* *
* The iterator will handle the user a stringshared value with the * The iterator will handle the user a stringshared value with the
* full path. One must call eina_stringshare_del() on it after usage * full path. One must call eina_stringshare_del() on it after usage
@ -468,7 +477,7 @@ eina_file_ls(const char *dir)
* *
* Iterators are cheap to be created and allow interruption at any * Iterators are cheap to be created and allow interruption at any
* iteration. At each iteration, only the next directory entry is read * iteration. At each iteration, only the next directory entry is read
* from the filesystem with readdir(). * from the filesystem with readdir_r().
* *
* The iterator returns the direct pointer to couple of useful information in * The iterator returns the direct pointer to couple of useful information in
* #Eina_File_Direct_Info and that pointer should not be modified anyhow! * #Eina_File_Direct_Info and that pointer should not be modified anyhow!