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

Style. 

Assume the operations will succeed, and set ret to 0 on fail.


SVN revision: 17881
This commit is contained in:
sebastid 2005-10-24 10:05:35 +00:00 committed by sebastid
parent 7f10622a24
commit 32732357cb
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,35 +96,39 @@ ecore_file_unlink(const char *file)
int int
ecore_file_recursive_rm(const char *dir) ecore_file_recursive_rm(const char *dir)
{ {
DIR *dirp; DIR *dirp;
struct dirent *dp; struct dirent *dp;
Ecore_List *list; Ecore_List *list;
int ret; int ret;
if(!ecore_file_is_dir(dir)) if (!ecore_file_is_dir(dir))
return ecore_file_unlink(dir); return ecore_file_unlink(dir);
ret = 0;
dirp = opendir(dir); dirp = opendir(dir);
if (!dirp) return ret; if (!dirp) return 0;
ret = 1;
while ((dp = readdir(dirp))) while ((dp = readdir(dirp)))
{ {
if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, ".."))) if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, "..")))
{ {
char path[PATH_MAX]; char path[PATH_MAX];
struct stat st; struct stat st;
snprintf(path, PATH_MAX, "%s/%s", dir, dp->d_name); snprintf(path, PATH_MAX, "%s/%s", dir, dp->d_name);
if (stat(path, &st) == -1) { ret = 0; continue; } if (stat(path, &st) == -1)
{
if(S_ISDIR(st.st_mode)) ret = 0;
continue;
}
if (S_ISDIR(st.st_mode))
{ {
ecore_file_recursive_rm(path); ecore_file_recursive_rm(path);
ecore_file_rmdir(path); ecore_file_rmdir(path);
} }
else if(S_ISREG(st.st_mode)||S_ISLNK(st.st_mode)) else if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
{ {
ecore_file_unlink(path); ecore_file_unlink(path);
} }
@ -132,9 +136,9 @@ ecore_file_recursive_rm(const char *dir)
} }
closedir(dirp); closedir(dirp);
if(ecore_file_rmdir(dir)) if (!ecore_file_rmdir(dir))
ret = 1; ret = 0;
return ret; return ret;
} }
@ -173,7 +177,7 @@ ecore_file_cp(const char *src, const char *dst)
char realpath1[PATH_MAX]; char realpath1[PATH_MAX];
char realpath2[PATH_MAX]; char realpath2[PATH_MAX];
size_t num; size_t num;
if (!realpath(src, realpath1)) return 0; if (!realpath(src, realpath1)) return 0;
if (realpath(dst, realpath2) && !strcmp(realpath1, realpath2)) return 0; if (realpath(dst, realpath2) && !strcmp(realpath1, realpath2)) return 0;
@ -306,7 +310,7 @@ ecore_file_app_exe_get(const char *app)
char *p, *pp, *exe1 = NULL, *exe2 = NULL; char *p, *pp, *exe1 = NULL, *exe2 = NULL;
char *exe = NULL; char *exe = NULL;
int in_quot_dbl = 0, in_quot_sing = 0, restart = 0; int in_quot_dbl = 0, in_quot_sing = 0, restart = 0;
p = (char *)app; p = (char *)app;
restart: restart:
while ((*p) && (isspace(*p))) p++; while ((*p) && (isspace(*p))) p++;
@ -393,7 +397,7 @@ restart:
{ {
/* techcincally this is wrong. double quotes also accept /* techcincally this is wrong. double quotes also accept
* special chars: * special chars:
* *
* $, `, \ * $, `, \
*/ */
*pp = *p; *pp = *p;
@ -403,7 +407,7 @@ restart:
else else
{ {
/* technically we should handle special chars: /* technically we should handle special chars:
* *
* $, `, \, etc. * $, `, \, etc.
*/ */
if ((p > exe1) && (p[-1] == '\\')) if ((p > exe1) && (p[-1] == '\\'))