Rework check for number of parameters

[ngircd-alex.git] / src / ngircd / irc-info.c

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index f87714fc90187927db3caf3d4e7e7024aa7642fd..88455c74d9e85c770442aea1aa6f0c54e2e0ab9c 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -407,8 +407,8 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
            (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o')))) {
                /* Client hostname */
                if (!IRC_WriteStrClient(from, RPL_WHOISHOST_MSG,
-                                       Client_ID(from), Client_ID(c), Client_Hostname(c),
-                                       Conn_GetIPAInfo(Client_Conn(c))))
+                                       Client_ID(from), Client_ID(c),
+                                       Client_Hostname(c), Client_IPAText(c)))
                        return DISCONNECTED;
                /* Client modes */
                if (!IRC_WriteStrClient(from, RPL_WHOISMODES_MSG,
@@ -501,7 +501,6 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
 
@@ -546,7 +545,6 @@ IRC_INFO(CLIENT * Client, REQUEST * Req)
 
        IRC_SetPenalty(Client, 2);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
 
@@ -596,8 +594,6 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
        assert(Client != NULL);
        assert(Req != NULL);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-
        strlcpy(rpl, RPL_ISON_MSG, sizeof rpl);
        for (i = 0; i < Req->argc; i++) {
                /* "All" ircd even parse ":<x> <y> ..." arguments and split
@@ -636,7 +632,6 @@ IRC_LINKS(CLIENT *Client, REQUEST *Req)
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        /* Get pointer to server mask or "*", if none given */
@@ -691,7 +686,6 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
 
@@ -718,12 +712,10 @@ IRC_SERVLIST(CLIENT *Client, REQUEST *Req)
 {
        CLIENT *c;
 
-       IRC_SetPenalty(Client, 1);
-
        assert(Client != NULL);
        assert(Req != NULL);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
+       IRC_SetPenalty(Client, 1);
 
        if (Req->argc < 2 || strcmp(Req->argv[1], "0") == 0) {
                for (c = Client_First(); c!= NULL; c = Client_Next(c)) {
@@ -762,7 +754,6 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 3);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
 
@@ -795,7 +786,6 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
 
@@ -881,7 +871,6 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 2);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
 
@@ -903,7 +892,7 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
        case 'k':       /* Server-local bans ("K-Lines") */
        case 'K':
                if (!Client_HasMode(from, 'o'))
-                   return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG,
+                   return IRC_WriteErrClient(from, ERR_NOPRIVILEGES_MSG,
                                              Client_ID(from));
                if (query == 'g' || query == 'G')
                        list = Class_GetList(CLASS_GLINE);
@@ -997,9 +986,7 @@ IRC_SUMMON(CLIENT * Client, UNUSED REQUEST * Req)
 {
        assert(Client != NULL);
 
-       IRC_SetPenalty(Client, 1);
-
-       return IRC_WriteStrClient(Client, ERR_SUMMONDISABLED_MSG,
+       return IRC_WriteErrClient(Client, ERR_SUMMONDISABLED_MSG,
                                  Client_ID(Client));
 } /* IRC_SUMMON */
 
@@ -1022,7 +1009,6 @@ IRC_TIME( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
 
@@ -1058,8 +1044,6 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req)
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-
        if (Req->argc > 5)
                max = 5;
        else
@@ -1101,9 +1085,7 @@ IRC_USERS(CLIENT * Client, UNUSED REQUEST * Req)
 {
        assert(Client != NULL);
 
-       IRC_SetPenalty(Client, 1);
-
-       return IRC_WriteStrClient(Client, ERR_USERSDISABLED_MSG,
+       return IRC_WriteErrClient(Client, ERR_USERSDISABLED_MSG,
                                  Client_ID(Client));
 } /* IRC_USERS */
 
@@ -1124,7 +1106,6 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
 
@@ -1160,15 +1141,13 @@ IRC_WHO(CLIENT *Client, REQUEST *Req)
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
-
        only_ops = false;
        if (Req->argc == 2) {
                if (strcmp(Req->argv[1], "o") == 0)
                        only_ops = true;
 #ifdef STRICT_RFC
                else
-                       return IRC_WriteStrClient(Client,
+                       return IRC_WriteErrClient(Client,
                                                  ERR_NEEDMOREPARAMS_MSG,
                                                  Client_ID(Client),
                                                  Req->command);
@@ -1215,11 +1194,12 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       /* Bad number of parameters? */
-       if (Req->argc < 1 || Req->argc > 2)
-               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-                                         Client_ID(Client), Req->command);
+       /* Wrong number of parameters? */
+       if (Req->argc < 1)
+               return IRC_WriteErrClient(Client, ERR_NONICKNAMEGIVEN_MSG,
+                                         Client_ID(Client));
 
+       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        /* Get target server for this command */
@@ -1259,7 +1239,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                                if (!IRC_WHOIS_SendReply(Client, from, c))
                                        return DISCONNECTED;
                        } else {
-                               if (!IRC_WriteStrClient(Client,
+                               if (!IRC_WriteErrClient(Client,
                                                        ERR_NOSUCHNICK_MSG,
                                                        Client_ID(Client),
                                                        query))
@@ -1269,7 +1249,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                }
                if (got_wildcard) {
                        /* we already handled one wildcard query */
-                       if (!IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+                       if (!IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG,
                             Client_ID(Client), query))
                                return DISCONNECTED;
                        continue;
@@ -1293,7 +1273,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                }
 
                if (match_count == 0)
-                       IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+                       IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG,
                                           Client_ID(Client),
                                           Req->argv[Req->argc - 1]);
        }
@@ -1320,19 +1300,19 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Do not reveal any info on disconnected users? */
-       if (Conf_MorePrivacy)
-               return CONNECTED;
-
        /* Wrong number of parameters? */
        if (Req->argc < 1)
-               return IRC_WriteStrClient(Client, ERR_NONICKNAMEGIVEN_MSG,
+               return IRC_WriteErrClient(Client, ERR_NONICKNAMEGIVEN_MSG,
                                          Client_ID(Client));
 
        _IRC_ARGC_LE_OR_RETURN_(Client, Req, 3)
        _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 2, prefix)
 
+       /* Do not reveal any info on disconnected users? */
+       if (Conf_MorePrivacy)
+               return CONNECTED;
+
        /* Forward? */
        if (target != Client_ThisServer()) {
                IRC_WriteStrClientPrefix(target, prefix, "WHOWAS %s %s %s",
@@ -1381,7 +1361,7 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
                                break;
                } while (i != last);
 
-               if (nc == 0 && !IRC_WriteStrClient(prefix, ERR_WASNOSUCHNICK_MSG,
+               if (nc == 0 && !IRC_WriteErrClient(prefix, ERR_WASNOSUCHNICK_MSG,
                                                Client_ID(prefix), nick))
                        return DISCONNECTED;
        }
@@ -1471,7 +1451,7 @@ IRC_Show_MOTD( CLIENT *Client )
 
        len_tot = array_bytes(&Conf_Motd);
        if (len_tot == 0 && !Conn_UsesSSL(Client_Conn(Client)))
-               return IRC_WriteStrClient(Client, ERR_NOMOTD_MSG, Client_ID(Client));
+               return IRC_WriteErrClient(Client, ERR_NOMOTD_MSG, Client_ID(Client));
 
        if (!IRC_WriteStrClient(Client, RPL_MOTDSTART_MSG, Client_ID(Client),
                                Client_ID(Client_ThisServer())))