snac2

commit 3e2cfa48d9e8881cbb3c1934eb33d5c419a76211
parent cea390bdabd65408baf6e46964ca7aaad5727f49
Author: default <nobody@localhost>
Date:   Wed,  5 Oct 2022 12:08:17 +0200

Alert if _timeline_find_fn() finds more than one file.

Diffstat:
M
data.c
 | 
8
+++++++-
M
xs_curl.h
 | 
4
++--
M
xs_socket.h
 | 
6
+++---

3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/data.c b/data.c
@@ -266,13 +266,19 @@ d_char *_timeline_find_fn(snac *snac, char *id)
     xs *spec = xs_fmt("%s/timeline/" "*-%s.json", snac->basedir, md5);
     xs *list = NULL;
     d_char *fn = NULL;
+    int l;
 
     list = xs_glob(spec, 0, 0);
+    l = xs_list_len(list);
 
     /* if there is something, get the first one */
-    if (xs_list_len(list) > 0)
+    if (l > 0) {
         fn = xs_str_new(xs_list_get(list, 0));
 
+        if (l > 1)
+            snac_log(snac, xs_fmt("**ALERT** _timeline_find_fn %d > 1", l));
+    }
+
     return fn;
 }
 
diff --git a/xs_curl.h b/xs_curl.h
@@ -29,11 +29,11 @@ static size_t _header_callback(char *buffer, size_t size,
 
         xs_tolower(xs_list_get(knv, 0));
 
-        headers = xs_dict_append(headers, xs_list_get(knv, 0), xs_list_get(knv, 1));
+        headers = xs_dict_set(headers, xs_list_get(knv, 0), xs_list_get(knv, 1));
     }
     else
     if (xs_startswith(l, "HTTP/"))
-        headers = xs_dict_append(headers, "_proto", l);
+        headers = xs_dict_set(headers, "_proto", l);
 
     *userdata = headers;
 
diff --git a/xs_socket.h b/xs_socket.h
@@ -82,10 +82,10 @@ FILE *xs_socket_accept(int rs)
 /* accepts an incoming connection */
 {
     int cs = -1;
-    struct sockaddr_in host;
-    socklen_t l = sizeof(host);
+    struct sockaddr_storage addr;
+    socklen_t l = sizeof(addr);
 
-    cs = accept(rs, (struct sockaddr *)&host, &l);
+    cs = accept(rs, (struct sockaddr *)&addr, &l);
 
     return cs == -1 ? NULL : fdopen(cs, "r+");
 }