* The size constant "256" which shows up everywhere as a buffer size has now

[citadel.git] / citadel / serv_chat.c

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 09a47d3b8f841530fd2f3070d4ce2211141d7267..08a450b48820126a600660a466bb26331c1b8b21 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -45,7 +45,7 @@ extern struct CitContext *ContextList;
 void allwrite(char *cmdbuf, int flag, char *username)
 {
        FILE *fp;
-       char bcast[256];
+       char bcast[SIZ];
        char *un;
        struct ChatLine *clptr, *clnew;
        time_t now;
@@ -183,6 +183,12 @@ void do_chat_listing(int allflag)
                cprintf(":|\n:| Users not in chat:\n");
                for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
 
+                       GenerateRoomDisplay(roomname, ccptr, CC);
+                       if ((CC->usersupp.axlevel < 6)
+                       && (strlen(ccptr->fake_roomname)>0)) {
+                               strcpy(roomname, ccptr->fake_roomname);
+                       }
+
                        if (((ccptr->cs_flags & CS_CHAT) == 0)
                            && ((ccptr->cs_flags & CS_STEALTH) == 0)) {
                                cprintf(":| %-25s <%s>:\n",
@@ -211,7 +217,7 @@ void do_chat_listing(int allflag)
 
 void cmd_chat(char *argbuf)
 {
-       char cmdbuf[256];
+       char cmdbuf[SIZ];
        char *un;
        char *strptr1;
        int MyLastMsg, ThisLastMsg;
@@ -577,8 +583,8 @@ int send_express_message(char *lun, char *x_user, char *x_msg)
 void cmd_sexp(char *argbuf)
 {
        int message_sent = 0;
-       char x_user[256];
-       char x_msg[256];
+       char x_user[SIZ];
+       char x_msg[SIZ];
        char *lun;              /* <bc> */
        char *x_big_msgbuf = NULL;
 
@@ -615,8 +621,8 @@ void cmd_sexp(char *argbuf)
                }
                cprintf("%d Transmit message (will deliver to %d users)\n",
                        SEND_LISTING, message_sent);
-               x_big_msgbuf = mallok(256);
-               memset(x_big_msgbuf, 0, 256);
+               x_big_msgbuf = mallok(SIZ);
+               memset(x_big_msgbuf, 0, SIZ);
                while (client_gets(x_msg), strcmp(x_msg, "000")) {
                        x_big_msgbuf = reallok(x_big_msgbuf,
                               strlen(x_big_msgbuf) + strlen(x_msg) + 4);