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

eina: update info in eina_file_stat seems more usefull. 

SVN revision: 68264
This commit is contained in:
Cedric BAIL 2012-02-22 11:50:29 +00:00
parent 59647d1be0
commit ddbf4f1252
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,27 +369,8 @@ _eina_file_stat_ls_iterator_next(Eina_File_Direct_Iterator *it, void **data)
if (it->info.type == EINA_FILE_UNKNOWN)
{
if (eina_file_stat(it->dirp, &it->info, &st))
if (eina_file_stat(it->dirp, &it->info, &st) != 0)
it->info.type = EINA_FILE_UNKNOWN;
else
{
if (S_ISREG(st.st_mode))
it->info.type = EINA_FILE_REG;
else if (S_ISDIR(st.st_mode))
it->info.type = EINA_FILE_DIR;
else if (S_ISCHR(st.st_mode))
it->info.type = EINA_FILE_CHR;
else if (S_ISBLK(st.st_mode))
it->info.type = EINA_FILE_BLK;
else if (S_ISFIFO(st.st_mode))
it->info.type = EINA_FILE_FIFO;
else if (S_ISLNK(st.st_mode))
it->info.type = EINA_FILE_LNK;
else if (S_ISSOCK(st.st_mode))
it->info.type = EINA_FILE_SOCK;
else
it->info.type = EINA_FILE_UNKNOWN;
}
}
return EINA_TRUE;
@ -1306,8 +1287,35 @@ eina_file_stat(void *container, Eina_File_Direct_Info *info, struct stat *buf)
#ifdef HAVE_FSTATAT
fd = dirfd(container);
return fstatat(fd, info->path + info->name_start, buf, 0);
if (fstatat(fd, info->path + info->name_start, buf, 0))
#else
return stat(it->info.path, buf);
if (stat(info->path, buf))
#endif
{
if (info->type != EINA_FILE_LNK)
info->type = EINA_FILE_UNKNOWN;
return -1;
}
if (info->type == EINA_FILE_UNKNOWN)
{
if (S_ISREG(buf->st_mode))
info->type = EINA_FILE_REG;
else if (S_ISDIR(buf->st_mode))
info->type = EINA_FILE_DIR;
else if (S_ISCHR(buf->st_mode))
info->type = EINA_FILE_CHR;
else if (S_ISBLK(buf->st_mode))
info->type = EINA_FILE_BLK;
else if (S_ISFIFO(buf->st_mode))
info->type = EINA_FILE_FIFO;
else if (S_ISLNK(buf->st_mode))
info->type = EINA_FILE_LNK;
else if (S_ISSOCK(buf->st_mode))
info->type = EINA_FILE_SOCK;
else
info->type = EINA_FILE_UNKNOWN;
}
return 0;
}