[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r1470 - in /fsf/trunk/libc: ./ assert/ iconvdata/ localedata/ localedata/charmaps/ nscd/ sysdeps/unix/sysv/linux/x86_64/
- To: commits@xxxxxxxxxx
- Subject: [commits] r1470 - in /fsf/trunk/libc: ./ assert/ iconvdata/ localedata/ localedata/charmaps/ nscd/ sysdeps/unix/sysv/linux/x86_64/
- From: eglibc@xxxxxxxxxx
- Date: Fri, 16 Feb 2007 08:01:44 -0000
Author: eglibc
Date: Fri Feb 16 00:01:44 2007
New Revision: 1470
Log:
Import glibc-mainline for 2007-02-16
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/assert/assert.h
fsf/trunk/libc/iconvdata/johab.c
fsf/trunk/libc/iconvdata/ksc5601.c
fsf/trunk/libc/iconvdata/ksc5601.h
fsf/trunk/libc/iconvdata/uhc.c
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/charmaps/EUC-KR
fsf/trunk/libc/localedata/charmaps/JOHAB
fsf/trunk/libc/nscd/nscd_helper.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/send.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Feb 16 00:01:44 2007
@@ -1,3 +1,33 @@
+2007-02-15 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #3991]
+ * assert/assert.h (assert): Simplify.
+ (assert_perror): Likewise.
+ Patch by Israel G. Lugo <ilugo@xxxxxxxxxxxxxxxxxx>.
+
+ * nscd/nscd_helper.c (open_socket): Don't send padding bytes from
+ reqdata.
+
+ * sysdeps/unix/sysv/linux/x86_64/send.c (__libc_send): Cosmetic
+ change: don't pass NULL in place of an integer.
+
+2007-02-02 Bruno Haible <bruno@xxxxxxxxx>
+
+ [BZ #3954]
+ * iconvdata/ksc5601.c (__ksc5601_sym_to_ucs, __ksc5601_sym_from_ucs):
+ Add mapping for U+327E.
+ * iconvdata/ksc5601.h (KSC5601_SYMBOL): Increment.
+ * iconvdata/johab.c (BODY for FROM_LOOP, BODY for TO_LOOP): Enable
+ mapping of 0xD9 0xE8.
+ * iconvdata/uhc.c (BODY for FROM_LOOP, BODY for TO_LOOP): Disable
+ mapping of U+327E.
+ Reported by Jungshik Shin <jungshik@xxxxxxxxxx>.
+
+ [BZ #3955]
+ * iconvdata/johab.c (BODY for FROM_LOOP, BODY for TO_LOOP): Enable
+ mapping of 0xD9 0xE6 and of 0xD9 0xE7.
+ Reported by Jungshik Shin <jungshik@xxxxxxxxxx>.
+
2007-02-14 Ulrich Drepper <drepper@xxxxxxxxxx>
* sysdeps/x86_64/bits/atomic;h: Fix asm parameters for some
Modified: fsf/trunk/libc/assert/assert.h
==============================================================================
--- fsf/trunk/libc/assert/assert.h (original)
+++ fsf/trunk/libc/assert/assert.h Fri Feb 16 00:01:44 2007
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1992,1994-2001,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1994-2001,2003,2004,2007
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -87,15 +88,13 @@
# define assert(expr) \
((expr) \
? __ASSERT_VOID_CAST (0) \
- : (__assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION), \
- __ASSERT_VOID_CAST (0)))
+ : __assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION))
# ifdef __USE_GNU
# define assert_perror(errnum) \
(!(errnum) \
? __ASSERT_VOID_CAST (0) \
- : (__assert_perror_fail ((errnum), __FILE__, __LINE__, __ASSERT_FUNCTION), \
- __ASSERT_VOID_CAST (0)))
+ : __assert_perror_fail ((errnum), __FILE__, __LINE__, __ASSERT_FUNCTION))
# endif
/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
Modified: fsf/trunk/libc/iconvdata/johab.c
==============================================================================
--- fsf/trunk/libc/iconvdata/johab.c (original)
+++ fsf/trunk/libc/iconvdata/johab.c Fri Feb 16 00:01:44 2007
@@ -1,5 +1,5 @@
/* Mapping tables for JOHAB handling.
- Copyright (C) 1998, 1999, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000-2002, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jungshik Shin <jshin@xxxxxxxxxxxxxxxxx>
and Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
@@ -239,7 +239,7 @@
if (__builtin_expect (ch2 < 0x31, 0) \
|| (__builtin_expect (ch2 > 0x7e, 0) && ch2 < 0x91) \
|| __builtin_expect (ch2, 0) == 0xff \
- || (__builtin_expect (ch, 0) == 0xd9 && ch2 > 0xe5) \
+ || (__builtin_expect (ch, 0) == 0xd9 && ch2 > 0xe8) \
|| (__builtin_expect (ch, 0) == 0xda \
&& ch2 > 0xa0 && ch2 < 0xd4) \
|| (__builtin_expect (ch, 0) == 0xde && ch2 > 0xf1)) \
@@ -386,7 +386,7 @@
break; \
} \
if (__builtin_expect (written == __UNKNOWN_10646_CHAR, 0) \
- || (outptr[0] == 0x22 && outptr[1] > 0x65)) \
+ || (outptr[0] == 0x22 && outptr[1] > 0x68)) \
{ \
UNICODE_TAG_HANDLER (ch, 4); \
STANDARD_TO_LOOP_ERR_HANDLER (4); \
Modified: fsf/trunk/libc/iconvdata/ksc5601.c
==============================================================================
--- fsf/trunk/libc/iconvdata/ksc5601.c (original)
+++ fsf/trunk/libc/iconvdata/ksc5601.c Fri Feb 16 00:01:44 2007
@@ -1,5 +1,5 @@
/* Conversion tables for KS C 5601-1992 based encoding conversion.
- Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2000, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jungshik Shin <jshin@xxxxxxxxxxxxxxxxx>, 1998.
@@ -412,7 +412,8 @@
[0x0098] = 0x2669, [0x0099] = 0x266a, [0x009a] = 0x266c, [0x009b] = 0x327f,
[0x009c] = 0x321c, [0x009d] = 0x2116, [0x009e] = 0x33c7, [0x009f] = 0x2122,
[0x00a0] = 0x33c2, [0x00a1] = 0x33d8, [0x00a2] = 0x2121, [0x00a3] = 0x20ac,
- [0x00a4] = 0x00ae, [0x00bc] = 0xff01, [0x00bd] = 0xff02, [0x00be] = 0xff03,
+ [0x00a4] = 0x00ae, [0x00a5] = 0x327e,
+ [0x00bc] = 0xff01, [0x00bd] = 0xff02, [0x00be] = 0xff03,
[0x00bf] = 0xff04, [0x00c0] = 0xff05, [0x00c1] = 0xff06, [0x00c2] = 0xff07,
[0x00c3] = 0xff08, [0x00c4] = 0xff09, [0x00c5] = 0xff0a, [0x00c6] = 0xff0b,
[0x00c7] = 0xff0c, [0x00c8] = 0xff0d, [0x00c9] = 0xff0e, [0x00ca] = 0xff0f,
@@ -917,6 +918,7 @@
{0x3273, "\x28\x44"}, {0x3274, "\x28\x45"}, {0x3275, "\x28\x46"},
{0x3276, "\x28\x47"}, {0x3277, "\x28\x48"}, {0x3278, "\x28\x49"},
{0x3279, "\x28\x4a"}, {0x327a, "\x28\x4b"}, {0x327b, "\x28\x4c"},
+ {0x327e, "\x22\x68"},
{0x327f, "\x22\x5e"}, {0x3380, "\x27\x49"}, {0x3381, "\x27\x4a"},
{0x3382, "\x27\x4b"}, {0x3383, "\x27\x4c"}, {0x3384, "\x27\x4d"},
{0x3388, "\x27\x3a"}, {0x3389, "\x27\x3b"}, {0x338a, "\x27\x5c"},
Modified: fsf/trunk/libc/iconvdata/ksc5601.h
==============================================================================
--- fsf/trunk/libc/iconvdata/ksc5601.h (original)
+++ fsf/trunk/libc/iconvdata/ksc5601.h Fri Feb 16 00:01:44 2007
@@ -1,5 +1,5 @@
/* Access functions for KS C 5601-1992 based encoding conversion.
- Copyright (C) 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2003, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#define KSC5601_HANGUL 2350
#define KSC5601_HANJA 4888
-#define KSC5601_SYMBOL 988
+#define KSC5601_SYMBOL 989
#include <gconv.h>
#include <stdint.h>
Modified: fsf/trunk/libc/iconvdata/uhc.c
==============================================================================
--- fsf/trunk/libc/iconvdata/uhc.c (original)
+++ fsf/trunk/libc/iconvdata/uhc.c Fri Feb 16 00:01:44 2007
@@ -1,5 +1,5 @@
/* Mapping tables for UHC handling.
- Copyright (C) 1998, 1999, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000-2002, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jungshik Shin <jshin@xxxxxxxxxxxxxxxxx>, 1998.
@@ -3135,7 +3135,8 @@
else \
{ \
ch = ksc5601_to_ucs4 (&inptr, 2, 0x80); \
- if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0)) \
+ if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0) \
+ || __builtin_expect (ch == 0x327e, 0)) \
{ \
/* Illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
@@ -3207,15 +3208,16 @@
{ \
size_t written = ucs4_to_ksc5601_sym (ch, outptr, outend - outptr); \
\
+ if (__builtin_expect (ch == 0x327e, 0) \
+ || __builtin_expect (written == __UNKNOWN_10646_CHAR, 0)) \
+ { \
+ UNICODE_TAG_HANDLER (ch, 4); \
+ STANDARD_TO_LOOP_ERR_HANDLER (4); \
+ } \
if (__builtin_expect (written == 0, 0)) \
{ \
result = __GCONV_FULL_OUTPUT; \
break; \
- } \
- if (__builtin_expect (written == __UNKNOWN_10646_CHAR, 0)) \
- { \
- UNICODE_TAG_HANDLER (ch, 4); \
- STANDARD_TO_LOOP_ERR_HANDLER (4); \
} \
\
*outptr++ |= 0x80; \
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Fri Feb 16 00:01:44 2007
@@ -1,3 +1,12 @@
+2007-02-02 Bruno Haible <bruno@xxxxxxxxx>
+
+ * charmaps/EUC-KR: Add mapping for 0xA2 0xE8.
+ * charmaps/JOHAB: Add mapping for 0xD9 0xE8.
+ Reported by Jungshik Shin <jungshik@xxxxxxxxxx>.
+
+ * charmaps/JOHAB: Add mappings for 0xD9 0xE6 and 0xD9 0xE7.
+ Reported by Jungshik Shin <jungshik@xxxxxxxxxx>.
+
2007-01-19 Ulrich Drepper <drepper@xxxxxxxxxx>
* charmaps/BRF: New file.
Modified: fsf/trunk/libc/localedata/charmaps/EUC-KR
==============================================================================
--- fsf/trunk/libc/localedata/charmaps/EUC-KR (original)
+++ fsf/trunk/libc/localedata/charmaps/EUC-KR Fri Feb 16 00:01:44 2007
@@ -341,6 +341,7 @@
<U2121> /xa2/xe5 TELEPHONE SIGN
<U20AC> /xa2/xe6 EURO SIGN
<U00AE> /xa2/xe7 REGISTERED SIGN
+<U327E> /xa2/xe8 CIRCLED HANGUL IEUNG U
<UFF01> /xa3/xa1 FULLWIDTH EXCLAMATION MARK
<UFF02> /xa3/xa2 FULLWIDTH QUOTATION MARK
<UFF03> /xa3/xa3 FULLWIDTH NUMBER SIGN
Modified: fsf/trunk/libc/localedata/charmaps/JOHAB
==============================================================================
--- fsf/trunk/libc/localedata/charmaps/JOHAB (original)
+++ fsf/trunk/libc/localedata/charmaps/JOHAB Fri Feb 16 00:01:44 2007
@@ -11520,6 +11520,9 @@
<U33C2> /xd9/xe3 SQUARE AM
<U33D8> /xd9/xe4 SQUARE PM
<U2121> /xd9/xe5 TELEPHONE SIGN
+<U20AC> /xd9/xe6 EURO SIGN
+<U00AE> /xd9/xe7 REGISTERED SIGN
+<U327E> /xd9/xe8 CIRCLED HANGUL IEUNG U
<UFF01> /xda/x31 FULLWIDTH EXCLAMATION MARK
<UFF02> /xda/x32 FULLWIDTH QUOTATION MARK
<UFF03> /xda/x33 FULLWIDTH NUMBER SIGN
Modified: fsf/trunk/libc/nscd/nscd_helper.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd_helper.c (original)
+++ fsf/trunk/libc/nscd/nscd_helper.c Fri Feb 16 00:01:44 2007
@@ -108,6 +108,7 @@
request_header req;
char key[keylen];
} reqdata;
+ size_t real_sizeof_reqdata = sizeof (request_header) + keylen;
/* Make socket non-blocking. */
__fcntl (sock, F_SETFL, O_RDWR | O_NONBLOCK);
@@ -135,9 +136,9 @@
# define MSG_NOSIGNAL 0
#endif
ssize_t wres = TEMP_FAILURE_RETRY (__send (sock, &reqdata,
- sizeof (reqdata),
+ real_sizeof_reqdata,
MSG_NOSIGNAL));
- if (__builtin_expect (wres == (ssize_t) sizeof (reqdata), 1))
+ if (__builtin_expect (wres == (ssize_t) real_sizeof_reqdata, 1))
/* We managed to send the request. */
return sock;
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/send.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/send.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/send.c Fri Feb 16 00:01:44 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -25,11 +25,12 @@
__libc_send (int fd, const void *buf, size_t n, int flags)
{
if (SINGLE_THREAD_P)
- return INLINE_SYSCALL (sendto, 6, fd, buf, n, flags, NULL, NULL);
+ return INLINE_SYSCALL (sendto, 6, fd, buf, n, flags, NULL, (size_t) 0);
int oldtype = LIBC_CANCEL_ASYNC ();
- ssize_t result = INLINE_SYSCALL (sendto, 6, fd, buf, n, flags, NULL, NULL);
+ ssize_t result = INLINE_SYSCALL (sendto, 6, fd, buf, n, flags, NULL,
+ (size_t) 0);
LIBC_CANCEL_RESET (oldtype);