9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pretty_mask(): Stop temporarily modifying the passed mask entirely.

Browse source
This commit is contained in:
Jilles Tjoelker 2014-10-18 00:54:34 +02:00
parent f4e893b515
commit 74b2fb72db
1 changed files with 36 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/chmode.c
View file

@ -375,25 +375,29 @@ pretty_mask(const char *idmask)
static char mask_buf[BUFSIZE]; static char mask_buf[BUFSIZE];
int old_mask_pos; int old_mask_pos;
const char *nick, *user, *host, *forward = NULL; const char *nick, *user, *host, *forward = NULL;
char *t, *at, *ex, *ex2; char *t, *at, *ex;
int nl, ul, hl, fl; int nl, ul, hl, fl;
char e2 = 0;
char *mask; char *mask;
size_t masklen;
mask = LOCAL_COPY(idmask); mask = LOCAL_COPY(idmask);
mask = check_string(mask); mask = check_string(mask);
collapse(mask); collapse(mask);
masklen = strlen(mask);
nick = user = host = "*"; nick = user = host = "*";
nl = ul = hl = 1;
fl = 0;
if((size_t) BUFSIZE - mask_pos < strlen(mask) + 5) if((size_t) BUFSIZE - mask_pos < masklen + 5)
return NULL; return NULL;
old_mask_pos = mask_pos; old_mask_pos = mask_pos;
if (*mask == '$') if (*mask == '$')
{ {
mask_pos += rb_sprintf(mask_buf + mask_pos, "%s", mask) + 1; memcpy(mask_buf + mask_pos, mask, masklen + 1);
mask_pos += masklen + 1;
t = mask_buf + old_mask_pos + 1; t = mask_buf + old_mask_pos + 1;
if (*t == '!') if (*t == '!')
*t = '~'; *t = '~';
@ -403,69 +407,65 @@ pretty_mask(const char *idmask)
return mask_buf + old_mask_pos; return mask_buf + old_mask_pos;
} }
at = ex = ex2 = NULL; at = ex = NULL;
if((t = strchr(mask, '@')) != NULL) if((t = memchr(mask, '@', masklen)) != NULL)
{ {
at = t; at = t;
*t++ = '\0'; t++;
if(*t != '\0') if(*t != '\0')
host = t; host = t, hl = strlen(t);
if((t = strchr(mask, '!')) != NULL) if((t = memchr(mask, '!', at - mask)) != NULL)
{ {
ex = t; ex = t;
*t++ = '\0'; t++;
if(*t != '\0') if(at != t)
user = t; user = t, ul = at - t;
if(*mask != '\0') if(ex != mask)
nick = mask; nick = mask, nl = ex - mask;
} }
else else
{ {
if(*mask != '\0') if(at != mask)
user = mask; user = mask, ul = at - mask;
} }
if((t = strchr(host, '!')) != NULL || (t = strchr(host, '$')) != NULL) if((t = memchr(host, '!', hl)) != NULL ||
(t = memchr(host, '$', hl)) != NULL)
{ {
ex2 = t; t++;
e2 = *t; if (host + hl != t)
*t++= '\0'; forward = t, fl = host + hl - t;
if (*t != '\0') hl = t - 1 - host;
forward = t;
} }
} }
else if((t = strchr(mask, '!')) != NULL) else if((t = memchr(mask, '!', masklen)) != NULL)
{ {
ex = t; ex = t;
*t++ = '\0'; t++;
if(*mask != '\0') if(ex != mask)
nick = mask; nick = mask, nl = ex - mask;
if(*t != '\0') if(*t != '\0')
user = t; user = t, ul = strlen(t);
} }
else if(strchr(mask, '.') != NULL || strchr(mask, ':') != NULL) else if(memchr(mask, '.', masklen) != NULL ||
memchr(mask, ':', masklen) != NULL)
{ {
if(*mask != '\0') host = mask, hl = masklen;
host = mask;
} }
else else
{ {
if(*mask != '\0') if(masklen > 0)
nick = mask; nick = mask, nl = masklen;
} }
/* truncate values to max lengths */ /* truncate values to max lengths */
nl = strlen(nick);
if(nl > NICKLEN - 1) if(nl > NICKLEN - 1)
nl = NICKLEN - 1; nl = NICKLEN - 1;
ul = strlen(user);
if(ul > USERLEN) if(ul > USERLEN)
ul = USERLEN; ul = USERLEN;
hl = strlen(host);
if(hl > HOSTLEN) if(hl > HOSTLEN)
hl = HOSTLEN; hl = HOSTLEN;
fl = forward ? strlen(forward) : 0;
if(fl > CHANNELLEN) if(fl > CHANNELLEN)
fl = CHANNELLEN; fl = CHANNELLEN;
@ -480,14 +480,6 @@ pretty_mask(const char *idmask)
} }
mask_buf[mask_pos++] = '\0'; mask_buf[mask_pos++] = '\0';
/* restore mask, since we may need to use it again later */
if(at)
*at = '@';
if(ex)
*ex = '!';
if(ex2)
*ex2 = e2;
return mask_buf + old_mask_pos; return mask_buf + old_mask_pos;
} }