X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fclient_chat.c;h=c86914f02bc6e80574c87df9e142f79aab05f2ce;hb=4eb74b26380dfde31c86c685f0589e0c653aebf0;hp=1cdb958f9dcd037f2fa1a5406cb58250e7fe6327;hpb=a2a06e5d6767d0e45eeccf4032153764e8a5520f;p=citadel.git

diff --git a/citadel/client_chat.c b/citadel/client_chat.c
index 1cdb958f9..c86914f02 100644
--- 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
@@ -84,6 +99,7 @@ void chatmode(CtdlIPC *ipc)
 
 	strcpy(buf, "");
 	strcpy(wbuf, "");
+	strcpy(last_user, ""); 
 	color(BRIGHT_YELLOW);
 	sln_printf_if("\n");
 	sln_printf("> ");
@@ -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;
 			}