Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/edje

Dir     : e17/libs/edje/src/bin


Modified Files:
        edje_cc_sources.c 


Log Message:


isspace.. and oops infinite loopies

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_sources.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_cc_sources.c   29 Aug 2004 11:03:19 -0000      1.1
+++ edje_cc_sources.c   29 Aug 2004 12:05:50 -0000      1.2
@@ -92,13 +92,12 @@
        notyet = 1;
        forgetit = 0;
        haveinclude = 0;
-       havefile = 0;
        file = NULL;
        while ((!forgetit) && (*p))
          {
             if (notyet)
               {
-                 if (!isblank(*p))
+                 if (!isspace(*p))
                    {
                       if (*p == '#')
                         notyet = 0;
@@ -111,7 +110,7 @@
               {
                  if (!haveinclude)
                    {
-                      if (!isblank(*p))
+                      if (!isspace(*p))
                         {
                            if (!strncmp(p, "include", 7))
                              {
@@ -124,40 +123,39 @@
                    }
                  else
                    {
-                      if (!havefile)
+                      if (!isspace(*p))
                         {
-                           if (!isblank(*p))
+                           if (*p == '"')
                              {
-                                if (*p == '"')
+                                pp = strchr(p + 1, '"');
+                                if (!pp)
+                                  forgetit = 1;
+                                else
                                   {
-                                     pp = strchr(p + 1, '"');
-                                     if (!pp)
-                                       forgetit = 1;
-                                     else
-                                       {
-                                          file = mem_alloc(pp - p);
-                                          strncpy(file, p + 1, pp - p - 1);
-                                          file[pp - p - 1] = 0;
-                                          forgetit = 1;
-                                       }
+                                     file = mem_alloc(pp - p);
+                                     strncpy(file, p + 1, pp - p - 1);
+                                     file[pp - p - 1] = 0;
+                                     forgetit = 1;
                                   }
-                                else if (*p == '<')
+                             }
+                           else if (*p == '<')
+                             {
+                                pp = strchr(p + 1, '>');
+                                if (!pp)
+                                  forgetit = 1;
+                                else
                                   {
-                                     pp = strchr(p + 1, '>');
-                                     if (!pp)
-                                       forgetit = 1;
-                                     else
-                                       {
-                                          file = mem_alloc(pp - p);
-                                          strncpy(file, p + 1, pp - p - 1);
-                                          file[pp - p - 1] = 0;
-                                          forgetit = 1;
-                                       }
+                                     file = mem_alloc(pp - p);
+                                     strncpy(file, p + 1, pp - p - 1);
+                                     file[pp - p - 1] = 0;
+                                     forgetit = 1;
                                   }
-                                else
-                                  forgetit = 1;
                              }
+                           else
+                             forgetit = 1;
                         }
+                      else
+                        p++;
                    }
               }
          }




-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to