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

and really fix it now 

SVN revision: 26610
This commit is contained in:
Carsten Haitzler 2006-10-15 09:32:25 +00:00
parent 6abe8fae09
commit fd41ddf197
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
legacy/ecore/src/lib/ecore_file/ecore_file.c
View File

@ -110,14 +110,16 @@ ecore_file_recursive_rm(const char *dir)
struct dirent *dp; struct dirent *dp;
char path[PATH_MAX], buf[PATH_MAX];; char path[PATH_MAX], buf[PATH_MAX];;
struct stat st; struct stat st;
int ret;
if (readlink(dir, buf, sizeof(buf)) > 0) if (readlink(dir, buf, sizeof(buf)) > 0)
{ {
ecore_file_unlink(dir); return ecore_file_unlink(dir);
} }
else if (S_ISDIR(st.st_mode)) ret = stat(dir, &st);
if ((ret == 0) && (S_ISDIR(st.st_mode)))
{ {
ret = 1;
if (stat(dir, &st) == -1) return 0; if (stat(dir, &st) == -1) return 0;
dirp = opendir(dir); dirp = opendir(dir);
if (dirp) if (dirp)
@ -127,17 +129,19 @@ ecore_file_recursive_rm(const char *dir)
if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, ".."))) if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, "..")))
{ {
snprintf(path, PATH_MAX, "%s/%s", dir, dp->d_name); snprintf(path, PATH_MAX, "%s/%s", dir, dp->d_name);
ecore_file_recursive_rm(path); if (!ecore_file_recursive_rm(path))
ret = 0;
} }
} }
closedir(dirp); closedir(dirp);
} }
ecore_file_rmdir(dir); if (!ecore_file_rmdir(dir)) ret = 0;
return ret;
} }
else else
{ {
if (stat(dir, &st) == -1) return 0; if (ret == -1) return 0;
ecore_file_unlink(dir); return ecore_file_unlink(dir);
} }
return 1; return 1;