Mercurial > hg > c2html / changeset

changeset

add basic support for line continuations in C highlighter

Wed, 10 Jul 2024 21:35:37 +0200

author
Mike Becker <universe@uap-core.de>
date
Wed, 10 Jul 2024 21:35:37 +0200
changeset 75
c72b250866ab
parent 74
831928419249
child 76
44c7423d6ce2

add basic support for line continuations in C highlighter

things that still do not work:
- user includes
- splitting keywords

fixes #392

src/c2html.c file | annotate | diff | comparison | revisions
src/highlighter.c file | annotate | diff | comparison | revisions
src/highlighter.h file | annotate | diff | comparison | revisions
test/ctest.c file | annotate | diff | comparison | revisions
test/gs/ctest.html file | annotate | diff | comparison | revisions 
--- a/src/c2html.c	Sun Oct 01 14:41:17 2023 +0200
+++ b/src/c2html.c	Wed Jul 10 21:35:37 2024 +0200
@@ -55,8 +55,7 @@
 
     /* process lines */
     int lineno = 0;
-    c2html_highlighter_data hd;
-    hd.multiline_comment = 0;
+    c2html_highlighter_data hd = {0};
     cxBufferInit(&hd.primary_buffer, NULL, 256, NULL, CX_BUFFER_AUTO_EXTEND);
     cxBufferInit(&hd.secondary_buffer, NULL, 32, NULL, CX_BUFFER_AUTO_EXTEND);
     CxBuffer out_line;
--- a/src/highlighter.c	Sun Oct 01 14:41:17 2023 +0200
+++ b/src/highlighter.c	Wed Jul 10 21:35:37 2024 +0200
@@ -29,12 +29,11 @@
 
 #include "highlighter.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
 #include <cx/string.h>
+#include <cx/printf.h>
 
 static void put_htmlescaped(CxBuffer *dest, char c) {
     if (c == '>') {
@@ -106,45 +105,101 @@
     
     /* local information */
     size_t sp = (size_t)-1;
+
     int isstring = 0, iscomment = 0, isinclude = 0, parseinclude = 0;
     char quote = '\0';
     int isescaping = 0;
-    
+
+    int continuation_enabled = 0;
+    const char* current_highlight = NULL;
+
+    /* define convenience macros */
+#define start_span(cl) \
+        current_highlight = cl; \
+        cx_bprintf(dest, "<span class=\"c2html-%s\">", current_highlight)
+#define stop_span \
+        current_highlight = NULL;\
+        cxBufferPutString(dest, "</span>")
+
     /* continue a multi line comment highlighting */
     if (hd->multiline_comment) {
         iscomment = 1;
-        cxBufferPutString(dest, "<span class=\"c2html-comment\">");
+        start_span("comment");
+    }
+
+    /* continue highlighting in case of line continuation */
+    if (hd->continue_highlight) {
+        start_span(hd->continue_highlight);
+        hd->continue_highlight = NULL;
+        isinclude = hd->continuation_info & 0x1;
+        isstring = hd->continuation_info & 0x2;
+        iscomment = hd->continuation_info & 0x4;
+        if (hd->continuation_info & 0x10) {
+            quote = '\'';
+        } else if (hd->continuation_info & 0x20) {
+            quote = '\"';
+        }
+        hd->continuation_info = 0;
     }
 
     char c;
     do {
         c = src[++sp];
         if (c == '\r') continue;
+
+        /* line continuation */
+        if (c == '\\') {
+            /* currently do not support continuations in user includes */
+            // TODO: also support user includes
+            if (!parseinclude) {
+                continuation_enabled = 1;
+            }
+        } else if (continuation_enabled) {
+            if (!isspace(c)) {
+                continuation_enabled = 0;
+            } else if (c == '\n') {
+                cxBufferPut(dest, '\n');
+                hd->continue_highlight = current_highlight;
+                hd->continuation_info =     \
+                        isinclude         | \
+                        (isstring << 1)   | \
+                        (iscomment << 2);
+                if (quote == '\'') {
+                    hd->continuation_info |= 0x10;
+                } else if (quote == '\"') {
+                    hd->continuation_info |= 0x20;
+                }
+                stop_span;
+                continue;
+            }
+        }
         
         /* comments */
         if (!isstring && c == '/') {
             if (hd->multiline_comment && sp > 0 && src[sp-1] == '*') {
                 iscomment = 0;
                 hd->multiline_comment = 0;
-                cxBufferPutString(dest, "/</span>");
+                cxBufferPut(dest, '/');
+                stop_span;
                 continue;
             } else if (!iscomment && (src[sp+1] == '/' || src[sp+1] == '*')) {
                 iscomment = 1;
                 hd->multiline_comment = (src[sp+1] == '*');
-                cxBufferPutString(dest, "<span class=\"c2html-comment\">");
+                start_span("comment");
             }
         }
 
         if (iscomment) {
             if (c == '\n') {
-                cxBufferPutString(dest, "</span>\n");
+                stop_span;
+                cxBufferPut(dest, '\n');
             } else {
                 put_htmlescaped(dest, c);
             }
         } else if (isinclude) {
             if (c == '<') {
-                cxBufferPutString(dest,
-                        "<span class=\"c2html-stdinclude\">&lt;");
+                start_span("stdinclude");
+                cxBufferPutString(dest, "&lt;");
             } else if (c == '\"') {
                 if (parseinclude) {
                     cxBufferPutString(dest, "\">");
@@ -158,7 +213,8 @@
                     parseinclude = 1;
                 }
             } else if (c == '>') {
-                cxBufferPutString(dest,  "&gt;</span>");
+                cxBufferPutString(dest,  "&gt;");
+                stop_span;
             } else {
                 if (parseinclude) {
                     cxBufferPut(ifilebuf, c);
@@ -172,14 +228,14 @@
                     put_htmlescaped(dest, c);
                     if (c == quote) {
                         isstring = 0;
-                        cxBufferPutString(dest, "</span>");
+                        stop_span;
                     } else {
                         put_htmlescaped(dest, c);
                     }
                 } else {
                     isstring = 1;
                     quote = c;
-                    cxBufferPutString(dest, "<span class=\"c2html-string\">");
+                    start_span("string");
                     put_htmlescaped(dest, c);
                 }
             } else {
@@ -195,24 +251,20 @@
                         int closespan = 1;
                         cxstring typesuffix = CX_STR("_t");
                         if (check_keyword(word, ckeywords)) {
-                            cxBufferPutString(dest,
-                                    "<span class=\"c2html-keyword\">");
+                            start_span("keyword");
                         } else if (cx_strsuffix(word, typesuffix)) {
-                            cxBufferPutString(dest,
-                                "<span class=\"c2html-type\">");
+                            start_span("type");
                         } else if (word.ptr[0] == '#') {
                             isinclude = !cx_strcmp(word, CX_STR("#include"));
-                            cxBufferPutString(dest,
-                                "<span class=\"c2html-directive\">");
+                            start_span("directive");
                         } else if (check_capsonly(word)) {
-                            cxBufferPutString(dest,
-                                "<span class=\"c2html-macroconst\">");
+                            start_span("macroconst");
                         } else {
                             closespan = 0;
                         }
                         put_htmlescapedstr(dest, word);
                         if (closespan) {
-                            cxBufferPutString(dest, "</span>");
+                            stop_span;
                         }
                     }
                     wbuf->pos = wbuf->size = 0; /* reset word buffer */
@@ -225,6 +277,9 @@
             isescaping = !isescaping & (c == '\\');
         }
     } while (c && c != '\n');
+
+#undef start_span
+#undef stop_span
 }
 
 /* Java Highlighter */
--- a/src/highlighter.h	Sun Oct 01 14:41:17 2023 +0200
+++ b/src/highlighter.h	Wed Jul 10 21:35:37 2024 +0200
@@ -38,6 +38,8 @@
     
 typedef struct {
     int multiline_comment;
+    const char* continue_highlight;
+    int continuation_info;
     CxBuffer primary_buffer;
     CxBuffer secondary_buffer;
 } c2html_highlighter_data;
--- a/test/ctest.c	Sun Oct 01 14:41:17 2023 +0200
+++ b/test/ctest.c	Wed Jul 10 21:35:37 2024 +0200
@@ -34,7 +34,8 @@
 #include <ucx/buffer.h>
 #include <ucx/utils.h>
 #include <libxml/tree.h>
-#include <curl/curl.h>
+#include <curl\
+/curl.h>
 
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
@@ -49,6 +50,9 @@
 
 #define MACRO1337 1337L
 
+static const char* continuation_test = "this is a string\
+    with a continuation";
+
 /* -------------------- This is a testing file. -------------------------- */
 /*
 time_t util_parse_creationdate(char *str) {
--- a/test/gs/ctest.html	Sun Oct 01 14:41:17 2023 +0200
+++ b/test/gs/ctest.html	Wed Jul 10 21:35:37 2024 +0200
@@ -87,361 +87,365 @@
 <a class="c2html-lineno" name="l34" href="#l34"> 34 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;ucx/buffer.h&gt;</span>
 <a class="c2html-lineno" name="l35" href="#l35"> 35 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;ucx/utils.h&gt;</span>
 <a class="c2html-lineno" name="l36" href="#l36"> 36 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;libxml/tree.h&gt;</span>
-<a class="c2html-lineno" name="l37" href="#l37"> 37 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;curl/curl.h&gt;</span>
-<a class="c2html-lineno" name="l38" href="#l38"> 38 </a>
-<a class="c2html-lineno" name="l39" href="#l39"> 39 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/sha.h&gt;</span>
-<a class="c2html-lineno" name="l40" href="#l40"> 40 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/hmac.h&gt;</span>
-<a class="c2html-lineno" name="l41" href="#l41"> 41 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/evp.h&gt;</span>
-<a class="c2html-lineno" name="l42" href="#l42"> 42 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/bio.h&gt;</span>
-<a class="c2html-lineno" name="l43" href="#l43"> 43 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/buffer.h&gt;</span>
-<a class="c2html-lineno" name="l44" href="#l44"> 44 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/rand.h&gt;</span>
-<a class="c2html-lineno" name="l45" href="#l45"> 45 </a>
-<a class="c2html-lineno" name="l46" href="#l46"> 46 </a><span class="c2html-directive">#include</span> <a class="c2html-userinclude" href="utils.h">"utils.h"</a>
-<a class="c2html-lineno" name="l47" href="#l47"> 47 </a><span class="c2html-directive">#include</span> <a class="c2html-userinclude" href="crypto.h">"crypto.h"</a>
-<a class="c2html-lineno" name="l48" href="#l48"> 48 </a><span class="c2html-directive">#include</span> <a class="c2html-userinclude" href="webdav.h">"webdav.h"</a>
-<a class="c2html-lineno" name="l49" href="#l49"> 49 </a>
-<a class="c2html-lineno" name="l50" href="#l50"> 50 </a><span class="c2html-directive">#define</span> <span class="c2html-macroconst">MACRO1337</span> <span class="c2html-macroconst">1337L</span>
-<a class="c2html-lineno" name="l51" href="#l51"> 51 </a>
-<a class="c2html-lineno" name="l52" href="#l52"> 52 </a><span class="c2html-comment">/* -------------------- This is a testing file. -------------------------- */</span>
-<a class="c2html-lineno" name="l53" href="#l53"> 53 </a><span class="c2html-comment">/*</span>
-<a class="c2html-lineno" name="l54" href="#l54"> 54 </a><span class="c2html-comment">time_t util_parse_creationdate(char *str) {</span>
-<a class="c2html-lineno" name="l55" href="#l55"> 55 </a><span class="c2html-comment">    // example: 2012-11-29T21:35:35Z</span>
-<a class="c2html-lineno" name="l56" href="#l56"> 56 </a><span class="c2html-comment">    if(!str) {</span>
-<a class="c2html-lineno" name="l57" href="#l57"> 57 </a><span class="c2html-comment">        return 0;</span>
-<a class="c2html-lineno" name="l58" href="#l58"> 58 </a><span class="c2html-comment">    }</span>
-<a class="c2html-lineno" name="l59" href="#l59"> 59 </a><span class="c2html-comment">    // TODO</span>
-<a class="c2html-lineno" name="l60" href="#l60"> 60 </a><span class="c2html-comment">    return 0;</span>
-<a class="c2html-lineno" name="l61" href="#l61"> 61 </a><span class="c2html-comment">}</span>
-<a class="c2html-lineno" name="l62" href="#l62"> 62 </a><span class="c2html-comment">*/</span>
-<a class="c2html-lineno" name="l63" href="#l63"> 63 </a><span class="c2html-type">time_t</span> util_parse_lastmodified(<span class="c2html-keyword">char</span> *str) {
-<a class="c2html-lineno" name="l64" href="#l64"> 64 </a>    <span class="c2html-comment">// example: Thu, 29 Nov 2012 21:35:35 GMT</span>
-<a class="c2html-lineno" name="l65" href="#l65"> 65 </a>    <span class="c2html-keyword">if</span>(!str) {
-<a class="c2html-lineno" name="l66" href="#l66"> 66 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l67" href="#l67"> 67 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l68" href="#l68"> 68 </a>        <span class="c2html-keyword">return</span> curl_getdate(str, <span class="c2html-macroconst">NULL</span>);
-<a class="c2html-lineno" name="l69" href="#l69"> 69 </a>    }
-<a class="c2html-lineno" name="l70" href="#l70"> 70 </a>}
-<a class="c2html-lineno" name="l71" href="#l71"> 71 </a>
-<a class="c2html-lineno" name="l72" href="#l72"> 72 </a><span class="c2html-keyword">int</span> util_getboolean(<span class="c2html-keyword">char</span> *v) {
-<a class="c2html-lineno" name="l73" href="#l73"> 73 </a>    <span class="c2html-keyword">if</span>(v[<span class="c2html-macroconst">0</span>] == <span class="c2html-string">'T'</span> || v[<span class="c2html-macroconst">0</span>] == <span class="c2html-string">'t'</span>) {
-<a class="c2html-lineno" name="l74" href="#l74"> 74 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l75" href="#l75"> 75 </a>    }
-<a class="c2html-lineno" name="l76" href="#l76"> 76 </a>    <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l77" href="#l77"> 77 </a>}
-<a class="c2html-lineno" name="l78" href="#l78"> 78 </a>
-<a class="c2html-lineno" name="l79" href="#l79"> 79 </a><span class="c2html-keyword">int</span> util_strtoint(<span class="c2html-keyword">char</span> *str, <span class="c2html-type">int64_t</span> *value) {
-<a class="c2html-lineno" name="l80" href="#l80"> 80 </a>    <span class="c2html-keyword">char</span> *end;
-<a class="c2html-lineno" name="l81" href="#l81"> 81 </a>    <span class="c2html-type">int64_t</span> val = strtoll(str, &end, <span class="c2html-macroconst">0</span>);
-<a class="c2html-lineno" name="l82" href="#l82"> 82 </a>    <span class="c2html-keyword">if</span>(strlen(end) == <span class="c2html-macroconst">0</span>) {
-<a class="c2html-lineno" name="l83" href="#l83"> 83 </a>        *value = val;
-<a class="c2html-lineno" name="l84" href="#l84"> 84 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l85" href="#l85"> 85 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l86" href="#l86"> 86 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l87" href="#l87"> 87 </a>    }
-<a class="c2html-lineno" name="l88" href="#l88"> 88 </a>}
-<a class="c2html-lineno" name="l89" href="#l89"> 89 </a>
-<a class="c2html-lineno" name="l90" href="#l90"> 90 </a><span class="c2html-keyword">char</span>* util_url_path(<span class="c2html-keyword">char</span> *url) { 
-<a class="c2html-lineno" name="l91" href="#l91"> 91 </a>    <span class="c2html-keyword">char</span> *path = <span class="c2html-macroconst">NULL</span>;
-<a class="c2html-lineno" name="l92" href="#l92"> 92 </a>    <span class="c2html-type">size_t</span> len = strlen(url);
-<a class="c2html-lineno" name="l93" href="#l93"> 93 </a>    <span class="c2html-keyword">int</span> slashcount = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l94" href="#l94"> 94 </a>    <span class="c2html-keyword">int</span> slmax;
-<a class="c2html-lineno" name="l95" href="#l95"> 95 </a>    <span class="c2html-keyword">if</span>(len &gt; <span class="c2html-macroconst">7</span> && !strncasecmp(url, <span class="c2html-string">"http://"</span>, <span class="c2html-macroconst">7</span>)) {
-<a class="c2html-lineno" name="l96" href="#l96"> 96 </a>        slmax = <span class="c2html-macroconst">3</span>;
-<a class="c2html-lineno" name="l97" href="#l97"> 97 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span>(len &gt; <span class="c2html-macroconst">8</span> && !strncasecmp(url, <span class="c2html-string">"https://"</span>, <span class="c2html-macroconst">8</span>)) {
-<a class="c2html-lineno" name="l98" href="#l98"> 98 </a>        slmax = <span class="c2html-macroconst">3</span>;
-<a class="c2html-lineno" name="l99" href="#l99"> 99 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l100" href="#l100">100 </a>        slmax = <span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l101" href="#l101">101 </a>    }
-<a class="c2html-lineno" name="l102" href="#l102">102 </a>    <span class="c2html-keyword">char</span> c;
-<a class="c2html-lineno" name="l103" href="#l103">103 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-macroconst">0</span>;i&lt;len;i++) {
-<a class="c2html-lineno" name="l104" href="#l104">104 </a>        c = url[i];
-<a class="c2html-lineno" name="l105" href="#l105">105 </a>        <span class="c2html-keyword">if</span>(c == <span class="c2html-string">'/'</span>) {
-<a class="c2html-lineno" name="l106" href="#l106">106 </a>            slashcount++;
-<a class="c2html-lineno" name="l107" href="#l107">107 </a>            <span class="c2html-keyword">if</span>(slashcount == slmax) {
-<a class="c2html-lineno" name="l108" href="#l108">108 </a>                path = url + i;
-<a class="c2html-lineno" name="l109" href="#l109">109 </a>                <span class="c2html-keyword">break</span>;
-<a class="c2html-lineno" name="l110" href="#l110">110 </a>            }
-<a class="c2html-lineno" name="l111" href="#l111">111 </a>        }
-<a class="c2html-lineno" name="l112" href="#l112">112 </a>    } 
-<a class="c2html-lineno" name="l113" href="#l113">113 </a>    <span class="c2html-keyword">return</span> path;
-<a class="c2html-lineno" name="l114" href="#l114">114 </a>}
-<a class="c2html-lineno" name="l115" href="#l115">115 </a>
-<a class="c2html-lineno" name="l116" href="#l116">116 </a><span class="c2html-keyword">char</span>* util_url_decode(DavSession *sn, <span class="c2html-keyword">char</span> *url) {
-<a class="c2html-lineno" name="l117" href="#l117">117 </a>    <span class="c2html-keyword">char</span> *unesc = curl_easy_unescape(sn-&gt;handle, url, strlen(url), <span class="c2html-macroconst">NULL</span>);
-<a class="c2html-lineno" name="l118" href="#l118">118 </a>    <span class="c2html-keyword">char</span> *ret = strdup(unesc);
-<a class="c2html-lineno" name="l119" href="#l119">119 </a>    curl_free(unesc);
-<a class="c2html-lineno" name="l120" href="#l120">120 </a>    <span class="c2html-keyword">return</span> ret;
-<a class="c2html-lineno" name="l121" href="#l121">121 </a>}
-<a class="c2html-lineno" name="l122" href="#l122">122 </a>
-<a class="c2html-lineno" name="l123" href="#l123">123 </a><span class="c2html-keyword">char</span>* util_resource_name(<span class="c2html-keyword">char</span> *url) {
-<a class="c2html-lineno" name="l124" href="#l124">124 </a>    <span class="c2html-keyword">int</span> si = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l125" href="#l125">125 </a>    <span class="c2html-keyword">int</span> osi = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l126" href="#l126">126 </a>    <span class="c2html-keyword">int</span> i = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l127" href="#l127">127 </a>    <span class="c2html-keyword">int</span> p = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l128" href="#l128">128 </a>    <span class="c2html-keyword">char</span> c;
-<a class="c2html-lineno" name="l129" href="#l129">129 </a>    <span class="c2html-keyword">while</span>((c = url[i]) != <span class="c2html-macroconst">0</span>) {
-<a class="c2html-lineno" name="l130" href="#l130">130 </a>        <span class="c2html-keyword">if</span>(c == <span class="c2html-string">'/'</span>) {
-<a class="c2html-lineno" name="l131" href="#l131">131 </a>            osi = si;
-<a class="c2html-lineno" name="l132" href="#l132">132 </a>            si = i;
-<a class="c2html-lineno" name="l133" href="#l133">133 </a>            p = <span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l134" href="#l134">134 </a>        }
-<a class="c2html-lineno" name="l135" href="#l135">135 </a>        i++;
-<a class="c2html-lineno" name="l136" href="#l136">136 </a>    }
-<a class="c2html-lineno" name="l137" href="#l137">137 </a>    
-<a class="c2html-lineno" name="l138" href="#l138">138 </a>    <span class="c2html-keyword">char</span> *name = url + si + p;
-<a class="c2html-lineno" name="l139" href="#l139">139 </a>    <span class="c2html-keyword">if</span>(name[<span class="c2html-macroconst">0</span>] == <span class="c2html-macroconst">0</span>) {
-<a class="c2html-lineno" name="l140" href="#l140">140 </a>        name = url + osi + p;
-<a class="c2html-lineno" name="l141" href="#l141">141 </a>        <span class="c2html-keyword">if</span>(name[<span class="c2html-macroconst">0</span>] == <span class="c2html-macroconst">0</span>) {
-<a class="c2html-lineno" name="l142" href="#l142">142 </a>            <span class="c2html-keyword">return</span> url;
-<a class="c2html-lineno" name="l143" href="#l143">143 </a>        }
-<a class="c2html-lineno" name="l144" href="#l144">144 </a>    }
-<a class="c2html-lineno" name="l145" href="#l145">145 </a>    
-<a class="c2html-lineno" name="l146" href="#l146">146 </a>    <span class="c2html-keyword">return</span> name;
-<a class="c2html-lineno" name="l147" href="#l147">147 </a>}
-<a class="c2html-lineno" name="l148" href="#l148">148 </a>
-<a class="c2html-lineno" name="l149" href="#l149">149 </a><span class="c2html-keyword">int</span> util_mkdir(<span class="c2html-keyword">char</span> *path, <span class="c2html-type">mode_t</span> mode) {
-<a class="c2html-lineno" name="l150" href="#l150">150 </a><span class="c2html-directive">#ifdef</span> <span class="c2html-macroconst">_WIN32</span>
-<a class="c2html-lineno" name="l151" href="#l151">151 </a>    <span class="c2html-keyword">return</span> mkdir(path);
-<a class="c2html-lineno" name="l152" href="#l152">152 </a><span class="c2html-directive">#else</span>
-<a class="c2html-lineno" name="l153" href="#l153">153 </a>    <span class="c2html-keyword">return</span> mkdir(path, mode);
-<a class="c2html-lineno" name="l154" href="#l154">154 </a><span class="c2html-directive">#endif</span>
-<a class="c2html-lineno" name="l155" href="#l155">155 </a>}
-<a class="c2html-lineno" name="l156" href="#l156">156 </a>
-<a class="c2html-lineno" name="l157" href="#l157">157 </a><span class="c2html-keyword">char</span>* util_concat_path(<span class="c2html-keyword">char</span> *url_base, <span class="c2html-keyword">char</span> *p) {
-<a class="c2html-lineno" name="l158" href="#l158">158 </a>    <span class="c2html-type">sstr_t</span> base = sstr(url_base);
-<a class="c2html-lineno" name="l159" href="#l159">159 </a>    <span class="c2html-type">sstr_t</span> path;
-<a class="c2html-lineno" name="l160" href="#l160">160 </a>    <span class="c2html-keyword">if</span>(p) {
-<a class="c2html-lineno" name="l161" href="#l161">161 </a>        path = sstr(p);
-<a class="c2html-lineno" name="l162" href="#l162">162 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l163" href="#l163">163 </a>        path = sstrn(<span class="c2html-string">""</span>, <span class="c2html-macroconst">0</span>);
-<a class="c2html-lineno" name="l164" href="#l164">164 </a>    }
-<a class="c2html-lineno" name="l165" href="#l165">165 </a>    
-<a class="c2html-lineno" name="l166" href="#l166">166 </a>    <span class="c2html-keyword">int</span> add_separator = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l167" href="#l167">167 </a>    <span class="c2html-keyword">if</span>(base.ptr[base.length-<span class="c2html-macroconst">1</span>] == <span class="c2html-string">'/'</span>) {
-<a class="c2html-lineno" name="l168" href="#l168">168 </a>        <span class="c2html-keyword">if</span>(path.ptr[<span class="c2html-macroconst">0</span>] == <span class="c2html-string">'/'</span>) {
-<a class="c2html-lineno" name="l169" href="#l169">169 </a>            base.length--;
-<a class="c2html-lineno" name="l170" href="#l170">170 </a>        }
-<a class="c2html-lineno" name="l171" href="#l171">171 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l172" href="#l172">172 </a>        <span class="c2html-keyword">if</span>(path.length == <span class="c2html-macroconst">0</span> || path.ptr[<span class="c2html-macroconst">0</span>] != <span class="c2html-string">'/'</span>) {
-<a class="c2html-lineno" name="l173" href="#l173">173 </a>            add_separator = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l37" href="#l37"> 37 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;curl\
+</span><a class="c2html-lineno" name="l38" href="#l38"> 38 </a><span class="c2html-stdinclude">/curl.h&gt;</span>
+<a class="c2html-lineno" name="l39" href="#l39"> 39 </a>
+<a class="c2html-lineno" name="l40" href="#l40"> 40 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/sha.h&gt;</span>
+<a class="c2html-lineno" name="l41" href="#l41"> 41 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/hmac.h&gt;</span>
+<a class="c2html-lineno" name="l42" href="#l42"> 42 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/evp.h&gt;</span>
+<a class="c2html-lineno" name="l43" href="#l43"> 43 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/bio.h&gt;</span>
+<a class="c2html-lineno" name="l44" href="#l44"> 44 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/buffer.h&gt;</span>
+<a class="c2html-lineno" name="l45" href="#l45"> 45 </a><span class="c2html-directive">#include</span> <span class="c2html-stdinclude">&lt;openssl/rand.h&gt;</span>
+<a class="c2html-lineno" name="l46" href="#l46"> 46 </a>
+<a class="c2html-lineno" name="l47" href="#l47"> 47 </a><span class="c2html-directive">#include</span> <a class="c2html-userinclude" href="utils.h">"utils.h"</a>
+<a class="c2html-lineno" name="l48" href="#l48"> 48 </a><span class="c2html-directive">#include</span> <a class="c2html-userinclude" href="crypto.h">"crypto.h"</a>
+<a class="c2html-lineno" name="l49" href="#l49"> 49 </a><span class="c2html-directive">#include</span> <a class="c2html-userinclude" href="webdav.h">"webdav.h"</a>
+<a class="c2html-lineno" name="l50" href="#l50"> 50 </a>
+<a class="c2html-lineno" name="l51" href="#l51"> 51 </a><span class="c2html-directive">#define</span> <span class="c2html-macroconst">MACRO1337</span> <span class="c2html-macroconst">1337L</span>
+<a class="c2html-lineno" name="l52" href="#l52"> 52 </a>
+<a class="c2html-lineno" name="l53" href="#l53"> 53 </a><span class="c2html-keyword">static</span> <span class="c2html-keyword">const</span> <span class="c2html-keyword">char</span>* continuation_test = <span class="c2html-string">"this is a string\
+</span><a class="c2html-lineno" name="l54" href="#l54"> 54 </a><span class="c2html-string">    with a continuation"</span>;
+<a class="c2html-lineno" name="l55" href="#l55"> 55 </a>
+<a class="c2html-lineno" name="l56" href="#l56"> 56 </a><span class="c2html-comment">/* -------------------- This is a testing file. -------------------------- */</span>
+<a class="c2html-lineno" name="l57" href="#l57"> 57 </a><span class="c2html-comment">/*</span>
+<a class="c2html-lineno" name="l58" href="#l58"> 58 </a><span class="c2html-comment">time_t util_parse_creationdate(char *str) {</span>
+<a class="c2html-lineno" name="l59" href="#l59"> 59 </a><span class="c2html-comment">    // example: 2012-11-29T21:35:35Z</span>
+<a class="c2html-lineno" name="l60" href="#l60"> 60 </a><span class="c2html-comment">    if(!str) {</span>
+<a class="c2html-lineno" name="l61" href="#l61"> 61 </a><span class="c2html-comment">        return 0;</span>
+<a class="c2html-lineno" name="l62" href="#l62"> 62 </a><span class="c2html-comment">    }</span>
+<a class="c2html-lineno" name="l63" href="#l63"> 63 </a><span class="c2html-comment">    // TODO</span>
+<a class="c2html-lineno" name="l64" href="#l64"> 64 </a><span class="c2html-comment">    return 0;</span>
+<a class="c2html-lineno" name="l65" href="#l65"> 65 </a><span class="c2html-comment">}</span>
+<a class="c2html-lineno" name="l66" href="#l66"> 66 </a><span class="c2html-comment">*/</span>
+<a class="c2html-lineno" name="l67" href="#l67"> 67 </a><span class="c2html-type">time_t</span> util_parse_lastmodified(<span class="c2html-keyword">char</span> *str) {
+<a class="c2html-lineno" name="l68" href="#l68"> 68 </a>    <span class="c2html-comment">// example: Thu, 29 Nov 2012 21:35:35 GMT</span>
+<a class="c2html-lineno" name="l69" href="#l69"> 69 </a>    <span class="c2html-keyword">if</span>(!str) {
+<a class="c2html-lineno" name="l70" href="#l70"> 70 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l71" href="#l71"> 71 </a>    } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l72" href="#l72"> 72 </a>        <span class="c2html-keyword">return</span> curl_getdate(str, <span class="c2html-macroconst">NULL</span>);
+<a class="c2html-lineno" name="l73" href="#l73"> 73 </a>    }
+<a class="c2html-lineno" name="l74" href="#l74"> 74 </a>}
+<a class="c2html-lineno" name="l75" href="#l75"> 75 </a>
+<a class="c2html-lineno" name="l76" href="#l76"> 76 </a><span class="c2html-keyword">int</span> util_getboolean(<span class="c2html-keyword">char</span> *v) {
+<a class="c2html-lineno" name="l77" href="#l77"> 77 </a>    <span class="c2html-keyword">if</span>(v[<span class="c2html-macroconst">0</span>] == <span class="c2html-string">'T'</span> || v[<span class="c2html-macroconst">0</span>] == <span class="c2html-string">'t'</span>) {
+<a class="c2html-lineno" name="l78" href="#l78"> 78 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l79" href="#l79"> 79 </a>    }
+<a class="c2html-lineno" name="l80" href="#l80"> 80 </a>    <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l81" href="#l81"> 81 </a>}
+<a class="c2html-lineno" name="l82" href="#l82"> 82 </a>
+<a class="c2html-lineno" name="l83" href="#l83"> 83 </a><span class="c2html-keyword">int</span> util_strtoint(<span class="c2html-keyword">char</span> *str, <span class="c2html-type">int64_t</span> *value) {
+<a class="c2html-lineno" name="l84" href="#l84"> 84 </a>    <span class="c2html-keyword">char</span> *end;
+<a class="c2html-lineno" name="l85" href="#l85"> 85 </a>    <span class="c2html-type">int64_t</span> val = strtoll(str, &end, <span class="c2html-macroconst">0</span>);
+<a class="c2html-lineno" name="l86" href="#l86"> 86 </a>    <span class="c2html-keyword">if</span>(strlen(end) == <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l87" href="#l87"> 87 </a>        *value = val;
+<a class="c2html-lineno" name="l88" href="#l88"> 88 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l89" href="#l89"> 89 </a>    } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l90" href="#l90"> 90 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l91" href="#l91"> 91 </a>    }
+<a class="c2html-lineno" name="l92" href="#l92"> 92 </a>}
+<a class="c2html-lineno" name="l93" href="#l93"> 93 </a>
+<a class="c2html-lineno" name="l94" href="#l94"> 94 </a><span class="c2html-keyword">char</span>* util_url_path(<span class="c2html-keyword">char</span> *url) { 
+<a class="c2html-lineno" name="l95" href="#l95"> 95 </a>    <span class="c2html-keyword">char</span> *path = <span class="c2html-macroconst">NULL</span>;
+<a class="c2html-lineno" name="l96" href="#l96"> 96 </a>    <span class="c2html-type">size_t</span> len = strlen(url);
+<a class="c2html-lineno" name="l97" href="#l97"> 97 </a>    <span class="c2html-keyword">int</span> slashcount = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l98" href="#l98"> 98 </a>    <span class="c2html-keyword">int</span> slmax;
+<a class="c2html-lineno" name="l99" href="#l99"> 99 </a>    <span class="c2html-keyword">if</span>(len &gt; <span class="c2html-macroconst">7</span> && !strncasecmp(url, <span class="c2html-string">"http://"</span>, <span class="c2html-macroconst">7</span>)) {
+<a class="c2html-lineno" name="l100" href="#l100">100 </a>        slmax = <span class="c2html-macroconst">3</span>;
+<a class="c2html-lineno" name="l101" href="#l101">101 </a>    } <span class="c2html-keyword">else</span> <span class="c2html-keyword">if</span>(len &gt; <span class="c2html-macroconst">8</span> && !strncasecmp(url, <span class="c2html-string">"https://"</span>, <span class="c2html-macroconst">8</span>)) {
+<a class="c2html-lineno" name="l102" href="#l102">102 </a>        slmax = <span class="c2html-macroconst">3</span>;
+<a class="c2html-lineno" name="l103" href="#l103">103 </a>    } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l104" href="#l104">104 </a>        slmax = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l105" href="#l105">105 </a>    }
+<a class="c2html-lineno" name="l106" href="#l106">106 </a>    <span class="c2html-keyword">char</span> c;
+<a class="c2html-lineno" name="l107" href="#l107">107 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-macroconst">0</span>;i&lt;len;i++) {
+<a class="c2html-lineno" name="l108" href="#l108">108 </a>        c = url[i];
+<a class="c2html-lineno" name="l109" href="#l109">109 </a>        <span class="c2html-keyword">if</span>(c == <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l110" href="#l110">110 </a>            slashcount++;
+<a class="c2html-lineno" name="l111" href="#l111">111 </a>            <span class="c2html-keyword">if</span>(slashcount == slmax) {
+<a class="c2html-lineno" name="l112" href="#l112">112 </a>                path = url + i;
+<a class="c2html-lineno" name="l113" href="#l113">113 </a>                <span class="c2html-keyword">break</span>;
+<a class="c2html-lineno" name="l114" href="#l114">114 </a>            }
+<a class="c2html-lineno" name="l115" href="#l115">115 </a>        }
+<a class="c2html-lineno" name="l116" href="#l116">116 </a>    } 
+<a class="c2html-lineno" name="l117" href="#l117">117 </a>    <span class="c2html-keyword">return</span> path;
+<a class="c2html-lineno" name="l118" href="#l118">118 </a>}
+<a class="c2html-lineno" name="l119" href="#l119">119 </a>
+<a class="c2html-lineno" name="l120" href="#l120">120 </a><span class="c2html-keyword">char</span>* util_url_decode(DavSession *sn, <span class="c2html-keyword">char</span> *url) {
+<a class="c2html-lineno" name="l121" href="#l121">121 </a>    <span class="c2html-keyword">char</span> *unesc = curl_easy_unescape(sn-&gt;handle, url, strlen(url), <span class="c2html-macroconst">NULL</span>);
+<a class="c2html-lineno" name="l122" href="#l122">122 </a>    <span class="c2html-keyword">char</span> *ret = strdup(unesc);
+<a class="c2html-lineno" name="l123" href="#l123">123 </a>    curl_free(unesc);
+<a class="c2html-lineno" name="l124" href="#l124">124 </a>    <span class="c2html-keyword">return</span> ret;
+<a class="c2html-lineno" name="l125" href="#l125">125 </a>}
+<a class="c2html-lineno" name="l126" href="#l126">126 </a>
+<a class="c2html-lineno" name="l127" href="#l127">127 </a><span class="c2html-keyword">char</span>* util_resource_name(<span class="c2html-keyword">char</span> *url) {
+<a class="c2html-lineno" name="l128" href="#l128">128 </a>    <span class="c2html-keyword">int</span> si = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l129" href="#l129">129 </a>    <span class="c2html-keyword">int</span> osi = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l130" href="#l130">130 </a>    <span class="c2html-keyword">int</span> i = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l131" href="#l131">131 </a>    <span class="c2html-keyword">int</span> p = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l132" href="#l132">132 </a>    <span class="c2html-keyword">char</span> c;
+<a class="c2html-lineno" name="l133" href="#l133">133 </a>    <span class="c2html-keyword">while</span>((c = url[i]) != <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l134" href="#l134">134 </a>        <span class="c2html-keyword">if</span>(c == <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l135" href="#l135">135 </a>            osi = si;
+<a class="c2html-lineno" name="l136" href="#l136">136 </a>            si = i;
+<a class="c2html-lineno" name="l137" href="#l137">137 </a>            p = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l138" href="#l138">138 </a>        }
+<a class="c2html-lineno" name="l139" href="#l139">139 </a>        i++;
+<a class="c2html-lineno" name="l140" href="#l140">140 </a>    }
+<a class="c2html-lineno" name="l141" href="#l141">141 </a>    
+<a class="c2html-lineno" name="l142" href="#l142">142 </a>    <span class="c2html-keyword">char</span> *name = url + si + p;
+<a class="c2html-lineno" name="l143" href="#l143">143 </a>    <span class="c2html-keyword">if</span>(name[<span class="c2html-macroconst">0</span>] == <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l144" href="#l144">144 </a>        name = url + osi + p;
+<a class="c2html-lineno" name="l145" href="#l145">145 </a>        <span class="c2html-keyword">if</span>(name[<span class="c2html-macroconst">0</span>] == <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l146" href="#l146">146 </a>            <span class="c2html-keyword">return</span> url;
+<a class="c2html-lineno" name="l147" href="#l147">147 </a>        }
+<a class="c2html-lineno" name="l148" href="#l148">148 </a>    }
+<a class="c2html-lineno" name="l149" href="#l149">149 </a>    
+<a class="c2html-lineno" name="l150" href="#l150">150 </a>    <span class="c2html-keyword">return</span> name;
+<a class="c2html-lineno" name="l151" href="#l151">151 </a>}
+<a class="c2html-lineno" name="l152" href="#l152">152 </a>
+<a class="c2html-lineno" name="l153" href="#l153">153 </a><span class="c2html-keyword">int</span> util_mkdir(<span class="c2html-keyword">char</span> *path, <span class="c2html-type">mode_t</span> mode) {
+<a class="c2html-lineno" name="l154" href="#l154">154 </a><span class="c2html-directive">#ifdef</span> <span class="c2html-macroconst">_WIN32</span>
+<a class="c2html-lineno" name="l155" href="#l155">155 </a>    <span class="c2html-keyword">return</span> mkdir(path);
+<a class="c2html-lineno" name="l156" href="#l156">156 </a><span class="c2html-directive">#else</span>
+<a class="c2html-lineno" name="l157" href="#l157">157 </a>    <span class="c2html-keyword">return</span> mkdir(path, mode);
+<a class="c2html-lineno" name="l158" href="#l158">158 </a><span class="c2html-directive">#endif</span>
+<a class="c2html-lineno" name="l159" href="#l159">159 </a>}
+<a class="c2html-lineno" name="l160" href="#l160">160 </a>
+<a class="c2html-lineno" name="l161" href="#l161">161 </a><span class="c2html-keyword">char</span>* util_concat_path(<span class="c2html-keyword">char</span> *url_base, <span class="c2html-keyword">char</span> *p) {
+<a class="c2html-lineno" name="l162" href="#l162">162 </a>    <span class="c2html-type">sstr_t</span> base = sstr(url_base);
+<a class="c2html-lineno" name="l163" href="#l163">163 </a>    <span class="c2html-type">sstr_t</span> path;
+<a class="c2html-lineno" name="l164" href="#l164">164 </a>    <span class="c2html-keyword">if</span>(p) {
+<a class="c2html-lineno" name="l165" href="#l165">165 </a>        path = sstr(p);
+<a class="c2html-lineno" name="l166" href="#l166">166 </a>    } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l167" href="#l167">167 </a>        path = sstrn(<span class="c2html-string">""</span>, <span class="c2html-macroconst">0</span>);
+<a class="c2html-lineno" name="l168" href="#l168">168 </a>    }
+<a class="c2html-lineno" name="l169" href="#l169">169 </a>    
+<a class="c2html-lineno" name="l170" href="#l170">170 </a>    <span class="c2html-keyword">int</span> add_separator = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l171" href="#l171">171 </a>    <span class="c2html-keyword">if</span>(base.ptr[base.length-<span class="c2html-macroconst">1</span>] == <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l172" href="#l172">172 </a>        <span class="c2html-keyword">if</span>(path.ptr[<span class="c2html-macroconst">0</span>] == <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l173" href="#l173">173 </a>            base.length--;
 <a class="c2html-lineno" name="l174" href="#l174">174 </a>        }
-<a class="c2html-lineno" name="l175" href="#l175">175 </a>    }
-<a class="c2html-lineno" name="l176" href="#l176">176 </a>    
-<a class="c2html-lineno" name="l177" href="#l177">177 </a>    <span class="c2html-type">sstr_t</span> url;
-<a class="c2html-lineno" name="l178" href="#l178">178 </a>    <span class="c2html-keyword">if</span>(add_separator) {
-<a class="c2html-lineno" name="l179" href="#l179">179 </a>        url = sstrcat(<span class="c2html-macroconst">3</span>, base, sstr(<span class="c2html-string">"/"</span>), path);
-<a class="c2html-lineno" name="l180" href="#l180">180 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l181" href="#l181">181 </a>        url = sstrcat(<span class="c2html-macroconst">2</span>, base, path);
-<a class="c2html-lineno" name="l182" href="#l182">182 </a>    }
-<a class="c2html-lineno" name="l183" href="#l183">183 </a>    
-<a class="c2html-lineno" name="l184" href="#l184">184 </a>    <span class="c2html-keyword">return</span> url.ptr;
-<a class="c2html-lineno" name="l185" href="#l185">185 </a>}
-<a class="c2html-lineno" name="l186" href="#l186">186 </a>
-<a class="c2html-lineno" name="l187" href="#l187">187 </a><span class="c2html-keyword">void</span> util_set_url(DavSession *sn, <span class="c2html-keyword">char</span> *href) {
-<a class="c2html-lineno" name="l188" href="#l188">188 </a>    <span class="c2html-type">sstr_t</span> base = sstr(sn-&gt;base_url);
-<a class="c2html-lineno" name="l189" href="#l189">189 </a>    <span class="c2html-type">sstr_t</span> href_str = sstr(href);
-<a class="c2html-lineno" name="l190" href="#l190">190 </a>    
-<a class="c2html-lineno" name="l191" href="#l191">191 </a>    <span class="c2html-keyword">char</span> *base_path = util_url_path(sn-&gt;base_url);
-<a class="c2html-lineno" name="l192" href="#l192">192 </a>    base.length -= strlen(base_path);
-<a class="c2html-lineno" name="l193" href="#l193">193 </a>    
-<a class="c2html-lineno" name="l194" href="#l194">194 </a>    <span class="c2html-type">sstr_t</span> url = sstrcat(<span class="c2html-macroconst">2</span>, base, href_str);
-<a class="c2html-lineno" name="l195" href="#l195">195 </a>    
-<a class="c2html-lineno" name="l196" href="#l196">196 </a>    curl_easy_setopt(sn-&gt;handle, <span class="c2html-macroconst">CURLOPT_URL</span>, url.ptr);
-<a class="c2html-lineno" name="l197" href="#l197">197 </a>    free(url.ptr);
-<a class="c2html-lineno" name="l198" href="#l198">198 </a>}
-<a class="c2html-lineno" name="l199" href="#l199">199 </a>
-<a class="c2html-lineno" name="l200" href="#l200">200 </a><span class="c2html-keyword">char</span>* util_path_to_url(DavSession *sn, <span class="c2html-keyword">char</span> *path) {
-<a class="c2html-lineno" name="l201" href="#l201">201 </a>    <span class="c2html-keyword">char</span> *space = malloc(<span class="c2html-macroconst">256</span>);
-<a class="c2html-lineno" name="l202" href="#l202">202 </a>    UcxBuffer *url = ucx_buffer_new(space, <span class="c2html-macroconst">256</span>, <span class="c2html-macroconst">CX_BUFFER_AUTO_EXTEND</span>);
-<a class="c2html-lineno" name="l203" href="#l203">203 </a>    
-<a class="c2html-lineno" name="l204" href="#l204">204 </a>    <span class="c2html-comment">// add base url</span>
-<a class="c2html-lineno" name="l205" href="#l205">205 </a>    ucx_buffer_write(sn-&gt;base_url, <span class="c2html-macroconst">1</span>, strlen(sn-&gt;base_url), url);
-<a class="c2html-lineno" name="l206" href="#l206">206 </a>    <span class="c2html-comment">// remove trailing slash</span>
-<a class="c2html-lineno" name="l207" href="#l207">207 </a>    ucx_buffer_seek(url, -<span class="c2html-macroconst">1</span>, <span class="c2html-macroconst">SEEK_CUR</span>);
-<a class="c2html-lineno" name="l208" href="#l208">208 </a>    
-<a class="c2html-lineno" name="l209" href="#l209">209 </a>    <span class="c2html-type">sstr_t</span> p = sstr(path);
-<a class="c2html-lineno" name="l210" href="#l210">210 </a>    <span class="c2html-type">ssize_t</span> ntk = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l211" href="#l211">211 </a>    <span class="c2html-type">sstr_t</span> *tks = sstrsplit(p, <span class="c2html-macroconst">S</span>(<span class="c2html-string">"/"</span>), &ntk);
+<a class="c2html-lineno" name="l175" href="#l175">175 </a>    } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l176" href="#l176">176 </a>        <span class="c2html-keyword">if</span>(path.length == <span class="c2html-macroconst">0</span> || path.ptr[<span class="c2html-macroconst">0</span>] != <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l177" href="#l177">177 </a>            add_separator = <span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l178" href="#l178">178 </a>        }
+<a class="c2html-lineno" name="l179" href="#l179">179 </a>    }
+<a class="c2html-lineno" name="l180" href="#l180">180 </a>    
+<a class="c2html-lineno" name="l181" href="#l181">181 </a>    <span class="c2html-type">sstr_t</span> url;
+<a class="c2html-lineno" name="l182" href="#l182">182 </a>    <span class="c2html-keyword">if</span>(add_separator) {
+<a class="c2html-lineno" name="l183" href="#l183">183 </a>        url = sstrcat(<span class="c2html-macroconst">3</span>, base, sstr(<span class="c2html-string">"/"</span>), path);
+<a class="c2html-lineno" name="l184" href="#l184">184 </a>    } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l185" href="#l185">185 </a>        url = sstrcat(<span class="c2html-macroconst">2</span>, base, path);
+<a class="c2html-lineno" name="l186" href="#l186">186 </a>    }
+<a class="c2html-lineno" name="l187" href="#l187">187 </a>    
+<a class="c2html-lineno" name="l188" href="#l188">188 </a>    <span class="c2html-keyword">return</span> url.ptr;
+<a class="c2html-lineno" name="l189" href="#l189">189 </a>}
+<a class="c2html-lineno" name="l190" href="#l190">190 </a>
+<a class="c2html-lineno" name="l191" href="#l191">191 </a><span class="c2html-keyword">void</span> util_set_url(DavSession *sn, <span class="c2html-keyword">char</span> *href) {
+<a class="c2html-lineno" name="l192" href="#l192">192 </a>    <span class="c2html-type">sstr_t</span> base = sstr(sn-&gt;base_url);
+<a class="c2html-lineno" name="l193" href="#l193">193 </a>    <span class="c2html-type">sstr_t</span> href_str = sstr(href);
+<a class="c2html-lineno" name="l194" href="#l194">194 </a>    
+<a class="c2html-lineno" name="l195" href="#l195">195 </a>    <span class="c2html-keyword">char</span> *base_path = util_url_path(sn-&gt;base_url);
+<a class="c2html-lineno" name="l196" href="#l196">196 </a>    base.length -= strlen(base_path);
+<a class="c2html-lineno" name="l197" href="#l197">197 </a>    
+<a class="c2html-lineno" name="l198" href="#l198">198 </a>    <span class="c2html-type">sstr_t</span> url = sstrcat(<span class="c2html-macroconst">2</span>, base, href_str);
+<a class="c2html-lineno" name="l199" href="#l199">199 </a>    
+<a class="c2html-lineno" name="l200" href="#l200">200 </a>    curl_easy_setopt(sn-&gt;handle, <span class="c2html-macroconst">CURLOPT_URL</span>, url.ptr);
+<a class="c2html-lineno" name="l201" href="#l201">201 </a>    free(url.ptr);
+<a class="c2html-lineno" name="l202" href="#l202">202 </a>}
+<a class="c2html-lineno" name="l203" href="#l203">203 </a>
+<a class="c2html-lineno" name="l204" href="#l204">204 </a><span class="c2html-keyword">char</span>* util_path_to_url(DavSession *sn, <span class="c2html-keyword">char</span> *path) {
+<a class="c2html-lineno" name="l205" href="#l205">205 </a>    <span class="c2html-keyword">char</span> *space = malloc(<span class="c2html-macroconst">256</span>);
+<a class="c2html-lineno" name="l206" href="#l206">206 </a>    UcxBuffer *url = ucx_buffer_new(space, <span class="c2html-macroconst">256</span>, <span class="c2html-macroconst">CX_BUFFER_AUTO_EXTEND</span>);
+<a class="c2html-lineno" name="l207" href="#l207">207 </a>    
+<a class="c2html-lineno" name="l208" href="#l208">208 </a>    <span class="c2html-comment">// add base url</span>
+<a class="c2html-lineno" name="l209" href="#l209">209 </a>    ucx_buffer_write(sn-&gt;base_url, <span class="c2html-macroconst">1</span>, strlen(sn-&gt;base_url), url);
+<a class="c2html-lineno" name="l210" href="#l210">210 </a>    <span class="c2html-comment">// remove trailing slash</span>
+<a class="c2html-lineno" name="l211" href="#l211">211 </a>    ucx_buffer_seek(url, -<span class="c2html-macroconst">1</span>, <span class="c2html-macroconst">SEEK_CUR</span>);
 <a class="c2html-lineno" name="l212" href="#l212">212 </a>    
-<a class="c2html-lineno" name="l213" href="#l213">213 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-macroconst">0</span>;i&lt;ntk;i++) {
-<a class="c2html-lineno" name="l214" href="#l214">214 </a>        <span class="c2html-type">sstr_t</span> node = tks[i];
-<a class="c2html-lineno" name="l215" href="#l215">215 </a>        <span class="c2html-keyword">if</span>(node.length &gt; <span class="c2html-macroconst">0</span>) {
-<a class="c2html-lineno" name="l216" href="#l216">216 </a>            <span class="c2html-keyword">char</span> *esc = curl_easy_escape(sn-&gt;handle, node.ptr, node.length);
-<a class="c2html-lineno" name="l217" href="#l217">217 </a>            ucx_buffer_putc(url, <span class="c2html-string">'/'</span>);
-<a class="c2html-lineno" name="l218" href="#l218">218 </a>            ucx_buffer_write(esc, <span class="c2html-macroconst">1</span>, strlen(esc), url);
-<a class="c2html-lineno" name="l219" href="#l219">219 </a>            curl_free(esc);
-<a class="c2html-lineno" name="l220" href="#l220">220 </a>        }
-<a class="c2html-lineno" name="l221" href="#l221">221 </a>        free(node.ptr);
-<a class="c2html-lineno" name="l222" href="#l222">222 </a>    }
-<a class="c2html-lineno" name="l223" href="#l223">223 </a>    free(tks);
-<a class="c2html-lineno" name="l224" href="#l224">224 </a>    <span class="c2html-keyword">if</span>(path[p.length-<span class="c2html-macroconst">1</span>] == <span class="c2html-string">'/'</span>) {
-<a class="c2html-lineno" name="l225" href="#l225">225 </a>        ucx_buffer_putc(url, <span class="c2html-string">'/'</span>);
+<a class="c2html-lineno" name="l213" href="#l213">213 </a>    <span class="c2html-type">sstr_t</span> p = sstr(path);
+<a class="c2html-lineno" name="l214" href="#l214">214 </a>    <span class="c2html-type">ssize_t</span> ntk = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l215" href="#l215">215 </a>    <span class="c2html-type">sstr_t</span> *tks = sstrsplit(p, <span class="c2html-macroconst">S</span>(<span class="c2html-string">"/"</span>), &ntk);
+<a class="c2html-lineno" name="l216" href="#l216">216 </a>    
+<a class="c2html-lineno" name="l217" href="#l217">217 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-macroconst">0</span>;i&lt;ntk;i++) {
+<a class="c2html-lineno" name="l218" href="#l218">218 </a>        <span class="c2html-type">sstr_t</span> node = tks[i];
+<a class="c2html-lineno" name="l219" href="#l219">219 </a>        <span class="c2html-keyword">if</span>(node.length &gt; <span class="c2html-macroconst">0</span>) {
+<a class="c2html-lineno" name="l220" href="#l220">220 </a>            <span class="c2html-keyword">char</span> *esc = curl_easy_escape(sn-&gt;handle, node.ptr, node.length);
+<a class="c2html-lineno" name="l221" href="#l221">221 </a>            ucx_buffer_putc(url, <span class="c2html-string">'/'</span>);
+<a class="c2html-lineno" name="l222" href="#l222">222 </a>            ucx_buffer_write(esc, <span class="c2html-macroconst">1</span>, strlen(esc), url);
+<a class="c2html-lineno" name="l223" href="#l223">223 </a>            curl_free(esc);
+<a class="c2html-lineno" name="l224" href="#l224">224 </a>        }
+<a class="c2html-lineno" name="l225" href="#l225">225 </a>        free(node.ptr);
 <a class="c2html-lineno" name="l226" href="#l226">226 </a>    }
-<a class="c2html-lineno" name="l227" href="#l227">227 </a>    ucx_buffer_putc(url, <span class="c2html-macroconst">0</span>);
-<a class="c2html-lineno" name="l228" href="#l228">228 </a>    
-<a class="c2html-lineno" name="l229" href="#l229">229 </a>    space = url-&gt;space;
-<a class="c2html-lineno" name="l230" href="#l230">230 </a>    ucx_buffer_free(url);
-<a class="c2html-lineno" name="l231" href="#l231">231 </a>    
-<a class="c2html-lineno" name="l232" href="#l232">232 </a>    <span class="c2html-keyword">return</span> space;
-<a class="c2html-lineno" name="l233" href="#l233">233 </a>}
-<a class="c2html-lineno" name="l234" href="#l234">234 </a>
-<a class="c2html-lineno" name="l235" href="#l235">235 </a><span class="c2html-keyword">char</span>* util_parent_path(<span class="c2html-keyword">char</span> *path) {
-<a class="c2html-lineno" name="l236" href="#l236">236 </a>    <span class="c2html-keyword">char</span> *name = util_resource_name(path);
-<a class="c2html-lineno" name="l237" href="#l237">237 </a>    <span class="c2html-type">size_t</span> namelen = strlen(name);
-<a class="c2html-lineno" name="l238" href="#l238">238 </a>    <span class="c2html-type">size_t</span> pathlen = strlen(path);
-<a class="c2html-lineno" name="l239" href="#l239">239 </a>    <span class="c2html-type">size_t</span> parentlen = pathlen - namelen;
-<a class="c2html-lineno" name="l240" href="#l240">240 </a>    <span class="c2html-keyword">char</span> *parent = malloc(parentlen + <span class="c2html-macroconst">1</span>);
-<a class="c2html-lineno" name="l241" href="#l241">241 </a>    memcpy(parent, path, parentlen);
-<a class="c2html-lineno" name="l242" href="#l242">242 </a>    parent[parentlen] = <span class="c2html-string">'\0'</span>;
-<a class="c2html-lineno" name="l243" href="#l243">243 </a>    <span class="c2html-keyword">return</span> parent;
-<a class="c2html-lineno" name="l244" href="#l244">244 </a>}
-<a class="c2html-lineno" name="l245" href="#l245">245 </a>
-<a class="c2html-lineno" name="l246" href="#l246">246 </a>
-<a class="c2html-lineno" name="l247" href="#l247">247 </a><span class="c2html-keyword">char</span>* util_xml_get_text(xmlNode *elm) {
-<a class="c2html-lineno" name="l248" href="#l248">248 </a>    xmlNode *node = elm-&gt;children;
-<a class="c2html-lineno" name="l249" href="#l249">249 </a>    <span class="c2html-keyword">while</span>(node) {
-<a class="c2html-lineno" name="l250" href="#l250">250 </a>        <span class="c2html-keyword">if</span>(node-&gt;type == <span class="c2html-macroconst">XML_TEXT_NODE</span>) {
-<a class="c2html-lineno" name="l251" href="#l251">251 </a>            <span class="c2html-keyword">return</span> (<span class="c2html-keyword">char</span>*)node-&gt;content;
-<a class="c2html-lineno" name="l252" href="#l252">252 </a>        }
-<a class="c2html-lineno" name="l253" href="#l253">253 </a>        node = node-&gt;next;
-<a class="c2html-lineno" name="l254" href="#l254">254 </a>    }
-<a class="c2html-lineno" name="l255" href="#l255">255 </a>    <span class="c2html-keyword">return</span> <span class="c2html-macroconst">NULL</span>;
-<a class="c2html-lineno" name="l256" href="#l256">256 </a>}
-<a class="c2html-lineno" name="l257" href="#l257">257 </a>
-<a class="c2html-lineno" name="l258" href="#l258">258 </a>
-<a class="c2html-lineno" name="l259" href="#l259">259 </a><span class="c2html-keyword">char</span>* util_base64decode(<span class="c2html-keyword">char</span> *in) {
-<a class="c2html-lineno" name="l260" href="#l260">260 </a>    <span class="c2html-keyword">int</span> len = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l261" href="#l261">261 </a>    <span class="c2html-keyword">return</span> util_base64decode_len(in, &len);
-<a class="c2html-lineno" name="l262" href="#l262">262 </a>}
-<a class="c2html-lineno" name="l263" href="#l263">263 </a>
-<a class="c2html-lineno" name="l264" href="#l264">264 </a><span class="c2html-keyword">char</span>* util_base64decode_len(<span class="c2html-keyword">char</span>* in, <span class="c2html-keyword">int</span> *outlen) {
-<a class="c2html-lineno" name="l265" href="#l265">265 </a>    <span class="c2html-type">size_t</span> len = strlen(in);
-<a class="c2html-lineno" name="l266" href="#l266">266 </a>    <span class="c2html-keyword">char</span> *out = calloc(<span class="c2html-macroconst">1</span>, len);
-<a class="c2html-lineno" name="l267" href="#l267">267 </a>    
-<a class="c2html-lineno" name="l268" href="#l268">268 </a>    <span class="c2html-macroconst">BIO</span>* b = BIO_new_mem_buf(in, len);
-<a class="c2html-lineno" name="l269" href="#l269">269 </a>    <span class="c2html-macroconst">BIO</span> *d = BIO_new(BIO_f_base64());
-<a class="c2html-lineno" name="l270" href="#l270">270 </a>    BIO_set_flags(d, <span class="c2html-macroconst">BIO_FLAGS_BASE64_NO_NL</span>);
-<a class="c2html-lineno" name="l271" href="#l271">271 </a>    b = BIO_push(d, b);
-<a class="c2html-lineno" name="l272" href="#l272">272 </a>
-<a class="c2html-lineno" name="l273" href="#l273">273 </a>    *outlen = BIO_read(b, out, len);
-<a class="c2html-lineno" name="l274" href="#l274">274 </a>    BIO_free_all(b);
-<a class="c2html-lineno" name="l275" href="#l275">275 </a>    
-<a class="c2html-lineno" name="l276" href="#l276">276 </a>    <span class="c2html-keyword">return</span> out;
-<a class="c2html-lineno" name="l277" href="#l277">277 </a>}
-<a class="c2html-lineno" name="l278" href="#l278">278 </a>
-<a class="c2html-lineno" name="l279" href="#l279">279 </a><span class="c2html-keyword">char</span>* util_base64encode(<span class="c2html-keyword">char</span> *in, <span class="c2html-type">size_t</span> len) { 
-<a class="c2html-lineno" name="l280" href="#l280">280 </a>    <span class="c2html-macroconst">BIO</span> *b;
-<a class="c2html-lineno" name="l281" href="#l281">281 </a>    <span class="c2html-macroconst">BIO</span> *e;
-<a class="c2html-lineno" name="l282" href="#l282">282 </a>    <span class="c2html-macroconst">BUF_MEM</span> *mem;
-<a class="c2html-lineno" name="l283" href="#l283">283 </a>
-<a class="c2html-lineno" name="l284" href="#l284">284 </a>    e = BIO_new(BIO_f_base64());
-<a class="c2html-lineno" name="l285" href="#l285">285 </a>    b = BIO_new(BIO_s_mem());
-<a class="c2html-lineno" name="l286" href="#l286">286 </a>    
-<a class="c2html-lineno" name="l287" href="#l287">287 </a>    e = BIO_push(e, b);
-<a class="c2html-lineno" name="l288" href="#l288">288 </a>    BIO_write(e, in, len);
-<a class="c2html-lineno" name="l289" href="#l289">289 </a>    BIO_flush(e);
+<a class="c2html-lineno" name="l227" href="#l227">227 </a>    free(tks);
+<a class="c2html-lineno" name="l228" href="#l228">228 </a>    <span class="c2html-keyword">if</span>(path[p.length-<span class="c2html-macroconst">1</span>] == <span class="c2html-string">'/'</span>) {
+<a class="c2html-lineno" name="l229" href="#l229">229 </a>        ucx_buffer_putc(url, <span class="c2html-string">'/'</span>);
+<a class="c2html-lineno" name="l230" href="#l230">230 </a>    }
+<a class="c2html-lineno" name="l231" href="#l231">231 </a>    ucx_buffer_putc(url, <span class="c2html-macroconst">0</span>);
+<a class="c2html-lineno" name="l232" href="#l232">232 </a>    
+<a class="c2html-lineno" name="l233" href="#l233">233 </a>    space = url-&gt;space;
+<a class="c2html-lineno" name="l234" href="#l234">234 </a>    ucx_buffer_free(url);
+<a class="c2html-lineno" name="l235" href="#l235">235 </a>    
+<a class="c2html-lineno" name="l236" href="#l236">236 </a>    <span class="c2html-keyword">return</span> space;
+<a class="c2html-lineno" name="l237" href="#l237">237 </a>}
+<a class="c2html-lineno" name="l238" href="#l238">238 </a>
+<a class="c2html-lineno" name="l239" href="#l239">239 </a><span class="c2html-keyword">char</span>* util_parent_path(<span class="c2html-keyword">char</span> *path) {
+<a class="c2html-lineno" name="l240" href="#l240">240 </a>    <span class="c2html-keyword">char</span> *name = util_resource_name(path);
+<a class="c2html-lineno" name="l241" href="#l241">241 </a>    <span class="c2html-type">size_t</span> namelen = strlen(name);
+<a class="c2html-lineno" name="l242" href="#l242">242 </a>    <span class="c2html-type">size_t</span> pathlen = strlen(path);
+<a class="c2html-lineno" name="l243" href="#l243">243 </a>    <span class="c2html-type">size_t</span> parentlen = pathlen - namelen;
+<a class="c2html-lineno" name="l244" href="#l244">244 </a>    <span class="c2html-keyword">char</span> *parent = malloc(parentlen + <span class="c2html-macroconst">1</span>);
+<a class="c2html-lineno" name="l245" href="#l245">245 </a>    memcpy(parent, path, parentlen);
+<a class="c2html-lineno" name="l246" href="#l246">246 </a>    parent[parentlen] = <span class="c2html-string">'\0'</span>;
+<a class="c2html-lineno" name="l247" href="#l247">247 </a>    <span class="c2html-keyword">return</span> parent;
+<a class="c2html-lineno" name="l248" href="#l248">248 </a>}
+<a class="c2html-lineno" name="l249" href="#l249">249 </a>
+<a class="c2html-lineno" name="l250" href="#l250">250 </a>
+<a class="c2html-lineno" name="l251" href="#l251">251 </a><span class="c2html-keyword">char</span>* util_xml_get_text(xmlNode *elm) {
+<a class="c2html-lineno" name="l252" href="#l252">252 </a>    xmlNode *node = elm-&gt;children;
+<a class="c2html-lineno" name="l253" href="#l253">253 </a>    <span class="c2html-keyword">while</span>(node) {
+<a class="c2html-lineno" name="l254" href="#l254">254 </a>        <span class="c2html-keyword">if</span>(node-&gt;type == <span class="c2html-macroconst">XML_TEXT_NODE</span>) {
+<a class="c2html-lineno" name="l255" href="#l255">255 </a>            <span class="c2html-keyword">return</span> (<span class="c2html-keyword">char</span>*)node-&gt;content;
+<a class="c2html-lineno" name="l256" href="#l256">256 </a>        }
+<a class="c2html-lineno" name="l257" href="#l257">257 </a>        node = node-&gt;next;
+<a class="c2html-lineno" name="l258" href="#l258">258 </a>    }
+<a class="c2html-lineno" name="l259" href="#l259">259 </a>    <span class="c2html-keyword">return</span> <span class="c2html-macroconst">NULL</span>;
+<a class="c2html-lineno" name="l260" href="#l260">260 </a>}
+<a class="c2html-lineno" name="l261" href="#l261">261 </a>
+<a class="c2html-lineno" name="l262" href="#l262">262 </a>
+<a class="c2html-lineno" name="l263" href="#l263">263 </a><span class="c2html-keyword">char</span>* util_base64decode(<span class="c2html-keyword">char</span> *in) {
+<a class="c2html-lineno" name="l264" href="#l264">264 </a>    <span class="c2html-keyword">int</span> len = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l265" href="#l265">265 </a>    <span class="c2html-keyword">return</span> util_base64decode_len(in, &len);
+<a class="c2html-lineno" name="l266" href="#l266">266 </a>}
+<a class="c2html-lineno" name="l267" href="#l267">267 </a>
+<a class="c2html-lineno" name="l268" href="#l268">268 </a><span class="c2html-keyword">char</span>* util_base64decode_len(<span class="c2html-keyword">char</span>* in, <span class="c2html-keyword">int</span> *outlen) {
+<a class="c2html-lineno" name="l269" href="#l269">269 </a>    <span class="c2html-type">size_t</span> len = strlen(in);
+<a class="c2html-lineno" name="l270" href="#l270">270 </a>    <span class="c2html-keyword">char</span> *out = calloc(<span class="c2html-macroconst">1</span>, len);
+<a class="c2html-lineno" name="l271" href="#l271">271 </a>    
+<a class="c2html-lineno" name="l272" href="#l272">272 </a>    <span class="c2html-macroconst">BIO</span>* b = BIO_new_mem_buf(in, len);
+<a class="c2html-lineno" name="l273" href="#l273">273 </a>    <span class="c2html-macroconst">BIO</span> *d = BIO_new(BIO_f_base64());
+<a class="c2html-lineno" name="l274" href="#l274">274 </a>    BIO_set_flags(d, <span class="c2html-macroconst">BIO_FLAGS_BASE64_NO_NL</span>);
+<a class="c2html-lineno" name="l275" href="#l275">275 </a>    b = BIO_push(d, b);
+<a class="c2html-lineno" name="l276" href="#l276">276 </a>
+<a class="c2html-lineno" name="l277" href="#l277">277 </a>    *outlen = BIO_read(b, out, len);
+<a class="c2html-lineno" name="l278" href="#l278">278 </a>    BIO_free_all(b);
+<a class="c2html-lineno" name="l279" href="#l279">279 </a>    
+<a class="c2html-lineno" name="l280" href="#l280">280 </a>    <span class="c2html-keyword">return</span> out;
+<a class="c2html-lineno" name="l281" href="#l281">281 </a>}
+<a class="c2html-lineno" name="l282" href="#l282">282 </a>
+<a class="c2html-lineno" name="l283" href="#l283">283 </a><span class="c2html-keyword">char</span>* util_base64encode(<span class="c2html-keyword">char</span> *in, <span class="c2html-type">size_t</span> len) { 
+<a class="c2html-lineno" name="l284" href="#l284">284 </a>    <span class="c2html-macroconst">BIO</span> *b;
+<a class="c2html-lineno" name="l285" href="#l285">285 </a>    <span class="c2html-macroconst">BIO</span> *e;
+<a class="c2html-lineno" name="l286" href="#l286">286 </a>    <span class="c2html-macroconst">BUF_MEM</span> *mem;
+<a class="c2html-lineno" name="l287" href="#l287">287 </a>
+<a class="c2html-lineno" name="l288" href="#l288">288 </a>    e = BIO_new(BIO_f_base64());
+<a class="c2html-lineno" name="l289" href="#l289">289 </a>    b = BIO_new(BIO_s_mem());
 <a class="c2html-lineno" name="l290" href="#l290">290 </a>    
-<a class="c2html-lineno" name="l291" href="#l291">291 </a>    BIO_get_mem_ptr(e, &mem);
-<a class="c2html-lineno" name="l292" href="#l292">292 </a>    <span class="c2html-keyword">char</span> *out = malloc(mem-&gt;length);
-<a class="c2html-lineno" name="l293" href="#l293">293 </a>    memcpy(out, mem-&gt;data, mem-&gt;length -<span class="c2html-macroconst">1</span>);
-<a class="c2html-lineno" name="l294" href="#l294">294 </a>    out[mem-&gt;length - <span class="c2html-macroconst">1</span>] = <span class="c2html-string">'\0'</span>;
-<a class="c2html-lineno" name="l295" href="#l295">295 </a>
-<a class="c2html-lineno" name="l296" href="#l296">296 </a>    BIO_free_all(e);
-<a class="c2html-lineno" name="l297" href="#l297">297 </a>
-<a class="c2html-lineno" name="l298" href="#l298">298 </a>    <span class="c2html-keyword">return</span> out;
-<a class="c2html-lineno" name="l299" href="#l299">299 </a>}
-<a class="c2html-lineno" name="l300" href="#l300">300 </a>
-<a class="c2html-lineno" name="l301" href="#l301">301 </a><span class="c2html-keyword">char</span>* util_encrypt_str(DavSession *sn, <span class="c2html-keyword">char</span> *str, <span class="c2html-keyword">char</span> *key) {
-<a class="c2html-lineno" name="l302" href="#l302">302 </a>    DavKey *k = dav_context_get_key(sn-&gt;context, key);
-<a class="c2html-lineno" name="l303" href="#l303">303 </a>    <span class="c2html-keyword">if</span>(!k) {
-<a class="c2html-lineno" name="l304" href="#l304">304 </a>        <span class="c2html-comment">// TODO: session error</span>
-<a class="c2html-lineno" name="l305" href="#l305">305 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">NULL</span>;
-<a class="c2html-lineno" name="l306" href="#l306">306 </a>    }
-<a class="c2html-lineno" name="l307" href="#l307">307 </a>    
-<a class="c2html-lineno" name="l308" href="#l308">308 </a>    <span class="c2html-keyword">char</span> *enc_str = aes_encrypt(str, k);
-<a class="c2html-lineno" name="l309" href="#l309">309 </a>    <span class="c2html-keyword">char</span> *ret_str = dav_session_strdup(sn, enc_str);
-<a class="c2html-lineno" name="l310" href="#l310">310 </a>    free(enc_str);
-<a class="c2html-lineno" name="l311" href="#l311">311 </a>    <span class="c2html-keyword">return</span> ret_str;
-<a class="c2html-lineno" name="l312" href="#l312">312 </a>}
-<a class="c2html-lineno" name="l313" href="#l313">313 </a>
-<a class="c2html-lineno" name="l314" href="#l314">314 </a><span class="c2html-comment">/* commented out for testing reasons */</span>
-<a class="c2html-lineno" name="l315" href="#l315">315 </a><span class="c2html-comment">/*</span>
-<a class="c2html-lineno" name="l316" href="#l316">316 </a><span class="c2html-comment">char* util_decrypt_str(DavSession *sn, char *str, char *key) {</span>
-<a class="c2html-lineno" name="l317" href="#l317">317 </a><span class="c2html-comment">    DavKey *k = dav_context_get_key(sn-&gt;context, key);</span>
-<a class="c2html-lineno" name="l318" href="#l318">318 </a><span class="c2html-comment">    if(!k) {</span>
-<a class="c2html-lineno" name="l319" href="#l319">319 </a><span class="c2html-comment">        // TODO: session error</span>
-<a class="c2html-lineno" name="l320" href="#l320">320 </a><span class="c2html-comment">        return NULL;</span>
-<a class="c2html-lineno" name="l321" href="#l321">321 </a><span class="c2html-comment">    }</span>
-<a class="c2html-lineno" name="l322" href="#l322">322 </a><span class="c2html-comment">    </span>
-<a class="c2html-lineno" name="l323" href="#l323">323 </a><span class="c2html-comment">    char *dec_str = aes_decrypt(str, k);</span>
-<a class="c2html-lineno" name="l324" href="#l324">324 </a><span class="c2html-comment">    char *ret_str = dav_session_strdup(sn, dec_str);</span>
-<a class="c2html-lineno" name="l325" href="#l325">325 </a><span class="c2html-comment">    free(dec_str);</span>
-<a class="c2html-lineno" name="l326" href="#l326">326 </a><span class="c2html-comment">    return ret_str;</span>
-<a class="c2html-lineno" name="l327" href="#l327">327 </a><span class="c2html-comment">}</span>
-<a class="c2html-lineno" name="l328" href="#l328">328 </a><span class="c2html-comment">*/</span>
-<a class="c2html-lineno" name="l329" href="#l329">329 </a><span class="c2html-keyword">char</span>* util_random_str() {
-<a class="c2html-lineno" name="l330" href="#l330">330 </a>    <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span> *str = malloc(<span class="c2html-macroconst">25</span>);
-<a class="c2html-lineno" name="l331" href="#l331">331 </a>    str[<span class="c2html-macroconst">24</span>] = <span class="c2html-string">'\0'</span>;
-<a class="c2html-lineno" name="l332" href="#l332">332 </a>    
-<a class="c2html-lineno" name="l333" href="#l333">333 </a>    <span class="c2html-type">sstr_t</span> t = <span class="c2html-macroconst">S</span>(
-<a class="c2html-lineno" name="l334" href="#l334">334 </a>            <span class="c2html-string">"01234567890"</span>
-<a class="c2html-lineno" name="l335" href="#l335">335 </a>            <span class="c2html-string">"abcdefghijklmnopqrstuvwxyz"</span>
-<a class="c2html-lineno" name="l336" href="#l336">336 </a>            <span class="c2html-string">"ABCDEFGHIJKLMNOPQRSTUVWXYZ"</span>);
-<a class="c2html-lineno" name="l337" href="#l337">337 </a>    <span class="c2html-keyword">const</span> <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span> *table = (<span class="c2html-keyword">const</span> <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span>*)t.ptr;
-<a class="c2html-lineno" name="l338" href="#l338">338 </a>    
-<a class="c2html-lineno" name="l339" href="#l339">339 </a>    RAND_pseudo_bytes(str, <span class="c2html-macroconst">24</span>);
-<a class="c2html-lineno" name="l340" href="#l340">340 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-macroconst">0</span>;i&lt;<span class="c2html-macroconst">24</span>;i++) {
-<a class="c2html-lineno" name="l341" href="#l341">341 </a>        <span class="c2html-keyword">int</span> c = str[i] % t.length;
-<a class="c2html-lineno" name="l342" href="#l342">342 </a>        str[i] = table[c];
-<a class="c2html-lineno" name="l343" href="#l343">343 </a>    }
-<a class="c2html-lineno" name="l344" href="#l344">344 </a>    
-<a class="c2html-lineno" name="l345" href="#l345">345 </a>    <span class="c2html-keyword">return</span> (<span class="c2html-keyword">char</span>*)str;
-<a class="c2html-lineno" name="l346" href="#l346">346 </a>}
-<a class="c2html-lineno" name="l347" href="#l347">347 </a>
-<a class="c2html-lineno" name="l348" href="#l348">348 </a><span class="c2html-comment">/*</span>
-<a class="c2html-lineno" name="l349" href="#l349">349 </a><span class="c2html-comment"> * gets a substring from 0 to the appearance of the token</span>
-<a class="c2html-lineno" name="l350" href="#l350">350 </a><span class="c2html-comment"> * tokens are separated by space</span>
-<a class="c2html-lineno" name="l351" href="#l351">351 </a><span class="c2html-comment"> * sets sub to the substring and returns the remaining string</span>
-<a class="c2html-lineno" name="l352" href="#l352">352 </a><span class="c2html-comment"> */</span>
-<a class="c2html-lineno" name="l353" href="#l353">353 </a><span class="c2html-type">sstr_t</span> util_getsubstr_until_token(<span class="c2html-type">sstr_t</span> str, <span class="c2html-type">sstr_t</span> token, <span class="c2html-type">sstr_t</span> *sub) {  
-<a class="c2html-lineno" name="l354" href="#l354">354 </a>    <span class="c2html-keyword">int</span> i;
-<a class="c2html-lineno" name="l355" href="#l355">355 </a>    <span class="c2html-keyword">int</span> token_start = -<span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l356" href="#l356">356 </a>    <span class="c2html-keyword">int</span> token_end = -<span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l357" href="#l357">357 </a>    <span class="c2html-keyword">for</span>(i=<span class="c2html-macroconst">0</span>;i&lt;=str.length;i++) {
-<a class="c2html-lineno" name="l358" href="#l358">358 </a>        <span class="c2html-keyword">int</span> c;
-<a class="c2html-lineno" name="l359" href="#l359">359 </a>        <span class="c2html-keyword">if</span>(i == str.length) {
-<a class="c2html-lineno" name="l360" href="#l360">360 </a>            c = <span class="c2html-string">' '</span>;
-<a class="c2html-lineno" name="l361" href="#l361">361 </a>        } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l362" href="#l362">362 </a>            c = str.ptr[i];
-<a class="c2html-lineno" name="l363" href="#l363">363 </a>        }
-<a class="c2html-lineno" name="l364" href="#l364">364 </a>        <span class="c2html-keyword">if</span>(c &lt; <span class="c2html-macroconst">33</span>) {
-<a class="c2html-lineno" name="l365" href="#l365">365 </a>            <span class="c2html-keyword">if</span>(token_start != -<span class="c2html-macroconst">1</span>) {
-<a class="c2html-lineno" name="l366" href="#l366">366 </a>                token_end = i;
-<a class="c2html-lineno" name="l367" href="#l367">367 </a>                <span class="c2html-type">size_t</span> len = token_end - token_start;
-<a class="c2html-lineno" name="l368" href="#l368">368 </a>                <span class="c2html-type">sstr_t</span> tk = sstrsubsl(str, token_start, len);
-<a class="c2html-lineno" name="l369" href="#l369">369 </a>                <span class="c2html-comment">//printf("token: {%.*s}\n", token.length, token.ptr);</span>
-<a class="c2html-lineno" name="l370" href="#l370">370 </a>                <span class="c2html-keyword">if</span>(!sstrcmp(tk, token)) {
-<a class="c2html-lineno" name="l371" href="#l371">371 </a>                    *sub = sstrtrim(sstrsubsl(str, <span class="c2html-macroconst">0</span>, token_start));
-<a class="c2html-lineno" name="l372" href="#l372">372 </a>                    <span class="c2html-keyword">break</span>;
-<a class="c2html-lineno" name="l373" href="#l373">373 </a>                }
-<a class="c2html-lineno" name="l374" href="#l374">374 </a>                token_start = -<span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l375" href="#l375">375 </a>                token_end = -<span class="c2html-macroconst">1</span>;
-<a class="c2html-lineno" name="l376" href="#l376">376 </a>            }
-<a class="c2html-lineno" name="l377" href="#l377">377 </a>        } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l378" href="#l378">378 </a>            <span class="c2html-keyword">if</span>(token_start == -<span class="c2html-macroconst">1</span>) {
-<a class="c2html-lineno" name="l379" href="#l379">379 </a>                token_start = i;
+<a class="c2html-lineno" name="l291" href="#l291">291 </a>    e = BIO_push(e, b);
+<a class="c2html-lineno" name="l292" href="#l292">292 </a>    BIO_write(e, in, len);
+<a class="c2html-lineno" name="l293" href="#l293">293 </a>    BIO_flush(e);
+<a class="c2html-lineno" name="l294" href="#l294">294 </a>    
+<a class="c2html-lineno" name="l295" href="#l295">295 </a>    BIO_get_mem_ptr(e, &mem);
+<a class="c2html-lineno" name="l296" href="#l296">296 </a>    <span class="c2html-keyword">char</span> *out = malloc(mem-&gt;length);
+<a class="c2html-lineno" name="l297" href="#l297">297 </a>    memcpy(out, mem-&gt;data, mem-&gt;length -<span class="c2html-macroconst">1</span>);
+<a class="c2html-lineno" name="l298" href="#l298">298 </a>    out[mem-&gt;length - <span class="c2html-macroconst">1</span>] = <span class="c2html-string">'\0'</span>;
+<a class="c2html-lineno" name="l299" href="#l299">299 </a>
+<a class="c2html-lineno" name="l300" href="#l300">300 </a>    BIO_free_all(e);
+<a class="c2html-lineno" name="l301" href="#l301">301 </a>
+<a class="c2html-lineno" name="l302" href="#l302">302 </a>    <span class="c2html-keyword">return</span> out;
+<a class="c2html-lineno" name="l303" href="#l303">303 </a>}
+<a class="c2html-lineno" name="l304" href="#l304">304 </a>
+<a class="c2html-lineno" name="l305" href="#l305">305 </a><span class="c2html-keyword">char</span>* util_encrypt_str(DavSession *sn, <span class="c2html-keyword">char</span> *str, <span class="c2html-keyword">char</span> *key) {
+<a class="c2html-lineno" name="l306" href="#l306">306 </a>    DavKey *k = dav_context_get_key(sn-&gt;context, key);
+<a class="c2html-lineno" name="l307" href="#l307">307 </a>    <span class="c2html-keyword">if</span>(!k) {
+<a class="c2html-lineno" name="l308" href="#l308">308 </a>        <span class="c2html-comment">// TODO: session error</span>
+<a class="c2html-lineno" name="l309" href="#l309">309 </a>        <span class="c2html-keyword">return</span> <span class="c2html-macroconst">NULL</span>;
+<a class="c2html-lineno" name="l310" href="#l310">310 </a>    }
+<a class="c2html-lineno" name="l311" href="#l311">311 </a>    
+<a class="c2html-lineno" name="l312" href="#l312">312 </a>    <span class="c2html-keyword">char</span> *enc_str = aes_encrypt(str, k);
+<a class="c2html-lineno" name="l313" href="#l313">313 </a>    <span class="c2html-keyword">char</span> *ret_str = dav_session_strdup(sn, enc_str);
+<a class="c2html-lineno" name="l314" href="#l314">314 </a>    free(enc_str);
+<a class="c2html-lineno" name="l315" href="#l315">315 </a>    <span class="c2html-keyword">return</span> ret_str;
+<a class="c2html-lineno" name="l316" href="#l316">316 </a>}
+<a class="c2html-lineno" name="l317" href="#l317">317 </a>
+<a class="c2html-lineno" name="l318" href="#l318">318 </a><span class="c2html-comment">/* commented out for testing reasons */</span>
+<a class="c2html-lineno" name="l319" href="#l319">319 </a><span class="c2html-comment">/*</span>
+<a class="c2html-lineno" name="l320" href="#l320">320 </a><span class="c2html-comment">char* util_decrypt_str(DavSession *sn, char *str, char *key) {</span>
+<a class="c2html-lineno" name="l321" href="#l321">321 </a><span class="c2html-comment">    DavKey *k = dav_context_get_key(sn-&gt;context, key);</span>
+<a class="c2html-lineno" name="l322" href="#l322">322 </a><span class="c2html-comment">    if(!k) {</span>
+<a class="c2html-lineno" name="l323" href="#l323">323 </a><span class="c2html-comment">        // TODO: session error</span>
+<a class="c2html-lineno" name="l324" href="#l324">324 </a><span class="c2html-comment">        return NULL;</span>
+<a class="c2html-lineno" name="l325" href="#l325">325 </a><span class="c2html-comment">    }</span>
+<a class="c2html-lineno" name="l326" href="#l326">326 </a><span class="c2html-comment">    </span>
+<a class="c2html-lineno" name="l327" href="#l327">327 </a><span class="c2html-comment">    char *dec_str = aes_decrypt(str, k);</span>
+<a class="c2html-lineno" name="l328" href="#l328">328 </a><span class="c2html-comment">    char *ret_str = dav_session_strdup(sn, dec_str);</span>
+<a class="c2html-lineno" name="l329" href="#l329">329 </a><span class="c2html-comment">    free(dec_str);</span>
+<a class="c2html-lineno" name="l330" href="#l330">330 </a><span class="c2html-comment">    return ret_str;</span>
+<a class="c2html-lineno" name="l331" href="#l331">331 </a><span class="c2html-comment">}</span>
+<a class="c2html-lineno" name="l332" href="#l332">332 </a><span class="c2html-comment">*/</span>
+<a class="c2html-lineno" name="l333" href="#l333">333 </a><span class="c2html-keyword">char</span>* util_random_str() {
+<a class="c2html-lineno" name="l334" href="#l334">334 </a>    <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span> *str = malloc(<span class="c2html-macroconst">25</span>);
+<a class="c2html-lineno" name="l335" href="#l335">335 </a>    str[<span class="c2html-macroconst">24</span>] = <span class="c2html-string">'\0'</span>;
+<a class="c2html-lineno" name="l336" href="#l336">336 </a>    
+<a class="c2html-lineno" name="l337" href="#l337">337 </a>    <span class="c2html-type">sstr_t</span> t = <span class="c2html-macroconst">S</span>(
+<a class="c2html-lineno" name="l338" href="#l338">338 </a>            <span class="c2html-string">"01234567890"</span>
+<a class="c2html-lineno" name="l339" href="#l339">339 </a>            <span class="c2html-string">"abcdefghijklmnopqrstuvwxyz"</span>
+<a class="c2html-lineno" name="l340" href="#l340">340 </a>            <span class="c2html-string">"ABCDEFGHIJKLMNOPQRSTUVWXYZ"</span>);
+<a class="c2html-lineno" name="l341" href="#l341">341 </a>    <span class="c2html-keyword">const</span> <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span> *table = (<span class="c2html-keyword">const</span> <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span>*)t.ptr;
+<a class="c2html-lineno" name="l342" href="#l342">342 </a>    
+<a class="c2html-lineno" name="l343" href="#l343">343 </a>    RAND_pseudo_bytes(str, <span class="c2html-macroconst">24</span>);
+<a class="c2html-lineno" name="l344" href="#l344">344 </a>    <span class="c2html-keyword">for</span>(<span class="c2html-keyword">int</span> i=<span class="c2html-macroconst">0</span>;i&lt;<span class="c2html-macroconst">24</span>;i++) {
+<a class="c2html-lineno" name="l345" href="#l345">345 </a>        <span class="c2html-keyword">int</span> c = str[i] % t.length;
+<a class="c2html-lineno" name="l346" href="#l346">346 </a>        str[i] = table[c];
+<a class="c2html-lineno" name="l347" href="#l347">347 </a>    }
+<a class="c2html-lineno" name="l348" href="#l348">348 </a>    
+<a class="c2html-lineno" name="l349" href="#l349">349 </a>    <span class="c2html-keyword">return</span> (<span class="c2html-keyword">char</span>*)str;
+<a class="c2html-lineno" name="l350" href="#l350">350 </a>}
+<a class="c2html-lineno" name="l351" href="#l351">351 </a>
+<a class="c2html-lineno" name="l352" href="#l352">352 </a><span class="c2html-comment">/*</span>
+<a class="c2html-lineno" name="l353" href="#l353">353 </a><span class="c2html-comment"> * gets a substring from 0 to the appearance of the token</span>
+<a class="c2html-lineno" name="l354" href="#l354">354 </a><span class="c2html-comment"> * tokens are separated by space</span>
+<a class="c2html-lineno" name="l355" href="#l355">355 </a><span class="c2html-comment"> * sets sub to the substring and returns the remaining string</span>
+<a class="c2html-lineno" name="l356" href="#l356">356 </a><span class="c2html-comment"> */</span>
+<a class="c2html-lineno" name="l357" href="#l357">357 </a><span class="c2html-type">sstr_t</span> util_getsubstr_until_token(<span class="c2html-type">sstr_t</span> str, <span class="c2html-type">sstr_t</span> token, <span class="c2html-type">sstr_t</span> *sub) {  
+<a class="c2html-lineno" name="l358" href="#l358">358 </a>    <span class="c2html-keyword">int</span> i;
+<a class="c2html-lineno" name="l359" href="#l359">359 </a>    <span class="c2html-keyword">int</span> token_start = -<span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l360" href="#l360">360 </a>    <span class="c2html-keyword">int</span> token_end = -<span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l361" href="#l361">361 </a>    <span class="c2html-keyword">for</span>(i=<span class="c2html-macroconst">0</span>;i&lt;=str.length;i++) {
+<a class="c2html-lineno" name="l362" href="#l362">362 </a>        <span class="c2html-keyword">int</span> c;
+<a class="c2html-lineno" name="l363" href="#l363">363 </a>        <span class="c2html-keyword">if</span>(i == str.length) {
+<a class="c2html-lineno" name="l364" href="#l364">364 </a>            c = <span class="c2html-string">' '</span>;
+<a class="c2html-lineno" name="l365" href="#l365">365 </a>        } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l366" href="#l366">366 </a>            c = str.ptr[i];
+<a class="c2html-lineno" name="l367" href="#l367">367 </a>        }
+<a class="c2html-lineno" name="l368" href="#l368">368 </a>        <span class="c2html-keyword">if</span>(c &lt; <span class="c2html-macroconst">33</span>) {
+<a class="c2html-lineno" name="l369" href="#l369">369 </a>            <span class="c2html-keyword">if</span>(token_start != -<span class="c2html-macroconst">1</span>) {
+<a class="c2html-lineno" name="l370" href="#l370">370 </a>                token_end = i;
+<a class="c2html-lineno" name="l371" href="#l371">371 </a>                <span class="c2html-type">size_t</span> len = token_end - token_start;
+<a class="c2html-lineno" name="l372" href="#l372">372 </a>                <span class="c2html-type">sstr_t</span> tk = sstrsubsl(str, token_start, len);
+<a class="c2html-lineno" name="l373" href="#l373">373 </a>                <span class="c2html-comment">//printf("token: {%.*s}\n", token.length, token.ptr);</span>
+<a class="c2html-lineno" name="l374" href="#l374">374 </a>                <span class="c2html-keyword">if</span>(!sstrcmp(tk, token)) {
+<a class="c2html-lineno" name="l375" href="#l375">375 </a>                    *sub = sstrtrim(sstrsubsl(str, <span class="c2html-macroconst">0</span>, token_start));
+<a class="c2html-lineno" name="l376" href="#l376">376 </a>                    <span class="c2html-keyword">break</span>;
+<a class="c2html-lineno" name="l377" href="#l377">377 </a>                }
+<a class="c2html-lineno" name="l378" href="#l378">378 </a>                token_start = -<span class="c2html-macroconst">1</span>;
+<a class="c2html-lineno" name="l379" href="#l379">379 </a>                token_end = -<span class="c2html-macroconst">1</span>;
 <a class="c2html-lineno" name="l380" href="#l380">380 </a>            }
-<a class="c2html-lineno" name="l381" href="#l381">381 </a>        }
-<a class="c2html-lineno" name="l382" href="#l382">382 </a>    }
-<a class="c2html-lineno" name="l383" href="#l383">383 </a>    
-<a class="c2html-lineno" name="l384" href="#l384">384 </a>    <span class="c2html-keyword">if</span>(i &lt; str.length) {
-<a class="c2html-lineno" name="l385" href="#l385">385 </a>        <span class="c2html-keyword">return</span> sstrtrim(sstrsubs(str, i));
-<a class="c2html-lineno" name="l386" href="#l386">386 </a>    } <span class="c2html-keyword">else</span> {
-<a class="c2html-lineno" name="l387" href="#l387">387 </a>        str.ptr = <span class="c2html-macroconst">NULL</span>;
-<a class="c2html-lineno" name="l388" href="#l388">388 </a>        str.length = <span class="c2html-macroconst">0</span>;
-<a class="c2html-lineno" name="l389" href="#l389">389 </a>        <span class="c2html-keyword">return</span> str;
-<a class="c2html-lineno" name="l390" href="#l390">390 </a>    }
-<a class="c2html-lineno" name="l391" href="#l391">391 </a>}</div>
+<a class="c2html-lineno" name="l381" href="#l381">381 </a>        } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l382" href="#l382">382 </a>            <span class="c2html-keyword">if</span>(token_start == -<span class="c2html-macroconst">1</span>) {
+<a class="c2html-lineno" name="l383" href="#l383">383 </a>                token_start = i;
+<a class="c2html-lineno" name="l384" href="#l384">384 </a>            }
+<a class="c2html-lineno" name="l385" href="#l385">385 </a>        }
+<a class="c2html-lineno" name="l386" href="#l386">386 </a>    }
+<a class="c2html-lineno" name="l387" href="#l387">387 </a>    
+<a class="c2html-lineno" name="l388" href="#l388">388 </a>    <span class="c2html-keyword">if</span>(i &lt; str.length) {
+<a class="c2html-lineno" name="l389" href="#l389">389 </a>        <span class="c2html-keyword">return</span> sstrtrim(sstrsubs(str, i));
+<a class="c2html-lineno" name="l390" href="#l390">390 </a>    } <span class="c2html-keyword">else</span> {
+<a class="c2html-lineno" name="l391" href="#l391">391 </a>        str.ptr = <span class="c2html-macroconst">NULL</span>;
+<a class="c2html-lineno" name="l392" href="#l392">392 </a>        str.length = <span class="c2html-macroconst">0</span>;
+<a class="c2html-lineno" name="l393" href="#l393">393 </a>        <span class="c2html-keyword">return</span> str;
+<a class="c2html-lineno" name="l394" href="#l394">394 </a>    }
+<a class="c2html-lineno" name="l395" href="#l395">395 </a>}</div>
   </body>
 </html>

Mercurial Repository: c2html

mercurial