diff -r a569148841ff -r efbd59642577 libidav/utils.h
--- a/libidav/utils.h	Sun Apr 16 14:12:24 2023 +0200
+++ b/libidav/utils.h	Fri Apr 21 21:25:32 2023 +0200
@@ -36,8 +36,8 @@
 
 #include <sys/types.h>
 #include <libxml/tree.h>
-#include <ucx/string.h>
-#include <ucx/buffer.h>
+#include <cx/string.h>
+#include <cx/buffer.h>
 #include <sys/stat.h>
 #include <inttypes.h>
 
@@ -66,10 +66,10 @@
 int util_mkdir(char *path, mode_t mode);
 
 char* util_url_base(char *url);
-char* util_url_base_s(sstr_t url);
-char* util_url_path(char *url);
-char* util_url_decode(DavSession *sn, char *url);
-char* util_resource_name(char *url);
+char* util_url_base_s(cxstring url);
+const char* util_url_path(const char *url);
+char* util_url_decode(DavSession *sn, const char *url);
+const char* util_resource_name(const char *url);
 char* util_concat_path(const char *url_base, const char *path);
 char* util_get_url(DavSession *sn, const char *href);
 void util_set_url(DavSession *sn, const char *href);
@@ -84,9 +84,9 @@
 char* util_path_normalize(const char *path);
 char* util_create_relative_path(const char *abspath, const char *base);
 
-void util_capture_header(CURL *handle, UcxMap* map);
+void util_capture_header(CURL *handle, CxMap* map);
 
-char* util_path_to_url(DavSession *sn, char *path);
+char* util_path_to_url(DavSession *sn, const char *path);
 char* util_parent_path(const char *path);
 
 char* util_size_str(DavBool iscollection, uint64_t contentlength);
@@ -105,19 +105,19 @@
 char* util_base64decode_len(const char *in, int *outlen);
 char* util_base64encode(const char *in, size_t len);
 
-char* util_encrypt_str(DavSession *sn, char *str, char *key);
-char* util_encrypt_str_k(DavSession *sn, char *str, DavKey *key);
-char* util_decrypt_str(DavSession *sn, char *str, char *key);
-char* util_decrypt_str_k(DavSession *sn, char *str, DavKey *key);
+char* util_encrypt_str(DavSession *sn, const char *str, const char *key);
+char* util_encrypt_str_k(DavSession *sn, const char *str, DavKey *key);
+char* util_decrypt_str(DavSession *sn, const char *str, const char *key);
+char* util_decrypt_str_k(DavSession *sn, const char *str, DavKey *key);
 
 char* util_random_str();
 
-sstr_t util_getsubstr_until_token(sstr_t str, sstr_t token, sstr_t *sub);
+//sstr_t util_getsubstr_until_token(sstr_t str, sstr_t token, sstr_t *sub);
 
-sstr_t util_readline(FILE *stream);
+cxmutstr util_readline(FILE *stream);
 char* util_password_input(char *prompt);
 
-int util_exec_command(char *command, UcxBuffer *outbuf);
+int util_exec_command(char *command, CxBuffer *outbuf);
 
 char* util_hexstr(const unsigned char *data, size_t len);
 
@@ -125,6 +125,8 @@
 
 char* util_file_hash(const char *path);
 
+int util_regdestr(CxMempool *mp, void *data, cx_destructor_func destructor);
+
 #ifdef	__cplusplus
 }
 #endif