[commits] r6193 - in /trunk/libc: ./ localedata/ localedata/locales/ string/ sysdeps/posix/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Sat May 17 04:15:38 2008
New Revision: 6193

Log:
Merge changes between r6177 and r6192 from /fsf/trunk.

Modified:
    trunk/libc/ChangeLog
    trunk/libc/localedata/ChangeLog
    trunk/libc/localedata/locales/iso14651_t1_common
    trunk/libc/string/strcasestr.c
    trunk/libc/sysdeps/posix/getaddrinfo.c

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Sat May 17 04:15:38 2008
@@ -1,3 +1,10 @@
+2008-05-16  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* string/strcasestr.c (CMP_FUNC): Use __strncasecmp, not strncasecmp.
+
+	* sysdeps/posix/getaddrinfo.c (gaih_inet): After gethostbyname4_r
+	lookup, don't assign canon unconditionally.
+
 2008-05-14  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* string/Makefile (distribute): Add str-two-way.h.

Modified: trunk/libc/localedata/ChangeLog
==============================================================================
--- trunk/libc/localedata/ChangeLog (original)
+++ trunk/libc/localedata/ChangeLog Sat May 17 04:15:38 2008
@@ -1,3 +1,7 @@
+2008-05-16  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* locales/iso14651_t1_common: Remove duplicate U0C7B definition.
+
 2008-05-14  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #6438]

Modified: trunk/libc/localedata/locales/iso14651_t1_common
==============================================================================
--- trunk/libc/localedata/locales/iso14651_t1_common (original)
+++ trunk/libc/localedata/locales/iso14651_t1_common Sat May 17 04:15:38 2008
@@ -3416,7 +3416,8 @@
 <U0C15> <t-ka>;<BAS>;<MIN>;IGNORE
 <U0C16> <t-kha>;<BAS>;<MIN>;IGNORE
 <U0C17> <t-ga>;<BAS>;<MIN>;IGNORE
-<U0C7B> <t-gga>;<BAS>;<MIN>;IGNORE
+#XXX This is wrong since there is already a definition for U0C7B.
+#<U0C7B> <t-gga>;<BAS>;<MIN>;IGNORE
 <U0C18> <t-gha>;<BAS>;<MIN>;IGNORE
 <U0C19> <t-nga>;<BAS>;<MIN>;IGNORE
 <U0C1A> <t-ca>;<BAS>;<MIN>;IGNORE

Modified: trunk/libc/string/strcasestr.c
==============================================================================
--- trunk/libc/string/strcasestr.c (original)
+++ trunk/libc/string/strcasestr.c Sat May 17 04:15:38 2008
@@ -46,7 +46,7 @@
    && ((h_l) = (j) + (n_l)))
 #define CANON_ELEMENT(c) TOLOWER (c)
 #define CMP_FUNC(p1, p2, l)				\
-  strncasecmp ((const char *) (p1), (const char *) (p2), l)
+  __strncasecmp ((const char *) (p1), (const char *) (p2), l)
 #include "str-two-way.h"
 
 #undef strcasestr

Modified: trunk/libc/sysdeps/posix/getaddrinfo.c
==============================================================================
--- trunk/libc/sysdeps/posix/getaddrinfo.c (original)
+++ trunk/libc/sysdeps/posix/getaddrinfo.c Sat May 17 04:15:38 2008
@@ -729,7 +729,8 @@
 
 		  if (status == NSS_STATUS_SUCCESS)
 		    {
-		      canon = (*pat)->name;
+		      if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL)
+			canon = (*pat)->name;
 
 		      while (*pat != NULL)
 			pat = &((*pat)->next);
@@ -953,7 +954,7 @@
 		    return -EAI_IDN_ENCODE;
 		  }
 		/* In case the output string is the same as the input
-		   string no new string has been allocated.  Otherwise
+		   string no new string has been allocated and we
 		   make a copy.  */
 		if (out == canon)
 		  goto make_copy;