pissnet/pissircd
1
0
Fork 0
mirror of https://github.com/pissnet/pissircd.git synced 2025-07-31 15:32:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix extra whitespace in USERHOST/USERIP (minor)

Browse source
This commit is contained in:
Bram Matthys 2019-11-11 14:17:44 +01:00
parent 6710e5c047
commit 77e308783f
No known key found for this signature in database
GPG key ID: BF8116B163EAAE98
2 changed files with 18 additions and 13 deletions

17
src/modules/userhost.c
View file

@ -58,13 +58,16 @@ MOD_UNLOAD()
* information only (no spurious AWAY labels or channels).
* Re-written by Dianora 1999
*/
/* Keep this at 5!!!! */
#define MAXUSERHOSTREPLIES 5
CMD_FUNC(cmd_userhost)
{
char *p; /* scratch end pointer */
char *cn; /* current name */
Client *acptr;
char response[5][NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30];
int i; /* loop counter */
char response[MAXUSERHOSTREPLIES][NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30];
int i; /* loop counter */
int w;
if (parc < 2)
{
@ -74,23 +77,22 @@ CMD_FUNC(cmd_userhost)
/* The idea is to build up the response string out of pieces
* none of this strlen() nonsense.
* 5 * (NICKLEN*2+CHANNELLEN+USERLEN+HOSTLEN+30) is still << sizeof(buf)
* MAXUSERHOSTREPLIES * (NICKLEN*2+CHANNELLEN+USERLEN+HOSTLEN+30) is still << sizeof(buf)
* and our ircsnprintf() truncates it to fit anyway. There is
* no danger of an overflow here. -Dianora
*/
response[0][0] = response[1][0] = response[2][0] =
response[3][0] = response[4][0] = '\0';
response[0][0] = response[1][0] = response[2][0] = response[3][0] = response[4][0] = '\0';
cn = parv[1];
for (i = 0; (i < 5) && cn; i++)
for (w = 0, i = 0; (i < MAXUSERHOSTREPLIES) && cn; i++)
{
if ((p = strchr(cn, ' ')))
*p = '\0';
if ((acptr = find_person(cn, NULL)))
{
ircsnprintf(response[i], NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30,
ircsnprintf(response[w], NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30,
"%s%s=%c%s@%s",
acptr->name,
(IsOper(acptr) && (!IsHideOper(acptr) || client == acptr || IsOper(client)))
@ -100,6 +102,7 @@ CMD_FUNC(cmd_userhost)
((acptr != client) && !IsOper(client)
&& IsHidden(acptr) ? acptr->user->virthost :
acptr->user->realhost));
w++;
}
if (p)
p++;

14
src/modules/userip.c
View file

@ -60,6 +60,8 @@ MOD_UNLOAD()
* information only (no spurious AWAY labels or channels).
* Re-written by Dianora 1999
*/
/* Keep this at 5!!!! */
#define MAXUSERHOSTREPLIES 5
CMD_FUNC(cmd_userip)
{
@ -67,8 +69,9 @@ CMD_FUNC(cmd_userip)
char *cn; /* current name */
char *ip, ipbuf[HOSTLEN+1];
Client *acptr;
char response[5][NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30];
char response[MAXUSERHOSTREPLIES][NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30];
int i; /* loop counter */
int w;
if (!MyUser(client))
return;
@ -81,7 +84,7 @@ CMD_FUNC(cmd_userip)
/* The idea is to build up the response string out of pieces
* none of this strlen() nonsense.
* 5 * (NICKLEN*2+CHANNELLEN+USERLEN+HOSTLEN+30) is still << sizeof(buf)
* MAXUSERHOSTREPLIES * (NICKLEN*2+CHANNELLEN+USERLEN+HOSTLEN+30) is still << sizeof(buf)
* and our ircsnprintf() truncates it to fit anyway. There is
* no danger of an overflow here. -Dianora
*/
@ -90,7 +93,7 @@ CMD_FUNC(cmd_userip)
cn = parv[1];
for (i = 0; (i < 5) && cn; i++)
for (w = 0, i = 0; (i < MAXUSERHOSTREPLIES) && cn; i++)
{
if ((p = strchr(cn, ' ')))
*p = '\0';
@ -105,14 +108,13 @@ CMD_FUNC(cmd_userip)
ip = ipbuf;
}
ircsnprintf(response[i], NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30, "%s%s=%c%s@%s",
ircsnprintf(response[w], NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30, "%s%s=%c%s@%s",
acptr->name,
(IsOper(acptr) && (!IsHideOper(acptr) || client == acptr || IsOper(client)))
? "*" : "",
(acptr->user->away) ? '-' : '+',
acptr->user->username, ip);
/* add extra fakelag (penalty) because of all the work we need to do: 1s per entry: */
client->local->since += 1;
w++;
}
if (p)
p++;