syntax fix

[NeonServV5.git] / IRCParser.c

diff --git a/IRCParser.c b/IRCParser.c
index bc14dfcfc04689f7ec6ff67b118749f3d2049c98..72e6dc3d6342d0fe49b9da7e0a79a7f4a3645f7a 100644 (file)
--- a/IRCParser.c
+++ b/IRCParser.c
@@ -6,6 +6,7 @@
 #include "IRCEvents.h"
 #include "ClientSocket.h"
 #include "WHOHandler.h"
+#include "lang.h"
 
 struct irc_cmd *irc_commands = NULL;
 
@@ -44,6 +45,7 @@ static void parse_line(struct ClientSocket *client, char *line) {
         if (*line == ':') {
            //the rest is a single parameter
            argv[argc++] = line + 1;
+           break;
         }
         argv[argc++] = line;
         if (argc >= MAXNUMPARAMS)
@@ -281,6 +283,7 @@ static IRC_CMD(raw_notice) {
 static IRC_CMD(raw_nick) {
     if(from == NULL || argc == 0) return 0;
     struct UserNode *user = getUserByMask(from);
+    if(user == NULL) return 0;
     event_nick(user, argv[0]);
     renameUser(user, argv[0]);
     return 1;
@@ -365,3 +368,25 @@ void free_parser() {
     }
 }
 
+void reply(struct ClientSocket *client, struct UserNode *user, const char *text, ...) {
+    const char *reply_format = get_language_string(user, text);
+    if(reply_format == NULL)
+        reply_format = text;
+    if((user->flags & USERFLAG_ISAUTHED) && !(user->flags & USERFLAG_LOADED_SETTINGS))
+        load_user_settings(user);
+    char formatBuf[MAXLEN];
+    sprintf(formatBuf, "%s %s :%s", ((user->flags & USERFLAG_REPLY_PRIVMSG) ? "PRIVMSG" : "NOTICE"), user->nick, reply_format);
+    va_list arg_list;
+    char sendBuf[MAXLEN];
+    int pos;
+    if (!(client->flags & SOCKET_FLAG_CONNECTED)) return;
+    sendBuf[0] = '\0';
+    va_start(arg_list, text);
+    pos = vsnprintf(sendBuf, MAXLEN - 2, formatBuf, arg_list);
+    va_end(arg_list);
+    if (pos < 0 || pos > (MAXLEN - 2)) pos = MAXLEN - 2;
+    sendBuf[pos] = '\n';
+    sendBuf[pos+1] = '\0';
+    write_socket(client, sendBuf, pos+1);
+}
+