--- a/test/gs/ctest.html Sun Mar 02 12:47:31 2025 +0100 +++ b/test/gs/ctest.html Sun Mar 02 16:06:24 2025 +0100 @@ -33,6 +33,9 @@ span.c2html-string { color: darkorange; } + span.c2html-number { + color: dodgerblue; + } span.c2html-comment { color: grey; } @@ -101,7 +104,7 @@ <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="l51" href="#l51"> 51 </a><span class="c2html-directive">#define</span> <span class="c2html-macroconst">MACRO1337</span> <span class="c2html-number">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>; @@ -120,44 +123,44 @@ <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="l70" href="#l70"> 70 </a> <span class="c2html-keyword">return</span> <span class="c2html-number">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="l77" href="#l77"> 77 </a> <span class="c2html-keyword">if</span>(v[<span class="c2html-number">0</span>] == <span class="c2html-string">'T'</span> || v[<span class="c2html-number">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-number">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="l80" href="#l80"> 80 </a> <span class="c2html-keyword">return</span> <span class="c2html-number">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="l85" href="#l85"> 85 </a> <span class="c2html-type">int64_t</span> val = strtoll(str, &end, <span class="c2html-number">0</span>); +<a class="c2html-lineno" name="l86" href="#l86"> 86 </a> <span class="c2html-keyword">if</span>(strlen(end) == <span class="c2html-number">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="l88" href="#l88"> 88 </a> <span class="c2html-keyword">return</span> <span class="c2html-number">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="l90" href="#l90"> 90 </a> <span class="c2html-keyword">return</span> <span class="c2html-number">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="l97" href="#l97"> 97 </a> <span class="c2html-keyword">int</span> slashcount = <span class="c2html-number">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 > <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 > <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="l99" href="#l99"> 99 </a> <span class="c2html-keyword">if</span>(len > <span class="c2html-number">7</span> && !strncasecmp(url, <span class="c2html-string">"http://"</span>, <span class="c2html-number">7</span>)) { +<a class="c2html-lineno" name="l100" href="#l100">100 </a> slmax = <span class="c2html-number">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 > <span class="c2html-number">8</span> && !strncasecmp(url, <span class="c2html-string">"https://"</span>, <span class="c2html-number">8</span>)) { +<a class="c2html-lineno" name="l102" href="#l102">102 </a> slmax = <span class="c2html-number">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="l104" href="#l104">104 </a> slmax = <span class="c2html-number">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<len;i++) { +<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-number">0</span>;i<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++; @@ -178,24 +181,24 @@ <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="l128" href="#l128">128 </a> <span class="c2html-keyword">int</span> si = <span class="c2html-number">0</span>; +<a class="c2html-lineno" name="l129" href="#l129">129 </a> <span class="c2html-keyword">int</span> osi = <span class="c2html-number">0</span>; +<a class="c2html-lineno" name="l130" href="#l130">130 </a> <span class="c2html-keyword">int</span> i = <span class="c2html-number">0</span>; +<a class="c2html-lineno" name="l131" href="#l131">131 </a> <span class="c2html-keyword">int</span> p = <span class="c2html-number">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="l133" href="#l133">133 </a> <span class="c2html-keyword">while</span>((c = url[i]) != <span class="c2html-number">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="l137" href="#l137">137 </a> p = <span class="c2html-number">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="l143" href="#l143">143 </a> <span class="c2html-keyword">if</span>(name[<span class="c2html-number">0</span>] == <span class="c2html-number">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="l145" href="#l145">145 </a> <span class="c2html-keyword">if</span>(name[<span class="c2html-number">0</span>] == <span class="c2html-number">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> } @@ -217,25 +220,25 @@ <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="l167" href="#l167">167 </a> path = sstrn(<span class="c2html-string">""</span>, <span class="c2html-number">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="l170" href="#l170">170 </a> <span class="c2html-keyword">int</span> add_separator = <span class="c2html-number">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-number">-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-number">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> } <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="l176" href="#l176">176 </a> <span class="c2html-keyword">if</span>(path.length == <span class="c2html-number">0</span> || path.ptr[<span class="c2html-number">0</span>] != <span class="c2html-string">'/'</span>) { +<a class="c2html-lineno" name="l177" href="#l177">177 </a> add_separator = <span class="c2html-number">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="l183" href="#l183">183 </a> url = sstrcat(<span class="c2html-number">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="l185" href="#l185">185 </a> url = sstrcat(<span class="c2html-number">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; @@ -248,40 +251,40 @@ <a class="c2html-lineno" name="l195" href="#l195">195 </a> <span class="c2html-keyword">char</span> *base_path = util_url_path(sn->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="l198" href="#l198">198 </a> <span class="c2html-type">sstr_t</span> url = sstrcat(<span class="c2html-number">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->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="l205" href="#l205">205 </a> <span class="c2html-keyword">char</span> *space = malloc(<span class="c2html-number">256</span>); +<a class="c2html-lineno" name="l206" href="#l206">206 </a> UcxBuffer *url = ucx_buffer_new(space, <span class="c2html-number">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->base_url, <span class="c2html-macroconst">1</span>, strlen(sn->base_url), url); +<a class="c2html-lineno" name="l209" href="#l209">209 </a> ucx_buffer_write(sn->base_url, <span class="c2html-number">1</span>, strlen(sn->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="l211" href="#l211">211 </a> ucx_buffer_seek(url, <span class="c2html-number">-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-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="l214" href="#l214">214 </a> <span class="c2html-type">ssize_t</span> ntk = <span class="c2html-number">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<ntk;i++) { +<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-number">0</span>;i<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 > <span class="c2html-macroconst">0</span>) { +<a class="c2html-lineno" name="l219" href="#l219">219 </a> <span class="c2html-keyword">if</span>(node.length > <span class="c2html-number">0</span>) { <a class="c2html-lineno" name="l220" href="#l220">220 </a> <span class="c2html-keyword">char</span> *esc = curl_easy_escape(sn->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="l222" href="#l222">222 </a> ucx_buffer_write(esc, <span class="c2html-number">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> 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="l228" href="#l228">228 </a> <span class="c2html-keyword">if</span>(path[p.length<span class="c2html-number">-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="l231" href="#l231">231 </a> ucx_buffer_putc(url, <span class="c2html-number">0</span>); <a class="c2html-lineno" name="l232" href="#l232">232 </a> <a class="c2html-lineno" name="l233" href="#l233">233 </a> space = url->space; <a class="c2html-lineno" name="l234" href="#l234">234 </a> ucx_buffer_free(url); @@ -294,7 +297,7 @@ <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="l244" href="#l244">244 </a> <span class="c2html-keyword">char</span> *parent = malloc(parentlen + <span class="c2html-number">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; @@ -314,13 +317,13 @@ <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="l264" href="#l264">264 </a> <span class="c2html-keyword">int</span> len = <span class="c2html-number">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="l270" href="#l270">270 </a> <span class="c2html-keyword">char</span> *out = calloc(<span class="c2html-number">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()); @@ -347,8 +350,8 @@ <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->length); -<a class="c2html-lineno" name="l297" href="#l297">297 </a> memcpy(out, mem->data, mem->length -<span class="c2html-macroconst">1</span>); -<a class="c2html-lineno" name="l298" href="#l298">298 </a> out[mem->length - <span class="c2html-macroconst">1</span>] = <span class="c2html-string">'\0'</span>; +<a class="c2html-lineno" name="l297" href="#l297">297 </a> memcpy(out, mem->data, mem->length <span class="c2html-number">-1</span>); +<a class="c2html-lineno" name="l298" href="#l298">298 </a> out[mem->length - <span class="c2html-number">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> @@ -384,8 +387,8 @@ <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="l334" href="#l334">334 </a> <span class="c2html-keyword">unsigned</span> <span class="c2html-keyword">char</span> *str = malloc(<span class="c2html-number">25</span>); +<a class="c2html-lineno" name="l335" href="#l335">335 </a> str[<span class="c2html-number">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> @@ -393,8 +396,8 @@ <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<<span class="c2html-macroconst">24</span>;i++) { +<a class="c2html-lineno" name="l343" href="#l343">343 </a> RAND_pseudo_bytes(str, <span class="c2html-number">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-number">0</span>;i<<span class="c2html-number">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> } @@ -409,30 +412,30 @@ <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<=str.length;i++) { +<a class="c2html-lineno" name="l359" href="#l359">359 </a> <span class="c2html-keyword">int</span> token_start = <span class="c2html-number">-1</span>; +<a class="c2html-lineno" name="l360" href="#l360">360 </a> <span class="c2html-keyword">int</span> token_end = <span class="c2html-number">-1</span>; +<a class="c2html-lineno" name="l361" href="#l361">361 </a> <span class="c2html-keyword">for</span>(i=<span class="c2html-number">0</span>;i<=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 < <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="l368" href="#l368">368 </a> <span class="c2html-keyword">if</span>(c < <span class="c2html-number">33</span>) { +<a class="c2html-lineno" name="l369" href="#l369">369 </a> <span class="c2html-keyword">if</span>(token_start != <span class="c2html-number">-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="l375" href="#l375">375 </a> *sub = sstrtrim(sstrsubsl(str, <span class="c2html-number">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="l378" href="#l378">378 </a> token_start = <span class="c2html-number">-1</span>; +<a class="c2html-lineno" name="l379" href="#l379">379 </a> token_end = <span class="c2html-number">-1</span>; <a class="c2html-lineno" name="l380" href="#l380">380 </a> } <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="l382" href="#l382">382 </a> <span class="c2html-keyword">if</span>(token_start == <span class="c2html-number">-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> } @@ -442,7 +445,7 @@ <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="l392" href="#l392">392 </a> str.length = <span class="c2html-number">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>