Tue, 11 Nov 2025 16:53:23 +0100
fix potential uninitialized read in util_uri_unescape_strict
| 1 | 1 | /* |
| 2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | |
| 3 | * | |
| 4 | * Copyright 2008 Sun Microsystems, Inc. All rights reserved. | |
| 5 | * | |
| 6 | * THE BSD LICENSE | |
| 7 | * | |
| 8 | * Redistribution and use in source and binary forms, with or without | |
| 9 | * modification, are permitted provided that the following conditions are met: | |
| 10 | * | |
| 11 | * Redistributions of source code must retain the above copyright notice, this | |
| 12 | * list of conditions and the following disclaimer. | |
| 13 | * Redistributions in binary form must reproduce the above copyright notice, | |
| 14 | * this list of conditions and the following disclaimer in the documentation | |
| 15 | * and/or other materials provided with the distribution. | |
| 16 | * | |
| 17 | * Neither the name of the nor the names of its contributors may be | |
| 18 | * used to endorse or promote products derived from this software without | |
| 19 | * specific prior written permission. | |
| 20 | * | |
| 21 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | |
| 22 | * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | |
| 23 | * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | |
| 24 | * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER | |
| 25 | * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | |
| 26 | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
| 27 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
| 28 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | |
| 29 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | |
| 30 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |
| 31 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 32 | */ | |
| 33 | ||
| 34 | /* | |
| 35 | * util.c: A hodge podge of utility functions and standard functions which | |
| 36 | * are unavailable on certain systems | |
| 37 | * | |
| 38 | * Rob McCool | |
| 39 | */ | |
| 40 | ||
| 41 | #ifdef XP_UNIX | |
| 42 | #include <sys/types.h> | |
| 43 | #include <sys/wait.h> | |
| 44 | #include <stdlib.h> | |
| 45 | #include <unistd.h> | |
| 46 | #include <limits.h> | |
| 47 | #include "prthread.h" | |
| 48 | #endif /* XP_UNIX */ | |
| 49 | ||
| 50 | ||
|
24
1a7853a4257e
removed some NSPR dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
51 | //include "nspr.h" |
|
56
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
52 | #include <errno.h> |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
53 | |
|
24
1a7853a4257e
removed some NSPR dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
54 | #include "../daemon/netsite.h" |
|
14
b8bf95b39952
New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
55 | #include "../public/nsapi.h" |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
56 | #include <cx/string.h> |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
57 | #include <cx/mempool.h> |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
58 | #include <cx/printf.h> |
| 1 | 59 | |
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
60 | #include "pblock.h" |
| 1 | 61 | #include "util.h" |
| 62 | ||
|
127
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
63 | #include <openssl/bio.h> |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
64 | #include <openssl/buffer.h> |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
65 | #include <openssl/evp.h> |
|
62
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
66 | |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
67 | |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
68 | /* ------------------------------ _uudecode ------------------------------- */ |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
69 | |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
70 | static const unsigned char pr2six[256] = { |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
71 | 64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
72 | 64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,62,64,64,64,63, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
73 | 52,53,54,55,56,57,58,59,60,61,64,64,64,64,64,64,64,0,1,2,3,4,5,6,7,8,9, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
74 | 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,64,64,64,64,64,64,26,27, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
75 | 28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
76 | 64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
77 | 64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
78 | 64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
79 | 64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
80 | 64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64, |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
81 | 64,64,64,64,64,64,64,64,64,64,64,64,64 |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
82 | }; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
83 | |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
84 | /** you MUST reserve at least 2 additional bytes for bufout */ |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
85 | size_t util_base64decode(char *bufcoded, size_t codedbytes, char *bufout) { |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
86 | register char *bufin = bufcoded; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
87 | register int nprbytes; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
88 | size_t nbytesdecoded; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
89 | |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
90 | /* Find the length */ |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
91 | nprbytes = (int) codedbytes; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
92 | while(pr2six[(int)(bufin[nprbytes-1])] >= 64) { |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
93 | nprbytes--; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
94 | } |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
95 | nbytesdecoded = ((nprbytes+3)/4) * 3; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
96 | |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
97 | while (nprbytes > 0) { |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
98 | *(bufout++) = (unsigned char) |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
99 | (pr2six[(int)(*bufin)] << 2 | pr2six[(int)bufin[1]] >> 4); |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
100 | *(bufout++) = (unsigned char) |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
101 | (pr2six[(int)bufin[1]] << 4 | pr2six[(int)bufin[2]] >> 2); |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
102 | *(bufout++) = (unsigned char) |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
103 | (pr2six[(int)bufin[2]] << 6 | pr2six[(int)bufin[3]]); |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
104 | bufin += 4; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
105 | nprbytes -= 4; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
106 | } |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
107 | |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
108 | if(nprbytes & 03) { |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
109 | if(pr2six[(int)bufin[-2]] > 63) |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
110 | nbytesdecoded -= 2; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
111 | else |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
112 | nbytesdecoded -= 1; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
113 | } |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
114 | |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
115 | return nbytesdecoded; |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
116 | } |
|
c47e081b6c0f
added keyfile based authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
59
diff
changeset
|
117 | |
|
127
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
118 | char* util_base64encode(char *in, size_t len) { |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
119 | BIO *b; |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
120 | BIO *e; |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
121 | BUF_MEM *mem; |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
122 | |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
123 | e = BIO_new(BIO_f_base64()); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
124 | b = BIO_new(BIO_s_mem()); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
125 | BIO_set_flags(e, BIO_FLAGS_BASE64_NO_NL); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
126 | |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
127 | e = BIO_push(e, b); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
128 | BIO_write(e, in, len); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
129 | BIO_flush(e); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
130 | |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
131 | BIO_get_mem_ptr(e, &mem); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
132 | char *out = malloc(mem->length + 1); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
133 | memcpy(out, mem->data, mem->length); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
134 | out[mem->length] = '\0'; |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
135 | |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
136 | BIO_free_all(e); |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
137 | |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
138 | return out; |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
139 | } |
|
84e206063b64
adds minimal websocket implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
119
diff
changeset
|
140 | |
| 77 | 141 | |
| 142 | /* --------------------------- util_env_create ---------------------------- */ | |
| 143 | ||
| 144 | ||
| 145 | NSAPI_PUBLIC char **util_env_create(char **env, int n, int *pos) | |
| 146 | { | |
| 147 | int x; | |
| 148 | ||
| 149 | if(!env) { | |
| 150 | *pos = 0; | |
| 151 | return (char **) MALLOC((n + 1)*sizeof(char *)); | |
| 152 | } | |
| 153 | else { | |
| 154 | for(x = 0; (env[x]); x++); | |
| 155 | env = (char **) REALLOC(env, (n + x + 1)*(sizeof(char *))); | |
| 156 | *pos = x; | |
| 157 | return env; | |
| 158 | } | |
| 159 | } | |
| 160 | ||
| 161 | ||
| 162 | /* ---------------------------- util_env_free ----------------------------- */ | |
| 163 | ||
| 164 | ||
| 165 | NSAPI_PUBLIC void util_env_free(char **env) | |
| 166 | { | |
| 167 | register char **ep = env; | |
| 168 | ||
| 169 | for(ep = env; *ep; ep++) | |
| 170 | FREE(*ep); | |
| 171 | FREE(env); | |
| 172 | } | |
| 173 | ||
| 174 | /* ----------------------------- util_env_str ----------------------------- */ | |
| 175 | ||
| 176 | ||
| 177 | NSAPI_PUBLIC char *util_env_str(const char *name, const char *value) { | |
| 178 | char *t; | |
|
118
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
179 | |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
180 | size_t len = strlen(name) + strlen(value) + 2; |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
181 | t = (char *) MALLOC(len); /* 2: '=' and '\0' */ |
| 77 | 182 | |
|
118
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
183 | snprintf(t, len, "%s=%s", name, value); |
| 77 | 184 | |
| 185 | return t; | |
| 186 | } | |
| 187 | ||
| 188 | ||
| 189 | /* --------------------------- util_env_replace --------------------------- */ | |
| 190 | ||
| 191 | ||
| 192 | NSAPI_PUBLIC void util_env_replace(char **env, const char *name, const char *value) | |
| 193 | { | |
| 194 | int x, y, z; | |
| 195 | char *i; | |
| 196 | ||
| 197 | for(x = 0; env[x]; x++) { | |
| 198 | i = strchr(env[x], '='); | |
| 199 | *i = '\0'; | |
| 200 | if(!strcmp(env[x], name)) { | |
| 201 | y = strlen(env[x]); | |
| 202 | z = strlen(value); | |
| 203 | ||
| 204 | env[x] = (char *) REALLOC(env[x], y + z + 2); | |
| 205 | util_sprintf(&env[x][y], "=%s", value); | |
| 206 | return; | |
| 207 | } | |
| 208 | *i = '='; | |
| 1 | 209 | } |
| 77 | 210 | } |
| 211 | ||
| 212 | ||
|
118
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
213 | /* ---------------------------- util_sh_escape ---------------------------- */ |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
214 | |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
215 | |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
216 | NSAPI_PUBLIC char *util_sh_escape(char *s) |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
217 | { |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
218 | char *ns = (char *) MALLOC(strlen(s) * 2 + 1); /* worst case */ |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
219 | register char *t, *u; |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
220 | |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
221 | for(t = s, u = ns; *t; ++t, ++u) { |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
222 | if(strchr("&;`'\"|*?~<>^()[]{}$\\ #!", *t)) |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
223 | *u++ = '\\'; |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
224 | *u = *t; |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
225 | } |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
226 | *u = '\0'; |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
227 | return ns; |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
228 | } |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
229 | |
|
38bf6dd8f4e7
adds minimal cgi implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
114
diff
changeset
|
230 | |
| 77 | 231 | /* ---------------------------- util_env_find ----------------------------- */ |
| 232 | ||
| 233 | ||
| 234 | NSAPI_PUBLIC char *util_env_find(char **env, const char *name) | |
| 235 | { | |
| 236 | char *i; | |
| 237 | int x, r; | |
| 238 | ||
| 239 | for(x = 0; env[x]; x++) { | |
| 240 | i = strchr(env[x], '='); | |
| 241 | *i = '\0'; | |
| 242 | r = !strcmp(env[x], name); | |
| 243 | *i = '='; | |
| 244 | if(r) | |
| 245 | return i + 1; | |
| 1 | 246 | } |
| 77 | 247 | return NULL; |
| 248 | } | |
| 249 | ||
| 250 | ||
| 251 | /* ---------------------------- util_env_copy ----------------------------- */ | |
| 252 | ||
| 253 | ||
| 254 | NSAPI_PUBLIC char **util_env_copy(char **src, char **dst) | |
| 255 | { | |
| 256 | char **src_ptr; | |
| 257 | int src_cnt; | |
| 258 | int index; | |
| 259 | ||
| 260 | if (!src) | |
| 261 | return NULL; | |
| 262 | ||
| 263 | for (src_cnt = 0, src_ptr = src; *src_ptr; src_ptr++, src_cnt++); | |
| 264 | ||
| 265 | if (!src_cnt) | |
| 266 | return NULL; | |
| 267 | ||
| 268 | dst = util_env_create(dst, src_cnt, &index); | |
| 269 | ||
| 270 | for (src_ptr = src; *src_ptr; index++, src_ptr++) | |
| 271 | dst[index] = STRDUP(*src_ptr); | |
| 272 | dst[index] = NULL; | |
| 273 | ||
| 274 | return dst; | |
| 1 | 275 | } |
| 77 | 276 | |
| 277 | /* ----------------------------- util_sprintf ----------------------------- */ | |
| 278 | ||
| 279 | NSAPI_PUBLIC int util_vsnprintf(char *s, int n, register const char *fmt, | |
| 280 | va_list args) | |
| 281 | { | |
| 282 | return vsnprintf(s, n, fmt, args); | |
| 283 | } | |
| 284 | ||
| 285 | NSAPI_PUBLIC int util_snprintf(char *s, int n, const char *fmt, ...) | |
| 286 | { | |
| 287 | va_list args; | |
| 288 | va_start(args, fmt); | |
| 289 | return vsnprintf(s, n, fmt, args); | |
| 290 | } | |
| 291 | ||
|
338
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
292 | NSAPI_PUBLIC int util_vasprintf(pool_handle_t *pool, char **s, const char *fmt, |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
293 | va_list args) |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
294 | { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
295 | CxAllocator *a = pool_allocator(pool); |
|
338
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
296 | va_list ap; |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
297 | va_copy(ap, args); |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
298 | cxmutstr str = cx_vasprintf_a(a, fmt, ap); |
|
338
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
299 | *s = str.ptr; |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
300 | return str.length; |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
301 | } |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
302 | |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
303 | NSAPI_PUBLIC int util_asprintf(pool_handle_t *pool, char **s, const char *fmt, ...) |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
304 | { |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
305 | va_list args; |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
306 | va_start(args, fmt); |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
307 | return util_vasprintf(pool, s, fmt, args); |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
308 | } |
|
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
309 | |
| 77 | 310 | NSAPI_PUBLIC int util_vsprintf(char *s, register const char *fmt, va_list args) |
| 311 | { | |
| 312 | return vsprintf(s, fmt, args); | |
| 313 | } | |
| 314 | ||
| 315 | NSAPI_PUBLIC int util_sprintf(char *s, const char *fmt, ...) | |
| 316 | { | |
| 317 | va_list args; | |
| 318 | va_start(args, fmt); | |
| 319 | return vsprintf(s, fmt, args); | |
| 320 | } | |
| 321 | ||
| 322 | // TODO: asprintf | |
| 323 | ||
| 1 | 324 | |
|
81
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
325 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
326 | /* -------------------------- util_uri_unescape --------------------------- */ |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
327 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
328 | NSAPI_PUBLIC void util_uri_unescape(char *s) |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
329 | { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
330 | char *t, *u; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
331 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
332 | for(t = s, u = s; *t; ++t, ++u) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
333 | if((*t == '%') && t[1] && t[2]) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
334 | *u = ((t[1] >= 'A' ? ((t[1] & 0xdf) - 'A')+10 : (t[1] - '0'))*16) + |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
335 | (t[2] >= 'A' ? ((t[2] & 0xdf) - 'A')+10 : (t[2] - '0')); |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
336 | t += 2; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
337 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
338 | else |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
339 | if(u != t) |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
340 | *u = *t; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
341 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
342 | *u = *t; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
343 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
344 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
345 | /* |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
346 | * Same as util_uri_unescape, but returns success/failure |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
347 | */ |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
348 | NSAPI_PUBLIC int util_uri_unescape_strict(char *s) |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
349 | { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
350 | char *t, *u, t1, t2; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
351 | int rv = 1; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
352 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
353 | for(t = s, u = s; *t; ++t, ++u) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
354 | if (*t == '%') { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
355 | t1 = t[1] & 0xdf; /* [a-f] -> [A-F] */ |
|
627
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
356 | if ((t1 < 'A' || t1 > 'F') && (t[1] < '0' || t[1] > '9')) { |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
357 | return 0; |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
358 | } |
|
81
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
359 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
360 | t2 = t[2] & 0xdf; /* [a-f] -> [A-F] */ |
|
627
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
361 | if ((t2 < 'A' || t2 > 'F') && (t[2] < '0' || t[2] > '9')) { |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
362 | return 0; |
|
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
363 | } |
|
81
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
364 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
365 | *u = ((t[1] >= 'A' ? ((t[1] & 0xdf) - 'A')+10 : (t[1] - '0'))*16) + |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
366 | (t[2] >= 'A' ? ((t[2] & 0xdf) - 'A')+10 : (t[2] - '0')); |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
367 | t += 2; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
368 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
369 | else if (u != t) |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
370 | *u = *t; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
371 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
372 | *u = *t; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
373 | |
|
627
b30bf356dac4
fix potential uninitialized read in util_uri_unescape_strict
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
584
diff
changeset
|
374 | return 1; |
|
81
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
375 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
376 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
377 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
378 | NSAPI_PUBLIC int |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
379 | util_uri_unescape_plus (const char *src, char *trg, int len) |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
380 | { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
381 | const char *t = src; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
382 | char *u = trg == NULL ? (char *)src : trg; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
383 | int rlen = 0; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
384 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
385 | if (len == -1) |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
386 | len = strlen (src); |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
387 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
388 | for( ; len && *t; ++t, ++u, len--, rlen++) |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
389 | { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
390 | if((*t == '%') && t[1] && t[2]) |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
391 | { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
392 | *u = ((t[1] >= 'A' ? ((t[1] & 0xdf) - 'A') + 10 : (t[1] - '0')) * 16) + |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
393 | (t[2] >= 'A' ? ((t[2] & 0xdf) - 'A') + 10 : (t[2] - '0')); |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
394 | t += 2; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
395 | len-= 2; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
396 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
397 | else |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
398 | if (*t == '+') |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
399 | *u = ' '; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
400 | else |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
401 | *u = *t; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
402 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
403 | *u = 0; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
404 | return rlen; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
405 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
406 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
407 | |
| 1 | 408 | NSAPI_PUBLIC int INTutil_getboolean(const char *v, int def) { |
| 409 | if(v[0] == 'T' || v[0] == 't') { | |
| 410 | return 1; | |
| 411 | } | |
| 412 | if(v[0] == 'F' || v[0] == 'f') { | |
| 413 | return 0; | |
| 414 | } | |
| 415 | return def; | |
| 416 | } | |
| 417 | ||
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
418 | int util_getboolean_s(cxstring s, int def) { |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
419 | if(s.length == 0) { |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
420 | return def; |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
421 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
422 | if(s.ptr[0] == 'T' || s.ptr[0] == 't') { |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
423 | return 1; |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
424 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
425 | if(s.ptr[0] == 'F' || s.ptr[0] == 'f') { |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
426 | return 0; |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
427 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
428 | return def; |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
429 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
430 | |
|
282
cfb588e27198
add support for getstat parameter in pg readdir
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
278
diff
changeset
|
431 | NSAPI_PUBLIC int util_strtoint(const char *str, int64_t *value) { |
|
119
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
432 | char *end; |
|
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
433 | errno = 0; |
|
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
434 | int64_t val = strtoll(str, &end, 0); |
|
548
40ecc0a6b280
fix strtoll result check
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
435 | if(errno == 0 && *end == '\0') { |
|
119
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
436 | *value = val; |
|
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
437 | return 1; |
|
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
438 | } else { |
|
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
439 | return 0; |
|
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
440 | } |
|
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
441 | } |
|
155cbab9eefd
adds support for CGI with request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
118
diff
changeset
|
442 | |
|
278
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
443 | NSAPI_PUBLIC const char* util_resource_name(const char *url) { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
444 | cxstring urlstr = cx_str(url); |
|
278
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
445 | if(urlstr.ptr[urlstr.length-1] == '/') { |
|
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
446 | urlstr.length--; |
|
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
447 | } |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
448 | cxstring resname = cx_strrchr(urlstr, '/'); |
|
278
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
449 | if(resname.length > 1) { |
|
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
450 | return resname.ptr+1; |
|
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
451 | } else { |
|
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
452 | return url; |
|
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
453 | } |
|
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
454 | } |
|
38bf7b42b58c
implement pg_vfs_open
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
455 | |
|
285
96e53bd94958
add support for O_CREAT flag in postgresql vfs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
456 | NSAPI_PUBLIC char* util_parent_path(const char *path) { |
|
338
c62ea2a2133b
add util_asprintf and util_vasprintf
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
457 | char *name = (char*)util_resource_name((char*)path); |
|
285
96e53bd94958
add support for O_CREAT flag in postgresql vfs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
458 | size_t namelen = strlen(name); |
|
96e53bd94958
add support for O_CREAT flag in postgresql vfs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
459 | size_t pathlen = strlen(path); |
|
96e53bd94958
add support for O_CREAT flag in postgresql vfs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
460 | size_t parentlen = pathlen - namelen; |
|
96e53bd94958
add support for O_CREAT flag in postgresql vfs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
461 | char *parent = MALLOC(parentlen + 1); |
|
96e53bd94958
add support for O_CREAT flag in postgresql vfs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
462 | memcpy(parent, path, parentlen); |
|
96e53bd94958
add support for O_CREAT flag in postgresql vfs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
463 | parent[parentlen] = '\0'; |
|
96e53bd94958
add support for O_CREAT flag in postgresql vfs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
464 | return parent; |
|
96e53bd94958
add support for O_CREAT flag in postgresql vfs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
465 | } |
| 1 | 466 | |
|
382
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
467 | NSAPI_PUBLIC char* util_parent_path_pool(pool_handle_t *pool, const char *path) { |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
468 | // maybe we can unify this function with util_parent_path |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
469 | char *name = (char*)util_resource_name((char*)path); |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
470 | size_t namelen = strlen(name); |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
471 | size_t pathlen = strlen(path); |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
472 | size_t parentlen = pathlen - namelen; |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
473 | char *parent = pool_malloc(pool, parentlen + 1); |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
474 | memcpy(parent, path, parentlen); |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
475 | parent[parentlen] = '\0'; |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
476 | return parent; |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
477 | } |
|
9e2289c77b04
disable pg large object IO functions for collections
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
338
diff
changeset
|
478 | |
| 1 | 479 | /* ------------------------------ util_itoa ------------------------------- */ |
| 480 | /* | |
| 481 | NSAPI_PUBLIC int util_itoa(int i, char *a) | |
| 482 | { | |
| 483 | int len = util_i64toa(i, a); | |
| 484 | ||
| 485 | PR_ASSERT(len < UTIL_ITOA_SIZE); | |
| 486 | ||
| 487 | return len; | |
| 488 | } | |
| 489 | */ | |
| 490 | NSAPI_PUBLIC int INTutil_itoa(int i, char *a) { | |
| 491 | return INTutil_i64toa(i, a); | |
| 492 | } | |
| 493 | ||
| 494 | ||
| 495 | /* ----------------------------- util_i64toa ------------------------------ */ | |
| 496 | ||
| 497 | /* | |
| 498 | * Assumption: Reversing the digits will be faster in the general case | |
| 499 | * than doing a log10 or some nasty trick to find the # of digits. | |
| 500 | */ | |
| 501 | ||
|
24
1a7853a4257e
removed some NSPR dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
502 | NSAPI_PUBLIC int INTutil_i64toa(int64_t i, char *a) |
| 1 | 503 | { |
| 504 | register int x, y, p; | |
| 505 | register char c; | |
| 506 | int negative; | |
| 507 | ||
| 508 | negative = 0; | |
| 509 | if(i < 0) { | |
| 510 | *a++ = '-'; | |
| 511 | negative = 1; | |
| 512 | i = -i; | |
| 513 | } | |
| 514 | p = 0; | |
| 515 | while(i > 9) { | |
| 516 | a[p++] = (i%10) + '0'; | |
| 517 | i /= 10; | |
| 518 | } | |
| 519 | a[p++] = i + '0'; | |
| 520 | ||
| 521 | if(p > 1) { | |
| 522 | for(x = 0, y = p - 1; x < y; ++x, --y) { | |
| 523 | c = a[x]; | |
| 524 | a[x] = a[y]; | |
| 525 | a[y] = c; | |
| 526 | } | |
| 527 | } | |
| 528 | a[p] = '\0'; | |
| 529 | ||
| 530 | //PR_ASSERT(p + negative < UTIL_I64TOA_SIZE); | |
| 531 | ||
| 532 | return p + negative; | |
| 533 | } | |
|
47
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
534 | |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
535 | |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
536 | |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
537 | #ifndef XP_WIN32 |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
538 | NSAPI_PUBLIC struct passwd * |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
539 | util_getpwnam(const char *name, struct passwd *result, char *buffer, |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
540 | int buflen) |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
541 | { |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
542 | struct passwd *rv; |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
543 | |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
544 | errno = getpwnam_r(name, result, buffer, buflen, &rv); |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
545 | if (errno != 0) |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
546 | rv = NULL; |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
547 | |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
548 | return rv; |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
549 | } |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
550 | #endif |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
551 | |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
552 | |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
553 | #ifndef XP_WIN32 |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
554 | NSAPI_PUBLIC struct passwd * |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
555 | util_getpwuid(uid_t uid, struct passwd *result, char *buffer, int buflen) |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
556 | { |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
557 | struct passwd *rv; |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
558 | |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
559 | errno = getpwuid_r(uid, result, buffer, buflen, &rv); |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
560 | if (errno != 0) |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
561 | rv = NULL; |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
562 | |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
563 | return rv; |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
564 | } |
|
ce9790523346
server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
565 | #endif |
|
56
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
566 | |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
567 | |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
568 | NSAPI_PUBLIC int util_errno2status(int errno_value) { |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
569 | switch(errno_value) { |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
570 | case 0: { |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
571 | return 200; |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
572 | } |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
573 | case EACCES: { |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
574 | return 403; |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
575 | } |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
576 | case ENOENT: { |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
577 | return 404; |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
578 | break; |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
579 | } |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
580 | } |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
581 | return 500; |
|
c6cf20b09043
added vfs_mkdir and vfs_unlink
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
47
diff
changeset
|
582 | } |
|
58
66c22e54aa90
webdav uses the vfs api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
583 | |
|
59
ab25c0a231d0
some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
58
diff
changeset
|
584 | |
|
58
66c22e54aa90
webdav uses the vfs api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
585 | |
|
66c22e54aa90
webdav uses the vfs api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
586 | NSAPI_PUBLIC |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
587 | cxmutstr util_path_append(pool_handle_t *pool, char *path, char *ch) { |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
588 | cxmutstr parent = cx_mutstr(path); |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
589 | cxmutstr child = cx_mutstr(ch); |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
590 | cxmutstr newstr; |
| 99 | 591 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
592 | CxAllocator *a = pool_allocator(pool); |
|
114
c3a0f1275d71
fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
113
diff
changeset
|
593 | if(parent.ptr[parent.length-1] == '/') { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
594 | newstr = cx_strcat_a(a, 2, parent, child); |
| 99 | 595 | } else { |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
596 | newstr = cx_strcat_a(a, 3, parent, cx_str("/"), child); |
|
58
66c22e54aa90
webdav uses the vfs api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
597 | } |
|
66c22e54aa90
webdav uses the vfs api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
598 | |
|
66c22e54aa90
webdav uses the vfs api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
599 | return newstr; |
|
66c22e54aa90
webdav uses the vfs api
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
56
diff
changeset
|
600 | } |
|
63
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
601 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
602 | cxmutstr util_path_remove_last(cxmutstr path) { |
|
63
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
603 | int i; |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
604 | for(i=path.length-1;i>=0;i--) { |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
605 | char c = path.ptr[i]; |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
606 | if(c == '/') { |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
607 | path.ptr[i] = 0; |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
608 | path.length = i; |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
609 | break; |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
610 | } |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
611 | } |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
612 | if(i < 0) { |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
613 | path.ptr = NULL; |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
614 | path.length = 0; |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
615 | } |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
616 | return path; |
|
66442f81f823
supports file system ACLs on Solaris
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
62
diff
changeset
|
617 | } |
|
81
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
618 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
619 | void util_add_ppath(cxmutstr root, cxmutstr path, pblock *vars) { |
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
620 | // concat path |
| 99 | 621 | size_t length = root.length + path.length; |
| 622 | char *translated_path = alloca(length); | |
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
623 | |
| 99 | 624 | memcpy(translated_path, root.ptr, root.length); |
| 625 | memcpy(translated_path + root.length, path.ptr, path.length); | |
| 626 | ||
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
627 | |
|
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
628 | // add path to specified pblock |
|
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
629 | pblock_kvinsert( |
|
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
630 | pb_key_ppath, |
| 99 | 631 | translated_path, |
| 632 | length, | |
|
96
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
633 | vars); |
|
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
634 | } |
|
0185b13bf41f
added document-root and pfx2dir nametrans safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
91
diff
changeset
|
635 | |
|
81
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
636 | |
|
102
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
637 | // new - code from params.cpp |
|
81
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
638 | NSAPI_PUBLIC pblock* util_parse_param(pool_handle_t *pool, char *query) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
639 | pblock *pb = pblock_create_pool(pool, 32); |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
640 | if(!pb) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
641 | return NULL; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
642 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
643 | if(!query || !(*query)) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
644 | return pb; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
645 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
646 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
647 | int loopFlag = 1; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
648 | int nl = 0; // size of the name substring |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
649 | int vl = 0; // size of the value substring |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
650 | int state = 0; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
651 | const char *np = query; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
652 | const char *vp = NULL; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
653 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
654 | while (loopFlag) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
655 | char delim = *query++; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
656 | switch (delim) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
657 | case '&': |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
658 | case '\0': { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
659 | if(!delim) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
660 | loopFlag = 0; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
661 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
662 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
663 | state = 0; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
664 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
665 | if(nl > 0) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
666 | util_uri_unescape_plus(np, NULL, nl); |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
667 | util_uri_unescape_plus(vp, NULL, vl); |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
668 | pblock_nvlinsert(np, nl, vp, vl, pb); |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
669 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
670 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
671 | nl = 0; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
672 | vl = 0; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
673 | vp = NULL; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
674 | np = query; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
675 | break; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
676 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
677 | case '=': { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
678 | state = 1; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
679 | vp = query; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
680 | break; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
681 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
682 | default: { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
683 | if(state) { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
684 | vl++; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
685 | } else { |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
686 | nl++; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
687 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
688 | } |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
689 | } /* switch */ |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
690 | } /* while */ |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
691 | |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
692 | return pb; |
|
d25825f37967
preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
77
diff
changeset
|
693 | } |
| 91 | 694 | |
|
102
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
695 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
696 | /* ---------------------------- util_mstr2num ----------------------------- */ |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
697 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
698 | static const int MSTR2NUM_HT_MASK = 0xf; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
699 | |
|
103
d3b514e2ddbd
added date header to response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
700 | struct mstr2num_ht { |
|
102
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
701 | unsigned ucmstr; // Uppercase 3 character month string in a machine word |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
702 | int mnum; // 0-based month number for this month string |
|
103
d3b514e2ddbd
added date header to response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
703 | }; |
|
d3b514e2ddbd
added date header to response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
704 | |
|
d3b514e2ddbd
added date header to response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
102
diff
changeset
|
705 | struct mstr2num_ht MSTR2NUM_HT[] = { |
|
102
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
706 | { 'A' << 16 | 'P' << 8 | 'R', 3 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
707 | { 'S' << 16 | 'E' << 8 | 'P', 8 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
708 | { 'M' << 16 | 'A' << 8 | 'Y', 4 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
709 | { 0, -1 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
710 | { 'M' << 16 | 'A' << 8 | 'R', 2 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
711 | { 'F' << 16 | 'E' << 8 | 'B', 1 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
712 | { 0, -1 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
713 | { 'D' << 16 | 'E' << 8 | 'C', 11 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
714 | { 'O' << 16 | 'C' << 8 | 'T', 9 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
715 | { 'J' << 16 | 'U' << 8 | 'N', 5 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
716 | { 0, -1 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
717 | { 'A' << 16 | 'U' << 8 | 'G', 7 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
718 | { 'J' << 16 | 'A' << 8 | 'N', 0 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
719 | { 'J' << 16 | 'U' << 8 | 'L', 6 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
720 | { 0, -1 }, |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
721 | { 'N' << 16 | 'O' << 8 | 'V', 10 } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
722 | }; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
723 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
724 | static inline int _mstr2num(const char *s) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
725 | { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
726 | const unsigned char *mstr = (const unsigned char *) s; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
727 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
728 | /* |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
729 | * We compute ucmstr (an uppercase 3 character month string stored in a |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
730 | * machine word) and hash (a perfect hash based on the last 2 characters |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
731 | * of the 3 character uppercase month string) from the input string s. |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
732 | * Note that each character from the input string is masked by 0xdf; in |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
733 | * ASCII, this has the effect of converting alphabetic characters to |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
734 | * uppercase while 1. not changing any nonalphabetic characters into |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
735 | * alphabetic characters and 2. leaving any nul characters unchanged. |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
736 | * |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
737 | * The hash value is used as an index into the MSTR2NUM_HT[] hash table. |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
738 | * If the ucmstr at that index matches our computed ucmstr, the mnum at |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
739 | * that index is the 0-based month number corresponding to the input |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
740 | * string. |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
741 | * |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
742 | * Note that we never read past the end of the input string and always |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
743 | * return -1 if the input string doesn't begin with a valid 3 character |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
744 | * month string. |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
745 | */ |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
746 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
747 | unsigned char ucmstr0 = mstr[0] & 0xdf; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
748 | unsigned ucmstr = ucmstr0 << 16; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
749 | if (ucmstr0 != '\0') { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
750 | unsigned char ucmstr1 = mstr[1] & 0xdf; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
751 | ucmstr |= ucmstr1 << 8; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
752 | if (ucmstr1 != '\0') { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
753 | unsigned char ucmstr2 = mstr[2] & 0xdf; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
754 | ucmstr |= ucmstr2; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
755 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
756 | unsigned hash = (ucmstr1 >> 2) ^ (ucmstr2 << 1); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
757 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
758 | int i = hash & MSTR2NUM_HT_MASK; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
759 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
760 | if (MSTR2NUM_HT[i].ucmstr == ucmstr) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
761 | return MSTR2NUM_HT[i].mnum; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
762 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
763 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
764 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
765 | return -1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
766 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
767 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
768 | NSAPI_PUBLIC int util_mstr2num(const char *s) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
769 | { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
770 | return _mstr2num(s); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
771 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
772 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
773 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
774 | /* ------------------------- util_str_time_equal -------------------------- */ |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
775 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
776 | /* |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
777 | * Function to compare if two time strings are equal |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
778 | * |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
779 | * Acceptable date formats: |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
780 | * Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123 |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
781 | * Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036 |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
782 | * Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
783 | * |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
784 | * Return 0 if equal, -1 if not equal. |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
785 | */ |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
786 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
787 | static inline const char * _parse_day_month(const char *p, int *day, int *month) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
788 | { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
789 | *day = 0; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
790 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
791 | if (*p == ',') { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
792 | // Parse day and month: ", 06 Nov", ", 06-Nov" |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
793 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
794 | if (*p == ' ') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
795 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
796 | while (*p >= '0' && *p <= '9') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
797 | *day = *day * 10 + (*p++ - '0'); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
798 | if (*p == ' ' || *p == '-') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
799 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
800 | *month = _mstr2num(p); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
801 | if (*month != -1) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
802 | p += 3; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
803 | } else { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
804 | // Parse month and day: " Nov 6" |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
805 | if (*p == ' ') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
806 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
807 | *month = _mstr2num(p); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
808 | if (*month != -1) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
809 | p += 3; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
810 | while (*p == ' ') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
811 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
812 | while (*p >= '0' && *p <= '9') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
813 | *day = *day * 10 + (*p++ - '0'); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
814 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
815 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
816 | return p; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
817 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
818 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
819 | static inline void _parse_year_time(const char *p, int *year, const char ** time) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
820 | { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
821 | int _year = 0; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
822 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
823 | if (*p == '-') { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
824 | // Parse year and time: "-94 08:49:37" |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
825 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
826 | while (*p >= '0' && *p <= '9') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
827 | _year = _year * 10 + (*p++ - '0'); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
828 | if (_year < 70) { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
829 | _year += 2000; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
830 | } else { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
831 | _year += 1900; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
832 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
833 | if (*p == ' ') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
834 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
835 | *time = p; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
836 | } else { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
837 | // Parse year and time or time and year |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
838 | if (*p == ' ') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
839 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
840 | if (p[0] && p[1] && p[2] == ':') { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
841 | // Parse time and year: "08:49:37 1994" |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
842 | *time = p; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
843 | p += 3; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
844 | while (*p && *p != ' ') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
845 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
846 | if (*p == ' ') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
847 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
848 | while (*p >= '0' && *p <= '9') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
849 | _year = _year * 10 + (*p++ - '0'); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
850 | } else { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
851 | // Parse year and time: "1994 08:49:37" |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
852 | while (*p >= '0' && *p <= '9') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
853 | _year = _year * 10 + (*p++ - '0'); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
854 | if (*p == ' ') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
855 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
856 | *time = p; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
857 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
858 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
859 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
860 | *year = _year; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
861 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
862 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
863 | NSAPI_PUBLIC int util_str_time_equal(const char *t1, const char *t2) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
864 | { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
865 | // Skip leading whitespace and day of week |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
866 | while (isspace(*t1)) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
867 | t1++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
868 | while (isalpha(*t1)) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
869 | t1++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
870 | while (isspace(*t2)) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
871 | t2++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
872 | while (isalpha(*t2)) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
873 | t2++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
874 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
875 | // Day and month: ", 06 Nov", ", 06-Nov", or " Nov 6" |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
876 | int day1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
877 | int month1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
878 | t1 = _parse_day_month(t1, &day1, &month1); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
879 | int day2; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
880 | int month2; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
881 | t2 = _parse_day_month(t2, &day2, &month2); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
882 | if (day1 != day2) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
883 | return -1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
884 | if (month1 != month2) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
885 | return -1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
886 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
887 | // Year and time: " 1994 08:49:37", "-94 08:49:37", or " 08:49:37 1994" |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
888 | int year1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
889 | const char *time1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
890 | _parse_year_time(t1, &year1, &time1); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
891 | int year2; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
892 | const char *time2; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
893 | _parse_year_time(t2, &year2, &time2); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
894 | if (year1 != year2) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
895 | return -1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
896 | while (*time1 && *time1 != ' ' && *time1 == *time2) { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
897 | time1++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
898 | time2++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
899 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
900 | if (*time2 && *time2 != ' ') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
901 | return -1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
902 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
903 | return 0; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
904 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
905 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
906 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
907 | /* --------------------------- util_later_than ---------------------------- */ |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
908 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
909 | static int _time_compare(const struct tm *lms, const char *ims) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
910 | { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
911 | while (isspace(*ims)) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
912 | ims++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
913 | while (isalpha(*ims)) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
914 | ims++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
915 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
916 | int day; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
917 | int month; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
918 | ims = _parse_day_month(ims, &day, &month); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
919 | if (month == -1) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
920 | return 1; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
921 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
922 | int year; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
923 | const char *time; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
924 | _parse_year_time(ims, &year, &time); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
925 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
926 | int rv; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
927 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
928 | rv = (lms->tm_year + 1900) - year; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
929 | if (rv) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
930 | return rv; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
931 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
932 | rv = lms->tm_mon - month; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
933 | if (rv) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
934 | return rv; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
935 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
936 | rv = lms->tm_mday - day; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
937 | if (rv) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
938 | return rv; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
939 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
940 | const char *p = time; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
941 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
942 | int hour = 0; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
943 | while (*p >= '0' && *p <= '9') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
944 | hour = hour * 10 + (*p++ - '0'); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
945 | if (*p == ':') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
946 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
947 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
948 | rv = lms->tm_hour - hour; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
949 | if (rv) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
950 | return rv; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
951 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
952 | int minutes = 0; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
953 | while (*p >= '0' && *p <= '9') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
954 | minutes = minutes * 10 + (*p++ - '0'); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
955 | if (*p == ':') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
956 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
957 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
958 | rv = lms->tm_min - minutes; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
959 | if (rv) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
960 | return rv; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
961 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
962 | int seconds = 0; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
963 | while (*p >= '0' && *p <= '9') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
964 | seconds = seconds * 10 + (*p++ - '0'); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
965 | if (*p == ':') |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
966 | p++; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
967 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
968 | rv = lms->tm_sec - seconds; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
969 | if (rv) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
970 | return rv; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
971 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
972 | return 0; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
973 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
974 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
975 | NSAPI_PUBLIC int util_later_than(const struct tm *lms, const char *ims) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
976 | { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
977 | /* |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
978 | * Returns 0 if lms later than ims |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
979 | * 0 if ims is malformed |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
980 | * 1 if ims later than lms |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
981 | * 1 if equal |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
982 | */ |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
983 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
984 | return _time_compare(lms, ims) <= 0; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
985 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
986 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
987 | NSAPI_PUBLIC int util_time_equal(const struct tm *lms, const char *ims) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
988 | { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
989 | return _time_compare(lms, ims) == 0; |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
990 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
991 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
992 | |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
993 | NSAPI_PUBLIC struct tm * |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
994 | util_gmtime(const time_t *clock, struct tm *res) |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
995 | { |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
996 | return gmtime_r(clock, res); |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
997 | } |
|
136a76e293b5
added etag and conditional request implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
99
diff
changeset
|
998 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
999 | int util_isdate(const char *str) { |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
1000 | cxstring datestr = cx_str(str); |
|
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
1001 | cxstring example = cx_str("Sun, 06 Nov 1994 08:49:37 GMT"); |
|
104
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1002 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1003 | if(datestr.length != example.length) { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1004 | return 0; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1005 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1006 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1007 | for(int i=0;i<datestr.length;i++) { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1008 | char e = example.ptr[i]; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1009 | if(isdigit(e)) { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1010 | if(!isdigit(datestr.ptr[i])) { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1011 | return 0; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1012 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1013 | } else if(e == ' ') { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1014 | if(datestr.ptr[i] != ' ') { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1015 | return 0; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1016 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1017 | } else if(e == ',') { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1018 | if(datestr.ptr[i] != ',') { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1019 | return 0; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1020 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1021 | } else if(e == ':') { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1022 | if(datestr.ptr[i] != ':') { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1023 | return 0; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1024 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1025 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1026 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1027 | |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
1028 | if(!cx_strsuffix(datestr, cx_str("GMT"))) { |
|
104
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1029 | return 0; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1030 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1031 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1032 | return 1; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1033 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1034 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1035 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1036 | /* ------------------------- util_mime_separator -------------------------- */ |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1037 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1038 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1039 | NSAPI_PUBLIC int util_mime_separator(char *sep) |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1040 | { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1041 | int size = 35; // documented in nsapi.h |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1042 | int pos = 0; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1043 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1044 | sep[pos++] = CR; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1045 | sep[pos++] = LF; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1046 | sep[pos++] = '-'; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1047 | sep[pos++] = '-'; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1048 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1049 | int r[6]; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1050 | for(int i=0;i<6;i++) { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1051 | r[i] = rand() % 10000; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1052 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1053 | pos += snprintf( |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1054 | sep+4, |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1055 | size-4, |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1056 | "X%04x%04x%04x%04x%04x%04xE", |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1057 | r[0], |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1058 | r[1], |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1059 | r[2], |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1060 | r[3], |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1061 | r[4], |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1062 | r[5]); |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1063 | |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1064 | return pos; |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
103
diff
changeset
|
1065 | } |
|
273
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1066 | |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1067 | |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1068 | /* ------------------------- util_html_escape -------------------------- */ |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1069 | |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1070 | NSAPI_PUBLIC char *util_html_escape(const char *s) |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1071 | { |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1072 | const char *in; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1073 | |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1074 | int len = 0; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1075 | for (in = s; *in; in++) { |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1076 | switch (*in) { |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1077 | case '<': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1078 | len += 4; // < |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1079 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1080 | case '>': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1081 | len += 4; // > |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1082 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1083 | case '&': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1084 | len += 5; // & |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1085 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1086 | case '"': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1087 | len += 6; // " |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1088 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1089 | case '\'': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1090 | len += 6; // ' |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1091 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1092 | case '+': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1093 | len += 5; // + |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1094 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1095 | default: |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1096 | len++; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1097 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1098 | } |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1099 | } |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1100 | |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1101 | char *ns = (char *) MALLOC(len + 1); |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1102 | if (!ns) |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1103 | return ns; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1104 | |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1105 | char *out = ns; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1106 | for (in = s; *in; in++) { |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1107 | switch (*in) { |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1108 | case '<': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1109 | *out++ = '&'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1110 | *out++ = 'l'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1111 | *out++ = 't'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1112 | *out++ = ';'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1113 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1114 | case '>': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1115 | *out++ = '&'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1116 | *out++ = 'g'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1117 | *out++ = 't'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1118 | *out++ = ';'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1119 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1120 | case '&': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1121 | *out++ = '&'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1122 | *out++ = 'a'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1123 | *out++ = 'm'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1124 | *out++ = 'p'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1125 | *out++ = ';'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1126 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1127 | case '"': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1128 | *out++ = '&'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1129 | *out++ = 'q'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1130 | *out++ = 'u'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1131 | *out++ = 'o'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1132 | *out++ = 't'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1133 | *out++ = ';'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1134 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1135 | case '\'': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1136 | *out++ = '&'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1137 | *out++ = 'a'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1138 | *out++ = 'p'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1139 | *out++ = 'o'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1140 | *out++ = 's'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1141 | *out++ = ';'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1142 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1143 | case '+': |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1144 | *out++ = '&'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1145 | *out++ = '#'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1146 | *out++ = '4'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1147 | *out++ = '3'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1148 | *out++ = ';'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1149 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1150 | default: |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1151 | *out++ = *in; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1152 | break; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1153 | } |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1154 | } |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1155 | *out = '\0'; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1156 | |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1157 | return ns; |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1158 | } |
|
f4eb5d125e58
add util_html_escape implementation from Open Web Server
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
256
diff
changeset
|
1159 |