mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-06-06 08:24:07 +00:00
Code Issues Releases Wiki Activity

Cosmetic whitespace and line length fixes, mostly in Send_Message().

Browse Source
This commit is contained in:
Alexander Barton 2008-07-27 15:50:51 +02:00
parent f8381aafb4
commit 318c8b238b
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/ngircd/irc.c
View File

@ -169,8 +169,11 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
} /* IRC_KILL */ } /* IRC_KILL */
/**
* Handler for the IRC command NOTICE.
*/
GLOBAL bool GLOBAL bool
IRC_NOTICE( CLIENT *Client, REQUEST *Req ) IRC_NOTICE(CLIENT *Client, REQUEST *Req)
{ {
return Send_Message(Client, Req, CLIENT_USER, false); return Send_Message(Client, Req, CLIENT_USER, false);
} /* IRC_NOTICE */ } /* IRC_NOTICE */
@ -337,10 +340,9 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
from = Client_Search(Req->prefix); from = Client_Search(Req->prefix);
else else
from = Client; from = Client;
if (!from) { if (!from)
return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
Client_ID(Client), Req->prefix); Client_ID(Client), Req->prefix);
}
/* handle msgtarget = msgto *("," msgto) */ /* handle msgtarget = msgto *("," msgto) */
currentTarget = strtok_r(currentTarget, ",", &lastCurrentTarget); currentTarget = strtok_r(currentTarget, ",", &lastCurrentTarget);
@ -397,18 +399,19 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
continue; continue;
if (nick != NULL) { if (nick != NULL) {
if (strcmp(nick, Client_ID(cl)) == 0 && if (strcmp(nick, Client_ID(cl)) == 0 &&
strcmp(user, Client_User(cl)) == 0 && strcmp(user, Client_User(cl)) == 0 &&
strcasecmp(host, Client_Hostname(cl)) == 0) strcasecmp(host, Client_Hostname(cl)) == 0)
break; break;
else else
continue; continue;
} }
if (strcasecmp(user, Client_User(cl)) != 0) if (strcasecmp(user, Client_User(cl)) != 0)
continue; continue;
if (host != NULL && strcasecmp(host, Client_Hostname(cl)) != 0) if (host != NULL && strcasecmp(host,
Client_Hostname(cl)) != 0)
continue; continue;
if (server != NULL && strcasecmp(server, if (server != NULL && strcasecmp(server,
Client_ID(Client_Introducer(cl))) != 0) Client_ID(Client_Introducer(cl))) != 0)
continue; continue;
break; break;
} }
@ -423,14 +426,15 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
Client_ID(from), Client_ID(from),
currentTarget)) currentTarget))
return false; return false;
} else if (SendErrors && (Client_Type(Client) != CLIENT_SERVER) } else if (SendErrors
&& strchr(Client_Modes(cl), 'a')) { && (Client_Type(Client) != CLIENT_SERVER)
&& strchr(Client_Modes(cl), 'a')) {
/* Target is away */ /* Target is away */
if (!SendErrors) if (!SendErrors)
return true; return true;
if (!IRC_WriteStrClient if (!IRC_WriteStrClient
(from, RPL_AWAY_MSG, Client_ID(from), Client_ID(cl), (from, RPL_AWAY_MSG, Client_ID(from),
Client_Away(cl))) Client_ID(cl), Client_Away(cl)))
return DISCONNECTED; return DISCONNECTED;
} }
if (Client_Conn(from) > NONE) { if (Client_Conn(from) > NONE) {
@ -439,10 +443,11 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s", if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s",
Client_ID(cl), Req->argv[1])) Client_ID(cl), Req->argv[1]))
return false; return false;
} else if (strchr("$#", currentTarget[0]) && strchr(currentTarget, '.')) { } else if (strchr("$#", currentTarget[0])
&& strchr(currentTarget, '.')) {
/* targetmask */ /* targetmask */
if (!Send_Message_Mask(from, currentTarget, Req->argv[1], if (!Send_Message_Mask(from, currentTarget,
SendErrors)) Req->argv[1], SendErrors))
return false; return false;
} else if ((chan = Channel_Search(currentTarget))) { } else if ((chan = Channel_Search(currentTarget))) {
/* channel */ /* channel */
@ -460,7 +465,6 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
} }
return CONNECTED; return CONNECTED;
} /* Send_Message */ } /* Send_Message */
@ -476,7 +480,8 @@ Send_Message_Mask(CLIENT * from, char * targetMask, char * message, bool SendErr
if (strchr(Client_Modes(from), 'o') == NULL) { if (strchr(Client_Modes(from), 'o') == NULL) {
if (!SendErrors) if (!SendErrors)
return true; return true;
return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG, Client_ID(from)); return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG,
Client_ID(from));
} }
if (targetMask[0] == '#') { if (targetMask[0] == '#') {
@ -486,7 +491,7 @@ Send_Message_Mask(CLIENT * from, char * targetMask, char * message, bool SendErr
client_match = MatchCaseInsensitive(mask, Client_Hostname(cl)); client_match = MatchCaseInsensitive(mask, Client_Hostname(cl));
if (client_match) if (client_match)
if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s", if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s",
Client_ID(cl), message)) Client_ID(cl), message))
return false; return false;
} }
} else { } else {
@ -494,10 +499,10 @@ Send_Message_Mask(CLIENT * from, char * targetMask, char * message, bool SendErr
if (Client_Type(cl) != CLIENT_USER) if (Client_Type(cl) != CLIENT_USER)
continue; continue;
client_match = MatchCaseInsensitive(mask, client_match = MatchCaseInsensitive(mask,
Client_ID(Client_Introducer(cl))); Client_ID(Client_Introducer(cl)));
if (client_match) if (client_match)
if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s", if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s",
Client_ID(cl), message)) Client_ID(cl), message))
return false; return false;
} }
} }

5
src/ngircd/match.c
View File

@ -61,10 +61,7 @@ MatchCaseInsensitive(const char *pattern, const char *searchme)
char haystack[COMMAND_LEN]; char haystack[COMMAND_LEN];
strlcpy(haystack, searchme, sizeof(haystack)); strlcpy(haystack, searchme, sizeof(haystack));
return Match(pattern, ngt_LowerStr(haystack));
ngt_LowerStr(haystack);
return Match(pattern, haystack);
} /* MatchCaseInsensitive */ } /* MatchCaseInsensitive */