Merge pull request #1151 from ascent12/master

Change regex to use PCRE

sway/criteria.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <regex.h>
+#include <pcre.h>
 #include "sway/criteria.h"
 #include "sway/container.h"
 #include "sway/config.h"
@@ -23,17 +23,16 @@ enum criteria_type { // *must* keep in sync with criteria_strings[]
 	CRIT_LAST
 };
 
-// this *must* match the ordering in criteria_type enum
+static const char * const criteria_strings[CRIT_LAST] = {
-static const char * const criteria_strings[] = {
+	[CRIT_CLASS] = "class",
-	"class",
+	[CRIT_CON_MARK] = "con_mark",
-	"con_mark",
+	[CRIT_ID] = "id",
-	"id",
+	[CRIT_INSTANCE] = "instance",
-	"instance",
+	[CRIT_TITLE] = "title",
-	"title",
+	[CRIT_URGENT] = "urgent", // either "latest" or "oldest" ...
-	"urgent", // either "latest" or "oldest" ...
+	[CRIT_WINDOW_ROLE] = "window_role",
-	"window_role",
+	[CRIT_WINDOW_TYPE] = "window_type",
-	"window_type",
+	[CRIT_WORKSPACE] = "workspace"
-	"workspace"
 };
 
 /**
@@ -42,18 +41,13 @@ static const char * const criteria_strings[] = {
  */
 struct crit_token {
 	enum criteria_type type;
-	regex_t *regex;
+	pcre *regex;
 	char *raw;
 };
 
 static void free_crit_token(struct crit_token *crit) {
-	if (crit->regex) {
+	pcre_free(crit->regex);
-		regfree(crit->regex);
+	free(crit->raw);
-		free(crit->regex);
-	}
-	if (crit->raw) {
-		free(crit->raw);
-	}
 	free(crit);
 }
 
@@ -190,18 +184,17 @@ static char *parse_criteria_name(enum criteria_type *type, char *name) {
 }
 
 // Returns error string on failure or NULL otherwise.
-static char *generate_regex(regex_t **regex, char *value) {
+static char *generate_regex(pcre **regex, char *value) {
-	*regex = calloc(1, sizeof(regex_t));
+	const char *reg_err;
-	int err = regcomp(*regex, value, REG_NOSUB);
+	int offset;
-	if (err != 0) {
+
-		char *reg_err = malloc(64);
+	*regex = pcre_compile(value, PCRE_UTF8 | PCRE_UCP, &reg_err, &offset, NULL);
-		regerror(err, *regex, reg_err, 64);
 
+	if (!*regex) {
 		const char *fmt = "Regex compilation (for '%s') failed: %s";
 		int len = strlen(fmt) + strlen(value) + strlen(reg_err) - 3;
 		char *error = malloc(len);
 		snprintf(error, len, fmt, value, reg_err);
-		free(reg_err);
 		return error;
 	}
 	return NULL;
@@ -245,8 +238,8 @@ ect_cleanup:
 	return error;
 }
 
-static int regex_cmp(const char *item, const regex_t *regex) {
+static int regex_cmp(const char *item, const pcre *regex) {
-    return regexec(regex, item, 0, NULL, 0);
+	return pcre_exec(regex, NULL, item, strlen(item), 0, 0, NULL, 0);
 }
 
 // test a single view if it matches list of criteria tokens (all of them).
@@ -266,7 +259,7 @@ static bool criteria_test(swayc_t *cont, list_t *tokens) {
 				if (focused->class && strcmp(cont->class, focused->class) == 0) {
 					matches++;
 				}
-			} else if (crit->regex && regexec(crit->regex, cont->class, 0, NULL, 0) == 0) {
+			} else if (crit->regex && regex_cmp(cont->class, crit->regex) == 0) {
 				matches++;
 			}
 			break;
@@ -281,7 +274,7 @@ static bool criteria_test(swayc_t *cont, list_t *tokens) {
 		case CRIT_ID:
 			if (!cont->app_id) {
 				// ignore
-			} else if (crit->regex && regexec(crit->regex, cont->app_id, 0, NULL, 0) == 0) {
+			} else if (crit->regex && regex_cmp(cont->app_id, crit->regex) == 0) {
 				matches++;
 			}
 			break;
@@ -293,7 +286,7 @@ static bool criteria_test(swayc_t *cont, list_t *tokens) {
 				if (focused->instance && strcmp(cont->instance, focused->instance) == 0) {
 					matches++;
 				}
-			} else if (crit->regex && regexec(crit->regex, cont->instance, 0, NULL, 0) == 0) {
+			} else if (crit->regex && regex_cmp(cont->instance, crit->regex) == 0) {
 				matches++;
 			}
 			break;
@@ -305,7 +298,7 @@ static bool criteria_test(swayc_t *cont, list_t *tokens) {
 				if (focused->name && strcmp(cont->name, focused->name) == 0) {
 					matches++;
 				}
-			} else if (crit->regex && regexec(crit->regex, cont->name, 0, NULL, 0) == 0) {
+			} else if (crit->regex && regex_cmp(cont->name, crit->regex) == 0) {
 				matches++;
 			}
 			break;
@@ -325,7 +318,7 @@ static bool criteria_test(swayc_t *cont, list_t *tokens) {
 				if (focused_ws->name && strcmp(cont_ws->name, focused_ws->name) == 0) {
 					matches++;
 				}
-			} else if (crit->regex && regexec(crit->regex, cont_ws->name, 0, NULL, 0) == 0) {
+			} else if (crit->regex && regex_cmp(cont_ws->name, crit->regex) == 0) {
 				matches++;
 			}
 			break;