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

Ecore_File: fix merge and simplify logic in ecore_file_file_get() on WindoWS 

Summary: Ecore_File: fix merge and simplify logic in ecore_file_file_get() on WindowS

Reviewers: cedric, jpeg

Reviewed By: jpeg

Subscribers: jpeg

Differential Revision: https://phab.enlightenment.org/D3404
This commit is contained in:
Vincent Torri 2015-12-07 14:08:19 +09:00 committed by Jean-Philippe Andre
parent 0497b9685c
commit 68107e5eb8
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib/ecore_file/ecore_file.c
View File

@ -773,32 +773,19 @@ ecore_file_file_get(const char *path)
if (!path) return NULL;
#ifdef _WIN32
{
char buf[MAX_PATH];
memcpy(buf, path, strlen(path) + 1);
EVIL_PATH_SEP_UNIX_TO_WIN32(buf);
if ((result = strrchr(buf, '\\')))
{
result++;
return path + (result - buf);
}
else
return path;
}
#endif
if ((result = strrchr(path, '/'))) result++;
else result = (char *)path;
#ifdef _WIN32
char *result_backslash = NULL;
if ((result_backslash = strrchr(path, '\\')))
{
result_backslash++;
if (result_backslash > result) result = result_backslash;
}
/*
* Here, we know that there is no more / in the string beginning at
* 'result'. So just check that there is no more \ from it.
*/
{
char *result_backslash;
if ((result_backslash = strrchr(result, '\\')))
result = ++result_backslash;
}
#endif
return result;