Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
engrave_load.c
Log Message:
- set the correct image/font directory
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_load.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- engrave_load.c 16 Nov 2004 01:13:30 -0000 1.11
+++ engrave_load.c 16 Nov 2004 01:54:08 -0000 1.12
@@ -83,6 +83,8 @@
char *work_dir = NULL;
static char tmpn[4096];
char *cpp_extra = NULL;
+ char *out_dir = NULL;
+
if (!filename) return NULL;
old_fname = strdup(filename);
@@ -148,18 +150,20 @@
/* we need the info on the work dir to pass the cpp so it can
* include files correctly
*/
- len = strlen(ptr) + strlen(work_dir) + 4;
+ len = strlen(ptr) + strlen(work_dir) + 2;
+ out_dir = (char *)calloc(len, sizeof(char));
+ snprintf(out_dir, len, "%s/%s", work_dir, ptr);
+
+ len = strlen(out_dir) + 3;
cpp_extra = (char *)calloc(len, sizeof(char));
- snprintf(cpp_extra, len, "-I%s/%s", work_dir, ptr);
+ snprintf(cpp_extra, len, "-I%s", out_dir);
- len = strlen(work_dir) + strlen(ptr) +
- strlen(MAIN_EDC_NAME) + 3;
+ len = strlen(out_dir) + strlen(MAIN_EDC_NAME) + 2;
new_fname = (char *)calloc(len, sizeof(char));
- snprintf(new_fname, len, "%s/%s/%s", work_dir, ptr,
- MAIN_EDC_NAME);
+ snprintf(new_fname, len, "%s/%s", out_dir, MAIN_EDC_NAME);
FREE(old_fname);
- enf = engrave_load_edc(new_fname, work_dir, work_dir);
+ enf = engrave_load_edc(new_fname, out_dir, out_dir);
FREE(work_dir);
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
