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

edje_cc: Use ecore_file_file_get() and ecore_file_dir_get() for EDC parsing 

Replace current EDC parsing code in edje_cc on Windows with the code
using ecore_file_file_get() and ecore_file_dir_get().

Signed-off-by: Jaehyun Cho <jae_hyun.cho@samsung.com>
This commit is contained in:
Vincent Torri 2015-12-10 20:09:00 +09:00 committed by Jaehyun Cho
parent 76f9739f21
commit 7500ef6f8c
2 changed files with 13 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bin/edje/edje_cc_parse.c
View File

@ -914,23 +914,13 @@ void
compile(void)
{
char buf[4096], buf2[4096];
char inc[4096];
Eina_Tmpstr *tmpn;
int fd;
off_t size;
char *data, *p;
char *data;
Eina_List *l;
Edje_Style *stl;
strncpy(inc, file_in, 4000);
inc[4001] = 0;
p = strrchr(inc, '/');
#ifdef _WIN32
char *p_backslash = strrchr(inc, '\\');
if (p_backslash > p) p = p_backslash;
#endif
if (!p) strcpy(inc, "./");
else *p = 0;
fd = eina_file_mkstemp("edje_cc.edc-tmp-XXXXXX", &tmpn);
if (fd < 0)
{
@ -986,25 +976,30 @@ compile(void)
eina_prefix_lib_get(pfx));
if (ecore_file_exists(buf2))
{
char *inc;
inc = ecore_file_dir_get(file_in);
if (depfile)
snprintf(buf, sizeof(buf), "%s -MMD %s -MT %s %s -I%s %s -o %s"
" -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
buf2, depfile, file_out, file_in,
inc, def, clean_file,
inc ? inc : "./", def, clean_file,
EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
else if (annotate)
snprintf(buf, sizeof(buf), "%s -annotate -a %s %s -I%s %s -o %s"
" -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
buf2, watchfile ? watchfile : "/dev/null", file_in,
inc, def, clean_file,
inc ? inc : "./", def, clean_file,
EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
else
snprintf(buf, sizeof(buf), "%s -a %s %s -I%s %s -o %s"
" -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
buf2, watchfile ? watchfile : "/dev/null", file_in,
inc, def, clean_file,
inc ? inc : "./", def, clean_file,
EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
ret = system(buf);
if (inc)
free(inc);
}
else
{
@ -1029,9 +1024,9 @@ compile(void)
}
DBG("Opening \"%s\" for input", file_in);
/* lseek can return -1 on error. trap that return and exit so that
/* lseek can return -1 on error. trap that return and exit so that
* we do not pass malloc a -1
*
*
* NB: Fixes Coverity CID 1040029 */
size = lseek(fd, 0, SEEK_END);
if (size < 0)

37
src/bin/edje/edje_cc_sources.c
View File

@ -154,25 +154,7 @@ source_fetch_file(const char *fil, const char *filname)
*/
if (!dir)
{
char *slash;
if (strrchr(fil, '/'))
{
dir = mem_strdup(fil);
slash = strrchr(dir, '/');
}
else
{
slash = NULL;
}
#ifdef _WIN32
if (strrchr(fil, '\\'))
{
if (!dir) dir = mem_strdup(fil);
char *backslash = strrchr(dir, '\\');
if (backslash > slash) slash = backslash;
}
#endif
if (slash) *slash = '\0';
dir = ecore_file_dir_get(fil);
if (dir) dir_len = strlen(dir);
}
@ -219,22 +201,7 @@ source_fetch_file(const char *fil, const char *filname)
void
source_fetch(void)
{
char buf[PATH_MAX] = {0}, *ptr;
ptr = strrchr(file_in, '/');
if (ptr)
{
snprintf(buf, sizeof (buf), "%s", ptr + 1);
}
#ifdef _WIN32
char *ptr_backslash = strrchr(file_in, '\\');
if (ptr_backslash)
{
if (ptr_backslash > ptr)
snprintf(buf, sizeof (buf), "%s", ptr_backslash + 1);
}
#endif
source_fetch_file(file_in, buf[0] ? buf : file_in);
source_fetch_file(file_in, ecore_file_file_get(file_in));
}
int