* strlen holy war: loops. in loops it's very evil. the easy ones go away now.

[citadel.git] / citadel / client_chat.c

diff --git a/citadel/client_chat.c b/citadel/client_chat.c
index f32241154610b11c678b1fe7b2499aa1b0cf91a9..535055fc9d40f7e8add4c2d70d57e1fcf3da4711 100644 (file)
--- a/citadel/client_chat.c
+++ b/citadel/client_chat.c
@@ -48,9 +48,8 @@
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
-extern struct CtdlServInfo serv_info;
 extern char temp[];
-void getline(char *, int);
+void ctdl_getline(char *, int);
 
 char last_paged[SIZ] = "";
 
@@ -72,8 +71,8 @@ void chatmode(CtdlIPC *ipc)
        struct timeval tv;
        int retval;
 
-       CtdlIPC_putline(ipc, "CHAT");
-       CtdlIPC_getline(ipc, buf);
+       CtdlIPC_chat_send(ipc, "CHAT");
+       CtdlIPC_chat_recv(ipc, buf);
        if (buf[0] != '8') {
                scr_printf("%s\n", &buf[4]);
                return;
@@ -103,7 +102,7 @@ void chatmode(CtdlIPC *ipc)
 
                /* If there's data from the server... */
                if (FD_ISSET(CtdlIPC_getsockfd(ipc), &rfds)) {
-                       CtdlIPC_getline(ipc, buf);
+                       CtdlIPC_chat_recv(ipc, buf);
                        recv_complete_line = 1;
                        goto RCL;       /* ugly, but we've gotta get out! */
                }
@@ -114,7 +113,7 @@ void chatmode(CtdlIPC *ipc)
                        if ((ch == 10) || (ch == 13)) {
                                send_complete_line = 1;
                        } else if ((ch == 8) || (ch == 127)) {
-                               if (strlen(wbuf) > 0) {
+                               if (!IsEmptyStr(wbuf)) {
                                        wbuf[strlen(wbuf) - 1] = 0;
                                        sln_printf("%c %c", 8, 8);
                                }
@@ -127,7 +126,7 @@ void chatmode(CtdlIPC *ipc)
 
                /* if the user hit return, send the line */
 RCL:           if (send_complete_line) {
-                       CtdlIPC_putline(ipc, wbuf);
+                       CtdlIPC_chat_send(ipc, wbuf);
                        last_transmit = time(NULL);
                        strcpy(wbuf, "");
                        send_complete_line = 0;
@@ -136,18 +135,18 @@ RCL:              if (send_complete_line) {
                /* if it's time to word wrap, send a partial line */
                if (strlen(wbuf) >= (77 - strlen(fullname))) {
                        pos = 0;
-                       for (a = 0; a < strlen(wbuf); ++a) {
+                       for (a = 0; !IsEmptyStr(&wbuf[a]); ++a) {
                                if (wbuf[a] == 32)
                                        pos = a;
                        }
                        if (pos == 0) {
-                               CtdlIPC_putline(ipc, wbuf);
+                               CtdlIPC_chat_send(ipc, wbuf);
                                last_transmit = time(NULL);
                                strcpy(wbuf, "");
                                send_complete_line = 0;
                        } else {
                                wbuf[pos] = 0;
-                               CtdlIPC_putline(ipc, wbuf);
+                               CtdlIPC_chat_send(ipc, wbuf);
                                last_transmit = time(NULL);
                                strcpy(wbuf, &wbuf[pos + 1]);
                        }
@@ -166,17 +165,17 @@ RCL:              if (send_complete_line) {
                                 * exiting chat.  This little dialog forces
                                 * everything to be hunky-dory.
                                 */
-                               CtdlIPC_putline(ipc, "ECHO __ExitingChat__");
+                               CtdlIPC_chat_send(ipc, "ECHO __ExitingChat__");
                                do {
-                                       CtdlIPC_getline(ipc, buf);
+                                       CtdlIPC_chat_recv(ipc, buf);
                                } while (strcmp(buf, "200 __ExitingChat__"));
                                return;
                        }
                        if (num_parms(buf) >= 2) {
-                               extract(c_user, buf, 0);
-                               extract(c_text, buf, 1);
+                               extract_token(c_user, buf, 0, '|', sizeof c_user);
+                               extract_token(c_text, buf, 1, '|', sizeof c_text);
                                if (num_parms(buf) > 2) {
-                                       extract(c_room, buf, 2);
+                                       extract_token(c_room, buf, 2, '|', sizeof c_room);
                                        scr_printf("Got room %s\n", c_room);
                                }
                                if (strcasecmp(c_text, "NOOP")) {
@@ -218,7 +217,7 @@ RCL:                if (send_complete_line) {
                 * server to prevent session timeout.
                 */
                if ((time(NULL) - last_transmit) >= S_KEEPALIVE) {
-                       CtdlIPC_putline(ipc, "NOOP");
+                       CtdlIPC_chat_send(ipc, "NOOP");
                        last_transmit = time(NULL);
                }
 
@@ -226,7 +225,7 @@ RCL:                if (send_complete_line) {
 }
 
 /*
- * send an express message
+ * send an instant message
  */
 void page_user(CtdlIPC *ipc)
 {
@@ -237,11 +236,11 @@ void page_user(CtdlIPC *ipc)
        strprompt("Page who", touser, 30);
 
        /* old server -- use inline paging */
-       if (serv_info.serv_paging_level == 0) {
+       if (ipc->ServInfo.paging_level == 0) {
                newprompt("Message: ", msg, 69);
                snprintf(buf, sizeof buf, "SEXP %s|%s", touser, msg);
-               CtdlIPC_putline(ipc, buf);
-               CtdlIPC_getline(ipc, buf);
+               CtdlIPC_chat_send(ipc, buf);
+               CtdlIPC_chat_recv(ipc, buf);
                if (!strncmp(buf, "200", 3)) {
                        strcpy(last_paged, touser);
                }
@@ -249,31 +248,31 @@ void page_user(CtdlIPC *ipc)
                return;
        }
        /* new server -- use extended paging */
-       else if (serv_info.serv_paging_level >= 1) {
+       else if (ipc->ServInfo.paging_level >= 1) {
                snprintf(buf, sizeof buf, "SEXP %s||", touser);
-               CtdlIPC_putline(ipc, buf);
-               CtdlIPC_getline(ipc, buf);
+               CtdlIPC_chat_send(ipc, buf);
+               CtdlIPC_chat_recv(ipc, buf);
                if (buf[0] != '2') {
                        scr_printf("%s\n", &buf[4]);
                        return;
                }
-               if (client_make_message(ipc, temp, touser, 0, 0, 0, NULL) != 0) {
+               if (client_make_message(ipc, temp, touser, 0, 0, 0, NULL, 0) != 0) {
                        scr_printf("No message sent.\n");
                        return;
                }
                pagefp = fopen(temp, "r");
                unlink(temp);
                snprintf(buf, sizeof buf, "SEXP %s|-", touser);
-               CtdlIPC_putline(ipc, buf);
-               CtdlIPC_getline(ipc, buf);
+               CtdlIPC_chat_send(ipc, buf);
+               CtdlIPC_chat_recv(ipc, buf);
                if (buf[0] == '4') {
                        strcpy(last_paged, touser);
                        while (fgets(buf, sizeof buf, pagefp) != NULL) {
                                buf[strlen(buf) - 1] = 0;
-                               CtdlIPC_putline(ipc, buf);
+                               CtdlIPC_chat_send(ipc, buf);
                        }
                        fclose(pagefp);
-                       CtdlIPC_putline(ipc, "000");
+                       CtdlIPC_chat_send(ipc, "000");
                        scr_printf("Message sent.\n");
                } else {
                        scr_printf("%s\n", &buf[4]);