Mercurial > hg > webserver / file diff

--- a/src/server/webdav/parser.c	Tue Jul 09 20:56:01 2013 +0200
+++ b/src/server/webdav/parser.c	Thu Jul 11 14:21:23 2013 +0200
@@ -74,30 +74,21 @@
         return davrq;
     }
     
-    PropfindParser *parser = pool_malloc(sn->pool, sizeof(PropfindParser));
-    parser->pool = sn->pool;
-    parser->rq = davrq;
-    parser->property = NULL;
-    parser->davPropTag = 0;
+    PropfindParser parser;
+    parser.pool = sn->pool;
+    parser.rq = davrq;
+    parser.davPropTag = 0;
     
     while((r = xmlTextReaderRead(reader)) == 1) {
          int nodetype = xmlTextReaderNodeType(reader);
-         const xmlChar *name = xmlTextReaderConstLocalName(reader);
          if(nodetype == XML_READER_TYPE_ELEMENT) {
-             if(propfind_begin_elm(parser, reader)) {
-                 fprintf(stderr, "propfind xml error\n");
-                 break;
-             }
-         } else if(nodetype == XML_READER_TYPE_END_ELEMENT) {
-             if(propfind_end_elm(parser, reader)) {
+             if(propfind_begin_elm(&parser, reader)) {
                  fprintf(stderr, "propfind xml error\n");
                  break;
              }
          }
     }
     
-    pool_free(sn->pool, parser);
-    
     return davrq;
 }
 
@@ -105,31 +96,22 @@
     pool_handle_t *pool = p->pool;
     const xmlChar *ns = xmlTextReaderConstNamespaceUri(elm);
     const xmlChar *name = xmlTextReaderConstLocalName(elm);
+    int depth = xmlTextReaderDepth(elm);
     
-    if(ns == NULL) {
-        fprintf(stderr, "ERROR: namespace is null!\n");
-        return -1;
+    // check namespace
+    int dav_ns = 0;
+    if(ns) {
+        dav_ns = xstreq(ns, "DAV:") ? 1 : 0;
     }
     
-    int dav_ns = xstreq(ns, "DAV:") ? 1 : 0;
-    
-    if(dav_ns && xstreq(name, "allprop")) {
+    if(dav_ns && xstreq(name, "allprop") && depth == 1) {
         p->rq->allprop = 1;
-    } else if(dav_ns && xstreq(name, "prop")) {
+    } else if(dav_ns && xstreq(name, "prop") && depth == 1) {
         p->davPropTag = 1;
-    } else if(p->davPropTag && !p->property && !p->rq->allprop) {
+    } else if(p->davPropTag && !p->rq->allprop && depth == 2) {
         DavProperty *property = pool_malloc(pool, sizeof(DavProperty));
-        size_t nslen = strlen(ns);
-        size_t namelen = strlen(name);
-        if(nslen > 0) {
-            property->xmlns = xmlnsmap_put(p->rq->nsmap, (char*)ns);
-        } else {
-            property->xmlns = NULL;
-        }
-
-        property->name = pool_malloc(pool, namelen + 1);
-        property->name[namelen] = 0;
-        memcpy(property->name, name, namelen);
+        property->xmlns = xmlnsmap_put(p->rq->nsmap, (char*)ns);
+        property->name = pool_strdup(pool, name);
         
         // add property to DavRequest
         UcxDlist *elm = pool_malloc(pool, sizeof(UcxDlist));
@@ -142,17 +124,3 @@
     return 0;
 }
 
-int propfind_end_elm(PropfindParser *p, xmlTextReaderPtr elm) {
-    pool_handle_t *pool = p->pool;
-    const xmlChar *ns = xmlTextReaderConstNamespaceUri(elm);
-    const xmlChar *name = xmlTextReaderConstLocalName(elm);
-    
-    if(ns == NULL) {
-        fprintf(stderr, "ERROR: namespace is null!\n");
-        return -1;
-    }
-    
-    // nothing here yet
-    
-    return 0;
-}