# HG changeset patch # User Mike Becker # Date 1720640137 -7200 # Node ID c72b250866ab23479c1ade90e109d8d470128b2a # Parent 831928419249a0f8692e333ff00b51fba1622142 add basic support for line continuations in C highlighter things that still do not work: - user includes - splitting keywords fixes #392 diff -r 831928419249 -r c72b250866ab src/c2html.c --- a/src/c2html.c Sun Oct 01 14:41:17 2023 +0200 +++ b/src/c2html.c Wed Jul 10 21:35:37 2024 +0200 @@ -55,8 +55,7 @@ /* process lines */ int lineno = 0; - c2html_highlighter_data hd; - hd.multiline_comment = 0; + c2html_highlighter_data hd = {0}; cxBufferInit(&hd.primary_buffer, NULL, 256, NULL, CX_BUFFER_AUTO_EXTEND); cxBufferInit(&hd.secondary_buffer, NULL, 32, NULL, CX_BUFFER_AUTO_EXTEND); CxBuffer out_line; diff -r 831928419249 -r c72b250866ab src/highlighter.c --- a/src/highlighter.c Sun Oct 01 14:41:17 2023 +0200 +++ b/src/highlighter.c Wed Jul 10 21:35:37 2024 +0200 @@ -29,12 +29,11 @@ #include "highlighter.h" -#include -#include #include #include #include +#include static void put_htmlescaped(CxBuffer *dest, char c) { if (c == '>') { @@ -106,45 +105,101 @@ /* local information */ size_t sp = (size_t)-1; + int isstring = 0, iscomment = 0, isinclude = 0, parseinclude = 0; char quote = '\0'; int isescaping = 0; - + + int continuation_enabled = 0; + const char* current_highlight = NULL; + + /* define convenience macros */ +#define start_span(cl) \ + current_highlight = cl; \ + cx_bprintf(dest, "", current_highlight) +#define stop_span \ + current_highlight = NULL;\ + cxBufferPutString(dest, "") + /* continue a multi line comment highlighting */ if (hd->multiline_comment) { iscomment = 1; - cxBufferPutString(dest, ""); + start_span("comment"); + } + + /* continue highlighting in case of line continuation */ + if (hd->continue_highlight) { + start_span(hd->continue_highlight); + hd->continue_highlight = NULL; + isinclude = hd->continuation_info & 0x1; + isstring = hd->continuation_info & 0x2; + iscomment = hd->continuation_info & 0x4; + if (hd->continuation_info & 0x10) { + quote = '\''; + } else if (hd->continuation_info & 0x20) { + quote = '\"'; + } + hd->continuation_info = 0; } char c; do { c = src[++sp]; if (c == '\r') continue; + + /* line continuation */ + if (c == '\\') { + /* currently do not support continuations in user includes */ + // TODO: also support user includes + if (!parseinclude) { + continuation_enabled = 1; + } + } else if (continuation_enabled) { + if (!isspace(c)) { + continuation_enabled = 0; + } else if (c == '\n') { + cxBufferPut(dest, '\n'); + hd->continue_highlight = current_highlight; + hd->continuation_info = \ + isinclude | \ + (isstring << 1) | \ + (iscomment << 2); + if (quote == '\'') { + hd->continuation_info |= 0x10; + } else if (quote == '\"') { + hd->continuation_info |= 0x20; + } + stop_span; + continue; + } + } /* comments */ if (!isstring && c == '/') { if (hd->multiline_comment && sp > 0 && src[sp-1] == '*') { iscomment = 0; hd->multiline_comment = 0; - cxBufferPutString(dest, "/"); + cxBufferPut(dest, '/'); + stop_span; continue; } else if (!iscomment && (src[sp+1] == '/' || src[sp+1] == '*')) { iscomment = 1; hd->multiline_comment = (src[sp+1] == '*'); - cxBufferPutString(dest, ""); + start_span("comment"); } } if (iscomment) { if (c == '\n') { - cxBufferPutString(dest, "\n"); + stop_span; + cxBufferPut(dest, '\n'); } else { put_htmlescaped(dest, c); } } else if (isinclude) { if (c == '<') { - cxBufferPutString(dest, - "<"); + start_span("stdinclude"); + cxBufferPutString(dest, "<"); } else if (c == '\"') { if (parseinclude) { cxBufferPutString(dest, "\">"); @@ -158,7 +213,8 @@ parseinclude = 1; } } else if (c == '>') { - cxBufferPutString(dest, ">"); + cxBufferPutString(dest, ">"); + stop_span; } else { if (parseinclude) { cxBufferPut(ifilebuf, c); @@ -172,14 +228,14 @@ put_htmlescaped(dest, c); if (c == quote) { isstring = 0; - cxBufferPutString(dest, ""); + stop_span; } else { put_htmlescaped(dest, c); } } else { isstring = 1; quote = c; - cxBufferPutString(dest, ""); + start_span("string"); put_htmlescaped(dest, c); } } else { @@ -195,24 +251,20 @@ int closespan = 1; cxstring typesuffix = CX_STR("_t"); if (check_keyword(word, ckeywords)) { - cxBufferPutString(dest, - ""); + start_span("keyword"); } else if (cx_strsuffix(word, typesuffix)) { - cxBufferPutString(dest, - ""); + start_span("type"); } else if (word.ptr[0] == '#') { isinclude = !cx_strcmp(word, CX_STR("#include")); - cxBufferPutString(dest, - ""); + start_span("directive"); } else if (check_capsonly(word)) { - cxBufferPutString(dest, - ""); + start_span("macroconst"); } else { closespan = 0; } put_htmlescapedstr(dest, word); if (closespan) { - cxBufferPutString(dest, ""); + stop_span; } } wbuf->pos = wbuf->size = 0; /* reset word buffer */ @@ -225,6 +277,9 @@ isescaping = !isescaping & (c == '\\'); } } while (c && c != '\n'); + +#undef start_span +#undef stop_span } /* Java Highlighter */ diff -r 831928419249 -r c72b250866ab src/highlighter.h --- a/src/highlighter.h Sun Oct 01 14:41:17 2023 +0200 +++ b/src/highlighter.h Wed Jul 10 21:35:37 2024 +0200 @@ -38,6 +38,8 @@ typedef struct { int multiline_comment; + const char* continue_highlight; + int continuation_info; CxBuffer primary_buffer; CxBuffer secondary_buffer; } c2html_highlighter_data; diff -r 831928419249 -r c72b250866ab test/ctest.c --- a/test/ctest.c Sun Oct 01 14:41:17 2023 +0200 +++ b/test/ctest.c Wed Jul 10 21:35:37 2024 +0200 @@ -34,7 +34,8 @@ #include #include #include -#include +#include #include #include @@ -49,6 +50,9 @@ #define MACRO1337 1337L +static const char* continuation_test = "this is a string\ + with a continuation"; + /* -------------------- This is a testing file. -------------------------- */ /* time_t util_parse_creationdate(char *str) { diff -r 831928419249 -r c72b250866ab test/gs/ctest.html --- a/test/gs/ctest.html Sun Oct 01 14:41:17 2023 +0200 +++ b/test/gs/ctest.html Wed Jul 10 21:35:37 2024 +0200 @@ -87,361 +87,365 @@ 34 #include <ucx/buffer.h> 35 #include <ucx/utils.h> 36 #include <libxml/tree.h> - 37 #include <curl/curl.h> - 38 - 39 #include <openssl/sha.h> - 40 #include <openssl/hmac.h> - 41 #include <openssl/evp.h> - 42 #include <openssl/bio.h> - 43 #include <openssl/buffer.h> - 44 #include <openssl/rand.h> - 45 - 46 #include "utils.h" - 47 #include "crypto.h" - 48 #include "webdav.h" - 49 - 50 #define MACRO1337 1337L - 51 - 52 /* -------------------- This is a testing file. -------------------------- */ - 53 /* - 54 time_t util_parse_creationdate(char *str) { - 55 // example: 2012-11-29T21:35:35Z - 56 if(!str) { - 57 return 0; - 58 } - 59 // TODO - 60 return 0; - 61 } - 62 */ - 63 time_t util_parse_lastmodified(char *str) { - 64 // example: Thu, 29 Nov 2012 21:35:35 GMT - 65 if(!str) { - 66 return 0; - 67 } else { - 68 return curl_getdate(str, NULL); - 69 } - 70 } - 71 - 72 int util_getboolean(char *v) { - 73 if(v[0] == 'T' || v[0] == 't') { - 74 return 1; - 75 } - 76 return 0; - 77 } - 78 - 79 int util_strtoint(char *str, int64_t *value) { - 80 char *end; - 81 int64_t val = strtoll(str, &end, 0); - 82 if(strlen(end) == 0) { - 83 *value = val; - 84 return 1; - 85 } else { - 86 return 0; - 87 } - 88 } - 89 - 90 char* util_url_path(char *url) { - 91 char *path = NULL; - 92 size_t len = strlen(url); - 93 int slashcount = 0; - 94 int slmax; - 95 if(len > 7 && !strncasecmp(url, "http://", 7)) { - 96 slmax = 3; - 97 } else if(len > 8 && !strncasecmp(url, "https://", 8)) { - 98 slmax = 3; - 99 } else { -100 slmax = 1; -101 } -102 char c; -103 for(int i=0;i<len;i++) { -104 c = url[i]; -105 if(c == '/') { -106 slashcount++; -107 if(slashcount == slmax) { -108 path = url + i; -109 break; -110 } -111 } -112 } -113 return path; -114 } -115 -116 char* util_url_decode(DavSession *sn, char *url) { -117 char *unesc = curl_easy_unescape(sn->handle, url, strlen(url), NULL); -118 char *ret = strdup(unesc); -119 curl_free(unesc); -120 return ret; -121 } -122 -123 char* util_resource_name(char *url) { -124 int si = 0; -125 int osi = 0; -126 int i = 0; -127 int p = 0; -128 char c; -129 while((c = url[i]) != 0) { -130 if(c == '/') { -131 osi = si; -132 si = i; -133 p = 1; -134 } -135 i++; -136 } -137 -138 char *name = url + si + p; -139 if(name[0] == 0) { -140 name = url + osi + p; -141 if(name[0] == 0) { -142 return url; -143 } -144 } -145 -146 return name; -147 } -148 -149 int util_mkdir(char *path, mode_t mode) { -150 #ifdef _WIN32 -151 return mkdir(path); -152 #else -153 return mkdir(path, mode); -154 #endif -155 } -156 -157 char* util_concat_path(char *url_base, char *p) { -158 sstr_t base = sstr(url_base); -159 sstr_t path; -160 if(p) { -161 path = sstr(p); -162 } else { -163 path = sstrn("", 0); -164 } -165 -166 int add_separator = 0; -167 if(base.ptr[base.length-1] == '/') { -168 if(path.ptr[0] == '/') { -169 base.length--; -170 } -171 } else { -172 if(path.length == 0 || path.ptr[0] != '/') { -173 add_separator = 1; + 37 #include <curl\ + 38 /curl.h> + 39 + 40 #include <openssl/sha.h> + 41 #include <openssl/hmac.h> + 42 #include <openssl/evp.h> + 43 #include <openssl/bio.h> + 44 #include <openssl/buffer.h> + 45 #include <openssl/rand.h> + 46 + 47 #include "utils.h" + 48 #include "crypto.h" + 49 #include "webdav.h" + 50 + 51 #define MACRO1337 1337L + 52 + 53 static const char* continuation_test = "this is a string\ + 54 with a continuation"; + 55 + 56 /* -------------------- This is a testing file. -------------------------- */ + 57 /* + 58 time_t util_parse_creationdate(char *str) { + 59 // example: 2012-11-29T21:35:35Z + 60 if(!str) { + 61 return 0; + 62 } + 63 // TODO + 64 return 0; + 65 } + 66 */ + 67 time_t util_parse_lastmodified(char *str) { + 68 // example: Thu, 29 Nov 2012 21:35:35 GMT + 69 if(!str) { + 70 return 0; + 71 } else { + 72 return curl_getdate(str, NULL); + 73 } + 74 } + 75 + 76 int util_getboolean(char *v) { + 77 if(v[0] == 'T' || v[0] == 't') { + 78 return 1; + 79 } + 80 return 0; + 81 } + 82 + 83 int util_strtoint(char *str, int64_t *value) { + 84 char *end; + 85 int64_t val = strtoll(str, &end, 0); + 86 if(strlen(end) == 0) { + 87 *value = val; + 88 return 1; + 89 } else { + 90 return 0; + 91 } + 92 } + 93 + 94 char* util_url_path(char *url) { + 95 char *path = NULL; + 96 size_t len = strlen(url); + 97 int slashcount = 0; + 98 int slmax; + 99 if(len > 7 && !strncasecmp(url, "http://", 7)) { +100 slmax = 3; +101 } else if(len > 8 && !strncasecmp(url, "https://", 8)) { +102 slmax = 3; +103 } else { +104 slmax = 1; +105 } +106 char c; +107 for(int i=0;i<len;i++) { +108 c = url[i]; +109 if(c == '/') { +110 slashcount++; +111 if(slashcount == slmax) { +112 path = url + i; +113 break; +114 } +115 } +116 } +117 return path; +118 } +119 +120 char* util_url_decode(DavSession *sn, char *url) { +121 char *unesc = curl_easy_unescape(sn->handle, url, strlen(url), NULL); +122 char *ret = strdup(unesc); +123 curl_free(unesc); +124 return ret; +125 } +126 +127 char* util_resource_name(char *url) { +128 int si = 0; +129 int osi = 0; +130 int i = 0; +131 int p = 0; +132 char c; +133 while((c = url[i]) != 0) { +134 if(c == '/') { +135 osi = si; +136 si = i; +137 p = 1; +138 } +139 i++; +140 } +141 +142 char *name = url + si + p; +143 if(name[0] == 0) { +144 name = url + osi + p; +145 if(name[0] == 0) { +146 return url; +147 } +148 } +149 +150 return name; +151 } +152 +153 int util_mkdir(char *path, mode_t mode) { +154 #ifdef _WIN32 +155 return mkdir(path); +156 #else +157 return mkdir(path, mode); +158 #endif +159 } +160 +161 char* util_concat_path(char *url_base, char *p) { +162 sstr_t base = sstr(url_base); +163 sstr_t path; +164 if(p) { +165 path = sstr(p); +166 } else { +167 path = sstrn("", 0); +168 } +169 +170 int add_separator = 0; +171 if(base.ptr[base.length-1] == '/') { +172 if(path.ptr[0] == '/') { +173 base.length--; 174 } -175 } -176 -177 sstr_t url; -178 if(add_separator) { -179 url = sstrcat(3, base, sstr("/"), path); -180 } else { -181 url = sstrcat(2, base, path); -182 } -183 -184 return url.ptr; -185 } -186 -187 void util_set_url(DavSession *sn, char *href) { -188 sstr_t base = sstr(sn->base_url); -189 sstr_t href_str = sstr(href); -190 -191 char *base_path = util_url_path(sn->base_url); -192 base.length -= strlen(base_path); -193 -194 sstr_t url = sstrcat(2, base, href_str); -195 -196 curl_easy_setopt(sn->handle, CURLOPT_URL, url.ptr); -197 free(url.ptr); -198 } -199 -200 char* util_path_to_url(DavSession *sn, char *path) { -201 char *space = malloc(256); -202 UcxBuffer *url = ucx_buffer_new(space, 256, CX_BUFFER_AUTO_EXTEND); -203 -204 // add base url -205 ucx_buffer_write(sn->base_url, 1, strlen(sn->base_url), url); -206 // remove trailing slash -207 ucx_buffer_seek(url, -1, SEEK_CUR); -208 -209 sstr_t p = sstr(path); -210 ssize_t ntk = 0; -211 sstr_t *tks = sstrsplit(p, S("/"), &ntk); +175 } else { +176 if(path.length == 0 || path.ptr[0] != '/') { +177 add_separator = 1; +178 } +179 } +180 +181 sstr_t url; +182 if(add_separator) { +183 url = sstrcat(3, base, sstr("/"), path); +184 } else { +185 url = sstrcat(2, base, path); +186 } +187 +188 return url.ptr; +189 } +190 +191 void util_set_url(DavSession *sn, char *href) { +192 sstr_t base = sstr(sn->base_url); +193 sstr_t href_str = sstr(href); +194 +195 char *base_path = util_url_path(sn->base_url); +196 base.length -= strlen(base_path); +197 +198 sstr_t url = sstrcat(2, base, href_str); +199 +200 curl_easy_setopt(sn->handle, CURLOPT_URL, url.ptr); +201 free(url.ptr); +202 } +203 +204 char* util_path_to_url(DavSession *sn, char *path) { +205 char *space = malloc(256); +206 UcxBuffer *url = ucx_buffer_new(space, 256, CX_BUFFER_AUTO_EXTEND); +207 +208 // add base url +209 ucx_buffer_write(sn->base_url, 1, strlen(sn->base_url), url); +210 // remove trailing slash +211 ucx_buffer_seek(url, -1, SEEK_CUR); 212 -213 for(int i=0;i<ntk;i++) { -214 sstr_t node = tks[i]; -215 if(node.length > 0) { -216 char *esc = curl_easy_escape(sn->handle, node.ptr, node.length); -217 ucx_buffer_putc(url, '/'); -218 ucx_buffer_write(esc, 1, strlen(esc), url); -219 curl_free(esc); -220 } -221 free(node.ptr); -222 } -223 free(tks); -224 if(path[p.length-1] == '/') { -225 ucx_buffer_putc(url, '/'); +213 sstr_t p = sstr(path); +214 ssize_t ntk = 0; +215 sstr_t *tks = sstrsplit(p, S("/"), &ntk); +216 +217 for(int i=0;i<ntk;i++) { +218 sstr_t node = tks[i]; +219 if(node.length > 0) { +220 char *esc = curl_easy_escape(sn->handle, node.ptr, node.length); +221 ucx_buffer_putc(url, '/'); +222 ucx_buffer_write(esc, 1, strlen(esc), url); +223 curl_free(esc); +224 } +225 free(node.ptr); 226 } -227 ucx_buffer_putc(url, 0); -228 -229 space = url->space; -230 ucx_buffer_free(url); -231 -232 return space; -233 } -234 -235 char* util_parent_path(char *path) { -236 char *name = util_resource_name(path); -237 size_t namelen = strlen(name); -238 size_t pathlen = strlen(path); -239 size_t parentlen = pathlen - namelen; -240 char *parent = malloc(parentlen + 1); -241 memcpy(parent, path, parentlen); -242 parent[parentlen] = '\0'; -243 return parent; -244 } -245 -246 -247 char* util_xml_get_text(xmlNode *elm) { -248 xmlNode *node = elm->children; -249 while(node) { -250 if(node->type == XML_TEXT_NODE) { -251 return (char*)node->content; -252 } -253 node = node->next; -254 } -255 return NULL; -256 } -257 -258 -259 char* util_base64decode(char *in) { -260 int len = 0; -261 return util_base64decode_len(in, &len); -262 } -263 -264 char* util_base64decode_len(char* in, int *outlen) { -265 size_t len = strlen(in); -266 char *out = calloc(1, len); -267 -268 BIO* b = BIO_new_mem_buf(in, len); -269 BIO *d = BIO_new(BIO_f_base64()); -270 BIO_set_flags(d, BIO_FLAGS_BASE64_NO_NL); -271 b = BIO_push(d, b); -272 -273 *outlen = BIO_read(b, out, len); -274 BIO_free_all(b); -275 -276 return out; -277 } -278 -279 char* util_base64encode(char *in, size_t len) { -280 BIO *b; -281 BIO *e; -282 BUF_MEM *mem; -283 -284 e = BIO_new(BIO_f_base64()); -285 b = BIO_new(BIO_s_mem()); -286 -287 e = BIO_push(e, b); -288 BIO_write(e, in, len); -289 BIO_flush(e); +227 free(tks); +228 if(path[p.length-1] == '/') { +229 ucx_buffer_putc(url, '/'); +230 } +231 ucx_buffer_putc(url, 0); +232 +233 space = url->space; +234 ucx_buffer_free(url); +235 +236 return space; +237 } +238 +239 char* util_parent_path(char *path) { +240 char *name = util_resource_name(path); +241 size_t namelen = strlen(name); +242 size_t pathlen = strlen(path); +243 size_t parentlen = pathlen - namelen; +244 char *parent = malloc(parentlen + 1); +245 memcpy(parent, path, parentlen); +246 parent[parentlen] = '\0'; +247 return parent; +248 } +249 +250 +251 char* util_xml_get_text(xmlNode *elm) { +252 xmlNode *node = elm->children; +253 while(node) { +254 if(node->type == XML_TEXT_NODE) { +255 return (char*)node->content; +256 } +257 node = node->next; +258 } +259 return NULL; +260 } +261 +262 +263 char* util_base64decode(char *in) { +264 int len = 0; +265 return util_base64decode_len(in, &len); +266 } +267 +268 char* util_base64decode_len(char* in, int *outlen) { +269 size_t len = strlen(in); +270 char *out = calloc(1, len); +271 +272 BIO* b = BIO_new_mem_buf(in, len); +273 BIO *d = BIO_new(BIO_f_base64()); +274 BIO_set_flags(d, BIO_FLAGS_BASE64_NO_NL); +275 b = BIO_push(d, b); +276 +277 *outlen = BIO_read(b, out, len); +278 BIO_free_all(b); +279 +280 return out; +281 } +282 +283 char* util_base64encode(char *in, size_t len) { +284 BIO *b; +285 BIO *e; +286 BUF_MEM *mem; +287 +288 e = BIO_new(BIO_f_base64()); +289 b = BIO_new(BIO_s_mem()); 290 -291 BIO_get_mem_ptr(e, &mem); -292 char *out = malloc(mem->length); -293 memcpy(out, mem->data, mem->length -1); -294 out[mem->length - 1] = '\0'; -295 -296 BIO_free_all(e); -297 -298 return out; -299 } -300 -301 char* util_encrypt_str(DavSession *sn, char *str, char *key) { -302 DavKey *k = dav_context_get_key(sn->context, key); -303 if(!k) { -304 // TODO: session error -305 return NULL; -306 } -307 -308 char *enc_str = aes_encrypt(str, k); -309 char *ret_str = dav_session_strdup(sn, enc_str); -310 free(enc_str); -311 return ret_str; -312 } -313 -314 /* commented out for testing reasons */ -315 /* -316 char* util_decrypt_str(DavSession *sn, char *str, char *key) { -317 DavKey *k = dav_context_get_key(sn->context, key); -318 if(!k) { -319 // TODO: session error -320 return NULL; -321 } -322 -323 char *dec_str = aes_decrypt(str, k); -324 char *ret_str = dav_session_strdup(sn, dec_str); -325 free(dec_str); -326 return ret_str; -327 } -328 */ -329 char* util_random_str() { -330 unsigned char *str = malloc(25); -331 str[24] = '\0'; -332 -333 sstr_t t = S( -334 "01234567890" -335 "abcdefghijklmnopqrstuvwxyz" -336 "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); -337 const unsigned char *table = (const unsigned char*)t.ptr; -338 -339 RAND_pseudo_bytes(str, 24); -340 for(int i=0;i<24;i++) { -341 int c = str[i] % t.length; -342 str[i] = table[c]; -343 } -344 -345 return (char*)str; -346 } -347 -348 /* -349 * gets a substring from 0 to the appearance of the token -350 * tokens are separated by space -351 * sets sub to the substring and returns the remaining string -352 */ -353 sstr_t util_getsubstr_until_token(sstr_t str, sstr_t token, sstr_t *sub) { -354 int i; -355 int token_start = -1; -356 int token_end = -1; -357 for(i=0;i<=str.length;i++) { -358 int c; -359 if(i == str.length) { -360 c = ' '; -361 } else { -362 c = str.ptr[i]; -363 } -364 if(c < 33) { -365 if(token_start != -1) { -366 token_end = i; -367 size_t len = token_end - token_start; -368 sstr_t tk = sstrsubsl(str, token_start, len); -369 //printf("token: {%.*s}\n", token.length, token.ptr); -370 if(!sstrcmp(tk, token)) { -371 *sub = sstrtrim(sstrsubsl(str, 0, token_start)); -372 break; -373 } -374 token_start = -1; -375 token_end = -1; -376 } -377 } else { -378 if(token_start == -1) { -379 token_start = i; +291 e = BIO_push(e, b); +292 BIO_write(e, in, len); +293 BIO_flush(e); +294 +295 BIO_get_mem_ptr(e, &mem); +296 char *out = malloc(mem->length); +297 memcpy(out, mem->data, mem->length -1); +298 out[mem->length - 1] = '\0'; +299 +300 BIO_free_all(e); +301 +302 return out; +303 } +304 +305 char* util_encrypt_str(DavSession *sn, char *str, char *key) { +306 DavKey *k = dav_context_get_key(sn->context, key); +307 if(!k) { +308 // TODO: session error +309 return NULL; +310 } +311 +312 char *enc_str = aes_encrypt(str, k); +313 char *ret_str = dav_session_strdup(sn, enc_str); +314 free(enc_str); +315 return ret_str; +316 } +317 +318 /* commented out for testing reasons */ +319 /* +320 char* util_decrypt_str(DavSession *sn, char *str, char *key) { +321 DavKey *k = dav_context_get_key(sn->context, key); +322 if(!k) { +323 // TODO: session error +324 return NULL; +325 } +326 +327 char *dec_str = aes_decrypt(str, k); +328 char *ret_str = dav_session_strdup(sn, dec_str); +329 free(dec_str); +330 return ret_str; +331 } +332 */ +333 char* util_random_str() { +334 unsigned char *str = malloc(25); +335 str[24] = '\0'; +336 +337 sstr_t t = S( +338 "01234567890" +339 "abcdefghijklmnopqrstuvwxyz" +340 "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); +341 const unsigned char *table = (const unsigned char*)t.ptr; +342 +343 RAND_pseudo_bytes(str, 24); +344 for(int i=0;i<24;i++) { +345 int c = str[i] % t.length; +346 str[i] = table[c]; +347 } +348 +349 return (char*)str; +350 } +351 +352 /* +353 * gets a substring from 0 to the appearance of the token +354 * tokens are separated by space +355 * sets sub to the substring and returns the remaining string +356 */ +357 sstr_t util_getsubstr_until_token(sstr_t str, sstr_t token, sstr_t *sub) { +358 int i; +359 int token_start = -1; +360 int token_end = -1; +361 for(i=0;i<=str.length;i++) { +362 int c; +363 if(i == str.length) { +364 c = ' '; +365 } else { +366 c = str.ptr[i]; +367 } +368 if(c < 33) { +369 if(token_start != -1) { +370 token_end = i; +371 size_t len = token_end - token_start; +372 sstr_t tk = sstrsubsl(str, token_start, len); +373 //printf("token: {%.*s}\n", token.length, token.ptr); +374 if(!sstrcmp(tk, token)) { +375 *sub = sstrtrim(sstrsubsl(str, 0, token_start)); +376 break; +377 } +378 token_start = -1; +379 token_end = -1; 380 } -381 } -382 } -383 -384 if(i < str.length) { -385 return sstrtrim(sstrsubs(str, i)); -386 } else { -387 str.ptr = NULL; -388 str.length = 0; -389 return str; -390 } -391 } +381 } else { +382 if(token_start == -1) { +383 token_start = i; +384 } +385 } +386 } +387 +388 if(i < str.length) { +389 return sstrtrim(sstrsubs(str, i)); +390 } else { +391 str.ptr = NULL; +392 str.length = 0; +393 return str; +394 } +395 }