From: Bruno Haible <bruno@clisp.org>
Date: Sun, 4 Mar 2007 22:17:49 +0000 (+0000)
Subject: Use mbsstr instead of strstr.
X-Git-Tag: v0.17~453
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2552cadcef98e62f1c2d8246cde6aff5f5a335c0;p=thirdparty%2Fgettext.git

Use mbsstr instead of strstr.
---

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index a8e54834c..400d5d1a3 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-04  Bruno Haible  <bruno@clisp.org>
+
+	* lib/propername.c (proper_name, proper_name_utf8): Use mbsstr instead
+	of strstr.
+	* modules/propername (Depends-on): Remove strstr. Add mbsstr.
+
 2007-03-04  Bruno Haible  <bruno@clisp.org>
 
 	Moved --enable-relocatable infrastructure to gnulib.
diff --git a/gnulib-local/lib/propername.c b/gnulib-local/lib/propername.c
index 7a7f4bcd8..bc9818e03 100644
--- a/gnulib-local/lib/propername.c
+++ b/gnulib-local/lib/propername.c
@@ -47,7 +47,7 @@ proper_name (const char *name)
   if (translation != name)
     {
       /* See whether the translation contains the original name.  */
-      if (strstr (translation, name) != NULL)
+      if (mbsstr (translation, name) != NULL)
 	return translation;
       else
 	{
@@ -121,9 +121,9 @@ proper_name_utf8 (const char *name_ascii, const char *name_utf8)
 	 The multibyte-aware mbsstr() is not absolutely necessary here.  */
       if (c_strstr (translation, name_ascii) != NULL
 	  || (name_converted != NULL
-	      && strstr (translation, name_converted) != NULL)
+	      && mbsstr (translation, name_converted) != NULL)
 	  || (name_converted_translit != NULL
-	      && strstr (translation, name_converted_translit) != NULL))
+	      && mbsstr (translation, name_converted_translit) != NULL))
 	{
 	  if (alloc_name_converted != NULL)
 	    free (alloc_name_converted);
diff --git a/gnulib-local/modules/propername b/gnulib-local/modules/propername
index 4ab93eb07..7fca804dd 100644
--- a/gnulib-local/modules/propername
+++ b/gnulib-local/modules/propername
@@ -11,7 +11,7 @@ localcharset
 c-strcase
 xstriconv
 c-strstr
-strstr
+mbsstr
 xalloc
 gettext-h