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

Fix the $servernum() function - no matter what string

Browse Source 
you gave it, it would return the first server in the list
where server.itsname == server.name, due to a misplaced
variable.  It also returned an empty string for
$servernum(  ) when it should return the current server.

Also removed the useless function_serverport() function -
it was a character-for-character duplicate of
function_servports().


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@70 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2009-09-17 13:38:09 +00:00
parent 4decd6202b
commit e338d2d9fd
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@@ -1,5 +1,8 @@
[Changes 1.2c01 ] [Changes 1.2c01 ]
* Fixed $servernum() scripting function, it was returning the wrong server
reference in most cases. (caf)
* [1.1s01] Fixed .cmsg crash reported by zimzum. (caf) * [1.1s01] Fixed .cmsg crash reported by zimzum. (caf)
* Changed the defaults for JOIN_NEW_WINDOW_TYPE and QUERY_NEW_WINDOW_TYPE * Changed the defaults for JOIN_NEW_WINDOW_TYPE and QUERY_NEW_WINDOW_TYPE

40
source/functions.c
View File

@@ -393,7 +393,6 @@ static char * function_parse_and_return (char *, char *);
static char * function_dccitem (char *, char *); static char * function_dccitem (char *, char *);
static char * function_winitem (char *, char *); static char * function_winitem (char *, char *);
static char * function_servgroup (char *, char *); static char * function_servgroup (char *, char *);
static char * function_serverport (char *, char *);
static char * function_ajoinitem (char *, char *); static char * function_ajoinitem (char *, char *);
static char * function_long_to_comma (char *, char *); static char * function_long_to_comma (char *, char *);
static char * function_nohighlight (char *, char *); static char * function_nohighlight (char *, char *);
@@ -713,7 +712,7 @@ static BuiltInFunctions built_in_functions[] =
{ "SERVERPASS", function_serverpass }, { "SERVERPASS", function_serverpass },
{ "SERVPORTS", function_servports }, { "SERVPORTS", function_servports },
{ "SETINFO", function_set_info }, { "SETINFO", function_set_info },
{ "SERVERPORT", function_serverport }, { "SERVERPORT", function_servports },
{ "SETITEM", function_setitem }, { "SETITEM", function_setitem },
{ "SHIFT", function_shift }, { "SHIFT", function_shift },
{ "SORT", function_sort }, { "SORT", function_sort },
@@ -3945,23 +3944,6 @@ BUILT_IN_FUNCTION(function_servername, input)
RETURN_STR(which); RETURN_STR(which);
} }
BUILT_IN_FUNCTION(function_serverport, input)
{
int servnum = from_server;
if (*input)
GET_INT_ARG(servnum, input);
if (servnum == -1)
servnum = from_server;
if (servnum < 0 || servnum > server_list_size())
RETURN_EMPTY;
return m_sprintf("%d %d", get_server_port(servnum),
get_server_local_port(servnum));
}
BUILT_IN_FUNCTION(function_lastserver, input) BUILT_IN_FUNCTION(function_lastserver, input)
{ {
RETURN_INT(last_server); RETURN_INT(last_server);
@@ -6313,20 +6295,24 @@ BUILT_IN_FUNCTION(function_rest, input)
*/ */
BUILT_IN_FUNCTION(function_servref, input) BUILT_IN_FUNCTION(function_servref, input)
{ {
char *servname = NULL; char *servname = NULL;
int i; int i;
char *s;
if (!input || !*input) if (input)
servname = new_next_arg(input, &input);
if (empty(servname))
RETURN_INT(from_server); RETURN_INT(from_server);
GET_STR_ARG(servname, input);
for (i = 0; i < server_list_size(); i++) for (i = 0; i < server_list_size(); i++)
{ {
if ((s = get_server_itsname(i)) && !my_stricmp(s, servname)) if (!my_stricmp(get_server_itsname(i), servname) ||
RETURN_INT(i); !my_stricmp(get_server_name(i), servname))
else if (!my_stricmp(s, get_server_name(i))) {
RETURN_INT(i); RETURN_INT(i);
}
} }
RETURN_INT(-1); RETURN_INT(-1);
} }