From 857e27aef6d04edc1e47d52d74031ba279d2da1a Mon Sep 17 00:00:00 2001 From: Jari Matilainen Date: Thu, 17 Mar 2016 23:58:46 +0100 Subject: Don't use glob matching, just regular string comparisons --- src/fe-common/core/fe-common-core.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/fe-common') diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index f0549358..1b2ab1e2 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -459,12 +459,21 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) { g_return_val_if_fail(array != NULL, FALSE); + if (strarray_find(array, "*") != -1) + return TRUE; + if (strarray_find(array, dest->target) != -1) return TRUE; if (dest->server_tag != NULL) { - char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, dest->target); - int ret = strarray_find_glob(array, tagtarget); + char *tagtarget = g_strdup_printf("%s/%s", dest->server_tag, "*"); + 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); if (ret != -1) return TRUE; -- cgit v1.2.3