Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/engrave

Dir     : e17/libs/engrave/src/lib


Modified Files:
        engrave_out.c 


Log Message:
image dir and font dir can be null.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- engrave_out.c       22 Dec 2004 21:36:21 -0000      1.22
+++ engrave_out.c       23 Dec 2004 12:43:48 -0000      1.23
@@ -123,6 +123,7 @@
   int fd = 0, ret = 0;
   char cmd[2048];
   const char *imgdir, *fontdir;
+  char ipart[512], fpart[512];
 
   strcpy(tmpn, "/tmp/engrave_cc.edc-tmp-XXXXXX");
   fd = mkstemp(tmpn);
@@ -137,8 +138,14 @@
   imgdir = engrave_file_image_dir_get(engrave_file);
   fontdir = engrave_file_font_dir_get(engrave_file);
 
-  snprintf(cmd, sizeof(cmd), "edje_cc -v -id %s -fd %s %s %s", 
-                                       imgdir, fontdir, tmpn, path);
+  if (imgdir) snprintf(ipart, sizeof(ipart), "-id %s", imgdir);
+  else ipart[0] = '\0';
+
+  if (fontdir) snprintf(fpart, sizeof(fpart), "-fd %s", fontdir);
+  else fpart[0] = '\0';
+
+  snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s %s %s", 
+                                      ipart, fpart, tmpn, path);
   ret = system(cmd);
 
   if (ret < 0) {




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to