Changed some C89 style comments to C99 style.

[citadel.git] / webcit-ng / server / room_functions.c

diff --git a/webcit-ng/server/room_functions.c b/webcit-ng/server/room_functions.c
index 1b5d9335b2665f4d9e0dc806b9ac1ba04a5fad8d..b1135c3b6130fb60232f678ce4fde81e17938f52 100644 (file)
--- a/webcit-ng/server/room_functions.c
+++ b/webcit-ng/server/room_functions.c
@@ -101,6 +101,17 @@ void json_stat(struct http_transaction *h, struct ctdlsession *c) {
 }
 
 
+// remove this when finished
+void diag_hexdump_str(char *str, char *desc) {
+       printf("%s\n", desc);
+       FILE *fp = popen("hexdump -C", "w");
+       if (fp) {
+               fwrite(str, strlen(str), 1, fp);
+               pclose(fp);
+       }
+}
+
+
 // Client is requesting a mailbox summary of the current room
 void json_mailbox(struct http_transaction *h, struct ctdlsession *c) {
        char buf[1024];
@@ -111,18 +122,22 @@ void json_mailbox(struct http_transaction *h, struct ctdlsession *c) {
        ctdl_readline(c, buf, sizeof(buf));
        if (buf[0] == '1') {
                while (ctdl_readline(c, buf, sizeof(buf)), (strcmp(buf, "000"))) {
-                       utf8ify_rfc822_string(buf);
+                       diag_hexdump_str(buf, "line received from server");
                        JsonValue *jmsg = NewJsonObject(HKEY("message"));
                        JsonObjectAppend(jmsg, NewJsonNumber(HKEY("msgnum"), extract_long(buf, 0)));
                        JsonObjectAppend(jmsg, NewJsonNumber(HKEY("time"), extract_long(buf, 1)));
                        extract_token(field, buf, 2, '|', sizeof field);
+                       utf8ify_rfc822_string(field);
                        JsonObjectAppend(jmsg, NewJsonPlainString(HKEY("author"), field, -1));
                        extract_token(field, buf, 4, '|', sizeof field);
+                       utf8ify_rfc822_string(field);
                        JsonObjectAppend(jmsg, NewJsonPlainString(HKEY("addr"), field, -1));
                        extract_token(field, buf, 5, '|', sizeof field);
+                       utf8ify_rfc822_string(field);
                        JsonObjectAppend(jmsg, NewJsonPlainString(HKEY("subject"), field, -1));
                        JsonObjectAppend(jmsg, NewJsonNumber(HKEY("msgidhash"), extract_long(buf, 6)));
                        extract_token(field, buf, 7, '|', sizeof field);
+                       utf8ify_rfc822_string(field);
                        JsonObjectAppend(jmsg, NewJsonPlainString(HKEY("references"), field, -1));
                        JsonArrayAppend(j, jmsg);               // add the message to the array
                }