aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Don't use glob matching, just regular string comparisons

Browse Source
This commit is contained in:
Jari Matilainen 2016-03-17 23:58:46 +01:00
parent 94b823c3cd
commit 857e27aef6
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/misc.c
View File

@ -169,30 +169,12 @@ int strarray_find(char **array, const char *item)
char **tmp; char **tmp;
int index; int index;
g_return_val_if_fail(array != NULL, 0);
g_return_val_if_fail(item != NULL, 0);
index = 0;
for (tmp = array; *tmp != NULL; tmp++, index++) {
if (g_ascii_strcasecmp(*tmp, item) == 0)
return index;
}
return -1;
}
int strarray_find_glob(char **array, const char *item)
{
char **tmp;
int index;
g_return_val_if_fail(array != NULL, -1); g_return_val_if_fail(array != NULL, -1);
g_return_val_if_fail(item != NULL, -1); g_return_val_if_fail(item != NULL, -1);
index = 0; index = 0;
for (tmp = array; *tmp != NULL; tmp++, index++) { for (tmp = array; *tmp != NULL; tmp++, index++) {
if (g_pattern_match_simple(*tmp, item)) if (g_ascii_strcasecmp(*tmp, item) == 0)
return index; return index;
} }

1
src/core/misc.h
View File

@ -111,7 +111,6 @@ char *replace_chars(char *str, char from, char to);
int strarray_length(char **array); int strarray_length(char **array);
/* return index of `item' in `array' or -1 if not found */ /* return index of `item' in `array' or -1 if not found */
int strarray_find(char **array, const char *item); int strarray_find(char **array, const char *item);
int strarray_find_glob(char **array, const char *item);
/* string -> uoff_t */ /* string -> uoff_t */
uoff_t str_to_uofft(const char *str); uoff_t str_to_uofft(const char *str);

13
src/fe-common/core/fe-common-core.c
View File

@ -459,12 +459,21 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
{ {
g_return_val_if_fail(array != NULL, FALSE); g_return_val_if_fail(array != NULL, FALSE);
if (strarray_find(array, "*") != -1)
return TRUE;
if (strarray_find(array, dest->target) != -1) if (strarray_find(array, dest->target) != -1)
return TRUE; return TRUE;
if (dest->server_tag != NULL) { if (dest->server_tag != NULL) {
char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target); char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, "*");
int ret = strarray_find_glob(array, tagtarget); int ret = strarray_find(array, tagtarget);
g_free(tagtarget);
if (ret != -1)
return TRUE;
tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target);
ret = strarray_find(array, tagtarget);
g_free(tagtarget); g_free(tagtarget);
if (ret != -1) if (ret != -1)
return TRUE; return TRUE;