Changeset 9349

Timestamp:

03/26/08 22:52:29 (5 years ago)

Author:

BrainSlayer

Message:

seems to be buggy on xscale, so we revert it

File:

• src/router/httpd/ej.c (modified) (5 diffs)

src/router/httpd/ej.c

@@ -8 +8 @@
 #include <shutils.h>
 #include "httpd.h"
-#include <endian.h>
 
 
@@ -25 +24 @@
 
 #define LOG(a)                  //fprintf(stderr,"%s\n",a);
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define AUF (unsigned short)'%<'
-#define ZU (unsigned short)'>%'
-#elif __BYTE_ORDER == __BIG_ENDIAN
-#define AUF (unsigned short)'<%'
-#define ZU (unsigned short)'%>'
-#else
-#error "unknown endian type
-#endif
 
 
@@ -54 +43 @@
 /* Look for unquoted character within a string */
 static char *
-unqstrstr (char *haystack, unsigned short needle)
+unqstrstr (char *haystack, char *needle)
 {
   char *cur;
   int q;
-  int haylen = strlen(haystack);
+  int needlelen = strlen(needle);
+  int haylen = strlen (haystack);
   for (cur = haystack, q = 0;
-       cur < &haystack[haylen] && !(!q && *((unsigned short*)cur)==needle);cur++)
+       cur < &haystack[haylen] && !(!q && !strncmp (needle, cur, needlelen));
+       cur++)
     {
       if (*cur == '"')
@@ -271 +262 @@
             }
         }
-      if (!asp)
-        {
-          if (len==1 && pattern[0]=='<')
-                continue;
-          if (pattern[1]=='%')
-          {
-                asp = pattern + 2;
-                continue;
-          }
-        }
-      
+      if (!asp && !strncmp (pattern, "<%", len))
+        {
+          if (len == 2)
+            asp = pattern + 2;
+          continue;
+        }
 
       /* Look for ... %> */
@@ -287 +273 @@
       if (asp)
         {
-          if (unqstrstr (asp, ZU))
+          if (unqstrstr (asp, "%>"))
             {
               for (func = asp; func < &pattern[len]; func = end)