Mercurial > hg > webserver / file comparison

comparison: src/server/webdav/parser.c

src/server/webdav/parser.c

changeset 87
bdec069d2239
parent 85
b62e77d8e80c
child 89
5eecce5314d6
equal deleted inserted replaced
86:49bb6c8ceb2b 87:bdec069d2239
72 if(!reader) { 72 if(!reader) {
73 fprintf(stderr, "Cannot create xmlReader\n"); 73 fprintf(stderr, "Cannot create xmlReader\n");
74 return davrq; 74 return davrq;
75 } 75 }
76 76
77 PropfindParser *parser = pool_malloc(sn->pool, sizeof(PropfindParser)); 77 PropfindParser parser;
78 parser->pool = sn->pool; 78 parser.pool = sn->pool;
79 parser->rq = davrq; 79 parser.rq = davrq;
80 parser->property = NULL; 80 parser.davPropTag = 0;
81 parser->davPropTag = 0;
82 81
83 while((r = xmlTextReaderRead(reader)) == 1) { 82 while((r = xmlTextReaderRead(reader)) == 1) {
84 int nodetype = xmlTextReaderNodeType(reader); 83 int nodetype = xmlTextReaderNodeType(reader);
85 const xmlChar *name = xmlTextReaderConstLocalName(reader);
86 if(nodetype == XML_READER_TYPE_ELEMENT) { 84 if(nodetype == XML_READER_TYPE_ELEMENT) {
87 if(propfind_begin_elm(parser, reader)) { 85 if(propfind_begin_elm(&parser, reader)) {
88 fprintf(stderr, "propfind xml error\n");
89 break;
90 }
91 } else if(nodetype == XML_READER_TYPE_END_ELEMENT) {
92 if(propfind_end_elm(parser, reader)) {
93 fprintf(stderr, "propfind xml error\n"); 86 fprintf(stderr, "propfind xml error\n");
94 break; 87 break;
95 } 88 }
96 } 89 }
97 } 90 }
98
99 pool_free(sn->pool, parser);
100 91
101 return davrq; 92 return davrq;
102 } 93 }
103 94
104 int propfind_begin_elm(PropfindParser *p, xmlTextReaderPtr elm) { 95 int propfind_begin_elm(PropfindParser *p, xmlTextReaderPtr elm) {
105 pool_handle_t *pool = p->pool; 96 pool_handle_t *pool = p->pool;
106 const xmlChar *ns = xmlTextReaderConstNamespaceUri(elm); 97 const xmlChar *ns = xmlTextReaderConstNamespaceUri(elm);
107 const xmlChar *name = xmlTextReaderConstLocalName(elm); 98 const xmlChar *name = xmlTextReaderConstLocalName(elm);
99 int depth = xmlTextReaderDepth(elm);
108 100
109 if(ns == NULL) { 101 // check namespace
110 fprintf(stderr, "ERROR: namespace is null!\n"); 102 int dav_ns = 0;
111 return -1; 103 if(ns) {
104 dav_ns = xstreq(ns, "DAV:") ? 1 : 0;
112 } 105 }
113 106
114 int dav_ns = xstreq(ns, "DAV:") ? 1 : 0; 107 if(dav_ns && xstreq(name, "allprop") && depth == 1) {
115
116 if(dav_ns && xstreq(name, "allprop")) {
117 p->rq->allprop = 1; 108 p->rq->allprop = 1;
118 } else if(dav_ns && xstreq(name, "prop")) { 109 } else if(dav_ns && xstreq(name, "prop") && depth == 1) {
119 p->davPropTag = 1; 110 p->davPropTag = 1;
120 } else if(p->davPropTag && !p->property && !p->rq->allprop) { 111 } else if(p->davPropTag && !p->rq->allprop && depth == 2) {
121 DavProperty *property = pool_malloc(pool, sizeof(DavProperty)); 112 DavProperty *property = pool_malloc(pool, sizeof(DavProperty));
122 size_t nslen = strlen(ns); 113 property->xmlns = xmlnsmap_put(p->rq->nsmap, (char*)ns);
123 size_t namelen = strlen(name); 114 property->name = pool_strdup(pool, name);
124 if(nslen > 0) {
125 property->xmlns = xmlnsmap_put(p->rq->nsmap, (char*)ns);
126 } else {
127 property->xmlns = NULL;
128 }
129
130 property->name = pool_malloc(pool, namelen + 1);
131 property->name[namelen] = 0;
132 memcpy(property->name, name, namelen);
133 115
134 // add property to DavRequest 116 // add property to DavRequest
135 UcxDlist *elm = pool_malloc(pool, sizeof(UcxDlist)); 117 UcxDlist *elm = pool_malloc(pool, sizeof(UcxDlist));
136 elm->prev = NULL; 118 elm->prev = NULL;
137 elm->next = NULL; 119 elm->next = NULL;
140 } 122 }
141 123
142 return 0; 124 return 0;
143 } 125 }
144 126
145 int propfind_end_elm(PropfindParser *p, xmlTextReaderPtr elm) {
146 pool_handle_t *pool = p->pool;
147 const xmlChar *ns = xmlTextReaderConstNamespaceUri(elm);
148 const xmlChar *name = xmlTextReaderConstLocalName(elm);
149
150 if(ns == NULL) {
151 fprintf(stderr, "ERROR: namespace is null!\n");
152 return -1;
153 }
154
155 // nothing here yet
156
157 return 0;
158 }

Mercurial Repository: webserver

mercurial