aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--wcsmbs/wcsmbsload.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c3619dc9cf..50a06c2cd9 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 5373da96d2..1f4065513d 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; \
})