diff --git a/src/match.c b/src/match.c
index e414d859d4cf323d03a1d8932f5507218c71bc1f..9e4c39148483210b21e656a9bc2648bdcc859b00 100644 (file)
--- a/src/match.c
+++ b/src/match.c
-/*
- * (c) 2008 Max Kellermann <max@duempel.org>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "match.h"
-#include "support.h"
+#include "charset.h"
+#include <glib.h>
#include <string.h>
+#include <ctype.h>
+
+static char *
+locale_casefold(const char *src)
+{
+ char *utf8 = locale_to_utf8(src);
+ char *folded = g_utf8_casefold(utf8, -1);
+
+ g_free(utf8);
+ return folded;
+}
+
+GRegex *
+compile_regex(const char *src, bool anchor)
+{
+ GRegexCompileFlags compile_flags =
+ G_REGEX_CASELESS | G_REGEX_DOTALL | G_REGEX_OPTIMIZE;
+ if (anchor)
+ compile_flags |= G_REGEX_ANCHORED;
+
+ char *src_folded = locale_casefold(src);
+ GRegex *regex = g_regex_new ((const gchar*)src_folded, compile_flags,
+ 0, NULL);
+
+ g_free(src_folded);
+
+ return regex;
+}
+
+bool
+match_regex(GRegex *regex, const char *line)
+{
+ char *line_folded = locale_casefold(line);
+ GMatchInfo *match_info;
+ g_regex_match(regex, line_folded, 0, &match_info);
+ bool match = (bool)g_match_info_matches(match_info);
+
+ g_match_info_free(match_info);
+ g_free(line_folded);
+
+ return match;
+}
bool
match_line(const char *line, const char *needle)
{
- return strcasestr(line, needle) != NULL;
+ char *line_folded = locale_casefold(line);
+ char *needle_folded = locale_casefold(needle);
+
+ bool ret = (bool)g_regex_match_simple((const gchar*)needle_folded,
+ (const gchar*)line_folded,
+ G_REGEX_CASELESS | G_REGEX_DOTALL | G_REGEX_OPTIMIZE,
+ 0);
+
+ g_free(line_folded);
+ g_free(needle_folded);
+
+ return ret;
}