|
@@ -82,9 +82,10 @@ char *getnick(const char *handle, struct chanset_t *chan)
|
|
|
for (memberlist *m = chan->channel.member; m && m->nick[0]; m = m->next) {
|
|
for (memberlist *m = chan->channel.member; m && m->nick[0]; m = m->next) {
|
|
|
member_getuser(m);
|
|
member_getuser(m);
|
|
|
if (m->user && !strcasecmp(m->user->handle, handle))
|
|
if (m->user && !strcasecmp(m->user->handle, handle))
|
|
|
- return m->nick[0] ? m->nick : NULL;
|
|
|
|
|
|
|
+ return m->nick;
|
|
|
}
|
|
}
|
|
|
- return NULL;
|
|
|
|
|
|
|
+ static char empty[] = "";
|
|
|
|
|
+ return empty;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static void cmd_act(int idx, char *par)
|
|
static void cmd_act(int idx, char *par)
|
|
@@ -358,7 +359,7 @@ static void cmd_voice(int idx, char *par)
|
|
|
chan = chanset;
|
|
chan = chanset;
|
|
|
putlog(LOG_CMDS, "*", "#%s# (%s) voice %s", dcc[idx].nick, all ? "*" : chan->dname , nick);
|
|
putlog(LOG_CMDS, "*", "#%s# (%s) voice %s", dcc[idx].nick, all ? "*" : chan->dname , nick);
|
|
|
while (chan) {
|
|
while (chan) {
|
|
|
- if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))) {
|
|
|
|
|
|
|
+ if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))[0]) {
|
|
|
if (all) goto next;
|
|
if (all) goto next;
|
|
|
dprintf(idx, "Usage: voice <nick> [channel|*]\n");
|
|
dprintf(idx, "Usage: voice <nick> [channel|*]\n");
|
|
|
return;
|
|
return;
|
|
@@ -422,7 +423,7 @@ static void cmd_devoice(int idx, char *par)
|
|
|
chan = chanset;
|
|
chan = chanset;
|
|
|
putlog(LOG_CMDS, "*", "#%s# (%s) devoice %s", dcc[idx].nick, all ? "*" : chan->dname, nick);
|
|
putlog(LOG_CMDS, "*", "#%s# (%s) devoice %s", dcc[idx].nick, all ? "*" : chan->dname, nick);
|
|
|
while (chan) {
|
|
while (chan) {
|
|
|
- if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))) {
|
|
|
|
|
|
|
+ if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))[0]) {
|
|
|
if (all) goto next;
|
|
if (all) goto next;
|
|
|
dprintf(idx, "Usage: devoice <nick> [channel|*]\n");
|
|
dprintf(idx, "Usage: devoice <nick> [channel|*]\n");
|
|
|
return;
|
|
return;
|
|
@@ -494,7 +495,7 @@ static void cmd_op(int idx, char *par)
|
|
|
|
|
|
|
|
while (chan) {
|
|
while (chan) {
|
|
|
get_user_flagrec(dcc[idx].user, &user, chan->dname);
|
|
get_user_flagrec(dcc[idx].user, &user, chan->dname);
|
|
|
- if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))) {
|
|
|
|
|
|
|
+ if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))[0]) {
|
|
|
if (all) goto next;
|
|
if (all) goto next;
|
|
|
dprintf(idx, "Usage: op <nick> [channel|*]\n");
|
|
dprintf(idx, "Usage: op <nick> [channel|*]\n");
|
|
|
return;
|
|
return;
|
|
@@ -985,7 +986,7 @@ static void cmd_deop(int idx, char *par)
|
|
|
|
|
|
|
|
while (chan) {
|
|
while (chan) {
|
|
|
get_user_flagrec(dcc[idx].user, &user, chan->dname);
|
|
get_user_flagrec(dcc[idx].user, &user, chan->dname);
|
|
|
- if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))) {
|
|
|
|
|
|
|
+ if (!nick[0] && !(nick = getnick(dcc[idx].nick, chan))[0]) {
|
|
|
if (all) goto next;
|
|
if (all) goto next;
|
|
|
dprintf(idx, "Usage: deop <nick> [channel|*]\n");
|
|
dprintf(idx, "Usage: deop <nick> [channel|*]\n");
|
|
|
return;
|
|
return;
|