* Began (but did not finish) applying GPL3+ declarations to each source file. This...

[citadel.git] / citadel / client_chat.c

diff --git a/citadel/client_chat.c b/citadel/client_chat.c
index a98b4bdfc0c9fd914dcf50bd8dd595bd5a79ba38..c86914f02bc6e80574c87df9e142f79aab05f2ce 100644 (file)
--- a/citadel/client_chat.c
+++ b/citadel/client_chat.c
@@ -4,6 +4,21 @@
  * front end for chat mode
  * (the "single process" version - no more fork() anymore)
  *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -32,13 +47,13 @@
 #include <sys/select.h>
 #endif
 #include <stdarg.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "citadel_ipc.h"
 #include "client_chat.h"
 #include "commands.h"
 #include "routines.h"
 #include "citadel_decls.h"
-#include "tools.h"
 #include "rooms.h"
 #include "messages.h"
 #ifndef HAVE_SNPRINTF
@@ -49,7 +64,7 @@
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
 extern char temp[];
-void getline(char *, int);
+void ctdl_getline(char *, int);
 
 char last_paged[SIZ] = "";
 
@@ -84,6 +99,7 @@ void chatmode(CtdlIPC *ipc)
 
        strcpy(buf, "");
        strcpy(wbuf, "");
+       strcpy(last_user, ""); 
        color(BRIGHT_YELLOW);
        sln_printf_if("\n");
        sln_printf("> ");
@@ -113,7 +129,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);
                                }
@@ -135,7 +151,7 @@ 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;
                        }
@@ -256,7 +272,7 @@ void page_user(CtdlIPC *ipc)
                        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;
                }