philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup s_watch().

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@408 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2013-10-23 17:44:20 +00:00
parent 07cdd587b4
commit b978b76bb7
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/notice.c
View File

@@ -1109,36 +1109,37 @@ unsigned long old = get_server_ircop_flags(server);
BUILT_IN_COMMAND(s_watch) BUILT_IN_COMMAND(s_watch)
{ {
unsigned long flag = 0; int gotargs = 0;
unsigned long old_flags; unsigned long old_flags, flag;
int gotargs = 0;
if (from_server == -1) if (from_server == -1)
{ {
put_it("%s", convert_output_format("$G Try connecting to a server first", NULL, NULL)); put_it("%s", convert_output_format("$G Try connecting to a server first", NULL, NULL));
return; return;
} }
if (args && *args) if (args && *args)
gotargs = 1; gotargs = 1;
old_flags = get_server_ircop_flags(from_server); old_flags = get_server_ircop_flags(from_server);
flag = ircop_str_to_flags(old_flags, args); flag = ircop_str_to_flags(old_flags, args);
if (flag != old_flags) if (flag != old_flags)
set_server_ircop_flags(from_server, flag); set_server_ircop_flags(from_server, flag);
else if (gotargs && old_flags != -1) else if (gotargs && old_flags != -1)
{ {
char buffer[BIG_BUFFER_SIZE+1];
int i; int i;
char buffer[BIG_BUFFER_SIZE];
strcpy(buffer, all); strcpy(buffer, all);
for (i = 0; opflags[i]; i++) for (i = 0; opflags[i]; i++)
{ {
strmcat(buffer, space, BIG_BUFFER_SIZE); strlcat(buffer, space, sizeof buffer);
strmcat(buffer, opflags[i], BIG_BUFFER_SIZE); strlcat(buffer, opflags[i], sizeof buffer);
} }
strmcat(buffer, space, BIG_BUFFER_SIZE); strlcat(buffer, space, BIG_BUFFER_SIZE);
strmcat(buffer, none, BIG_BUFFER_SIZE); strlcat(buffer, none, BIG_BUFFER_SIZE);
bitchsay("You must specify from the following:"); bitchsay("You must specify from the following:");
put_it("\t%s", buffer); put_it("\t%s", buffer);
/*ALL COLLIDE KILLS MISMATCH HACK IDENTD FAKES UNAUTHS CLIENTS TRAFFIC CRAP REHASH KLINE BOTS OPER SQUIT SERVER CONNECT FLOOD USER STATS NICK ACTIVEK NONE");*/
return; return;
} }
print_ircop_flags(from_server); print_ircop_flags(from_server);