client_chat.c: use citedit() for page composition

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 194baf859e98217cda987387770826d012a20014..07ae7746f67eac000286cd03743b1678029a8ff9 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,5 +1,6 @@
 Wed Mar  3 00:00:55 EST 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Prevent buffer overruns in lowercase_name in [get|put]user()
+       * client_chat.c: use citedit() for page composition
 
 Sat Feb 27 07:47:36 EST 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * rooms.c: download_to_local_disk() prompts for a filename if a blank

diff --git a/citadel/client_chat.c b/citadel/client_chat.c
index e76f25766476954ade6e6a76cfc5dbfaaafbae84..738ca681a8fed5ca1d3b34fa7a3d2729848ab624 100644 (file)
--- a/citadel/client_chat.c
+++ b/citadel/client_chat.c
@@ -203,15 +203,14 @@ RCL:          if (send_complete_line) {
 void page_user() {
        static char last_paged[32] = "";
        char buf[256], touser[256], msg[256];
-       char longmsg[5][80];
-       int i;
+       FILE *pagefp;
 
        strcpy(touser, last_paged);
        strprompt("Page who", touser, 30);
 
        /* old server -- use inline paging */
        if (serv_info.serv_paging_level == 0) {
-               newprompt("Message:  ",msg,69);
+               newprompt("Message:  ", msg, 69);
                snprintf(buf,sizeof buf,"SEXP %s|%s",touser,msg);
                serv_puts(buf);
                serv_gets(buf);
@@ -233,20 +232,20 @@ void page_user() {
                        }
 
                printf("Type message to send.  Enter a blank line when finished.\n");
-               memset(longmsg, 0, sizeof longmsg);
-               for (i=0; i<5; ++i) {
-                       printf("> ");
-                       getline(&longmsg[i][0], 77);
-                       if (strlen(&longmsg[i][0])==0) i=5;
-                       }
+               pagefp = fopen(temp, "w+");
+               unlink(temp);
+               citedit(pagefp, 0L);
+               rewind(pagefp);
                snprintf(buf, sizeof buf, "SEXP %s|-", touser);
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0]=='4') {
                        strcpy(last_paged, touser);
-                       for (i=0; i<5; ++i)
-                               if (strlen(&longmsg[i][0])>0)
-                                       serv_puts(&longmsg[i][0]);
+                       while (fgets(buf, 256, pagefp) != NULL) {
+                               buf[strlen(buf)-1] = 0;
+                               serv_puts(buf);
+                               }
+                       fclose(pagefp);
                        serv_puts("000");
                        printf("Message sent.\n");
                }