commit 3642cd2

default  ·  2023-07-10 16:04:59 +0000 UTC
parent 1a94d7c
Simplified inbox_list().
1 files changed,  +7, -15
M data.c
M data.c
+7, -15
 1@@ -1725,13 +1725,9 @@ void inbox_add(const char *inbox)
 2     xs *fn  = xs_fmt("%s/inbox/%s", srv_basedir, md5);
 3     FILE *f;
 4 
 5-    if (strlen(inbox) < 256 && (f = fopen(fn, "w")) != NULL) {
 6-        pthread_mutex_lock(&data_mutex);
 7-
 8+    if ((f = fopen(fn, "w")) != NULL) {
 9         fprintf(f, "%s\n", inbox);
10         fclose(f);
11-
12-        pthread_mutex_unlock(&data_mutex);
13     }
14 }
15 
16@@ -1760,18 +1756,14 @@ xs_list *inbox_list(void)
17         FILE *f;
18 
19         if ((f = fopen(v, "r")) != NULL) {
20-            char line[256];
21-
22-            if (fgets(line, sizeof(line), f)) {
23-                fclose(f);
24+            xs *line = xs_readline(f);
25 
26-                int i = strlen(line);
27-
28-                if (i) {
29-                    line[i - 1] = '\0';
30-                    ibl = xs_list_append(ibl, line);
31-                }
32+            if (line) {
33+                line = xs_strip_i(line);
34+                ibl  = xs_list_append(ibl, line);
35             }
36+
37+            fclose(f);
38         }
39     }
40