lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

[BZ #1386]

Browse Source 
* iconvdata/ibm932.c: Change mapping to allow round-trips.
	* iconvdata/ibm943.c: Likewise.
	Patch by Masahide Washizawa <WASHI@jp.ibm.com>.
This commit is contained in:
Ulrich Drepper
2006-04-27 05:54:27 +00:00
parent b8c31ac161
commit 15627a21c6
4 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -5,6 +5,11 @@
2006-04-26 Ulrich Drepper <drepper@redhat.com> 2006-04-26 Ulrich Drepper <drepper@redhat.com>
[BZ #1386]
* iconvdata/ibm932.c: Change mapping to allow round-trips.
* iconvdata/ibm943.c: Likewise.
Patch by Masahide Washizawa <WASHI@jp.ibm.com>.
* sysdeps/unix/sysv/linux/syscalls.list: Add vmsplice. * sysdeps/unix/sysv/linux/syscalls.list: Add vmsplice.
* sysdeps/unix/sysv/linux/Versions: Export vmsplice@@GLIBC_2.5. * sysdeps/unix/sysv/linux/Versions: Export vmsplice@@GLIBC_2.5.
* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Declare vmsplice. * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Declare vmsplice.

16
iconvdata/ibm932.c
View File

@ -94,16 +94,10 @@
} \ } \
else \ else \
{ \ { \
if (res == 0x1c) \ if (res == 0xa5) \
res = 0x1a; \
else if (res == 0x7f) \
res = 0x1c; \
else if (res == 0xa5) \
res = 0x5c; \ res = 0x5c; \
else if (res == 0x203e) \ else if (res == 0x203e) \
res = 0x7e; \ res = 0x7e; \
else if (res == 0x1a) \
res = 0x7f; \
put32 (outptr, res); \ put32 (outptr, res); \
outptr += 4; \ outptr += 4; \
inptr++; \ inptr++; \
@ -117,16 +111,10 @@
uint32_t res = __ibm932sb_to_ucs4[c]; \ uint32_t res = __ibm932sb_to_ucs4[c]; \
if (res == 0 && c != 0) \ if (res == 0 && c != 0) \
return WEOF; \ return WEOF; \
if (res == 0x1c) \ if (res == 0xa5) \
res = 0x1a; \
else if (res == 0x7f) \
res = 0x1c; \
else if (res == 0xa5) \
res = 0x5c; \ res = 0x5c; \
else if (res == 0x203e) \ else if (res == 0x203e) \
res = 0x7e; \ res = 0x7e; \
else if (res == 0x1a) \
res = 0x7f; \
return res; \ return res; \
} }
#include <iconv/loop.c> #include <iconv/loop.c>

16
iconvdata/ibm943.c
View File

@ -95,16 +95,10 @@
} \ } \
else \ else \
{ \ { \
if (res == 0x1c) \ if (res == 0xa5) \
res = 0x1a; \
else if (res == 0x7f) \
res = 0x1c; \
else if (res == 0xa5) \
res = 0x5c; \ res = 0x5c; \
else if (res == 0x203e) \ else if (res == 0x203e) \
res = 0x7e; \ res = 0x7e; \
else if (res == 0x1a) \
res = 0x7f; \
put32 (outptr, res); \ put32 (outptr, res); \
outptr += 4; \ outptr += 4; \
inptr++; \ inptr++; \
@ -118,16 +112,10 @@
uint32_t res = __ibm943sb_to_ucs4[c]; \ uint32_t res = __ibm943sb_to_ucs4[c]; \
if (res == 0 && c != 0) \ if (res == 0 && c != 0) \
return WEOF; \ return WEOF; \
if (res == 0x1c) \ if (res == 0xa5) \
res = 0x1a; \
else if (res == 0x7f) \
res = 0x1c; \
else if (res == 0xa5) \
res = 0x5c; \ res = 0x5c; \
else if (res == 0x203e) \ else if (res == 0x203e) \
res = 0x7e; \ res = 0x7e; \
else if (res == 0x1a) \
res = 0x7f; \
return res; \ return res; \
} }
#include <iconv/loop.c> #include <iconv/loop.c>

4
sysdeps/unix/sysv/linux/bits/uio.h
View File

@ -20,6 +20,8 @@
# error "Never include <bits/uio.h> directly; use <sys/uio.h> instead." # error "Never include <bits/uio.h> directly; use <sys/uio.h> instead."
#endif #endif
#ifndef _BITS_UIO_H
#define _BITS_UIO_H 1
#include <sys/types.h> #include <sys/types.h>
@ -44,3 +46,5 @@ struct iovec
void *iov_base; /* Pointer to data. */ void *iov_base; /* Pointer to data. */
size_t iov_len; /* Length of data. */ size_t iov_len; /* Length of data. */
}; };
#endif