From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 13 May 1998 16:05:28 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/libc-ud-980518~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7c378d8cdaea230b545936dede0d3aa567429b6;p=thirdparty%2Fglibc.git

Update.

1998-05-13  Ulrich Drepper  <drepper@cygnus.com>

	* wcsmbs/wcsmbsload.c (extract_charset_name): Fix silly bugs in
	last addition.  Patch by wkpark@chem.skku.ac.kr.
---

diff --git a/ChangeLog b/ChangeLog
index c3619dc9cfb..50a06c2cd93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* wcsmbs/wcsmbsload.c (extract_charset_name): Fix silly bugs in
+	last addition.  Patch by wkpark@chem.skku.ac.kr.
+
 1998-05-12  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
 	* iconvdata/8bit-gap.c (BODY): Don't fall off the end of the gap
diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c
index 5373da96d2c..1f4065513d3 100644
--- a/wcsmbs/wcsmbsload.c
+++ b/wcsmbs/wcsmbsload.c
@@ -96,15 +96,15 @@ getfct (const char *to, const char *from)
     const char *cp = str;						      \
     char *result = NULL;						      \
 									      \
-    while (strchr ("@._+,", *cp) == NULL)				      \
+    while (strchr ("@.+,", *cp) == NULL)				      \
       ++cp;								      \
     if (*cp == '.')							      \
       {									      \
-	const char *endp = cp;						      \
+	const char *endp = ++cp;					      \
 	while (*endp != '\0' && *endp != '@')				      \
 	  ++endp;							      \
 	if (endp != cp)							      \
-	  result = strndupa (str, endp - cp);				      \
+	  result = strndupa (cp, endp - cp);				      \
       }									      \
     result;								      \
   })