minor fix to multiline pages

diff --git a/citadel/client_chat.c b/citadel/client_chat.c
index 79f72622b9f41693649347796259c9931e4f7cc9..b1bdd58a12d01943872b658943cfb40d61960bea 100644 (file)
--- a/citadel/client_chat.c
+++ b/citadel/client_chat.c
@@ -226,20 +226,20 @@ void page_user() {
                        return;
                        }
                fp = fopen(temp, "w");
+               fp = freopen(temp, "rb+", fp);
                if (fp==NULL) printf("Error: %s\n", strerror(errno));
+               unlink(temp);
                printf("Type message to send.  Enter a blank line when finished.\n");
                citedit(fp, 0);
-               fclose(fp);
                snprintf(buf, sizeof buf, "SEXP %s|-", touser);
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0]=='4') {
                        strcpy(last_paged, touser);
-                       fp = fopen(temp, "r");
+                       rewind(fp);
                        while (fgets(buf, sizeof buf, fp) != NULL) {
                                buf[strlen(buf)-1] = 0;
                                if (strcmp(buf, "000")) serv_puts(buf);
-                       fclose(fp);
                        unlink(temp);
                        }
                        serv_puts("000");
@@ -248,6 +248,7 @@ void page_user() {
                else {
                        printf("%s\n", &buf[4]);
                }
+               fclose(fp);
        }
 }
 

diff --git a/citadel/commands.c b/citadel/commands.c
index ec51dbaafd04613424aea239b94ff2cb0b379289..24537952cbcb94ae28b2083bc795825d88e09239 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -77,6 +77,7 @@ void print_express(void) {
        FILE *outpipe;
 
        if (express_msgs == 0) return;
+       printf("printing express messages\n");
        express_msgs = 0;
        serv_puts("PEXP");
        serv_gets(buf);

diff --git a/citadel/tasklist.txt b/citadel/tasklist.txt
index a10f3e101edb96a8295694f57d963b9f6780d473..61804edadb16f6a6fb3f24f53c96e08dd652958b 100644 (file)
--- a/citadel/tasklist.txt
+++ b/citadel/tasklist.txt
@@ -5,7 +5,6 @@ Priority items
 Important items
 ---------------
 * In the client, make <G>oto go directly to Mail> when there's new mail.
-* Implement multi-line pages.
 
 Honeydew items
 --------------