Changeset 5670

Timestamp:

02/23/10 21:58:14 (3 years ago)

Author:

blogic

Message:

make xml parser allow /> to close tags without real close tag

Location:

luci2/cbi2

Files:

• lucip.c (modified) (5 diffs)
• network.luci (modified) (1 diff)

luci2/cbi2/lucip.c

@@ -14 +14 @@
 #define TAG_OPEN        0
 #define TAG_CLOSE       1
+#define TAG_OPENCLOSE   2
 
 #define lucip_fail(a,b) lucip_error(a,b,"")
@@ -104 +105 @@
 }
 
-static int lucip_add_tag(struct lucip *l, const char *namespace, const char *widget, char *data)
+static int lucip_add_tag(struct lucip *l, const char *namespace, const char *widget, char *data, int close)
 {
     int r;
@@ -124 +125 @@
     else
         list_add_tail(&t->list, &l->tags);
+    if(close)
+        return MORE;
     if(l->stackcount >= STACK_DEPTH)
         return lucip_error(l, STACK_TOO_DEEP, "Stack depth has reached %d", STACK_DEPTH);
@@ -200 +203 @@
         ctag = TAG_CLOSE;
     }
+    if(stop[-1] == '/')
+    {
+        stop[-1] = '\0';
+        printf("%s:%s[%d]\n", __FILE__, __func__, __LINE__);
+        ctag = TAG_OPENCLOSE;
+    }
     *stop++ = '\0';
     *colon++ = '\0';
@@ -207 +216 @@
     l->last = l->pos = stop;
     if(ctag == TAG_OPEN)
-        return lucip_add_tag(l, start, colon, space);
+        return lucip_add_tag(l, start, colon, space, 0);
+    if(ctag == TAG_OPENCLOSE)
+        return lucip_add_tag(l, start, colon, space, 1);
     return lucip_close_tag(l, start, colon);
 }

luci2/cbi2/network.luci

@@ -34 +34 @@
 
 <luci:page uci="network">
-    <luci:section ref="network.interface" name="wan"></luci:section>
+    <luci:section ref="network.interface" name="wan"/>
     <luci:section package="dhcp" name="dhcp">
         <luci:option uci="enable">Enable</luci:option>