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

chmode: Generate a canonical mode string

Browse source 
Primarily because I want to use it in tests, but it also means people
reading override snotes don't have as much mental overhead. I hope.
This commit is contained in:
Ed Kellett 2020-11-06 14:00:06 +00:00
parent ea41b24fd4
commit 047b56e70e
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ircd/chmode.c
View file

@ -1372,7 +1372,7 @@ void
set_channel_mode(struct Client *client_p, struct Client *source_p, set_channel_mode(struct Client *client_p, struct Client *source_p,
struct Channel *chptr, struct membership *msptr, int parc, const char *parv[]) struct Channel *chptr, struct membership *msptr, int parc, const char *parv[])
{ {
static char modebuf[BUFSIZE]; static char modebuf[BUFSIZE * 2]; /* paranoid case: 2 canonical chars per input char */
static char parabuf[BUFSIZE]; static char parabuf[BUFSIZE];
char *mbuf; char *mbuf;
char *pbuf; char *pbuf;
@ -1409,6 +1409,9 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
static struct modeset modesets[MAXPARA]; static struct modeset modesets[MAXPARA];
struct modeset *ms = modesets, *mend; struct modeset *ms = modesets, *mend;
char canon_op = '\0';
mbuf = modebuf;
for (ml = parv[0]; *ml != 0; ml++) for (ml = parv[0]; *ml != 0; ml++)
{ {
@ -1453,8 +1456,18 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
* does nothing for a query on a mode with no query. would it be * does nothing for a query on a mode with no query. would it be
* good to send an error here? * good to send an error here?
*/ */
continue;
} }
char op = effective_dir == MODE_ADD ? '+' :
effective_dir == MODE_DEL ? '-' :
'=';
if (op != canon_op)
*mbuf++ = canon_op = op;
*mbuf++ = c;
if (effective_dir != MODE_QUERY && access_dir == MODE_QUERY) if (effective_dir != MODE_QUERY && access_dir == MODE_QUERY)
access_dir = effective_dir; access_dir = effective_dir;
if (effective_dir == MODE_QUERY && cm->flags & CHM_OPS_QUERY) if (effective_dir == MODE_QUERY && cm->flags & CHM_OPS_QUERY)
@ -1472,6 +1485,13 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
} }
} }
/* this will happen on something like MODE +-=++-.
* we'd have caught that with the if !mode_count
* later on, but this saves an override notice
*/
if (ms == modesets)
return;
if (parn < parc) if (parn < parc)
{ {
/* XXX we could reject excess params here */ /* XXX we could reject excess params here */
@ -1479,7 +1499,16 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
mend = ms; mend = ms;
alevel = get_channel_access(source_p, chptr, msptr, access_dir, reconstruct_parv(parc, parv)); if (parn > 1)
{
strcpy(mbuf, " ");
rb_strlcat(modebuf, reconstruct_parv(parn - 1, parv + 1), sizeof modebuf);
}
else
{
*mbuf = '\0';
}
alevel = get_channel_access(source_p, chptr, msptr, access_dir, modebuf);
for (ms = modesets; ms < mend; ms++) for (ms = modesets; ms < mend; ms++)
{ {
@ -1490,10 +1519,10 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
} }
/* bail out if we have nothing to do... */ /* bail out if we have nothing to do... */
if(!mode_count) if (!mode_count)
return; return;
if(IsServer(source_p)) if (IsServer(source_p))
mlen = sprintf(modebuf, ":%s MODE %s ", fakesource_p->name, chptr->chname); mlen = sprintf(modebuf, ":%s MODE %s ", fakesource_p->name, chptr->chname);
else else
mlen = sprintf(modebuf, ":%s!%s@%s MODE %s ", mlen = sprintf(modebuf, ":%s!%s@%s MODE %s ",