#include "conn-func.h"
#include "conf.h"
#include "channel.h"
+#include "conn-encoding.h"
#include "defines.h"
#include "irc-write.h"
#include "log.h"
static char *
-Option_String( CONN_ID Idx )
+#ifdef ZLIB
+Option_String(CONN_ID Idx)
+#else
+Option_String(UNUSED CONN_ID Idx)
+#endif
{
static char option_txt[8];
+#ifdef ZLIB
UINT16 options;
options = Conn_Options(Idx);
+#endif
strcpy(option_txt, "F"); /* No idea what this means, but the
* original ircd sends it ... */
CHANNEL *chan;
char *currentTarget = Req->argv[0];
char *lastCurrentTarget = NULL;
+ char *message = NULL;
assert(Client != NULL);
assert(Req != NULL);
return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
Client_ID(Client), Req->prefix);
+#ifdef ICONV
+ if (Client_Conn(Client) > NONE)
+ message = Conn_EncodingFrom(Client_Conn(Client), Req->argv[1]);
+ else
+#endif
+ message = Req->argv[1];
+
/* handle msgtarget = msgto *("," msgto) */
currentTarget = strtok_r(currentTarget, ",", &lastCurrentTarget);
ngt_UpperStr(Req->command);
Client_Type(cl) != CLIENT_SERVICE)
continue;
if (nick != NULL && host != NULL) {
- if (strcmp(nick, Client_ID(cl)) == 0 &&
- strcmp(user, Client_User(cl)) == 0 &&
+ if (strcasecmp(nick, Client_ID(cl)) == 0 &&
+ strcasecmp(user, Client_User(cl)) == 0 &&
strcasecmp(host, Client_HostnameCloaked(cl)) == 0)
break;
else
}
if (!IRC_WriteStrClientPrefix(cl, from, "%s %s :%s",
Req->command, Client_ID(cl),
- Req->argv[1]))
+ message))
return DISCONNECTED;
} else if (ForceType != CLIENT_SERVICE
&& (chan = Channel_Search(currentTarget))) {
if (!Channel_Write(chan, from, Client, Req->command,
- SendErrors, Req->argv[1]))
+ SendErrors, message))
return DISCONNECTED;
} else if (ForceType != CLIENT_SERVICE
/* $#: server/target mask, RFC 2812, sec. 3.3.1 */
&& strchr(currentTarget, '.')) {
/* targetmask */
if (!Send_Message_Mask(from, Req->command, currentTarget,
- Req->argv[1], SendErrors))
+ message, SendErrors))
return DISCONNECTED;
} else {
if (!SendErrors)