bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a crash on /part command

Browse Source
This commit is contained in:
Michiel Broek 2005-04-27 20:26:53 +00:00
parent 545318e14f
commit c49716cb70
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mbtask/taskchat.c
View File

@ -315,7 +315,11 @@ int join(pid_t pid, char *channel, int sysop)
/* /*
* A new channel must be created, but only the sysop may create the "sysop" channel * A new channel must be created, but only the sysop may create the "sysop" channel
*/ */
#ifdef USE_EXPERIMENT
if (!sysop && (strcasecmp(channel, "#sysop") == 0)) {
#else
if (!sysop && (strcasecmp(channel, "sysop") == 0)) { if (!sysop && (strcasecmp(channel, "sysop") == 0)) {
#endif
sprintf(buf, "*** Only the sysop may create channel \"%s\"", channel); sprintf(buf, "*** Only the sysop may create channel \"%s\"", channel);
system_msg(pid, buf); system_msg(pid, buf);
return FALSE; return FALSE;
@ -331,7 +335,7 @@ int join(pid_t pid, char *channel, int sysop)
strncpy(chat_users[j].channel, channel, 20); strncpy(chat_users[j].channel, channel, 20);
chat_users[j].chatting = TRUE; chat_users[j].chatting = TRUE;
Syslog('-', "Added user %d to channel %s", j, channel); Syslog('-', "Added user %d to channel %s", j, channel);
sprintf(buf, "Created channel #%s", channel); sprintf(buf, "Created channel %s", channel);
chat_msg(channel, NULL, buf); chat_msg(channel, NULL, buf);
chat_dump(); chat_dump();
send_all("JOIN %s@%s %s\r\n", chat_users[j].nick, CFG.myfqdn, channel); send_all("JOIN %s@%s %s\r\n", chat_users[j].nick, CFG.myfqdn, channel);
@ -411,7 +415,7 @@ int part(pid_t pid, char *reason)
chat_msg(chat_users[i].channel, chat_users[i].nick, reason); chat_msg(chat_users[i].channel, chat_users[i].nick, reason);
sprintf(buf, "%s has left channel %s, %d users left", chat_users[i].nick, tmp->name, tmp->users); sprintf(buf, "%s has left channel %s, %d users left", chat_users[i].nick, tmp->name, tmp->users);
chat_msg(chat_users[i].channel, NULL, buf); chat_msg(chat_users[i].channel, NULL, buf);
if (strcmp(tmp->name, (char *)"sysop")) { if (strcmp(tmp->name, (char *)"#sysop")) {
if (reason && strlen(reason)) if (reason && strlen(reason))
send_all("PART %s@%s %s %s\r\n", chat_users[i].nick, CFG.myfqdn, tmp->name, reason); send_all("PART %s@%s %s %s\r\n", chat_users[i].nick, CFG.myfqdn, tmp->name, reason);
else else
@ -848,8 +852,8 @@ char *chat_put(char *data)
cmd = strtok(msg, " \0"); cmd = strtok(msg, " \0");
Syslog('-', "\"%s\"", cmd); Syslog('-', "\"%s\"", cmd);
cmd = strtok(NULL, "\0"); cmd = strtok(NULL, "\0");
Syslog('-', "\"%s\"", cmd); Syslog('-', "\"%s\"", printable(cmd, 0));
if (part(chat_users[i].pid, cmd) == FALSE) { if (part(chat_users[i].pid, cmd ? cmd : (char *)"Quitting") == FALSE) {
sprintf(buf, "** Not in a channel"); sprintf(buf, "** Not in a channel");
system_msg(chat_users[i].pid, buf); system_msg(chat_users[i].pid, buf);
} }

3
mbtask/taskibc.c
View File

@ -1380,6 +1380,9 @@ int do_command(char *hostname, char *command, char *parameters)
if (! strcmp(command, (char *)"NICK")) { if (! strcmp(command, (char *)"NICK")) {
return command_nick(hostname, parameters); return command_nick(hostname, parameters);
} }
if (! strcmp(command, (char *)"PART")) {
return command_join(hostname, parameters);
}
if (! strcmp(command, (char *)"PART")) { if (! strcmp(command, (char *)"PART")) {
return command_part(hostname, parameters); return command_part(hostname, parameters);
} }