* Better alignment of system messages

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index a6b3d608e98814cb3d0638503968925262acb330..e99037e0828d56f4da2d2f6ced708e11ba379c86 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -100,14 +100,14 @@ void get_serv_info(char *browser_host, char *user_agent)
  * If fp is non-null, it is considered to be the file handle to read the
  * text from.  Otherwise, text is read from the server.
  */
-void fmout(FILE * fp)
+void fmout(FILE *fp, char *align)
 {
 
        int intext = 0;
        int bq = 0;
        char buf[SIZ];
 
-       wprintf("<DIV ALIGN=JUSTIFY>\n");
+       wprintf("<DIV ALIGN=%s>\n", align);
        while (1) {
                if (fp == NULL)
                        serv_gets(buf);
@@ -133,11 +133,11 @@ void fmout(FILE * fp)
                 */
                if ((bq == 0) &&
                    ((!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
-                       wprintf("<FONT COLOR=\"000044\"><I>");
+                       wprintf("<SPAN CLASS=\"pull_quote\">");
                        bq = 1;
                } else if ((bq == 1) &&
                  (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
-                       wprintf("</FONT></I>");
+                       wprintf("</SPAN>");
                        bq = 0;
                }
                /* Activate embedded URL's */
@@ -248,6 +248,7 @@ void read_server_binary(char *buffer, size_t total_len) {
                serv_gets(buf);
                if (buf[0] == '6') {
                        thisblock = (size_t)atoi(&buf[4]);
+                       if (!WC->connected) return;
                        serv_read(&buffer[bytes], thisblock);
                        bytes += thisblock;
                }
@@ -259,3 +260,39 @@ void read_server_binary(char *buffer, size_t total_len) {
 }
 
 
+/*
+ * Read text from server, appending to a string buffer until the
+ * usual 000 terminator is found.  Caller is responsible for freeing
+ * the returned pointer.
+ */
+char *read_server_text(void) {
+       char *text = NULL;
+       size_t bytes_allocated = 0;
+       size_t bytes_read = 0;
+       int linelen;
+       char buf[SIZ];
+
+       text = malloc(SIZ);
+       if (text == NULL) {
+               return(NULL);
+       }
+       strcpy(text, "");
+       bytes_allocated = SIZ;
+
+       while (serv_gets(buf), strcmp(buf, "000")) {
+               linelen = strlen(buf);
+               buf[linelen] = '\n';
+               buf[linelen+1] = 0;
+               ++linelen;
+
+               if ((bytes_read + linelen) >= (bytes_allocated - 2)) {
+                       bytes_allocated = 2 * bytes_allocated;
+                       text = realloc(text, bytes_allocated);
+               }
+
+               strcpy(&text[bytes_read], buf);
+               bytes_read += linelen;
+       }
+
+       return(text);
+}