compatibility fixes for GLib 2.12

[ncmpc.git] / src / match.c

diff --git a/src/match.c b/src/match.c
index e414d859d4cf323d03a1d8932f5507218c71bc1f..e729b440b95e33716ee42717a35bf628a6984684 100644 (file)
--- a/src/match.c
+++ b/src/match.c
@@ -1,28 +1,56 @@
-/*
- * (c) 2008 Max Kellermann <max@duempel.org>
- *
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2009 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+
  * This program is distributed in the hope that it will be useful,
  * 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;
+}
 
 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);
+
+#if GLIB_CHECK_VERSION(2,14,0)
+       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);
+#else
+       bool ret = strstr(line_folded, needle_folded) != NULL;
+#endif
+
+       g_free(line_folded);
+       g_free(needle_folded);
+
+       return ret;
 }