Updated year in copyright notices.

27 files changed, 56 insertions, 45 deletions

diff --git a/LICENSE b/LICENSE
index c4c1fa9..3f316ff 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 grunfink (Fediverse: @grunfink@comam.es)
+Copyright (c) 2022 - 2023 grunfink (Fediverse: @grunfink@comam.es)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/activitypub.c b/activitypub.c
index b878bc5..5e1fa79 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_encdec.h"
diff --git a/data.c b/data.c
index f90036d..0419664 100644
--- a/data.c
+++ b/data.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/format.c b/format.c
index 418f59b..8299d0f 100644
--- a/format.c
+++ b/format.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_regex.h"
diff --git a/html.c b/html.c
index 530c573..746b7bb 100644
--- a/html.c
+++ b/html.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/http.c b/http.c
index 4b45753..54268e5 100644
--- a/http.c
+++ b/http.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/httpd.c b/httpd.c
index 52b4307..87ff669 100644
--- a/httpd.c
+++ b/httpd.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/main.c b/main.c
index 19be78c..2802e76 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
@@ -11,7 +11,7 @@
 int usage(void)
 {
     printf("snac " VERSION " - A simple, minimalistic ActivityPub instance\n");
-    printf("Copyright (c) 2022 grunfink - MIT license\n");
+    printf("Copyright (c) 2022 - 2023 grunfink / MIT license\n");
     printf("\n");
     printf("Commands:\n");
     printf("\n");
diff --git a/snac.c b/snac.c
index 2a54447..e8c3a3d 100644
--- a/snac.c
+++ b/snac.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #define XS_IMPLEMENTATION
 
diff --git a/snac.h b/snac.h
index c50b526..2041855 100644
--- a/snac.h
+++ b/snac.h
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #define VERSION "2.19-dev"
 
diff --git a/upgrade.c b/upgrade.c
index 4eb211e..19fc39a 100644
--- a/upgrade.c
+++ b/upgrade.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/utils.c b/utils.c
index 2ae0c63..5639aa0 100644
--- a/utils.c
+++ b/utils.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/webfinger.c b/webfinger.c
index 6a6133d..0811bca 100644
--- a/webfinger.c
+++ b/webfinger.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #include "xs.h"
 #include "xs_encdec.h"
diff --git a/xs.h b/xs.h
index 36445e4..800e407 100644
--- a/xs.h
+++ b/xs.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_H
 
@@ -53,7 +53,9 @@ d_char *xs_insert_m(d_char *data, int offset, const char *mem, int size);
 #define xs_insert(data, offset, data2) xs_insert_m(data, offset, data2, xs_size(data2))
 #define xs_append_m(data, mem, size) xs_insert_m(data, xs_size(data) - 1, mem, size)
 d_char *xs_str_new(const char *str);
-#define xs_str_cat(str1, str2) xs_insert(str1, xs_size(str1) - 1, str2)
+d_char *xs_str_wrap_i(const char *prefix, d_char *str, const char *suffix);
+#define xs_str_prepend_i(str, prefix) xs_str_wrap_i(prefix, str, NULL)
+#define xs_str_cat(str, suffix) xs_str_wrap_i(NULL, str, suffix)
 d_char *xs_replace_i(d_char *str, const char *sfrom, const char *sto);
 #define xs_replace(str, sfrom, sto) xs_replace_i(xs_dup(str), sfrom, sto)
 d_char *xs_fmt(const char *fmt, ...);
@@ -64,7 +66,6 @@ d_char *xs_crop_i(d_char *str, int start, int end);
 d_char *xs_strip_chars_i(d_char *str, const char *chars);
 #define xs_strip_i(str) xs_strip_chars_i(str, " \r\n\t\v\f")
 d_char *xs_tolower_i(d_char *str);
-d_char *xs_str_prepend_i(d_char *str, const char *prefix);
 d_char *xs_list_new(void);
 d_char *xs_list_append_m(d_char *list, const char *mem, int dsz);
 #define xs_list_append(list, data) xs_list_append_m(list, data, xs_size(data))
@@ -364,6 +365,19 @@ d_char *xs_str_new(const char *str)
 }
 
 
+d_char *xs_str_wrap_i(const char *prefix, d_char *str, const char *suffix)
+/* wraps str with prefix and suffix */
+{
+    if (prefix)
+        str = xs_insert_m(str, 0, prefix, strlen(prefix));
+
+    if (suffix)
+        str = xs_insert_m(str, xs_size(str) - 1, suffix, xs_size(suffix));
+
+    return str;
+}
+
+
 d_char *xs_replace_i(d_char *str, const char *sfrom, const char *sto)
 /* replaces inline all sfrom with sto */
 {
@@ -490,18 +504,6 @@ d_char *xs_tolower_i(d_char *str)
 }
 
 
-d_char *xs_str_prepend_i(d_char *str, const char *prefix)
-/* prepends prefix into string */
-{
-    int sz = strlen(prefix);
-
-    str = xs_expand(str, 0, sz);
-    memcpy(str, prefix, sz);
-
-    return str;
-}
-
-
 /** lists **/
 
 d_char *xs_list_new(void)
@@ -666,9 +668,16 @@ d_char *xs_list_set(d_char *list, int num, const char *data)
 d_char *xs_list_pop(d_char *list, char **data)
 /* pops the last element from the list */
 {
-    if ((*data = xs_list_get(list, -1)) != NULL) {
-        *data = xs_dup(*data);
-        list = xs_list_del(list, -1);
+    char *p = list, *v = NULL;
+
+    /* iterate to the end */
+    while (xs_list_iter(&p, &v));
+
+    if (v != NULL) {
+        *data = xs_dup(v);
+
+        /* collapse from the address of the element */
+        list = xs_collapse(list, v - 1 - list, xs_size(v - 1));
     }
 
     return list;
diff --git a/xs_curl.h b/xs_curl.h
index c39c42d..bed643c 100644
--- a/xs_curl.h
+++ b/xs_curl.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_CURL_H
 
diff --git a/xs_encdec.h b/xs_encdec.h
index 334f995..5f9ae01 100644
--- a/xs_encdec.h
+++ b/xs_encdec.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_ENCDEC_H
 
diff --git a/xs_glob.h b/xs_glob.h
index a69cba1..795abd9 100644
--- a/xs_glob.h
+++ b/xs_glob.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_GLOB_H
 
diff --git a/xs_httpd.h b/xs_httpd.h
index 7121214..47901e8 100644
--- a/xs_httpd.h
+++ b/xs_httpd.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_HTTPD_H
 
diff --git a/xs_io.h b/xs_io.h
index c4ec7ea..cb6ba85 100644
--- a/xs_io.h
+++ b/xs_io.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_IO_H
 
diff --git a/xs_json.h b/xs_json.h
index d992494..2b047ae 100644
--- a/xs_json.h
+++ b/xs_json.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_JSON_H
 
diff --git a/xs_mime.h b/xs_mime.h
index 072a98a..8d8b16b 100644
--- a/xs_mime.h
+++ b/xs_mime.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_MIME
 
@@ -23,6 +23,8 @@ struct _mime_info {
     { "text/html",          ".html" },
     { "text/plain",         ".txt" },
     { "text/xml",           ".xml" },
+    { "text/markdown",      ".md" },
+    { "text/gemini",        ".gmi" },
     { NULL, NULL }
 };
 
diff --git a/xs_openssl.h b/xs_openssl.h
index 5e3d03c..33de853 100644
--- a/xs_openssl.h
+++ b/xs_openssl.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_OPENSSL_H
 
diff --git a/xs_regex.h b/xs_regex.h
index 302bcf0..c01a19a 100644
--- a/xs_regex.h
+++ b/xs_regex.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_REGEX_H
 
diff --git a/xs_set.h b/xs_set.h
index f97eb20..d1daa01 100644
--- a/xs_set.h
+++ b/xs_set.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_SET_H
 
diff --git a/xs_socket.h b/xs_socket.h
index d2853a2..24b97f1 100644
--- a/xs_socket.h
+++ b/xs_socket.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_SOCKET_H
 
diff --git a/xs_time.h b/xs_time.h
index 979bde4..ff0e73e 100644
--- a/xs_time.h
+++ b/xs_time.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 grunfink - MIT license */
+/* copyright (c) 2022 - 2023 grunfink / MIT license */
 
 #ifndef _XS_TIME_H
 
diff --git a/xs_version.h b/xs_version.h
index a91e805..261706a 100644
--- a/xs_version.h
+++ b/xs_version.h
@@ -1 +1 @@
-/* 41985e780c622a078118ea7c7143dc304758d958 */
+/* 366ce5817597e9f4d735bced6b8c40ecc897608e */