1 files changed, 19 insertions, 11 deletions

diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 96242f9e..800e881d 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -58,14 +58,17 @@ static void ignore_print(int index, IGNORE_REC *rec)
 		g_string_append(options, "-regexp ");
 		if (rec->pattern == NULL)
 			g_string_append(options, "[INVALID! -pattern missing] ");
-#ifdef HAVE_REGEX_H
+#ifdef USE_GREGEX
+		else if (rec->preg == NULL)
+			g_string_append(options, "[INVALID!] ");
+#else
 		else if (!rec->regexp_compiled)
 			g_string_append(options, "[INVALID!] ");
 #endif
 	}
 	if (rec->fullword) g_string_append(options, "-full ");
 	if (rec->replies) g_string_append(options, "-replies ");
-	if (rec->servertag != NULL) 
+	if (rec->servertag != NULL)
 		g_string_append_printf(options, "-network %s ", rec->servertag);
 	if (rec->pattern != NULL)
 		g_string_append_printf(options, "-pattern %s ", rec->pattern);
@@ -127,7 +130,8 @@ static void cmd_ignore(const char *data)
 		return;
 	}
 
-	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST,
+	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | 
+			    PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
 			    "ignore", &optlist, &mask, &levels))
 		return;
 
@@ -137,7 +141,7 @@ static void cmd_ignore(const char *data)
 	/* Allow -ircnet for backwards compatibility */
 	if (!servertag)
 		servertag = g_hash_table_lookup(optlist, "ircnet");
-	
+
 	if (*mask == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
         if (*levels == '\0') levels = "ALL";
 	level = level2bits(levels, NULL);
@@ -157,15 +161,15 @@ static void cmd_ignore(const char *data)
 	channels = (chanarg == NULL || *chanarg == '\0') ? NULL :
 		g_strsplit(chanarg, ",", -1);
 
-	rec = patternarg != NULL ? NULL: ignore_find_noact(servertag, mask, channels,
-			(level & MSGLEVEL_NO_ACT));
+	rec = ignore_find_full(servertag, mask, patternarg, channels,
+			  IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0));
 	new_ignore = rec == NULL;
 
 	if (rec == NULL) {
 		rec = g_new0(IGNORE_REC, 1);
 
 		rec->mask = mask == NULL || *mask == '\0' ||
-			strcmp(mask, "*") == 0 ? NULL : g_strdup(mask);
+			g_strcmp0(mask, "*") == 0 ? NULL : g_strdup(mask);
 		rec->channels = channels;
 	} else {
                 g_free_and_null(rec->pattern);
@@ -214,7 +218,7 @@ static void cmd_unignore(const char *data)
 {
 	IGNORE_REC *rec;
 	GSList *tmp;
-        char *mask;
+        char *mask, *mask_orig;
 	void *free_arg;
 
 	if (!cmd_get_params(data, &free_arg, 1, &mask))
@@ -223,6 +227,10 @@ static void cmd_unignore(const char *data)
 	if (*mask == '\0')
                 cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 
+	/* Save the mask string here since it might be modified in the code
+	 * below and we need it to print meaningful error messages. */
+	mask_orig = mask;
+
 	if (is_numeric(mask, ' ')) {
 		/* with index number */
 		tmp = g_slist_nth(ignores, atoi(mask)-1);
@@ -236,9 +244,9 @@ static void cmd_unignore(const char *data)
 			chans[0] = mask;
 			mask = NULL;
 		}
-		rec = ignore_find_noact("*", mask, (char **) chans, 0);
+		rec = ignore_find_full("*", mask, NULL, (char **) chans, 0);
 		if (rec == NULL) {
-			rec = ignore_find_noact("*", mask, (char **) chans, 1);
+			rec = ignore_find_full("*", mask, NULL, (char **) chans, IGNORE_FIND_NOACT);
 		}
 	}
 
@@ -247,7 +255,7 @@ static void cmd_unignore(const char *data)
 		ignore_update_rec(rec);
 	} else {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-			    TXT_IGNORE_NOT_FOUND, mask);
+			    TXT_IGNORE_NOT_FOUND, mask_orig);
 	}
 	cmd_params_free(free_arg);
 }