diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 14:12:05 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 14:12:05 +0000 |
| commit | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (patch) | |
| tree | 12a521ddf17b3e1bb26594656bbb05903c54afd0 /iconvdata | |
| parent | 7bb5f8a836b916d6ebf7b6921b136e99cea2442d (diff) | |
| parent | 3c03baca37fdcb52c3881e653ca392bba7a99c2b (diff) | |
Merge tag 'glibc-2.28' into baseline-2.28baseline
The GNU C Library
=================
The GNU C Library version 2.28 is now available.
The GNU C Library is used as *the* C library in the GNU system and
in GNU/Linux systems, as well as many other systems that use Linux
as the kernel.
The GNU C Library is primarily designed to be a portable
and high performance C library. It follows all relevant
standards including ISO C11 and POSIX.1-2008. It is also
internationalized and has one of the most complete
internationalization interfaces known.
The GNU C Library webpage is at http://www.gnu.org/software/libc/
Packages for the 2.28 release may be downloaded from:
http://ftpmirror.gnu.org/libc/
http://ftp.gnu.org/gnu/libc/
The mirror list is at http://www.gnu.org/order/ftp.html
NEWS for version 2.28
=====================
Major new features:
* The localization data for ISO 14651 is updated to match the 2016
Edition 4 release of the standard, this matches data provided by
Unicode 9.0.0. This update introduces significant improvements to the
collation of Unicode characters. This release deviates slightly from
the standard in that the collation element ordering for lowercase and
uppercase LATIN script characters is adjusted to ensure that regular
expressions with ranges like [a-z] and [A-Z] don't interleave e.g. A
is not matched by [a-z]. With the update many locales have been
updated to take advantage of the new collation information. The new
collation information has increased the size of the compiled locale
archive or binary locales.
* The GNU C Library can now be compiled with support for Intel CET, AKA
Intel Control-flow Enforcement Technology. When the library is built
with --enable-cet, the resulting glibc is protected with indirect
branch tracking (IBT) and shadow stack (SHSTK). CET-enabled glibc is
compatible with all existing executables and shared libraries. This
feature is currently supported on i386, x86_64 and x32 with GCC 8 and
binutils 2.29 or later. Note that CET-enabled glibc requires CPUs
capable of multi-byte NOPs, like x86-64 processors as well as Intel
Pentium Pro or newer. NOTE: --enable-cet has been tested for i686,
x86_64 and x32 on non-CET processors. --enable-cet has been tested
for x86_64 and x32 on CET SDVs, but Intel CET support hasn't been
validated for i686.
* The GNU C Library now has correct support for ABSOLUTE symbols
(SHN_ABS-relative symbols). Previously such ABSOLUTE symbols were
relocated incorrectly or in some cases discarded. The GNU linker can
make use of the newer semantics, but it must communicate it to the
dynamic loader by setting the ELF file's identification (EI_ABIVERSION
field) to indicate such support is required.
* Unicode 11.0.0 Support: Character encoding, character type info, and
transliteration tables are all updated to Unicode 11.0.0, using
generator scripts contributed by Mike FABIAN (Red Hat).
* <math.h> functions that round their results to a narrower type are added
from TS 18661-1:2014 and TS 18661-3:2015:
- fadd, faddl, daddl and corresponding fMaddfN, fMaddfNx, fMxaddfN and
fMxaddfNx functions.
- fsub, fsubl, dsubl and corresponding fMsubfN, fMsubfNx, fMxsubfN and
fMxsubfNx functions.
- fmul, fmull, dmull and corresponding fMmulfN, fMmulfNx, fMxmulfN and
fMxmulfNx functions.
- fdiv, fdivl, ddivl and corresponding fMdivfN, fMdivfNx, fMxdivfN and
fMxdivfNx functions.
* Two grammatical forms of month names are now supported for the following
languages: Armenian, Asturian, Catalan, Czech, Kashubian, Occitan, Ossetian,
Scottish Gaelic, Upper Sorbian, and Walloon. The following languages now
support two grammatical forms in abbreviated month names: Catalan, Greek,
and Kashubian.
* Newly added locales: Lower Sorbian (dsb_DE) and Yakut (sah_RU) also
include the support for two grammatical forms of month names.
* Building and running on GNU/Hurd systems now works without out-of-tree
patches.
* The renameat2 function has been added, a variant of the renameat function
which has a flags argument. If the flags are zero, the renameat2 function
acts like renameat. If the flag is not zero and there is no kernel
support for renameat2, the function will fail with an errno value of
EINVAL. This is different from the existing gnulib function renameatu,
which performs a plain rename operation in case of a RENAME_NOREPLACE
flags and a non-existing destination (and therefore has a race condition
that can clobber the destination inadvertently).
* The statx function has been added, a variant of the fstatat64
function with an additional flags argument. If there is no direct
kernel support for statx, glibc provides basic stat support based on
the fstatat64 function.
* IDN domain names in getaddrinfo and getnameinfo now use the system libidn2
library if installed. libidn2 version 2.0.5 or later is recommended. If
libidn2 is not available, internationalized domain names are not encoded
or decoded even if the AI_IDN or NI_IDN flags are passed to getaddrinfo or
getnameinfo. (getaddrinfo calls with non-ASCII names and AI_IDN will fail
with an encoding error.) Flags which used to change the IDN encoding and
decoding behavior (AI_IDN_ALLOW_UNASSIGNED, AI_IDN_USE_STD3_ASCII_RULES,
NI_IDN_ALLOW_UNASSIGNED, NI_IDN_USE_STD3_ASCII_RULES) have been
deprecated. They no longer have any effect.
* Parsing of dynamic string tokens in DT_RPATH, DT_RUNPATH, DT_NEEDED,
DT_AUXILIARY, and DT_FILTER has been expanded to support the full
range of ELF gABI expressions including such constructs as
'$ORIGIN$ORIGIN' (if valid). For SUID/GUID applications the rules
have been further restricted, and where in the past a dynamic string
token sequence may have been interpreted as a literal string it will
now cause a load failure. These load failures were always considered
unspecified behaviour from the perspective of the dynamic loader, and
for safety are now load errors e.g. /foo/${ORIGIN}.so in DT_NEEDED
results in a load failure now.
* Support for ISO C threads (ISO/IEC 9899:2011) has been added. The
implementation includes all the standard functions provided by
<threads.h>:
- thrd_current, thrd_equal, thrd_sleep, thrd_yield, thrd_create,
thrd_detach, thrd_exit, and thrd_join for thread management.
- mtx_init, mtx_lock, mtx_timedlock, mtx_trylock, mtx_unlock, and
mtx_destroy for mutual exclusion.
- call_once for function call synchronization.
- cnd_broadcast, cnd_destroy, cnd_init, cnd_signal, cnd_timedwait, and
cnd_wait for conditional variables.
- tss_create, tss_delete, tss_get, and tss_set for thread-local storage.
Application developers must link against libpthread to use ISO C threads.
Deprecated and removed features, and other changes affecting compatibility:
* The nonstandard header files <libio.h> and <_G_config.h> are no longer
installed. Software that was using either header should be updated to
use standard <stdio.h> interfaces instead.
* The stdio functions 'getc' and 'putc' are no longer defined as macros.
This was never required by the C standard, and the macros just expanded
to call alternative names for the same functions. If you hoped getc and
putc would provide performance improvements over fgetc and fputc, instead
investigate using (f)getc_unlocked and (f)putc_unlocked, and, if
necessary, flockfile and funlockfile.
* All stdio functions now treat end-of-file as a sticky condition. If you
read from a file until EOF, and then the file is enlarged by another
process, you must call clearerr or another function with the same effect
(e.g. fseek, rewind) before you can read the additional data. This
corrects a longstanding C99 conformance bug. It is most likely to affect
programs that use stdio to read interactive input from a terminal.
(Bug #1190.)
* The macros 'major', 'minor', and 'makedev' are now only available from
the header <sys/sysmacros.h>; not from <sys/types.h> or various other
headers that happen to include <sys/types.h>. These macros are rarely
used, not part of POSIX nor XSI, and their names frequently collide with
user code; see https://sourceware.org/bugzilla/show_bug.cgi?id=19239 for
further explanation.
<sys/sysmacros.h> is a GNU extension. Portable programs that require
these macros should first include <sys/types.h>, and then include
<sys/sysmacros.h> if __GNU_LIBRARY__ is defined.
* The tilegx*-*-linux-gnu configurations are no longer supported.
* The obsolete function ustat is no longer available to newly linked
binaries; the headers <ustat.h> and <sys/ustat.h> have been removed. This
function has been deprecated in favor of fstatfs and statfs.
* The obsolete function nfsservctl is no longer available to newly linked
binaries. This function was specific to systems using the Linux kernel
and could not usefully be used with the GNU C Library on systems with
version 3.1 or later of the Linux kernel.
* The obsolete function name llseek is no longer available to newly linked
binaries. This function was specific to systems using the Linux kernel
and was not declared in a header. Programs should use the lseek64 name
for this function instead.
* The AI_IDN_ALLOW_UNASSIGNED and NI_IDN_ALLOW_UNASSIGNED flags for the
getaddrinfo and getnameinfo functions have been deprecated. The behavior
previously selected by them is now always enabled.
* The AI_IDN_USE_STD3_ASCII_RULES and NI_IDN_USE_STD3_ASCII_RULES flags for
the getaddrinfo and getnameinfo functions have been deprecated. The STD3
restriction (rejecting '_' in host names, among other things) has been
removed, for increased compatibility with non-IDN name resolution.
* The fcntl function now have a Long File Support variant named fcntl64. It
is added to fix some Linux Open File Description (OFD) locks usage on non
LFS mode. As for others *64 functions, fcntl64 semantics are analogous with
fcntl and LFS support is handled transparently. Also for Linux, the OFD
locks act as a cancellation entrypoint.
* The obsolete functions encrypt, encrypt_r, setkey, setkey_r, cbc_crypt,
ecb_crypt, and des_setparity are no longer available to newly linked
binaries, and the headers <rpc/des_crypt.h> and <rpc/rpc_des.h> are no
longer installed. These functions encrypted and decrypted data with the
DES block cipher, which is no longer considered secure. Software that
still uses these functions should switch to a modern cryptography library,
such as libgcrypt.
* Reflecting the removal of the encrypt and setkey functions above, the
macro _XOPEN_CRYPT is no longer defined. As a consequence, the crypt
function is no longer declared unless _DEFAULT_SOURCE or _GNU_SOURCE is
enabled.
* The obsolete function fcrypt is no longer available to newly linked
binaries. It was just another name for the standard function crypt,
and it has not appeared in any header file in many years.
* We have tentative plans to hand off maintenance of the passphrase-hashing
library, libcrypt, to a separate development project that will, we hope,
keep up better with new passphrase-hashing algorithms. We will continue
to declare 'crypt' in <unistd.h>, and programs that use 'crypt' or
'crypt_r' should not need to change at all; however, distributions will
need to install <crypt.h> and libcrypt from a separate project.
In this release, if the configure option --disable-crypt is used, glibc
will not install <crypt.h> or libcrypt, making room for the separate
project's versions of these files. The plan is to make this the default
behavior in a future release.
Changes to build and runtime requirements:
GNU make 4.0 or later is now required to build glibc.
Security related changes:
CVE-2016-6261, CVE-2016-6263, CVE-2017-14062: Various vulnerabilities have
been fixed by removing the glibc-internal IDNA implementation and using
the system-provided libidn2 library instead. Originally reported by Hanno
Böck and Christian Weisgerber.
CVE-2017-18269: An SSE2-based memmove implementation for the i386
architecture could corrupt memory. Reported by Max Horn.
CVE-2018-11236: Very long pathname arguments to realpath function could
result in an integer overflow and buffer overflow. Reported by Alexey
Izbyshev.
CVE-2018-11237: The mempcpy implementation for the Intel Xeon Phi
architecture could write beyond the target buffer, resulting in a buffer
overflow. Reported by Andreas Schwab.
The following bugs are resolved with this release:
[1190] stdio: fgetc()/fread() behaviour is not POSIX compliant
[6889] manual: 'PWD' mentioned but not specified
[13575] libc: SSIZE_MAX defined as LONG_MAX is inconsistent with ssize_t,
when __WORDSIZE != 64
[13762] regex: re_search etc. should return -2 on memory exhaustion
[13888] build: /tmp usage during testing
[13932] math: dbl-64 pow unexpectedly slow for some inputs
[14092] nptl: Support C11 threads
[14095] localedata: Review / update collation data from Unicode / ISO
14651
[14508] libc: -Wformat warnings
[14553] libc: Namespace pollution loff_t in sys/types.h
[14890] libc: Make NT_PRFPREG canonical.
[15105] libc: Extra PLT references with -Os
[15512] libc: __bswap_constant_16 not compiled when -Werror -Wsign-
conversion is given
[16335] manual: Feature test macro documentation incomplete and out of
date
[16552] libc: Unify umount implementations in terms of umount2
[17082] libc: htons et al.: statement-expressions prevent use on global
scope with -O1 and higher
[17343] libc: Signed integer overflow in /stdlib/random_r.c
[17438] localedata: pt_BR: wrong d_fmt delimiter
[17662] libc: please implement binding for the new renameat2 syscall
[17721] libc: __restrict defined as /* Ignore */ even in c11
[17979] libc: inconsistency between uchar.h and stdint.h
[18018] dynamic-link: Additional $ORIGIN handling issues (CVE-2011-0536)
[18023] libc: extend_alloca is broken (questionable pointer comparison,
horrible machine code)
[18124] libc: hppa: setcontext erroneously returns -1 as exit code for
last constant.
[18471] libc: llseek should be a compat symbol
[18473] soft-fp: [powerpc-nofpu] __sqrtsf2, __sqrtdf2 should be compat
symbols
[18991] nss: nss_files skips large entry in database
[19239] libc: Including stdlib.h ends up with macros major and minor being
defined
[19463] libc: linknamespace failures when compiled with -Os
[19485] localedata: csb_PL: Update month translations + add yesstr/nostr
[19527] locale: Normalized charset name not recognized by setlocale
[19667] string: Missing Sanity Check for malloc calls in file 'testcopy.c'
[19668] libc: Missing Sanity Check for malloc() in file 'tst-setcontext-
fpscr.c'
[19728] network: out of bounds stack read in libidn function
idna_to_ascii_4i (CVE-2016-6261)
[19729] network: out of bounds heap read on invalid utf-8 inputs in
stringprep_utf8_nfkc_normalize (CVE-2016-6263)
[19818] dynamic-link: Absolute (SHN_ABS) symbols incorrectly relocated by
the base address
[20079] libc: Add SHT_X86_64_UNWIND to elf.h
[20251] libc: 32bit programs pass garbage in struct flock for OFD locks
[20419] dynamic-link: files with large allocated notes crash in
open_verify
[20530] libc: bswap_16 should use __builtin_bswap16() when available
[20890] dynamic-link: ldconfig: fsync the files before atomic rename
[20980] manual: CFLAGS environment variable replaces vital options
[21163] regex: Assertion failure in pop_fail_stack when executing a
malformed regexp (CVE-2015-8985)
[21234] manual: use of CFLAGS makes glibc detect no optimization
[21269] dynamic-link: i386 sigaction sa_restorer handling is wrong
[21313] build: Compile Error GCC 5.4.0 MIPS with -0S
[21314] build: Compile Error GCC 5.2.0 MIPS with -0s
[21508] locale: intl/tst-gettext failure with latest msgfmt
[21547] localedata: Tibetan script collation broken (Dzongkha and Tibetan)
[21812] network: getifaddrs() returns entries with ifa_name == NULL
[21895] libc: ppc64 setjmp/longjmp not fully interoperable with static
dlopen
[21942] dynamic-link: _dl_dst_substitute incorrectly handles $ORIGIN: with
AT_SECURE=1
[22241] localedata: New locale: Yakut (Sakha) locale for Russia (sah_RU)
[22247] network: Integer overflow in the decode_digit function in
puny_decode.c in libidn (CVE-2017-14062)
[22342] nscd: NSCD not properly caching netgroup
[22391] nptl: Signal function clear NPTL internal symbols inconsistently
[22550] localedata: es_ES locale (and other es_* locales): collation
should treat ñ as a primary different character, sync the collation
for Spanish with CLDR
[22638] dynamic-link: sparc: static binaries are broken if glibc is built
by gcc configured with --enable-default-pie
[22639] time: year 2039 bug for localtime etc. on 64-bit platforms
[22644] string: memmove-sse2-unaligned on 32bit x86 produces garbage when
crossing 2GB threshold (CVE-2017-18269)
[22646] localedata: redundant data (LC_TIME) for es_CL, es_CU, es_EC and
es_BO
[22735] time: Misleading typo in time.h source comment regarding
CLOCKS_PER_SECOND
[22753] libc: preadv2/pwritev2 fallback code should handle offset=-1
[22761] libc: No trailing `%n' conversion specifier in FMT passed from
`__assert_perror_fail ()' to `__assert_fail_base ()'
[22766] libc: all glibc internal dlopen should use RTLD_NOW for robust
dlopen failures
[22786] libc: Stack buffer overflow in realpath() if input size is close
to SSIZE_MAX (CVE-2018-11236)
[22787] dynamic-link: _dl_check_caller returns false when libc is linked
through an absolute DT_NEEDED path
[22792] build: tcb-offsets.h dependency dropped
[22797] libc: pkey_get() uses non-reserved name of argument
[22807] libc: PTRACE_* constants missing for powerpc
[22818] glob: posix/tst-glob_lstat_compat failure on alpha
[22827] dynamic-link: RISC-V ELF64 parser mis-reads flag in ldconfig
[22830] malloc: malloc_stats doesn't restore cancellation state on stderr
[22848] localedata: ca_ES: update date definitions from CLDR
[22862] build: _DEFAULT_SOURCE is defined even when _ISOC11_SOURCE is
[22884] math: RISCV fmax/fmin handle signalling NANs incorrectly
[22896] localedata: Update locale data for an_ES
[22902] math: float128 test failures with GCC 8
[22918] libc: multiple common of `__nss_shadow_database'
[22919] libc: sparc32: backtrace yields infinite backtrace with
makecontext
[22926] libc: FTBFS on powerpcspe
[22932] localedata: lt_LT: Update of abbreviated month names from CLDR
required
[22937] localedata: Greek (el_GR, el_CY) locales actually need ab_alt_mon
[22947] libc: FAIL: misc/tst-preadvwritev2
[22963] localedata: cs_CZ: Add alternative month names
[22987] math: [powerpc/sparc] fdim inlines errno, exceptions handling
[22996] localedata: change LC_PAPER to en_US in es_BO locale
[22998] dynamic-link: execstack tests are disabled when SELinux is
disabled
[23005] network: Crash in __res_context_send after memory allocation
failure
[23007] math: strtod cannot handle -nan
[23024] nss: getlogin_r is performing NSS lookups when loginid isn't set
[23036] regex: regex equivalence class regression
[23037] libc: initialize msg_flags to zero for sendmmsg() calls
[23069] libc: sigaction broken on riscv64-linux-gnu
[23094] localedata: hr_HR: wrong thousands_sep and mon_thousands_sep
[23102] dynamic-link: Incorrect parsing of multiple consecutive $variable
patterns in runpath entries (e.g. $ORIGIN$ORIGIN)
[23137] nptl: s390: pthread_join sometimes block indefinitely (on 31bit
and libc build with -Os)
[23140] localedata: More languages need two forms of month names
[23145] libc: _init/_fini aren't marked as hidden
[23152] localedata: gd_GB: Fix typo in "May" (abbreviated)
[23171] math: C++ iseqsig for long double converts arguments to double
[23178] nscd: sudo will fail when it is run in concurrent with commands
that changes /etc/passwd
[23196] string: __mempcpy_avx512_no_vzeroupper mishandles large copies
(CVE-2018-11237)
[23206] dynamic-link: static-pie + dlopen breaks debugger interaction
[23208] localedata: New locale - Lower Sorbian (dsb)
[23233] regex: Memory leak in build_charclass_op function in file
posix/regcomp.c
[23236] stdio: Harden function pointers in _IO_str_fields
[23250] nptl: Offset of __private_ss differs from GCC
[23253] math: tgamma test suite failures on i686 with -march=x86-64
-mtune=generic -mfpmath=sse
[23259] dynamic-link: Unsubstituted ${ORIGIN} remains in DT_NEEDED for
AT_SECURE
[23264] libc: posix_spawnp wrongly executes ENOEXEC in non compat mode
[23266] nis: stringop-truncation warning with new gcc8.1 in nisplus-
parser.c
[23272] math: fma(INFINITY,INFIITY,0.0) should be INFINITY
[23277] math: nan function should not have const attribute
[23279] math: scanf and strtod wrong for some hex floating-point
[23280] math: wscanf rounds wrong; wcstod is ok for negative numbers and
directed rounding
[23290] localedata: IBM273 is not equivalent to ISO-8859-1
[23303] build: undefined reference to symbol
'__parse_hwcap_and_convert_at_platform@@GLIBC_2.23'
[23307] dynamic-link: Absolute symbols whose value is zero ignored in
lookup
[23313] stdio: libio vtables validation and standard file object
interposition
[23329] libc: The __libc_freeres infrastructure is not properly run across
DSO boundaries.
[23349] libc: Various glibc headers no longer compatible with
<linux/time.h>
[23351] malloc: Remove unused code related to heap dumps and malloc
checking
[23363] stdio: stdio-common/tst-printf.c has non-free license
[23396] regex: Regex equivalence regression in single-byte locales
[23422] localedata: oc_FR: More updates of locale data
[23442] build: New warning with GCC 8
[23448] libc: Out of bounds access in IBM-1390 converter
[23456] libc: Wrong index_cpu_LZCNT
[23458] build: tst-get-cpu-features-static isn't added to tests
[23459] libc: COMMON_CPUID_INDEX_80000001 isn't populated for Intel
processors
[23467] dynamic-link: x86/CET: A property note parser bug
Release Notes
=============
https://sourceware.org/glibc/wiki/Release/2.28
Contributors
============
This release was made possible by the contributions of many people.
The maintainers are grateful to everyone who has contributed
changes or bug reports. These include:
Adhemerval Zanella
Agustina Arzille
Alan Modra
Alexandre Oliva
Amit Pawar
Andreas Schwab
Andrew Senkevich
Andrew Waterman
Aurelien Jarno
Carlos O'Donell
Chung-Lin Tang
DJ Delorie
Daniel Alvarez
David Michael
Dmitry V. Levin
Dragan Stanojevic - Nevidljivi
Florian Weimer
Flávio Cruz
Francois Goichon
Gabriel F. T. Gomes
H.J. Lu
Herman ten Brugge
Hongbo Zhang
Igor Gnatenko
Jesse Hathaway
John David Anglin
Joseph Myers
Leonardo Sandoval
Maciej W. Rozycki
Mark Wielaard
Martin Sebor
Michael Wolf
Mike FABIAN
Patrick McGehearty
Patsy Franklin
Paul Pluzhnikov
Quentin PAGÈS
Rafal Luzynski
Rajalakshmi Srinivasaraghavan
Raymond Nicholson
Rical Jasan
Richard Braun
Robert Buj
Rogerio Alves
Samuel Thibault
Sean McKean
Siddhesh Poyarekar
Stefan Liebler
Steve Ellcey
Sylvain Lesage
Szabolcs Nagy
Thomas Schwinge
Tulio Magno Quites Machado Filho
Valery Timiriliyev
Vincent Chen
Wilco Dijkstra
Zack Weinberg
Zong Li
Diffstat (limited to 'iconvdata')
350 files changed, 914 insertions, 561 deletions
diff --git a/iconvdata/8bit-gap.c b/iconvdata/8bit-gap.c index 6b40853b3a..9e949dd7ec 100644 --- a/iconvdata/8bit-gap.c +++ b/iconvdata/8bit-gap.c @@ -1,6 +1,6 @@ /* Generic conversion to and from 8bit charsets, converting from UCS using gaps. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/8bit-generic.c b/iconvdata/8bit-generic.c index 256802355e..8110b30178 100644 --- a/iconvdata/8bit-generic.c +++ b/iconvdata/8bit-generic.c @@ -1,5 +1,5 @@ /* Generic conversion to and from 8bit charsets. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/Makefile b/iconvdata/Makefile index 357530b558..06e161d9b8 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997-2016 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 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 @@ -36,9 +36,9 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ IBM874 CP737 CP775 ISO-2022-KR HP-TURKISH8 HP-THAI8 HP-GREEK8 \ KOI8-R LATIN-GREEK LATIN-GREEK-1 IBM256 IBM273 IBM277 IBM278 \ IBM280 IBM281 IBM284 IBM285 IBM290 IBM297 IBM420 IBM424 \ - IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM860 IBM861 \ - IBM862 IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 IBM880 \ - IBM866 CP1258 IBM922 IBM1124 IBM1129 IBM932 IBM943 \ + IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM858 IBM860 \ + IBM861 IBM862 IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 \ + IBM880 IBM866 CP1258 IBM922 IBM1124 IBM1129 IBM932 IBM943 \ IBM856 IBM930 IBM933 IBM935 IBM937 IBM939 IBM1046 \ IBM1132 IBM1133 IBM1160 IBM1161 IBM1162 IBM1163 IBM1164 \ IBM918 IBM1004 IBM1026 CP1125 CP1250 CP1251 CP1252 CP1253 \ @@ -63,12 +63,17 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \ MAC-CENTRALEUROPE KOI8-RU ISO8859-9E \ CP770 CP771 CP772 CP773 CP774 +# If lazy binding is disabled, use BIND_NOW for the gconv modules. +ifeq ($(bind-now),yes) +LDFLAGS.so += -Wl,-z,now +endif + modules.so := $(addsuffix .so, $(modules)) ifeq (yes,$(build-shared)) tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \ tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \ - bug-iconv10 bug-iconv11 + bug-iconv10 bug-iconv11 bug-iconv12 ifeq ($(have-thread-library),yes) tests += bug-iconv3 endif @@ -148,11 +153,11 @@ gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290 \ ibm297 ibm420 ibm424 ibm437 ibm850 ibm851 ibm852 \ - ibm855 ibm857 ibm860 ibm861 ibm862 ibm863 ibm864 \ - ibm865 ibm868 ibm869 ibm875 ibm880 ibm918 ibm1004 \ - ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 cp1254 \ - cp1256 cp1257 ibm866 iso8859-5 iso8859-7 iso8859-8 \ - iso8859-10 macintosh iec_p27-1 asmo_449 \ + ibm855 ibm857 ibm858 ibm860 ibm861 ibm862 ibm863 \ + ibm864 ibm865 ibm868 ibm869 ibm875 ibm880 ibm918 \ + ibm1004 ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 \ + cp1254 cp1256 cp1257 ibm866 iso8859-5 iso8859-7 \ + iso8859-8 iso8859-10 macintosh iec_p27-1 asmo_449 \ csn_369103 cwi dec-mcs ecma-cyrillic gost_19768-74 \ greek-ccitt greek7 greek7-old inis inis-8 \ inis-cyrillic iso_2033 iso_5427 iso_5427-ext \ @@ -244,7 +249,7 @@ headers: $(addprefix $(objpfx), $(generated-modules:=.h)) $(addprefix $(inst_gconvdir)/, $(modules.so)): \ $(inst_gconvdir)/%: $(objpfx)% $(+force) $(do-install-program) -$(inst_gconvdir)/gconv-modules: gconv-modules $(+force) +$(inst_gconvdir)/gconv-modules: $(objpfx)gconv-modules $(+force) $(do-install) ifeq (no,$(cross-compiling)) # Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary @@ -285,7 +290,7 @@ cpp-srcs-left := $(modules) $(generated-modules) $(libJIS-routines) \ $(libKSC-routines) $(libGB-routines) $(libCNS-routines) \ $(libISOIR165-routines) $(libJISX0213-routines) lib := iconvdata -include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) +include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace $(objpfx)mtrace-tst-loading.out: $(objpfx)tst-loading.out @@ -309,6 +314,8 @@ $(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) $(objpfx)bug-iconv10.out: $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) +$(objpfx)bug-iconv12.out: $(objpfx)gconv-modules \ + $(addprefix $(objpfx),$(modules.so)) $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \ $(addprefix $(objpfx),$(modules.so)) \ @@ -331,7 +338,5 @@ do-tests-clean common-mostlyclean: tst-tables-clean tst-tables-clean: -rm -f $(objpfx)tst-*.table $(objpfx)tst-EUC-TW.irreversible -ifdef objpfx $(objpfx)gconv-modules: gconv-modules - cp $^ $@ -endif + cat $(sysdeps-gconv-modules) $^ > $@ diff --git a/iconvdata/TESTS b/iconvdata/TESTS index 35d487b868..80027bbcd6 100644 --- a/iconvdata/TESTS +++ b/iconvdata/TESTS @@ -1,5 +1,5 @@ # Available tests for iconv(1) (and therefore iconv(3)) in GNU libc. -# Copyright (C) 1998-2016 Free Software Foundation, Inc. +# Copyright (C) 1998-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. # diff --git a/iconvdata/TESTS2 b/iconvdata/TESTS2 index 572657e1d4..eb4139c724 100644 --- a/iconvdata/TESTS2 +++ b/iconvdata/TESTS2 @@ -1,5 +1,5 @@ # Tests for endianness dependent iconv(1) (and therefore iconv(3)) in GNU libc. -# Copyright (C) 2001-2016 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2001. # diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c index 8babd9b228..86e2ac9dc7 100644 --- a/iconvdata/ansi_x3.110.c +++ b/iconvdata/ansi_x3.110.c @@ -1,5 +1,5 @@ /* Generic conversion to and from ANSI_X3.110-1983. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/armscii-8.c b/iconvdata/armscii-8.c index 78c35a2db7..5a9c85365f 100644 --- a/iconvdata/armscii-8.c +++ b/iconvdata/armscii-8.c @@ -1,5 +1,5 @@ /* Conversion to and from ARMSCII-8 - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/asmo_449.c b/iconvdata/asmo_449.c index 64b8716cd8..bc02463f6e 100644 --- a/iconvdata/asmo_449.c +++ b/iconvdata/asmo_449.c @@ -1,5 +1,5 @@ /* Conversion from and to ASMO_449. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/big5.c b/iconvdata/big5.c index 9d2a10dc65..0ffcbb1414 100644 --- a/iconvdata/big5.c +++ b/iconvdata/big5.c @@ -1,5 +1,5 @@ /* Mapping tables for Big5 handling. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/big5hkscs.c b/iconvdata/big5hkscs.c index 066aecb83e..e54a58ae20 100644 --- a/iconvdata/big5hkscs.c +++ b/iconvdata/big5hkscs.c @@ -1,5 +1,5 @@ /* Mapping tables for Big5-HKSCS handling. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. Modified for Big5-HKSCS by Roger So <spacehunt@e-fever.org>, 2000. diff --git a/iconvdata/brf.c b/iconvdata/brf.c index eb0ece8da7..e8b02c29fc 100644 --- a/iconvdata/brf.c +++ b/iconvdata/brf.c @@ -1,5 +1,5 @@ /* Conversion from and to BRF. - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Samuel Thibault <samuel.thibault@ens-lyon.org>, 2006. diff --git a/iconvdata/bug-iconv10.c b/iconvdata/bug-iconv10.c index a974cef7d9..5af2efb99c 100644 --- a/iconvdata/bug-iconv10.c +++ b/iconvdata/bug-iconv10.c @@ -1,5 +1,5 @@ /* bug 17197: check that iconv doesn't emit invalid extra shift character - Copyright (C) 2015-2016 Free Software Foundation, Inc. + Copyright (C) 2015-2018 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 diff --git a/iconvdata/bug-iconv11.c b/iconvdata/bug-iconv11.c index 5b9d9a36af..67fe4fc925 100644 --- a/iconvdata/bug-iconv11.c +++ b/iconvdata/bug-iconv11.c @@ -1,7 +1,7 @@ /* bug 19432: iconv rejects redundant escape sequences in IBM903, IBM905, IBM907, and IBM909 - Copyright (C) 2016 Free Software Foundation, Inc. + Copyright (C) 2016-2018 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 @@ -23,6 +23,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <limits.h> // The longest test input sequence. #define MAXINBYTES 8 diff --git a/iconvdata/bug-iconv12.c b/iconvdata/bug-iconv12.c new file mode 100644 index 0000000000..a5df4d94b0 --- /dev/null +++ b/iconvdata/bug-iconv12.c @@ -0,0 +1,263 @@ +/* bug 19727: Testing UTF conversions with UTF16 surrogates as input. + Copyright (C) 2016-2018 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <string.h> +#include <inttypes.h> +#include <iconv.h> +#include <byteswap.h> + +static int +run_conversion (const char *from, const char *to, char *inbuf, size_t inbuflen, + int exp_errno, int line) +{ + char outbuf[16]; + iconv_t cd; + char *inptr; + size_t inlen; + char *outptr; + size_t outlen; + size_t n; + int e; + int fails = 0; + + cd = iconv_open (to, from); + if (cd == (iconv_t) -1) + { + printf ("line %d: cannot convert from %s to %s: %m\n", line, from, to); + return 1; + } + + inptr = (char *) inbuf; + inlen = inbuflen; + outptr = outbuf; + outlen = sizeof (outbuf); + + errno = 0; + n = iconv (cd, &inptr, &inlen, &outptr, &outlen); + e = errno; + + if (exp_errno == 0) + { + if (n == (size_t) -1) + { + puts ("n should be >= 0, but n == -1"); + fails ++; + } + + if (e != 0) + { + printf ("errno should be 0: 'Success', but errno == %d: '%s'\n" + , e, strerror(e)); + fails ++; + } + } + else + { + if (n != (size_t) -1) + { + printf ("n should be -1, but n == %zd\n", n); + fails ++; + } + + if (e != exp_errno) + { + printf ("errno should be %d: '%s', but errno == %d: '%s'\n" + , exp_errno, strerror (exp_errno), e, strerror (e)); + fails ++; + } + } + + iconv_close (cd); + + if (fails > 0) + { + printf ("Errors in line %d while converting %s to %s.\n\n" + , line, from, to); + } + + return fails; +} + +static int +do_test (void) +{ + int fails = 0; + char buf[4]; + + /* This test runs iconv() with UTF character in range of an UTF16 surrogate. + UTF-16 high surrogate is in range 0xD800..0xDBFF and + UTF-16 low surrogate is in range 0xDC00..0xDFFF. + Converting from or to UTF-xx has to report errors in those cases. + In UTF-16, surrogate pairs with a high surrogate in front of a low + surrogate is valid. */ + + /* Use RUN_UCS4_UTF32_INPUT to test conversion ... + + ... from INTERNAL to UTF-xx[LE|BE]: + Converting from UCS4 to UTF-xx[LE|BE] first converts UCS4 to INTERNAL + without checking for UTF-16 surrogate values + and then converts from INTERNAL to UTF-xx[LE|BE]. + The latter conversion has to report an error in those cases. + + ... from UTF-32[LE|BE] to INTERNAL: + Converting directly from UTF-32LE to UTF-8|16 is needed, + because e.g. s390x has iconv-modules which converts directly. */ +#define RUN_UCS4_UTF32_INPUT(b0, b1, b2, b3, err, line) \ + buf[0] = b0; \ + buf[1] = b1; \ + buf[2] = b2; \ + buf[3] = b3; \ + fails += run_conversion ("UCS4", "UTF-8", buf, 4, err, line); \ + fails += run_conversion ("UCS4", "UTF-16LE", buf, 4, err, line); \ + fails += run_conversion ("UCS4", "UTF-16BE", buf, 4, err, line); \ + fails += run_conversion ("UCS4", "UTF-32LE", buf, 4, err, line); \ + fails += run_conversion ("UCS4", "UTF-32BE", buf, 4, err, line); \ + fails += run_conversion ("UTF-32BE", "WCHAR_T", buf, 4, err, line); \ + fails += run_conversion ("UTF-32BE", "UTF-8", buf, 4, err, line); \ + fails += run_conversion ("UTF-32BE", "UTF-16LE", buf, 4, err, line); \ + fails += run_conversion ("UTF-32BE", "UTF-16BE", buf, 4, err, line); \ + buf[0] = b3; \ + buf[1] = b2; \ + buf[2] = b1; \ + buf[3] = b0; \ + fails += run_conversion ("UTF-32LE", "WCHAR_T", buf, 4, err, line); \ + fails += run_conversion ("UTF-32LE", "UTF-8", buf, 4, err, line); \ + fails += run_conversion ("UTF-32LE", "UTF-16LE", buf, 4, err, line); \ + fails += run_conversion ("UTF-32LE", "UTF-16BE", buf, 4, err, line); + + /* Use UCS4/UTF32 input of 0xD7FF. */ + RUN_UCS4_UTF32_INPUT (0x0, 0x0, 0xD7, 0xFF, 0, __LINE__); + + /* Use UCS4/UTF32 input of 0xD800. */ + RUN_UCS4_UTF32_INPUT (0x0, 0x0, 0xD8, 0x00, EILSEQ, __LINE__); + + /* Use UCS4/UTF32 input of 0xDBFF. */ + RUN_UCS4_UTF32_INPUT (0x0, 0x0, 0xDB, 0xFF, EILSEQ, __LINE__); + + /* Use UCS4/UTF32 input of 0xDC00. */ + RUN_UCS4_UTF32_INPUT (0x0, 0x0, 0xDC, 0x00, EILSEQ, __LINE__); + + /* Use UCS4/UTF32 input of 0xDFFF. */ + RUN_UCS4_UTF32_INPUT (0x0, 0x0, 0xDF, 0xFF, EILSEQ, __LINE__); + + /* Use UCS4/UTF32 input of 0xE000. */ + RUN_UCS4_UTF32_INPUT (0x0, 0x0, 0xE0, 0x00, 0, __LINE__); + + + /* Use RUN_UTF16_INPUT to test conversion from UTF16[LE|BE] to INTERNAL. + Converting directly from UTF-16 to UTF-8|32 is needed, + because e.g. s390x has iconv-modules which converts directly. + Use len == 2 or 4 to specify one or two UTF-16 characters. */ +#define RUN_UTF16_INPUT(b0, b1, b2, b3, len, err, line) \ + buf[0] = b0; \ + buf[1] = b1; \ + buf[2] = b2; \ + buf[3] = b3; \ + fails += run_conversion ("UTF-16BE", "WCHAR_T", buf, len, err, line); \ + fails += run_conversion ("UTF-16BE", "UTF-8", buf, len, err, line); \ + fails += run_conversion ("UTF-16BE", "UTF-32LE", buf, len, err, line); \ + fails += run_conversion ("UTF-16BE", "UTF-32BE", buf, len, err, line); \ + buf[0] = b1; \ + buf[1] = b0; \ + buf[2] = b3; \ + buf[3] = b2; \ + fails += run_conversion ("UTF-16LE", "WCHAR_T", buf, len, err, line); \ + fails += run_conversion ("UTF-16LE", "UTF-8", buf, len, err, line); \ + fails += run_conversion ("UTF-16LE", "UTF-32LE", buf, len, err, line); \ + fails += run_conversion ("UTF-16LE", "UTF-32BE", buf, len, err, line); + + /* Use UTF16 input of 0xD7FF. */ + RUN_UTF16_INPUT (0xD7, 0xFF, 0xD7, 0xFF, 4, 0, __LINE__); + + /* Use [single] UTF16 high surrogate 0xD800 [with a valid character behind]. + And check an UTF16 surrogate pair [without valid low surrogate]. */ + RUN_UTF16_INPUT (0xD8, 0x0, 0x0, 0x0, 2, EINVAL, __LINE__); + RUN_UTF16_INPUT (0xD8, 0x0, 0xD7, 0xFF, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xD8, 0x0, 0xD8, 0x0, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xD8, 0x0, 0xE0, 0x0, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xD8, 0x0, 0xDC, 0x0, 4, 0, __LINE__); + + /* Use [single] UTF16 high surrogate 0xDBFF [with a valid character behind]. + And check an UTF16 surrogate pair [without valid low surrogate]. */ + RUN_UTF16_INPUT (0xDB, 0xFF, 0x0, 0x0, 2, EINVAL, __LINE__); + RUN_UTF16_INPUT (0xDB, 0xFF, 0xD7, 0xFF, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xDB, 0xFF, 0xDB, 0xFF, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xDB, 0xFF, 0xE0, 0x0, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xDB, 0xFF, 0xDF, 0xFF, 4, 0, __LINE__); + + /* Use single UTF16 low surrogate 0xDC00 [with a valid character behind]. + And check an UTF16 surrogate pair [without valid high surrogate]. */ + RUN_UTF16_INPUT (0xDC, 0x0, 0x0, 0x0, 2, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xDC, 0x0, 0xD7, 0xFF, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xD8, 0x0, 0xDC, 0x0, 4, 0, __LINE__); + RUN_UTF16_INPUT (0xD7, 0xFF, 0xDC, 0x0, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xDC, 0x0, 0xDC, 0x0, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xE0, 0x0, 0xDC, 0x0, 4, EILSEQ, __LINE__); + + /* Use single UTF16 low surrogate 0xDFFF [with a valid character behind]. + And check an UTF16 surrogate pair [without valid high surrogate]. */ + RUN_UTF16_INPUT (0xDF, 0xFF, 0x0, 0x0, 2, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xDF, 0xFF, 0xD7, 0xFF, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xDB, 0xFF, 0xDF, 0xFF, 4, 0, __LINE__); + RUN_UTF16_INPUT (0xD7, 0xFF, 0xDF, 0xFF, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xDF, 0xFF, 0xDF, 0xFF, 4, EILSEQ, __LINE__); + RUN_UTF16_INPUT (0xE0, 0x0, 0xDF, 0xFF, 4, EILSEQ, __LINE__); + + /* Use UCS4/UTF32 input of 0xE000. */ + RUN_UTF16_INPUT (0xE0, 0x0, 0xE0, 0x0, 4, 0, __LINE__); + + + /* Use RUN_UTF8_3BYTE_INPUT to test conversion from UTF-8 to INTERNAL. + Converting directly from UTF-8 to UTF-16|32 is needed, + because e.g. s390x has iconv-modules which converts directly. */ +#define RUN_UTF8_3BYTE_INPUT(b0, b1, b2, err, line) \ + buf[0] = b0; \ + buf[1] = b1; \ + buf[2] = b2; \ + fails += run_conversion ("UTF-8", "WCHAR_T", buf, 3, err, line); \ + fails += run_conversion ("UTF-8", "UTF-16LE", buf, 3, err, line); \ + fails += run_conversion ("UTF-8", "UTF-16BE", buf, 3, err, line); \ + fails += run_conversion ("UTF-8", "UTF-32LE", buf, 3, err, line); \ + fails += run_conversion ("UTF-8", "UTF-32BE", buf, 3, err, line); + + /* Use UTF-8 input of 0xD7FF. */ + RUN_UTF8_3BYTE_INPUT (0xED, 0x9F, 0xBF, 0, __LINE__); + + /* Use UTF-8 input of 0xD800. */ + RUN_UTF8_3BYTE_INPUT (0xED, 0xA0, 0x80, EILSEQ, __LINE__); + + /* Use UTF-8 input of 0xDBFF. */ + RUN_UTF8_3BYTE_INPUT (0xED, 0xAF, 0xBF, EILSEQ, __LINE__); + + /* Use UTF-8 input of 0xDC00. */ + RUN_UTF8_3BYTE_INPUT (0xED, 0xB0, 0x80, EILSEQ, __LINE__); + + /* Use UTF-8 input of 0xDFFF. */ + RUN_UTF8_3BYTE_INPUT (0xED, 0xBF, 0xBF, EILSEQ, __LINE__); + + /* Use UTF-8 input of 0xF000. */ + RUN_UTF8_3BYTE_INPUT (0xEF, 0x80, 0x80, 0, __LINE__); + + return fails > 0 ? EXIT_FAILURE : EXIT_SUCCESS; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/iconvdata/bug-iconv3.c b/iconvdata/bug-iconv3.c index f28520a7a9..d338198a54 100644 --- a/iconvdata/bug-iconv3.c +++ b/iconvdata/bug-iconv3.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003-2016 Free Software Foundation, Inc. +/* Copyright (C) 2003-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. diff --git a/iconvdata/cns11643.c b/iconvdata/cns11643.c index 5961b2dae5..7ac251f3ea 100644 --- a/iconvdata/cns11643.c +++ b/iconvdata/cns11643.c @@ -1,5 +1,5 @@ /* Mapping tables for CNS 11643, planes 2 to 7 handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cns11643.h b/iconvdata/cns11643.h index 217ac993b8..77e29a8f90 100644 --- a/iconvdata/cns11643.h +++ b/iconvdata/cns11643.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643 handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cns11643l1.c b/iconvdata/cns11643l1.c index 0b008856b5..a86861c8aa 100644 --- a/iconvdata/cns11643l1.c +++ b/iconvdata/cns11643l1.c @@ -1,5 +1,5 @@ /* Mapping tables for CNS 11643, plane 1 handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cns11643l1.h b/iconvdata/cns11643l1.h index 862a8a9802..1225e9a0bf 100644 --- a/iconvdata/cns11643l1.h +++ b/iconvdata/cns11643l1.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643, plane 1 handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cns11643l2.h b/iconvdata/cns11643l2.h index b9458c07d8..9d2d0fcd1a 100644 --- a/iconvdata/cns11643l2.h +++ b/iconvdata/cns11643l2.h @@ -1,5 +1,5 @@ /* Access functions for CNS 11643, plane 2 handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp10007.c b/iconvdata/cp10007.c index f98535d1dd..307efc8bd7 100644 --- a/iconvdata/cp10007.c +++ b/iconvdata/cp10007.c @@ -1,5 +1,5 @@ /* Conversion from and to CP10007 (MS MacCyrillic). - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/iconvdata/cp1125.c b/iconvdata/cp1125.c index 9afea79ac6..edcb50ef84 100644 --- a/iconvdata/cp1125.c +++ b/iconvdata/cp1125.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1125. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2018 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 diff --git a/iconvdata/cp1250.c b/iconvdata/cp1250.c index cdd8a8912e..08535a7080 100644 --- a/iconvdata/cp1250.c +++ b/iconvdata/cp1250.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1250. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1251.c b/iconvdata/cp1251.c index 3464989bef..303d472d1b 100644 --- a/iconvdata/cp1251.c +++ b/iconvdata/cp1251.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1251. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1252.c b/iconvdata/cp1252.c index 62581e926f..3c8879b91e 100644 --- a/iconvdata/cp1252.c +++ b/iconvdata/cp1252.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1252. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1253.c b/iconvdata/cp1253.c index 2f140aa617..f6417c9370 100644 --- a/iconvdata/cp1253.c +++ b/iconvdata/cp1253.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1253. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1254.c b/iconvdata/cp1254.c index f94449d58e..2cc81e54b4 100644 --- a/iconvdata/cp1254.c +++ b/iconvdata/cp1254.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1254. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1255.c b/iconvdata/cp1255.c index a607c8b076..1e56bdb903 100644 --- a/iconvdata/cp1255.c +++ b/iconvdata/cp1255.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1255. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998, and Bruno Haible <haible@clisp.cons.org>, 2001. diff --git a/iconvdata/cp1256.c b/iconvdata/cp1256.c index c6d4f21374..91a313cc54 100644 --- a/iconvdata/cp1256.c +++ b/iconvdata/cp1256.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1256. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1257.c b/iconvdata/cp1257.c index 4e348aa62d..c6b8e086a4 100644 --- a/iconvdata/cp1257.c +++ b/iconvdata/cp1257.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1257. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp1258.c b/iconvdata/cp1258.c index e6aace687c..c7d3d6882d 100644 --- a/iconvdata/cp1258.c +++ b/iconvdata/cp1258.c @@ -1,5 +1,5 @@ /* Conversion from and to CP1258. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998, and Bruno Haible <haible@clisp.cons.org>, 2001. diff --git a/iconvdata/cp737.c b/iconvdata/cp737.c index 5ee283ac34..83402e2cdd 100644 --- a/iconvdata/cp737.c +++ b/iconvdata/cp737.c @@ -1,5 +1,5 @@ /* Conversion from and to CP737. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp737.h b/iconvdata/cp737.h index ea443da4ca..f29093a90f 100644 --- a/iconvdata/cp737.h +++ b/iconvdata/cp737.h @@ -1,5 +1,5 @@ /* Mapping table for CP737. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp770.c b/iconvdata/cp770.c index 0950462b55..a9e334f361 100644 --- a/iconvdata/cp770.c +++ b/iconvdata/cp770.c @@ -1,5 +1,5 @@ /* Conversion from and to CP770. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp771.c b/iconvdata/cp771.c index 8a72e014e6..118ed1844a 100644 --- a/iconvdata/cp771.c +++ b/iconvdata/cp771.c @@ -1,5 +1,5 @@ /* Conversion from and to CP771. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp772.c b/iconvdata/cp772.c index 113e52d0f9..293912ba15 100644 --- a/iconvdata/cp772.c +++ b/iconvdata/cp772.c @@ -1,5 +1,5 @@ /* Conversion from and to CP772. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp773.c b/iconvdata/cp773.c index 07fc9e60b1..424e7553b2 100644 --- a/iconvdata/cp773.c +++ b/iconvdata/cp773.c @@ -1,5 +1,5 @@ /* Conversion from and to CP773. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp774.c b/iconvdata/cp774.c index 0c5fc35b8c..9902b4dba9 100644 --- a/iconvdata/cp774.c +++ b/iconvdata/cp774.c @@ -1,5 +1,5 @@ /* Conversion from and to CP774. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gmail.com>, 2011. diff --git a/iconvdata/cp775.c b/iconvdata/cp775.c index 72f6e36d0d..0a539105bb 100644 --- a/iconvdata/cp775.c +++ b/iconvdata/cp775.c @@ -1,5 +1,5 @@ /* Conversion from and to CP775. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp775.h b/iconvdata/cp775.h index 050fec13d0..6bad71b626 100644 --- a/iconvdata/cp775.h +++ b/iconvdata/cp775.h @@ -1,5 +1,5 @@ /* Mapping table for CP775. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cp932.c b/iconvdata/cp932.c index 5687b8e4ce..00c8824143 100644 --- a/iconvdata/cp932.c +++ b/iconvdata/cp932.c @@ -1,5 +1,5 @@ /* Mapping tables for CP932 handling. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by MORIYAMA Masayuki <msyk@mtg.biglobe.ne.jp>, 2003. diff --git a/iconvdata/csn_369103.c b/iconvdata/csn_369103.c index 3cb3d0b780..49b90d729e 100644 --- a/iconvdata/csn_369103.c +++ b/iconvdata/csn_369103.c @@ -1,5 +1,5 @@ /* Conversion from and to CSN_369103. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/cwi.c b/iconvdata/cwi.c index 50b75fa4e8..3b3ec96b4e 100644 --- a/iconvdata/cwi.c +++ b/iconvdata/cwi.c @@ -1,5 +1,5 @@ /* Conversion from and to CWI. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/dec-mcs.c b/iconvdata/dec-mcs.c index 68d5e261cf..53feb1aa59 100644 --- a/iconvdata/dec-mcs.c +++ b/iconvdata/dec-mcs.c @@ -1,5 +1,5 @@ /* Conversion from and to DEC-MCS. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-at-de-a.c b/iconvdata/ebcdic-at-de-a.c index ed023f4f1c..5ffdaf6191 100644 --- a/iconvdata/ebcdic-at-de-a.c +++ b/iconvdata/ebcdic-at-de-a.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-AT-DE-A. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/ebcdic-at-de.c b/iconvdata/ebcdic-at-de.c index e5684726ed..c670f87ccc 100644 --- a/iconvdata/ebcdic-at-de.c +++ b/iconvdata/ebcdic-at-de.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-AT-DE. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/ebcdic-ca-fr.c b/iconvdata/ebcdic-ca-fr.c index 9c68827f35..4fdf71d209 100644 --- a/iconvdata/ebcdic-ca-fr.c +++ b/iconvdata/ebcdic-ca-fr.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-CA-FR. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/ebcdic-dk-no-a.c b/iconvdata/ebcdic-dk-no-a.c index 652c1959a7..d3585b8d34 100644 --- a/iconvdata/ebcdic-dk-no-a.c +++ b/iconvdata/ebcdic-dk-no-a.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-DK-NO-A. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-dk-no.c b/iconvdata/ebcdic-dk-no.c index c161092768..caf60c869e 100644 --- a/iconvdata/ebcdic-dk-no.c +++ b/iconvdata/ebcdic-dk-no.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-DK-NO. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-es-a.c b/iconvdata/ebcdic-es-a.c index 613e5eb9c3..efef1b85ad 100644 --- a/iconvdata/ebcdic-es-a.c +++ b/iconvdata/ebcdic-es-a.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-ES-A. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-es-s.c b/iconvdata/ebcdic-es-s.c index 663a57e68f..66d17f04d6 100644 --- a/iconvdata/ebcdic-es-s.c +++ b/iconvdata/ebcdic-es-s.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-ES-S. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-es.c b/iconvdata/ebcdic-es.c index 6504bcb407..306f7dddfa 100644 --- a/iconvdata/ebcdic-es.c +++ b/iconvdata/ebcdic-es.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-ES. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-fi-se-a.c b/iconvdata/ebcdic-fi-se-a.c index a229adabea..53f5278ad8 100644 --- a/iconvdata/ebcdic-fi-se-a.c +++ b/iconvdata/ebcdic-fi-se-a.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-FI-SE-A. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-fi-se.c b/iconvdata/ebcdic-fi-se.c index 5986a2a89e..f1d7661860 100644 --- a/iconvdata/ebcdic-fi-se.c +++ b/iconvdata/ebcdic-fi-se.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-FI-SE. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-fr.c b/iconvdata/ebcdic-fr.c index d4dd01aaae..dbc881f562 100644 --- a/iconvdata/ebcdic-fr.c +++ b/iconvdata/ebcdic-fr.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-FR. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-is-friss.c b/iconvdata/ebcdic-is-friss.c index a71b86502a..3ee21a7168 100644 --- a/iconvdata/ebcdic-is-friss.c +++ b/iconvdata/ebcdic-is-friss.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-IS-FRISS. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-it.c b/iconvdata/ebcdic-it.c index 94bde746f4..c96e590844 100644 --- a/iconvdata/ebcdic-it.c +++ b/iconvdata/ebcdic-it.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-IT. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-pt.c b/iconvdata/ebcdic-pt.c index 8f762a88b4..33684f01ab 100644 --- a/iconvdata/ebcdic-pt.c +++ b/iconvdata/ebcdic-pt.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-PT. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-uk.c b/iconvdata/ebcdic-uk.c index 9a66535065..00f7a7d97e 100644 --- a/iconvdata/ebcdic-uk.c +++ b/iconvdata/ebcdic-uk.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-UK. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ebcdic-us.c b/iconvdata/ebcdic-us.c index 7f29bbbc5b..f6f30e9550 100644 --- a/iconvdata/ebcdic-us.c +++ b/iconvdata/ebcdic-us.c @@ -1,5 +1,5 @@ /* Conversion from and to EBCDIC-US. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ecma-cyrillic.c b/iconvdata/ecma-cyrillic.c index 6cb4f793b2..9eda1ac612 100644 --- a/iconvdata/ecma-cyrillic.c +++ b/iconvdata/ecma-cyrillic.c @@ -1,5 +1,5 @@ /* Conversion from and to ECMA-CYRILLIC. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/euc-cn.c b/iconvdata/euc-cn.c index a571e03e9c..b252eb6d0c 100644 --- a/iconvdata/euc-cn.c +++ b/iconvdata/euc-cn.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-CN handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/euc-jisx0213.c b/iconvdata/euc-jisx0213.c index f29ee5c206..f4e8f6c5ee 100644 --- a/iconvdata/euc-jisx0213.c +++ b/iconvdata/euc-jisx0213.c @@ -1,5 +1,5 @@ /* Conversion from and to EUC-JISX0213. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/iconvdata/euc-jp-ms.c b/iconvdata/euc-jp-ms.c index 1900db247a..bba584036b 100644 --- a/iconvdata/euc-jp-ms.c +++ b/iconvdata/euc-jp-ms.c @@ -1,5 +1,5 @@ /* Mapping tables for EUCJP-MS handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by MORIYAMA Masayuki <msyk@mtg.biglobe.ne.jp>, 2003. diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c index 3285891254..3b37ae48ed 100644 --- a/iconvdata/euc-jp.c +++ b/iconvdata/euc-jp.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-JP handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c index 6c5ee22052..73e02817a0 100644 --- a/iconvdata/euc-kr.c +++ b/iconvdata/euc-kr.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-KR handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin <jshin@pantheon.yale.edu> and Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/euc-tw.c b/iconvdata/euc-tw.c index 68d00cdea3..c7a8eb3c6f 100644 --- a/iconvdata/euc-tw.c +++ b/iconvdata/euc-tw.c @@ -1,5 +1,5 @@ /* Mapping tables for EUC-TW handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c index d3a3737f89..400c547d32 100644 --- a/iconvdata/gb18030.c +++ b/iconvdata/gb18030.c @@ -1,5 +1,5 @@ /* Mapping tables for GBK handling. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Sean Chen <seanc@turbolinux.com.cn>, 1999. diff --git a/iconvdata/gb2312.c b/iconvdata/gb2312.c index 30abe2f5f8..64c53f19f2 100644 --- a/iconvdata/gb2312.c +++ b/iconvdata/gb2312.c @@ -1,5 +1,5 @@ /* GB 2312 conversion tables. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/gb2312.h b/iconvdata/gb2312.h index bdd03bf98e..9685abee20 100644 --- a/iconvdata/gb2312.h +++ b/iconvdata/gb2312.h @@ -1,5 +1,5 @@ /* Access functions for GB2312 conversion. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/gbbig5.c b/iconvdata/gbbig5.c index 7e9812d8c1..a7c3941a1c 100644 --- a/iconvdata/gbbig5.c +++ b/iconvdata/gbbig5.c @@ -1,5 +1,5 @@ /* Mapping tables from GB2312 to BIG5 and vice versa. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/gbgbk.c b/iconvdata/gbgbk.c index 228721f007..88ee9b6e74 100644 --- a/iconvdata/gbgbk.c +++ b/iconvdata/gbgbk.c @@ -1,5 +1,5 @@ /* Mapping tables from GBK to GB2312 and vice versa. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c index fc32a506d2..9215e0fd53 100644 --- a/iconvdata/gbk.c +++ b/iconvdata/gbk.c @@ -1,5 +1,5 @@ /* Mapping tables for GBK handling. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Sean Chen <sean.chen@turbolinux.com>, 1999. @@ -13148,8 +13148,17 @@ static const char __gbk_from_ucs4_tab12[][2] = if (__builtin_expect (ch <= 0x80, 0) \ || __builtin_expect (ch > 0xfe, 0)) \ { \ - /* This is illegal. */ \ - STANDARD_FROM_LOOP_ERR_HANDLER (1); \ + if (__glibc_likely (ch == 0x80)) \ + { \ + /* Exception for the Euro sign (see CP936). */ \ + ch = 0x20ac; \ + ++inptr; \ + } \ + else \ + { \ + /* This is illegal. */ \ + STANDARD_FROM_LOOP_ERR_HANDLER (1); \ + } \ } \ else \ { \ @@ -13292,6 +13301,10 @@ static const char __gbk_from_ucs4_tab12[][2] = case 0x2010 ... 0x203b: \ cp = __gbk_from_ucs4_tab4[ch - 0x2010]; \ break; \ + case 0x20ac: \ + /* Exception for the Euro sign (see CP396). */ \ + cp = "\x80"; \ + break; \ case 0x2103 ... 0x22bf: \ cp = __gbk_from_ucs4_tab5[ch - 0x2103]; \ break; \ diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules index 11274dd2a9..81687c1619 100644 --- a/iconvdata/gconv-modules +++ b/iconvdata/gconv-modules @@ -1,5 +1,5 @@ # GNU libc iconv configuration. -# Copyright (C) 1997-2016 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 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 @@ -744,6 +744,13 @@ module IBM850// INTERNAL IBM850 1 module INTERNAL IBM850// IBM850 1 # from to module cost +alias CP858// IBM858// +alias 858// IBM858// +alias CSPC858MULTILINGUAL// IBM858// +module IBM858// INTERNAL IBM858 1 +module INTERNAL IBM858// IBM858 1 + +# from to module cost alias CP851// IBM851// alias 851// IBM851// alias CSIBM851// IBM851// @@ -1556,6 +1563,7 @@ module MAC-SAMI// INTERNAL MAC-SAMI 1 module INTERNAL MAC-SAMI// MAC-SAMI 1 # from to module cost +alias ARMSCII8// ARMSCII-8// module ARMSCII-8// INTERNAL ARMSCII-8 1 module INTERNAL ARMSCII-8// ARMSCII-8 1 @@ -1571,6 +1579,7 @@ module EUC-JISX0213// INTERNAL EUC-JISX0213 1 module INTERNAL EUC-JISX0213// EUC-JISX0213 1 # from to module cost +alias ShiftJISX0213// Shift_JISX0213// module Shift_JISX0213// INTERNAL SHIFT_JISX0213 1 module INTERNAL Shift_JISX0213// SHIFT_JISX0213 1 diff --git a/iconvdata/georgian-academy.c b/iconvdata/georgian-academy.c index 0ae5c1f88e..2531b23901 100644 --- a/iconvdata/georgian-academy.c +++ b/iconvdata/georgian-academy.c @@ -1,5 +1,5 @@ /* Conversion from and to GEORGIAN-ACADEMY. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. diff --git a/iconvdata/georgian-ps.c b/iconvdata/georgian-ps.c index 8a391e9b78..3981be0df2 100644 --- a/iconvdata/georgian-ps.c +++ b/iconvdata/georgian-ps.c @@ -1,5 +1,5 @@ /* Conversion from and to GEORGIAN-PS. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. diff --git a/iconvdata/gost_19768-74.c b/iconvdata/gost_19768-74.c index 2036b74b32..2c9806b67c 100644 --- a/iconvdata/gost_19768-74.c +++ b/iconvdata/gost_19768-74.c @@ -1,5 +1,5 @@ /* Conversion from and to GOST_19768-74. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/greek-ccitt.c b/iconvdata/greek-ccitt.c index 327a572025..555c6b488b 100644 --- a/iconvdata/greek-ccitt.c +++ b/iconvdata/greek-ccitt.c @@ -1,5 +1,5 @@ /* Conversion from and to GREEK-CCITT. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/greek7-old.c b/iconvdata/greek7-old.c index 8d4f5c44e4..c2075c722d 100644 --- a/iconvdata/greek7-old.c +++ b/iconvdata/greek7-old.c @@ -1,5 +1,5 @@ /* Conversion from and to GREEK7-OLD. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/greek7.c b/iconvdata/greek7.c index 39620da832..b42ff5d244 100644 --- a/iconvdata/greek7.c +++ b/iconvdata/greek7.c @@ -1,5 +1,5 @@ /* Conversion from and to GREEK7. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/hp-greek8.c b/iconvdata/hp-greek8.c index 8ff408e1a8..65e23036d8 100644 --- a/iconvdata/hp-greek8.c +++ b/iconvdata/hp-greek8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-GREEK8. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/hp-roman8.c b/iconvdata/hp-roman8.c index 399a9d5950..75e34dbab3 100644 --- a/iconvdata/hp-roman8.c +++ b/iconvdata/hp-roman8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-ROMAN8. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/hp-roman9.c b/iconvdata/hp-roman9.c index 71c4e18129..0bea7a5178 100644 --- a/iconvdata/hp-roman9.c +++ b/iconvdata/hp-roman9.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-ROMAN9. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/hp-thai8.c b/iconvdata/hp-thai8.c index 3e9726194b..67f797ed86 100644 --- a/iconvdata/hp-thai8.c +++ b/iconvdata/hp-thai8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-THAI8. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/hp-turkish8.c b/iconvdata/hp-turkish8.c index 30dd454008..ee727df745 100644 --- a/iconvdata/hp-turkish8.c +++ b/iconvdata/hp-turkish8.c @@ -1,5 +1,5 @@ /* Conversion from and to HP-TURKISH8. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/ibm037.c b/iconvdata/ibm037.c index 6f8210aec5..0e6ad67323 100644 --- a/iconvdata/ibm037.c +++ b/iconvdata/ibm037.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM037. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm038.c b/iconvdata/ibm038.c index 9b3bb93b26..3ad40a3f54 100644 --- a/iconvdata/ibm038.c +++ b/iconvdata/ibm038.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM038. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm1004.c b/iconvdata/ibm1004.c index 421490dcf0..9e5a3a6fbb 100644 --- a/iconvdata/ibm1004.c +++ b/iconvdata/ibm1004.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1004. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm1008.c b/iconvdata/ibm1008.c index 7a7fdf8699..dc782464cc 100644 --- a/iconvdata/ibm1008.c +++ b/iconvdata/ibm1008.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1008. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1008.h b/iconvdata/ibm1008.h index ea3f5ea1ef..5e624be9b2 100644 --- a/iconvdata/ibm1008.h +++ b/iconvdata/ibm1008.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1008. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1008_420.c b/iconvdata/ibm1008_420.c index eab18fd35a..8ba91df3c3 100644 --- a/iconvdata/ibm1008_420.c +++ b/iconvdata/ibm1008_420.c @@ -1,5 +1,5 @@ /* Mapping tables from IBM1008 to IBM420 and vice versa. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1025.c b/iconvdata/ibm1025.c index e3468fe218..7614b0eb7c 100644 --- a/iconvdata/ibm1025.c +++ b/iconvdata/ibm1025.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1025. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1025.h b/iconvdata/ibm1025.h index fd17aab19e..3bf0712f54 100644 --- a/iconvdata/ibm1025.h +++ b/iconvdata/ibm1025.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1025. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1026.c b/iconvdata/ibm1026.c index ec3fede98a..67c0fd2876 100644 --- a/iconvdata/ibm1026.c +++ b/iconvdata/ibm1026.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1026. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm1046.c b/iconvdata/ibm1046.c index cf30fd4cfd..71889f8e49 100644 --- a/iconvdata/ibm1046.c +++ b/iconvdata/ibm1046.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1046. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm1046.h b/iconvdata/ibm1046.h index 902e5eee69..6ac337392f 100644 --- a/iconvdata/ibm1046.h +++ b/iconvdata/ibm1046.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1046. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm1047.c b/iconvdata/ibm1047.c index d5b2a45c1a..bf8ea282c1 100644 --- a/iconvdata/ibm1047.c +++ b/iconvdata/ibm1047.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1047. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm1097.c b/iconvdata/ibm1097.c index bf39eed23f..3b5c904e66 100644 --- a/iconvdata/ibm1097.c +++ b/iconvdata/ibm1097.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1097. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1097.h b/iconvdata/ibm1097.h index 5e578a73db..462e684f8d 100644 --- a/iconvdata/ibm1097.h +++ b/iconvdata/ibm1097.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1097. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1112.c b/iconvdata/ibm1112.c index 13a86ff791..0754766894 100644 --- a/iconvdata/ibm1112.c +++ b/iconvdata/ibm1112.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1112. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1112.h b/iconvdata/ibm1112.h index d06e919bae..9b9f8c9362 100644 --- a/iconvdata/ibm1112.h +++ b/iconvdata/ibm1112.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1112. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1122.c b/iconvdata/ibm1122.c index 24271da477..b51240edcb 100644 --- a/iconvdata/ibm1122.c +++ b/iconvdata/ibm1122.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1122. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1122.h b/iconvdata/ibm1122.h index 86129e6531..fc28f4e5c5 100644 --- a/iconvdata/ibm1122.h +++ b/iconvdata/ibm1122.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1122. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1123.c b/iconvdata/ibm1123.c index 4b5b17aa0d..fc44284fda 100644 --- a/iconvdata/ibm1123.c +++ b/iconvdata/ibm1123.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1123. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1123.h b/iconvdata/ibm1123.h index 6cd9ed2a4c..81046dc333 100644 --- a/iconvdata/ibm1123.h +++ b/iconvdata/ibm1123.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1123. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1124.c b/iconvdata/ibm1124.c index 1c2e129b2e..26084d7d4f 100644 --- a/iconvdata/ibm1124.c +++ b/iconvdata/ibm1124.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1124. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm1124.h b/iconvdata/ibm1124.h index 711d5106f1..4fca325bf5 100644 --- a/iconvdata/ibm1124.h +++ b/iconvdata/ibm1124.h @@ -1,5 +1,5 @@ /* Conversion from and to IBM1124. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm1129.c b/iconvdata/ibm1129.c index c75da94e8f..84a0a6d5db 100644 --- a/iconvdata/ibm1129.c +++ b/iconvdata/ibm1129.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1129. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm1129.h b/iconvdata/ibm1129.h index 3dfdf299bc..d707defb5f 100644 --- a/iconvdata/ibm1129.h +++ b/iconvdata/ibm1129.h @@ -1,5 +1,5 @@ /* Conversion from and to IBM1129. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm1130.c b/iconvdata/ibm1130.c index 0a7fb5124b..2f4231f153 100644 --- a/iconvdata/ibm1130.c +++ b/iconvdata/ibm1130.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1130. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1130.h b/iconvdata/ibm1130.h index 2fe2a12278..594b3069f6 100644 --- a/iconvdata/ibm1130.h +++ b/iconvdata/ibm1130.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1130. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1132.c b/iconvdata/ibm1132.c index f3aee6ff5a..e062c86c81 100644 --- a/iconvdata/ibm1132.c +++ b/iconvdata/ibm1132.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1132. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1132.h b/iconvdata/ibm1132.h index 3b158c06bc..395261846d 100644 --- a/iconvdata/ibm1132.h +++ b/iconvdata/ibm1132.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1132. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1133.c b/iconvdata/ibm1133.c index cbda3c7b4a..f4fe9f042d 100644 --- a/iconvdata/ibm1133.c +++ b/iconvdata/ibm1133.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1133. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1133.h b/iconvdata/ibm1133.h index 1f67cc7178..8a636d2459 100644 --- a/iconvdata/ibm1133.h +++ b/iconvdata/ibm1133.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1133. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1137.c b/iconvdata/ibm1137.c index 9808e9a57a..fbda98483c 100644 --- a/iconvdata/ibm1137.c +++ b/iconvdata/ibm1137.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1137. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1137.h b/iconvdata/ibm1137.h index 5ee657ffca..286244cdf0 100644 --- a/iconvdata/ibm1137.h +++ b/iconvdata/ibm1137.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1137. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1140.c b/iconvdata/ibm1140.c index 99add89f38..0035ed1fa4 100644 --- a/iconvdata/ibm1140.c +++ b/iconvdata/ibm1140.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1140. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1140.h b/iconvdata/ibm1140.h index 889c761178..c6872d07be 100644 --- a/iconvdata/ibm1140.h +++ b/iconvdata/ibm1140.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1140. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1141.c b/iconvdata/ibm1141.c index 9a1677387b..265d67466c 100644 --- a/iconvdata/ibm1141.c +++ b/iconvdata/ibm1141.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1141. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1141.h b/iconvdata/ibm1141.h index c9532147cf..69fa1bf578 100644 --- a/iconvdata/ibm1141.h +++ b/iconvdata/ibm1141.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1141. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1142.c b/iconvdata/ibm1142.c index 7f67278111..fa6d6be54a 100644 --- a/iconvdata/ibm1142.c +++ b/iconvdata/ibm1142.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1142. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1142.h b/iconvdata/ibm1142.h index 3acefd1be2..e063818264 100644 --- a/iconvdata/ibm1142.h +++ b/iconvdata/ibm1142.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1142. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1143.c b/iconvdata/ibm1143.c index a3166b2ded..6d457741e8 100644 --- a/iconvdata/ibm1143.c +++ b/iconvdata/ibm1143.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1143. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1143.h b/iconvdata/ibm1143.h index 54f887bc6e..c06e517b98 100644 --- a/iconvdata/ibm1143.h +++ b/iconvdata/ibm1143.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1143. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1144.c b/iconvdata/ibm1144.c index fc577fd05d..84fa513bf5 100644 --- a/iconvdata/ibm1144.c +++ b/iconvdata/ibm1144.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1144. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1144.h b/iconvdata/ibm1144.h index 98575d17cf..1b9aac4b8e 100644 --- a/iconvdata/ibm1144.h +++ b/iconvdata/ibm1144.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1144. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1145.c b/iconvdata/ibm1145.c index 0f17e55757..f01c637a43 100644 --- a/iconvdata/ibm1145.c +++ b/iconvdata/ibm1145.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1145. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1145.h b/iconvdata/ibm1145.h index a3ad1e4545..5d7e0d0ba3 100644 --- a/iconvdata/ibm1145.h +++ b/iconvdata/ibm1145.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1145. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1146.c b/iconvdata/ibm1146.c index 42faaa0425..ae33c9ce75 100644 --- a/iconvdata/ibm1146.c +++ b/iconvdata/ibm1146.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1146. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1146.h b/iconvdata/ibm1146.h index 77d480af7a..5b172f9c12 100644 --- a/iconvdata/ibm1146.h +++ b/iconvdata/ibm1146.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1146. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1147.c b/iconvdata/ibm1147.c index bc6745647f..eef4d6dbca 100644 --- a/iconvdata/ibm1147.c +++ b/iconvdata/ibm1147.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1147. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1147.h b/iconvdata/ibm1147.h index 7e66a573f6..2dfe25f186 100644 --- a/iconvdata/ibm1147.h +++ b/iconvdata/ibm1147.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1147. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1148.c b/iconvdata/ibm1148.c index 567dd7ce0e..5855e75eb6 100644 --- a/iconvdata/ibm1148.c +++ b/iconvdata/ibm1148.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1148. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1148.h b/iconvdata/ibm1148.h index 338e57c6b7..4aff15804d 100644 --- a/iconvdata/ibm1148.h +++ b/iconvdata/ibm1148.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1148. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1149.c b/iconvdata/ibm1149.c index 9b0175484c..db5906fadb 100644 --- a/iconvdata/ibm1149.c +++ b/iconvdata/ibm1149.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1149. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1149.h b/iconvdata/ibm1149.h index a5249baf56..1fe94d985e 100644 --- a/iconvdata/ibm1149.h +++ b/iconvdata/ibm1149.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1149. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1153.c b/iconvdata/ibm1153.c index 42670d37a1..d8b72c7101 100644 --- a/iconvdata/ibm1153.c +++ b/iconvdata/ibm1153.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1153. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1153.h b/iconvdata/ibm1153.h index bc45e0782a..6b459154cb 100644 --- a/iconvdata/ibm1153.h +++ b/iconvdata/ibm1153.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1153. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1154.c b/iconvdata/ibm1154.c index 6ab6716894..ee28ea1703 100644 --- a/iconvdata/ibm1154.c +++ b/iconvdata/ibm1154.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1154. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1154.h b/iconvdata/ibm1154.h index aa6089e298..bfd5872960 100644 --- a/iconvdata/ibm1154.h +++ b/iconvdata/ibm1154.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1154. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1155.c b/iconvdata/ibm1155.c index 7e60dedea4..62271c8660 100644 --- a/iconvdata/ibm1155.c +++ b/iconvdata/ibm1155.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1155. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1155.h b/iconvdata/ibm1155.h index 8fb0b35bb1..b655661d82 100644 --- a/iconvdata/ibm1155.h +++ b/iconvdata/ibm1155.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1155. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1156.c b/iconvdata/ibm1156.c index 52554bfb31..82c8c4c6b4 100644 --- a/iconvdata/ibm1156.c +++ b/iconvdata/ibm1156.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1156. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1156.h b/iconvdata/ibm1156.h index b7ad9d4eed..b9bf44159b 100644 --- a/iconvdata/ibm1156.h +++ b/iconvdata/ibm1156.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1156. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1157.c b/iconvdata/ibm1157.c index 8805916dbb..d2d41d78c4 100644 --- a/iconvdata/ibm1157.c +++ b/iconvdata/ibm1157.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1157. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1157.h b/iconvdata/ibm1157.h index b3410b5477..13687e1ae1 100644 --- a/iconvdata/ibm1157.h +++ b/iconvdata/ibm1157.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1157. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1158.c b/iconvdata/ibm1158.c index 2a769ce905..34fb2f1690 100644 --- a/iconvdata/ibm1158.c +++ b/iconvdata/ibm1158.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1158. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1158.h b/iconvdata/ibm1158.h index 968d3356cf..0cc742d4d9 100644 --- a/iconvdata/ibm1158.h +++ b/iconvdata/ibm1158.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1158. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jiro SEKIBA <sekiba@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1160.c b/iconvdata/ibm1160.c index f88888f6be..bcc447cd15 100644 --- a/iconvdata/ibm1160.c +++ b/iconvdata/ibm1160.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1160. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1160.h b/iconvdata/ibm1160.h index a93edf9acc..e09f2b62e9 100644 --- a/iconvdata/ibm1160.h +++ b/iconvdata/ibm1160.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1160. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1161.c b/iconvdata/ibm1161.c index 2bb33cdfe6..434fc7681e 100644 --- a/iconvdata/ibm1161.c +++ b/iconvdata/ibm1161.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1161. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1161.h b/iconvdata/ibm1161.h index 45d492a711..4f8494c63b 100644 --- a/iconvdata/ibm1161.h +++ b/iconvdata/ibm1161.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1161. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1162.c b/iconvdata/ibm1162.c index e93318a5a2..f67f77c711 100644 --- a/iconvdata/ibm1162.c +++ b/iconvdata/ibm1162.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1162. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1162.h b/iconvdata/ibm1162.h index bfbca79d6f..a267b80465 100644 --- a/iconvdata/ibm1162.h +++ b/iconvdata/ibm1162.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1162. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1163.c b/iconvdata/ibm1163.c index f1f47eaf8d..e8b9f3d311 100644 --- a/iconvdata/ibm1163.c +++ b/iconvdata/ibm1163.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1163. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1163.h b/iconvdata/ibm1163.h index c55bd4de51..eceb1a3d59 100644 --- a/iconvdata/ibm1163.h +++ b/iconvdata/ibm1163.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1163. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1164.c b/iconvdata/ibm1164.c index f7db68c7dd..3e98b78756 100644 --- a/iconvdata/ibm1164.c +++ b/iconvdata/ibm1164.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1164. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1164.h b/iconvdata/ibm1164.h index 92691d9e4b..e70ceef448 100644 --- a/iconvdata/ibm1164.h +++ b/iconvdata/ibm1164.h @@ -1,5 +1,5 @@ /* Mapping table for IBM1164. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2001. diff --git a/iconvdata/ibm1166.c b/iconvdata/ibm1166.c index 6126ad448d..77ae228454 100644 --- a/iconvdata/ibm1166.c +++ b/iconvdata/ibm1166.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1166. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1166.h b/iconvdata/ibm1166.h index 037245121f..c564e95d29 100644 --- a/iconvdata/ibm1166.h +++ b/iconvdata/ibm1166.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1166. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1167.c b/iconvdata/ibm1167.c index dc24067d14..b8337d6c2b 100644 --- a/iconvdata/ibm1167.c +++ b/iconvdata/ibm1167.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1167. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1167.h b/iconvdata/ibm1167.h index 595564966a..cf871291e3 100644 --- a/iconvdata/ibm1167.h +++ b/iconvdata/ibm1167.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1167. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm12712.c b/iconvdata/ibm12712.c index fd7d091db2..ff5242f537 100644 --- a/iconvdata/ibm12712.c +++ b/iconvdata/ibm12712.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM12712. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm12712.h b/iconvdata/ibm12712.h index 754e49483c..8d8e5b80fc 100644 --- a/iconvdata/ibm12712.h +++ b/iconvdata/ibm12712.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM12712. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c index 75cf4afb1f..517fe60813 100644 --- a/iconvdata/ibm1364.c +++ b/iconvdata/ibm1364.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1364. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. @@ -150,6 +150,7 @@ enum #define MIN_NEEDED_INPUT MIN_NEEDED_FROM #define MAX_NEEDED_INPUT MAX_NEEDED_FROM #define MIN_NEEDED_OUTPUT MIN_NEEDED_TO +#define MAX_NEEDED_OUTPUT MAX_NEEDED_TO #define LOOPFCT FROM_LOOP #define BODY \ { \ @@ -296,6 +297,7 @@ enum /* Next, define the other direction. */ #define MIN_NEEDED_INPUT MIN_NEEDED_TO +#define MAX_NEEDED_INPUT MAX_NEEDED_TO #define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM #define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM #define LOOPFCT TO_LOOP diff --git a/iconvdata/ibm1364.h b/iconvdata/ibm1364.h index eb542c7de1..ef2d32b885 100644 --- a/iconvdata/ibm1364.h +++ b/iconvdata/ibm1364.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1364. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1371.c b/iconvdata/ibm1371.c index 1594ec1b31..a79f7bcef0 100644 --- a/iconvdata/ibm1371.c +++ b/iconvdata/ibm1371.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1371. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1371.h b/iconvdata/ibm1371.h index 7c81d92ba7..0a749aa730 100644 --- a/iconvdata/ibm1371.h +++ b/iconvdata/ibm1371.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1371. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1388.c b/iconvdata/ibm1388.c index 8b15253ea0..acaf643db1 100644 --- a/iconvdata/ibm1388.c +++ b/iconvdata/ibm1388.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1388. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1388.h b/iconvdata/ibm1388.h index 7ee72021bd..0911cffef5 100644 --- a/iconvdata/ibm1388.h +++ b/iconvdata/ibm1388.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1388. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1390.c b/iconvdata/ibm1390.c index 7636a80262..e08ff93b5c 100644 --- a/iconvdata/ibm1390.c +++ b/iconvdata/ibm1390.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1390. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1390.h b/iconvdata/ibm1390.h index 8caed59bdb..88dac12684 100644 --- a/iconvdata/ibm1390.h +++ b/iconvdata/ibm1390.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1390. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1399.c b/iconvdata/ibm1399.c index f900812916..4179946d4b 100644 --- a/iconvdata/ibm1399.c +++ b/iconvdata/ibm1399.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM1399. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm1399.h b/iconvdata/ibm1399.h index b9ab503474..d2887708e7 100644 --- a/iconvdata/ibm1399.h +++ b/iconvdata/ibm1399.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM1399. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm16804.c b/iconvdata/ibm16804.c index 099b1b8929..22a73645ff 100644 --- a/iconvdata/ibm16804.c +++ b/iconvdata/ibm16804.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM16804. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm16804.h b/iconvdata/ibm16804.h index 0eab50ce91..cb9ea8b7e1 100644 --- a/iconvdata/ibm16804.h +++ b/iconvdata/ibm16804.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM16804. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm256.c b/iconvdata/ibm256.c index 15f6bdc5e1..e772f18d0e 100644 --- a/iconvdata/ibm256.c +++ b/iconvdata/ibm256.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM256. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm273.c b/iconvdata/ibm273.c index 03b07e535e..132c06f0eb 100644 --- a/iconvdata/ibm273.c +++ b/iconvdata/ibm273.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM273. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -23,6 +23,6 @@ #define TABLES <ibm273.h> #define CHARSET_NAME "IBM273//" -#define HAS_HOLES 1 /* Not all 256 character are defined. */ +#define HAS_HOLES 0 #include <8bit-gap.c> diff --git a/iconvdata/ibm274.c b/iconvdata/ibm274.c index 51b10360c7..52b446506e 100644 --- a/iconvdata/ibm274.c +++ b/iconvdata/ibm274.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM274. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm275.c b/iconvdata/ibm275.c index 3410bbf542..efc73b7e1c 100644 --- a/iconvdata/ibm275.c +++ b/iconvdata/ibm275.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM275. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm277.c b/iconvdata/ibm277.c index 5c82530f32..f93ca2acb8 100644 --- a/iconvdata/ibm277.c +++ b/iconvdata/ibm277.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM277. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm278.c b/iconvdata/ibm278.c index 9b4be45d47..4263000760 100644 --- a/iconvdata/ibm278.c +++ b/iconvdata/ibm278.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM278. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm280.c b/iconvdata/ibm280.c index 6981dbdbb9..3efddd7dec 100644 --- a/iconvdata/ibm280.c +++ b/iconvdata/ibm280.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM280. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm281.c b/iconvdata/ibm281.c index 0c7e9fa319..467363e776 100644 --- a/iconvdata/ibm281.c +++ b/iconvdata/ibm281.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM281. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm284.c b/iconvdata/ibm284.c index 20038b7784..57dab27d0c 100644 --- a/iconvdata/ibm284.c +++ b/iconvdata/ibm284.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM284. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm285.c b/iconvdata/ibm285.c index e8589d701f..1b555552e3 100644 --- a/iconvdata/ibm285.c +++ b/iconvdata/ibm285.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM285. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm290.c b/iconvdata/ibm290.c index fba0965cd4..53e0e182d0 100644 --- a/iconvdata/ibm290.c +++ b/iconvdata/ibm290.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM290. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm297.c b/iconvdata/ibm297.c index 76d491349e..f355659afd 100644 --- a/iconvdata/ibm297.c +++ b/iconvdata/ibm297.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM297. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm420.c b/iconvdata/ibm420.c index 17b9f4d96c..4b46e58aa2 100644 --- a/iconvdata/ibm420.c +++ b/iconvdata/ibm420.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM420. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm423.c b/iconvdata/ibm423.c index e76c4c045f..960e6601f2 100644 --- a/iconvdata/ibm423.c +++ b/iconvdata/ibm423.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM423. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm424.c b/iconvdata/ibm424.c index 30e60460d6..9af3a17180 100644 --- a/iconvdata/ibm424.c +++ b/iconvdata/ibm424.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM424. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm437.c b/iconvdata/ibm437.c index af8329cbb8..6c08bfd40f 100644 --- a/iconvdata/ibm437.c +++ b/iconvdata/ibm437.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM437. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm4517.c b/iconvdata/ibm4517.c index 341ec85e5c..16264f2788 100644 --- a/iconvdata/ibm4517.c +++ b/iconvdata/ibm4517.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM4517. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4517.h b/iconvdata/ibm4517.h index 337e729caf..acbf0da31d 100644 --- a/iconvdata/ibm4517.h +++ b/iconvdata/ibm4517.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM4517. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4899.c b/iconvdata/ibm4899.c index 6de9557986..2588b93a21 100644 --- a/iconvdata/ibm4899.c +++ b/iconvdata/ibm4899.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM4899. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4899.h b/iconvdata/ibm4899.h index 701231bbe0..21d62cfc15 100644 --- a/iconvdata/ibm4899.h +++ b/iconvdata/ibm4899.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM4899. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4909.c b/iconvdata/ibm4909.c index 30cccd5496..6e3fba9f95 100644 --- a/iconvdata/ibm4909.c +++ b/iconvdata/ibm4909.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM4909. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4909.h b/iconvdata/ibm4909.h index 5e2cc0dce5..f8fb1bfca1 100644 --- a/iconvdata/ibm4909.h +++ b/iconvdata/ibm4909.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM4909. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4971.c b/iconvdata/ibm4971.c index d41adb069d..0aed13d9e1 100644 --- a/iconvdata/ibm4971.c +++ b/iconvdata/ibm4971.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM4971. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm4971.h b/iconvdata/ibm4971.h index b4d00a60e6..020ecde8c4 100644 --- a/iconvdata/ibm4971.h +++ b/iconvdata/ibm4971.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM4971. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm500.c b/iconvdata/ibm500.c index ae9b898f38..98dcd35dcc 100644 --- a/iconvdata/ibm500.c +++ b/iconvdata/ibm500.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM500. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm5347.c b/iconvdata/ibm5347.c index a8946420c8..8a78e73ac0 100644 --- a/iconvdata/ibm5347.c +++ b/iconvdata/ibm5347.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM5347. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm5347.h b/iconvdata/ibm5347.h index bff8fb4e6e..6a2f8d5342 100644 --- a/iconvdata/ibm5347.h +++ b/iconvdata/ibm5347.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM5347. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm803.c b/iconvdata/ibm803.c index 61305d38a5..966f3f1eca 100644 --- a/iconvdata/ibm803.c +++ b/iconvdata/ibm803.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM803. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm803.h b/iconvdata/ibm803.h index 5ada7e2bb9..390b7d76f6 100644 --- a/iconvdata/ibm803.h +++ b/iconvdata/ibm803.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM803. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm850.c b/iconvdata/ibm850.c index c5fd5c47c6..13b54dbd4a 100644 --- a/iconvdata/ibm850.c +++ b/iconvdata/ibm850.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM850. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm851.c b/iconvdata/ibm851.c index d78e9aa711..90bf262a8d 100644 --- a/iconvdata/ibm851.c +++ b/iconvdata/ibm851.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM851. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm852.c b/iconvdata/ibm852.c index c26602f17d..a092237334 100644 --- a/iconvdata/ibm852.c +++ b/iconvdata/ibm852.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM852. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm855.c b/iconvdata/ibm855.c index 3a6eb8c915..148d1d0ed9 100644 --- a/iconvdata/ibm855.c +++ b/iconvdata/ibm855.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM855. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm856.c b/iconvdata/ibm856.c index 018083bf7b..b2bec84422 100644 --- a/iconvdata/ibm856.c +++ b/iconvdata/ibm856.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM856. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm856.h b/iconvdata/ibm856.h index 92afed8f6c..dc66b6956e 100644 --- a/iconvdata/ibm856.h +++ b/iconvdata/ibm856.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM856. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm857.c b/iconvdata/ibm857.c index ae8a8529bc..029afc0c36 100644 --- a/iconvdata/ibm857.c +++ b/iconvdata/ibm857.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM857. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm858.c b/iconvdata/ibm858.c new file mode 100644 index 0000000000..bd374ce1fc --- /dev/null +++ b/iconvdata/ibm858.c @@ -0,0 +1,27 @@ +/* Conversion from and to IBM858. + Copyright (C) 2017-2018 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <stdint.h> + +/* Get the conversion table. */ +#define TABLES <ibm858.h> + +#define CHARSET_NAME "IBM858//" +#define HAS_HOLES 1 /* Not all 256 character are defined. */ + +#include <8bit-gap.c> diff --git a/iconvdata/ibm860.c b/iconvdata/ibm860.c index 62783fb5c8..fe0d090b33 100644 --- a/iconvdata/ibm860.c +++ b/iconvdata/ibm860.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM860. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm861.c b/iconvdata/ibm861.c index 5ea952cdcf..e7243bf459 100644 --- a/iconvdata/ibm861.c +++ b/iconvdata/ibm861.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM861. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm862.c b/iconvdata/ibm862.c index 6334c49186..f30c5466e5 100644 --- a/iconvdata/ibm862.c +++ b/iconvdata/ibm862.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM862. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm863.c b/iconvdata/ibm863.c index dda9774efc..45f3c9eccb 100644 --- a/iconvdata/ibm863.c +++ b/iconvdata/ibm863.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM863. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm864.c b/iconvdata/ibm864.c index cc743a84cc..6655bebed8 100644 --- a/iconvdata/ibm864.c +++ b/iconvdata/ibm864.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM864. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm865.c b/iconvdata/ibm865.c index 43d7fab0da..5702adedb7 100644 --- a/iconvdata/ibm865.c +++ b/iconvdata/ibm865.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM865. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm866.c b/iconvdata/ibm866.c index 249bdc5bcb..3fab77ade5 100644 --- a/iconvdata/ibm866.c +++ b/iconvdata/ibm866.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM866. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm866nav.c b/iconvdata/ibm866nav.c index 9f42944f35..b9bcd65ef5 100644 --- a/iconvdata/ibm866nav.c +++ b/iconvdata/ibm866nav.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM866NAV. - Copyright (C) 2003-2016 Free Software Foundation, Inc. + Copyright (C) 2003-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2003. diff --git a/iconvdata/ibm868.c b/iconvdata/ibm868.c index 2a28665736..9f6f3ca686 100644 --- a/iconvdata/ibm868.c +++ b/iconvdata/ibm868.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM868. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm869.c b/iconvdata/ibm869.c index 3e1bf4ae53..1efe219f9a 100644 --- a/iconvdata/ibm869.c +++ b/iconvdata/ibm869.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM869. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm870.c b/iconvdata/ibm870.c index 7624d06a37..3130e71424 100644 --- a/iconvdata/ibm870.c +++ b/iconvdata/ibm870.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM870. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm871.c b/iconvdata/ibm871.c index 0e5e2ae62e..69e2a7c0ac 100644 --- a/iconvdata/ibm871.c +++ b/iconvdata/ibm871.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM871. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm874.c b/iconvdata/ibm874.c index be1c5cf8da..7158d7f4c0 100644 --- a/iconvdata/ibm874.c +++ b/iconvdata/ibm874.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM874. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm875.c b/iconvdata/ibm875.c index 62080f3039..55c691f52b 100644 --- a/iconvdata/ibm875.c +++ b/iconvdata/ibm875.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM875. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm880.c b/iconvdata/ibm880.c index b53609f924..c9a5b59f2f 100644 --- a/iconvdata/ibm880.c +++ b/iconvdata/ibm880.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM880. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm891.c b/iconvdata/ibm891.c index 94a52590c1..94d3e92add 100644 --- a/iconvdata/ibm891.c +++ b/iconvdata/ibm891.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM891. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm901.c b/iconvdata/ibm901.c index 349a22a3aa..a04a3ba75d 100644 --- a/iconvdata/ibm901.c +++ b/iconvdata/ibm901.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM901. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm901.h b/iconvdata/ibm901.h index 9ce693b554..2152ba3900 100644 --- a/iconvdata/ibm901.h +++ b/iconvdata/ibm901.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM901. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm902.c b/iconvdata/ibm902.c index 4751c551a2..e1abc94a64 100644 --- a/iconvdata/ibm902.c +++ b/iconvdata/ibm902.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM902. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm902.h b/iconvdata/ibm902.h index 60b61f74fd..c3ac6e7f98 100644 --- a/iconvdata/ibm902.h +++ b/iconvdata/ibm902.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM902. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm903.c b/iconvdata/ibm903.c index 04c94b2f75..7fb9217e5b 100644 --- a/iconvdata/ibm903.c +++ b/iconvdata/ibm903.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM903. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm9030.c b/iconvdata/ibm9030.c index ac4ae2546b..deb1d5520a 100644 --- a/iconvdata/ibm9030.c +++ b/iconvdata/ibm9030.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM9030. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm9030.h b/iconvdata/ibm9030.h index 5249214c2d..2e1317141c 100644 --- a/iconvdata/ibm9030.h +++ b/iconvdata/ibm9030.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM9030. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm904.c b/iconvdata/ibm904.c index b688b4e520..3d8513ba68 100644 --- a/iconvdata/ibm904.c +++ b/iconvdata/ibm904.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM904. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm905.c b/iconvdata/ibm905.c index b77919bc1b..2a548e9332 100644 --- a/iconvdata/ibm905.c +++ b/iconvdata/ibm905.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM905. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm9066.c b/iconvdata/ibm9066.c index 53048127e3..915d5227cc 100644 --- a/iconvdata/ibm9066.c +++ b/iconvdata/ibm9066.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM9066. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm9066.h b/iconvdata/ibm9066.h index 00763ba41e..9b925f2608 100644 --- a/iconvdata/ibm9066.h +++ b/iconvdata/ibm9066.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM9066. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm918.c b/iconvdata/ibm918.c index d61e5d35c2..81ae737a4e 100644 --- a/iconvdata/ibm918.c +++ b/iconvdata/ibm918.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM918. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/ibm921.c b/iconvdata/ibm921.c index 3fdffa2c8c..75688d6f39 100644 --- a/iconvdata/ibm921.c +++ b/iconvdata/ibm921.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM921. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm921.h b/iconvdata/ibm921.h index 706de8e238..8a1939758d 100644 --- a/iconvdata/ibm921.h +++ b/iconvdata/ibm921.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM921. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm922.c b/iconvdata/ibm922.c index 6814574bfa..0a546c3adc 100644 --- a/iconvdata/ibm922.c +++ b/iconvdata/ibm922.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM922. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm922.h b/iconvdata/ibm922.h index a0815694d0..bc286447d3 100644 --- a/iconvdata/ibm922.h +++ b/iconvdata/ibm922.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM922. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm930.c b/iconvdata/ibm930.c index 9d35734b3a..2d6b9e0762 100644 --- a/iconvdata/ibm930.c +++ b/iconvdata/ibm930.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM930. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -191,7 +191,6 @@ enum uint32_t ch = get32 (inptr); \ const struct gap *rp1 = __ucs4_to_ibm930sb_idx; \ const struct gap *rp2 = __ucs4_to_ibm930db_idx; \ - const char *cp; \ \ if (__glibc_unlikely (ch >= 0xffff)) \ { \ @@ -204,14 +203,16 @@ enum ++rp1; \ \ /* Use the UCS4 table for single byte. */ \ + unsigned char sbconv; \ if (__builtin_expect (ch < rp1->start, 0) \ - || (cp = __ucs4_to_ibm930sb[ch + rp1->idx], \ - __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \ + || (sbconv = __ucs4_to_ibm930sb[ch + rp1->idx], \ + __builtin_expect (sbconv, L'\1') == L'\0' && ch != '\0')) \ { \ /* Use the UCS4 table for double byte. */ \ while (ch > rp2->end) \ ++rp2; \ \ + const char *cp; \ if (__builtin_expect (ch < rp2->start, 0) \ || (cp = __ucs4_to_ibm930db[ch + rp2->idx], \ __builtin_expect (cp[0], L'\1')== L'\0' && ch != '\0')) \ @@ -264,7 +265,7 @@ enum else if (ch == 0x5c) \ *outptr++ = 0x5b; \ else \ - *outptr++ = cp[0]; \ + *outptr++ = sbconv; \ } \ \ /* Now that we wrote the output increment the input pointer. */ \ diff --git a/iconvdata/ibm930.h b/iconvdata/ibm930.h index 1afda568e9..91a30c3f95 100644 --- a/iconvdata/ibm930.h +++ b/iconvdata/ibm930.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM930. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -1499,46 +1499,46 @@ static const struct gap __ucs4_to_ibm930sb_idx[] = { .start = 0xffff, .end = 0xffff, .idx = 0 } }; -static const char * __ucs4_to_ibm930sb[] = +static const unsigned char __ucs4_to_ibm930sb[] = { - "\x00", "\x01", "\x02", "\x03", "\x37", "\x2d", "\x2e", "\x2f", "\x16", - "\x05", "\x25", "\x0b", "\x0c", "\x0d", "\x3f", "\x3f", "\x10", "\x11", - "\x12", "\x13", "\x3c", "\x3d", "\x32", "\x26", "\x18", "\x19", "\x3f", - "\x27", "\x1c", "\x1d", "\x1e", "\x1f", "\x40", "\x5a", "\x7f", "\x7b", - "\xe0", "\x6c", "\x50", "\x7d", "\x4d", "\x5d", "\x5c", "\x4e", "\x6b", - "\x60", "\x4b", "\x61", "\xf0", "\xf1", "\xf2", "\xf3", "\xf4", "\xf5", - "\xf6", "\xf7", "\xf8", "\xf9", "\x7a", "\x5e", "\x4c", "\x7e", "\x6e", - "\x6f", "\x7c", "\xc1", "\xc2", "\xc3", "\xc4", "\xc5", "\xc6", "\xc7", - "\xc8", "\xc9", "\xd1", "\xd2", "\xd3", "\xd4", "\xd5", "\xd6", "\xd7", - "\xd8", "\xd9", "\xe2", "\xe3", "\xe4", "\xe5", "\xe6", "\xe7", "\xe8", - "\xe9", "\x70", "\xb2", "\x80", "\xb0", "\x6d", "\x79", "\x62", "\x63", - "\x64", "\x65", "\x66", "\x67", "\x68", "\x69", "\x71", "\x72", "\x73", - "\x74", "\x75", "\x76", "\x77", "\x78", "\x8b", "\x9b", "\xab", "\xb3", - "\xb4", "\xb5", "\xb6", "\xb7", "\xb8", "\xb9", "\xc0", "\x4f", "\xd0", - "\xa0", "\x07", "\x20", "\x21", "\x22", "\x23", "\x24", "\x15", "\x06", - "\x17", "\x28", "\x29", "\x2a", "\x2b", "\x2c", "\x09", "\x0a", "\x1b", - "\x30", "\x31", "\x1a", "\x33", "\x34", "\x35", "\x36", "\x08", "\x38", - "\x39", "\x3a", "\x3b", "\x04", "\x14", "\x3e", "\xff", "\x3f", "\x3f", - "\xb1", "\x4a", "\x3f", "\x5b", "\x3f", "\x3f", "\x3f", "\x5f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\xa1", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x41", "\x42", "\x43", "\x44", "\x45", - "\x46", "\x47", "\x48", "\x49", "\x51", "\x52", "\x53", "\x54", "\x55", - "\x56", "\x58", "\x81", "\x82", "\x83", "\x84", "\x85", "\x86", "\x87", - "\x88", "\x89", "\x8a", "\x8c", "\x8d", "\x8e", "\x8f", "\x90", "\x91", - "\x92", "\x93", "\x94", "\x95", "\x96", "\x97", "\x98", "\x99", "\x9a", - "\x9d", "\x9e", "\x9f", "\xa2", "\xa3", "\xa4", "\xa5", "\xa6", "\xa7", - "\xa8", "\xa9", "\xaa", "\xac", "\xad", "\xae", "\xaf", "\xba", "\xbb", - "\xbc", "\xbd", "\xbe", "\xbf", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f" + '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f', '\x16', + '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x3f', '\x3f', '\x10', '\x11', + '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26', '\x18', '\x19', '\x3f', + '\x27', '\x1c', '\x1d', '\x1e', '\x1f', '\x40', '\x5a', '\x7f', '\x7b', + '\xe0', '\x6c', '\x50', '\x7d', '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', + '\x60', '\x4b', '\x61', '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', + '\xf6', '\xf7', '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', + '\x6f', '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7', + '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7', + '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7', '\xe8', + '\xe9', '\x70', '\xb2', '\x80', '\xb0', '\x6d', '\x79', '\x62', '\x63', + '\x64', '\x65', '\x66', '\x67', '\x68', '\x69', '\x71', '\x72', '\x73', + '\x74', '\x75', '\x76', '\x77', '\x78', '\x8b', '\x9b', '\xab', '\xb3', + '\xb4', '\xb5', '\xb6', '\xb7', '\xb8', '\xb9', '\xc0', '\x4f', '\xd0', + '\xa0', '\x07', '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', + '\x17', '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b', + '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08', '\x38', + '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff', '\x3f', '\x3f', + '\xb1', '\x4a', '\x3f', '\x5b', '\x3f', '\x3f', '\x3f', '\x5f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\xa1', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x41', '\x42', '\x43', '\x44', '\x45', + '\x46', '\x47', '\x48', '\x49', '\x51', '\x52', '\x53', '\x54', '\x55', + '\x56', '\x58', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87', + '\x88', '\x89', '\x8a', '\x8c', '\x8d', '\x8e', '\x8f', '\x90', '\x91', + '\x92', '\x93', '\x94', '\x95', '\x96', '\x97', '\x98', '\x99', '\x9a', + '\x9d', '\x9e', '\x9f', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7', + '\xa8', '\xa9', '\xaa', '\xac', '\xad', '\xae', '\xaf', '\xba', '\xbb', + '\xbc', '\xbd', '\xbe', '\xbf', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f' }; static const struct gap __ucs4_to_ibm930db_idx[] = diff --git a/iconvdata/ibm932.c b/iconvdata/ibm932.c index b5b7c9b132..d7dc7a5458 100644 --- a/iconvdata/ibm932.c +++ b/iconvdata/ibm932.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM932. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm932.h b/iconvdata/ibm932.h index 72a05b02fc..d46a607f1c 100644 --- a/iconvdata/ibm932.h +++ b/iconvdata/ibm932.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM932. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm933.c b/iconvdata/ibm933.c index 669e357066..a426e8e008 100644 --- a/iconvdata/ibm933.c +++ b/iconvdata/ibm933.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM933. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -189,7 +189,6 @@ enum uint32_t ch = get32 (inptr); \ const struct gap *rp1 = __ucs4_to_ibm933sb_idx; \ const struct gap *rp2 = __ucs4_to_ibm933db_idx; \ - const char *cp; \ \ if (__glibc_unlikely (ch >= 0xffff)) \ { \ @@ -202,14 +201,16 @@ enum ++rp1; \ \ /* Use the UCS4 table for single byte. */ \ + unsigned char sbconv; \ if (__builtin_expect (ch < rp1->start, 0) \ - || (cp = __ucs4_to_ibm933sb[ch + rp1->idx], \ - __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \ + || (sbconv = __ucs4_to_ibm933sb[ch + rp1->idx], \ + __builtin_expect (sbconv, L'\1') == L'\0' && ch != '\0')) \ { \ /* Use the UCS4 table for double byte. */ \ while (ch > rp2->end) \ ++rp2; \ \ + const char *cp; \ if (__builtin_expect (ch < rp2->start, 0) \ || (cp = __ucs4_to_ibm933db[ch + rp2->idx], \ __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \ @@ -257,7 +258,7 @@ enum result = __GCONV_FULL_OUTPUT; \ break; \ } \ - *outptr++ = cp[0]; \ + *outptr++ = sbconv; \ } \ \ /* Now that we wrote the output increment the input pointer. */ \ diff --git a/iconvdata/ibm933.h b/iconvdata/ibm933.h index cb0013758e..0d653a1ecb 100644 --- a/iconvdata/ibm933.h +++ b/iconvdata/ibm933.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM933. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -3371,39 +3371,39 @@ static const struct gap __ucs4_to_ibm933sb_idx[] = { .start = 0xffff, .end = 0xffff, .idx = 0 } }; -static const char *__ucs4_to_ibm933sb[] = +static const unsigned char __ucs4_to_ibm933sb[] = { - "\x00", "\x01", "\x02", "\x03", "\x37", "\x2d", "\x2e", "\x2f", "\x16", - "\x05", "\x25", "\x0b", "\x0c", "\x0d", "\x3f", "\x3f", "\x10", "\x11", - "\x12", "\x13", "\x3c", "\x3d", "\x32", "\x26", "\x18", "\x19", "\x3f", - "\x27", "\x1c", "\x1d", "\x1e", "\x1f", "\x40", "\x5a", "\x7f", "\x7b", - "\x5b", "\x6c", "\x50", "\x7d", "\x4d", "\x5d", "\x5c", "\x4e", "\x6b", - "\x60", "\x4b", "\x61", "\xf0", "\xf1", "\xf2", "\xf3", "\xf4", "\xf5", - "\xf6", "\xf7", "\xf8", "\xf9", "\x7a", "\x5e", "\x4c", "\x7e", "\x6e", - "\x6f", "\x7c", "\xc1", "\xc2", "\xc3", "\xc4", "\xc5", "\xc6", "\xc7", - "\xc8", "\xc9", "\xd1", "\xd2", "\xd3", "\xd4", "\xd5", "\xd6", "\xd7", - "\xd8", "\xd9", "\xe2", "\xe3", "\xe4", "\xe5", "\xe6", "\xe7", "\xe8", - "\xe9", "\x70", "\xb2", "\x80", "\xb0", "\x6d", "\x79", "\x81", "\x82", - "\x83", "\x84", "\x85", "\x86", "\x87", "\x88", "\x89", "\x91", "\x92", - "\x93", "\x94", "\x95", "\x96", "\x97", "\x98", "\x99", "\xa2", "\xa3", - "\xa4", "\xa5", "\xa6", "\xa7", "\xa8", "\xa9", "\xc0", "\x4f", "\xd0", - "\xa1", "\x07", "\x20", "\x21", "\x22", "\x23", "\x24", "\x15", "\x06", - "\x17", "\x28", "\x29", "\x2a", "\x2b", "\x2c", "\x09", "\x0a", "\x1b", - "\x30", "\x31", "\x1a", "\x33", "\x34", "\x35", "\x36", "\x08", "\x38", - "\x39", "\x3a", "\x3b", "\x04", "\x14", "\x3e", "\xff", "\x3f", "\x4a", - "\x3f", "\x3f", "\x6a", "\x3f", "\x3f", "\x5f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\xa0", "\xe0", "\x42", "\x43", "\x44", "\x45", "\x46", "\x47", "\x48", - "\x49", "\x52", "\x53", "\x54", "\x55", "\x56", "\x57", "\x58", "\x59", - "\x62", "\x63", "\x64", "\x65", "\x66", "\x67", "\x68", "\x69", "\x72", - "\x73", "\x74", "\x75", "\x76", "\x77", "\x78", "\x8a", "\x8b", "\x8c", - "\x8d", "\x8e", "\x8f", "\x9a", "\x9b", "\x9c", "\x9d", "\x9e", "\x9f", - "\xaa", "\xab", "\xac", "\xad", "\xae", "\xaf", "\xba", "\xbb", "\xbc" + '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f', '\x16', + '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x3f', '\x3f', '\x10', '\x11', + '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26', '\x18', '\x19', '\x3f', + '\x27', '\x1c', '\x1d', '\x1e', '\x1f', '\x40', '\x5a', '\x7f', '\x7b', + '\x5b', '\x6c', '\x50', '\x7d', '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', + '\x60', '\x4b', '\x61', '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', + '\xf6', '\xf7', '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', + '\x6f', '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7', + '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7', + '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7', '\xe8', + '\xe9', '\x70', '\xb2', '\x80', '\xb0', '\x6d', '\x79', '\x81', '\x82', + '\x83', '\x84', '\x85', '\x86', '\x87', '\x88', '\x89', '\x91', '\x92', + '\x93', '\x94', '\x95', '\x96', '\x97', '\x98', '\x99', '\xa2', '\xa3', + '\xa4', '\xa5', '\xa6', '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', + '\xa1', '\x07', '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', + '\x17', '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b', + '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08', '\x38', + '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff', '\x3f', '\x4a', + '\x3f', '\x3f', '\x6a', '\x3f', '\x3f', '\x5f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\xa0', '\xe0', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47', '\x48', + '\x49', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57', '\x58', '\x59', + '\x62', '\x63', '\x64', '\x65', '\x66', '\x67', '\x68', '\x69', '\x72', + '\x73', '\x74', '\x75', '\x76', '\x77', '\x78', '\x8a', '\x8b', '\x8c', + '\x8d', '\x8e', '\x8f', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f', + '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf', '\xba', '\xbb', '\xbc' }; static const struct gap __ucs4_to_ibm933db_idx[] = diff --git a/iconvdata/ibm935.c b/iconvdata/ibm935.c index 2d3065e54c..856e7d7732 100644 --- a/iconvdata/ibm935.c +++ b/iconvdata/ibm935.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM935 - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -190,7 +190,6 @@ enum uint32_t ch = get32 (inptr); \ const struct gap *rp1 = __ucs4_to_ibm935sb_idx; \ const struct gap *rp2 = __ucs4_to_ibm935db_idx; \ - const char *cp; \ \ if (__glibc_unlikely (ch >= 0xffff)) \ { \ @@ -203,14 +202,16 @@ enum ++rp1; \ \ /* Use the UCS4 table for single byte. */ \ + unsigned char sbconv; \ if (__builtin_expect (ch < rp1->start, 0) \ - || (cp = __ucs4_to_ibm935sb[ch + rp1->idx], \ - __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \ + || (sbconv = __ucs4_to_ibm935sb[ch + rp1->idx], \ + __builtin_expect (sbconv, L'\1') == L'\0' && ch != '\0')) \ { \ /* Use the UCS4 table for double byte. */ \ while (ch > rp2->end) \ ++rp2; \ \ + const char *cp; \ if (__builtin_expect (ch < rp2->start, 0) \ || (cp = __ucs4_to_ibm935db[ch + rp2->idx], \ __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \ @@ -258,7 +259,7 @@ enum result = __GCONV_FULL_OUTPUT; \ break; \ } \ - *outptr++ = cp[0]; \ + *outptr++ = sbconv; \ } \ \ /* Now that we wrote the output increment the input pointer. */ \ diff --git a/iconvdata/ibm935.h b/iconvdata/ibm935.h index f7a96e9a4b..0a37713f61 100644 --- a/iconvdata/ibm935.h +++ b/iconvdata/ibm935.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM935 - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -1282,35 +1282,35 @@ static const struct gap __ucs4_to_ibm935sb_idx[] = { .start = 0xffff, .end = 0xffff, .idx = 0 } }; -static const char *__ucs4_to_ibm935sb[] = +static const unsigned char __ucs4_to_ibm935sb[] = { - "\x00", "\x01", "\x02", "\x03", "\x37", "\x2d", "\x2e", "\x2f", "\x16", - "\x05", "\x25", "\x0b", "\x0c", "\x0d", "\x3f", "\x3f", "\x10", "\x11", - "\x12", "\x13", "\x3c", "\x3d", "\x32", "\x26", "\x18", "\x19", "\x3f", - "\x27", "\x1c", "\x1d", "\x1e", "\x1f", "\x40", "\x5a", "\x7f", "\x7b", - "\xe0", "\x6c", "\x50", "\x7d", "\x4d", "\x5d", "\x5c", "\x4e", "\x6b", - "\x60", "\x4b", "\x61", "\xf0", "\xf1", "\xf2", "\xf3", "\xf4", "\xf5", - "\xf6", "\xf7", "\xf8", "\xf9", "\x7a", "\x5e", "\x4c", "\x7e", "\x6e", - "\x6f", "\x7c", "\xc1", "\xc2", "\xc3", "\xc4", "\xc5", "\xc6", "\xc7", - "\xc8", "\xc9", "\xd1", "\xd2", "\xd3", "\xd4", "\xd5", "\xd6", "\xd7", - "\xd8", "\xd9", "\xe2", "\xe3", "\xe4", "\xe5", "\xe6", "\xe7", "\xe8", - "\xe9", "\xba", "\xb2", "\xbb", "\xb0", "\x6d", "\x79", "\x81", "\x82", - "\x83", "\x84", "\x85", "\x86", "\x87", "\x88", "\x89", "\x91", "\x92", - "\x93", "\x94", "\x95", "\x96", "\x97", "\x98", "\x99", "\xa2", "\xa3", - "\xa4", "\xa5", "\xa6", "\xa7", "\xa8", "\xa9", "\xc0", "\x4f", "\xd0", - "\xa0", "\x07", "\x20", "\x21", "\x22", "\x23", "\x24", "\x15", "\x06", - "\x17", "\x28", "\x29", "\x2a", "\x2b", "\x2c", "\x09", "\x0a", "\x1b", - "\x30", "\x31", "\x1a", "\x33", "\x34", "\x35", "\x36", "\x08", "\x38", - "\x39", "\x3a", "\x3b", "\x04", "\x14", "\x3e", "\xff", "\x3f", "\x3f", - "\x3f", "\x4a", "\x5b", "\x6a", "\x3f", "\x3f", "\x3f", "\x5f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\xa1" + '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f', '\x16', + '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x3f', '\x3f', '\x10', '\x11', + '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26', '\x18', '\x19', '\x3f', + '\x27', '\x1c', '\x1d', '\x1e', '\x1f', '\x40', '\x5a', '\x7f', '\x7b', + '\xe0', '\x6c', '\x50', '\x7d', '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', + '\x60', '\x4b', '\x61', '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', + '\xf6', '\xf7', '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', + '\x6f', '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7', + '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7', + '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7', '\xe8', + '\xe9', '\xba', '\xb2', '\xbb', '\xb0', '\x6d', '\x79', '\x81', '\x82', + '\x83', '\x84', '\x85', '\x86', '\x87', '\x88', '\x89', '\x91', '\x92', + '\x93', '\x94', '\x95', '\x96', '\x97', '\x98', '\x99', '\xa2', '\xa3', + '\xa4', '\xa5', '\xa6', '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', + '\xa0', '\x07', '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', + '\x17', '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b', + '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08', '\x38', + '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff', '\x3f', '\x3f', + '\x3f', '\x4a', '\x5b', '\x6a', '\x3f', '\x3f', '\x3f', '\x5f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\xa1' }; static const struct gap __ucs4_to_ibm935db_idx[] = diff --git a/iconvdata/ibm937.c b/iconvdata/ibm937.c index 3ed6479366..349bf2814e 100644 --- a/iconvdata/ibm937.c +++ b/iconvdata/ibm937.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM937. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. diff --git a/iconvdata/ibm937.h b/iconvdata/ibm937.h index 1f7f5ed939..6590e8b496 100644 --- a/iconvdata/ibm937.h +++ b/iconvdata/ibm937.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM937. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm939.c b/iconvdata/ibm939.c index c0a75f7797..0e44e91875 100644 --- a/iconvdata/ibm939.c +++ b/iconvdata/ibm939.c @@ -1,5 +1,5 @@ /* Conversion to and from IBM939. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -190,7 +190,6 @@ enum uint32_t ch = get32 (inptr); \ const struct gap *rp1 = __ucs4_to_ibm939sb_idx; \ const struct gap *rp2 = __ucs4_to_ibm939db_idx; \ - const char *cp; \ \ if (__glibc_unlikely (ch >= 0xffff)) \ { \ @@ -202,14 +201,16 @@ enum ++rp1; \ \ /* Use the UCS4 table for single byte. */ \ + unsigned char sbconv; \ if (__builtin_expect (ch < rp1->start, 0) \ - || (cp = __ucs4_to_ibm939sb[ch + rp1->idx], \ - __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \ + || (sbconv = __ucs4_to_ibm939sb[ch + rp1->idx], \ + __builtin_expect (sbconv, L'\1') == L'\0' && ch != '\0')) \ { \ /* Use the UCS4 table for double byte. */ \ while (ch > rp2->end) \ ++rp2; \ \ + const char *cp; \ if (__builtin_expect (ch < rp2->start, 0) \ || (cp = __ucs4_to_ibm939db[ch + rp2->idx], \ __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \ @@ -263,7 +264,7 @@ enum else if (ch == 0x5c) \ *outptr++ = 0xb2; \ else \ - *outptr++ = cp[0]; \ + *outptr++ = sbconv; \ } \ \ /* Now that we wrote the output increment the input pointer. */ \ diff --git a/iconvdata/ibm939.h b/iconvdata/ibm939.h index bb8a8de1da..b32bb67abb 100644 --- a/iconvdata/ibm939.h +++ b/iconvdata/ibm939.h @@ -1,5 +1,5 @@ /* Tables for conversion to and from IBM939. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -1499,46 +1499,46 @@ static const struct gap __ucs4_to_ibm939sb_idx[] = { .start = 0xffff, .end = 0xffff, .idx = 0 } }; -static const char * __ucs4_to_ibm939sb[] = +static const unsigned char __ucs4_to_ibm939sb[] = { - "\x00", "\x01", "\x02", "\x03", "\x37", "\x2d", "\x2e", "\x2f", "\x16", - "\x05", "\x25", "\x0b", "\x0c", "\x0d", "\x3f", "\x3f", "\x10", "\x11", - "\x12", "\x13", "\x3c", "\x3d", "\x32", "\x26", "\x18", "\x19", "\x3f", - "\x27", "\x1c", "\x1d", "\x1e", "\x1f", "\x40", "\x5a", "\x7f", "\x7b", - "\x5b", "\x6c", "\x50", "\x7d", "\x4d", "\x5d", "\x5c", "\x4e", "\x6b", - "\x60", "\x4b", "\x61", "\xf0", "\xf1", "\xf2", "\xf3", "\xf4", "\xf5", - "\xf6", "\xf7", "\xf8", "\xf9", "\x7a", "\x5e", "\x4c", "\x7e", "\x6e", - "\x6f", "\x7c", "\xc1", "\xc2", "\xc3", "\xc4", "\xc5", "\xc6", "\xc7", - "\xc8", "\xc9", "\xd1", "\xd2", "\xd3", "\xd4", "\xd5", "\xd6", "\xd7", - "\xd8", "\xd9", "\xe2", "\xe3", "\xe4", "\xe5", "\xe6", "\xe7", "\xe8", - "\xe9", "\xad", "\xe0", "\xbd", "\xb0", "\x6d", "\x79", "\x81", "\x82", - "\x83", "\x84", "\x85", "\x86", "\x87", "\x88", "\x89", "\x91", "\x92", - "\x93", "\x94", "\x95", "\x96", "\x97", "\x98", "\x99", "\xa2", "\xa3", - "\xa4", "\xa5", "\xa6", "\xa7", "\xa8", "\xa9", "\xc0", "\x4f", "\xd0", - "\xa1", "\x07", "\x20", "\x21", "\x22", "\x23", "\x24", "\x15", "\x06", - "\x17", "\x28", "\x29", "\x2a", "\x2b", "\x2c", "\x09", "\x0a", "\x1b", - "\x30", "\x31", "\x1a", "\x33", "\x34", "\x35", "\x36", "\x08", "\x38", - "\x39", "\x3a", "\x3b", "\x04", "\x14", "\x3e", "\xff", "\x3f", "\x3f", - "\x4a", "\xb1", "\x3f", "\xb2", "\x3f", "\x3f", "\x3f", "\x5f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\xa0", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f", "\x3f", "\x3f", "\x42", "\x43", "\x44", "\x45", "\x46", - "\x47", "\x48", "\x49", "\x51", "\x52", "\x53", "\x54", "\x55", "\x56", - "\x57", "\x58", "\x59", "\x62", "\x63", "\x64", "\x65", "\x66", "\x67", - "\x68", "\x69", "\x70", "\x71", "\x72", "\x73", "\x74", "\x75", "\x76", - "\x77", "\x78", "\x8a", "\x8b", "\x8c", "\x8d", "\x8e", "\x8f", "\x9a", - "\x9b", "\x9c", "\x9d", "\x9e", "\x9f", "\xaa", "\xab", "\xac", "\xae", - "\xaf", "\xb3", "\xb4", "\xb5", "\xb6", "\xb7", "\xb8", "\xb9", "\xba", - "\xbb", "\xbc", "\xbe", "\xbf", "\x3f", "\x3f", "\x3f", "\x3f", "\x3f", - "\x3f", "\x3f" + '\x00', '\x01', '\x02', '\x03', '\x37', '\x2d', '\x2e', '\x2f', '\x16', + '\x05', '\x25', '\x0b', '\x0c', '\x0d', '\x3f', '\x3f', '\x10', '\x11', + '\x12', '\x13', '\x3c', '\x3d', '\x32', '\x26', '\x18', '\x19', '\x3f', + '\x27', '\x1c', '\x1d', '\x1e', '\x1f', '\x40', '\x5a', '\x7f', '\x7b', + '\x5b', '\x6c', '\x50', '\x7d', '\x4d', '\x5d', '\x5c', '\x4e', '\x6b', + '\x60', '\x4b', '\x61', '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', + '\xf6', '\xf7', '\xf8', '\xf9', '\x7a', '\x5e', '\x4c', '\x7e', '\x6e', + '\x6f', '\x7c', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7', + '\xc8', '\xc9', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7', + '\xd8', '\xd9', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7', '\xe8', + '\xe9', '\xad', '\xe0', '\xbd', '\xb0', '\x6d', '\x79', '\x81', '\x82', + '\x83', '\x84', '\x85', '\x86', '\x87', '\x88', '\x89', '\x91', '\x92', + '\x93', '\x94', '\x95', '\x96', '\x97', '\x98', '\x99', '\xa2', '\xa3', + '\xa4', '\xa5', '\xa6', '\xa7', '\xa8', '\xa9', '\xc0', '\x4f', '\xd0', + '\xa1', '\x07', '\x20', '\x21', '\x22', '\x23', '\x24', '\x15', '\x06', + '\x17', '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x09', '\x0a', '\x1b', + '\x30', '\x31', '\x1a', '\x33', '\x34', '\x35', '\x36', '\x08', '\x38', + '\x39', '\x3a', '\x3b', '\x04', '\x14', '\x3e', '\xff', '\x3f', '\x3f', + '\x4a', '\xb1', '\x3f', '\xb2', '\x3f', '\x3f', '\x3f', '\x5f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\xa0', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f', '\x3f', '\x3f', '\x42', '\x43', '\x44', '\x45', '\x46', + '\x47', '\x48', '\x49', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', + '\x57', '\x58', '\x59', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67', + '\x68', '\x69', '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', + '\x77', '\x78', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f', '\x9a', + '\x9b', '\x9c', '\x9d', '\x9e', '\x9f', '\xaa', '\xab', '\xac', '\xae', + '\xaf', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7', '\xb8', '\xb9', '\xba', + '\xbb', '\xbc', '\xbe', '\xbf', '\x3f', '\x3f', '\x3f', '\x3f', '\x3f', + '\x3f', '\x3f' }; static const struct gap __ucs4_to_ibm939db_idx[] = diff --git a/iconvdata/ibm943.c b/iconvdata/ibm943.c index bbce4def48..0a5691f451 100644 --- a/iconvdata/ibm943.c +++ b/iconvdata/ibm943.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM943. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm943.h b/iconvdata/ibm943.h index 024c834bd7..d1898e9ce7 100644 --- a/iconvdata/ibm943.h +++ b/iconvdata/ibm943.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM943. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2000. diff --git a/iconvdata/ibm9448.c b/iconvdata/ibm9448.c index 2be48125d2..09544aa3b0 100644 --- a/iconvdata/ibm9448.c +++ b/iconvdata/ibm9448.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM9448. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/ibm9448.h b/iconvdata/ibm9448.h index 1501bf36fd..fff93e42ae 100644 --- a/iconvdata/ibm9448.h +++ b/iconvdata/ibm9448.h @@ -1,5 +1,5 @@ /* Tables for conversion from and to IBM9448. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@jp.ibm.com>, 2005. diff --git a/iconvdata/iec_p27-1.c b/iconvdata/iec_p27-1.c index 1ec96328cc..fe1457c88f 100644 --- a/iconvdata/iec_p27-1.c +++ b/iconvdata/iec_p27-1.c @@ -1,5 +1,5 @@ /* Conversion from and to IEC_P27-1. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/inis-8.c b/iconvdata/inis-8.c index 21099f1e4b..3d79e99bb7 100644 --- a/iconvdata/inis-8.c +++ b/iconvdata/inis-8.c @@ -1,5 +1,5 @@ /* Conversion from and to INIS-8. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/inis-cyrillic.c b/iconvdata/inis-cyrillic.c index 62e29e2ca5..cf4d5f44b3 100644 --- a/iconvdata/inis-cyrillic.c +++ b/iconvdata/inis-cyrillic.c @@ -1,5 +1,5 @@ /* Conversion from and to INIS-CYRILLIC. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/inis.c b/iconvdata/inis.c index e8c463233a..ccf4633196 100644 --- a/iconvdata/inis.c +++ b/iconvdata/inis.c @@ -1,5 +1,5 @@ /* Conversion from and to INIS. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/isiri-3342.c b/iconvdata/isiri-3342.c index 78dcf97526..ee9b6d9b8f 100644 --- a/iconvdata/isiri-3342.c +++ b/iconvdata/isiri-3342.c @@ -1,5 +1,5 @@ /* Conversion from and to ISIRI-3342. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c index df5b5df1fd..c21a7187b4 100644 --- a/iconvdata/iso-2022-cn-ext.c +++ b/iconvdata/iso-2022-cn-ext.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-CN-EXT. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. @@ -27,6 +27,7 @@ #include "cns11643.h" #include "cns11643l1.h" #include "cns11643l2.h" +#include <libc-diag.h> #include <assert.h> @@ -394,6 +395,16 @@ enum #define MIN_NEEDED_OUTPUT TO_LOOP_MIN_NEEDED_TO #define MAX_NEEDED_OUTPUT TO_LOOP_MAX_NEEDED_TO #define LOOPFCT TO_LOOP +/* With GCC 5.3 when compiling with -Os the compiler emits a warning + that buf[0] and buf[1] may be used uninitialized. This can only + happen in the case where tmpbuf[3] is used, and in that case the + write to the tmpbuf[1] and tmpbuf[2] was assured because + ucs4_to_cns11643 would have filled in those entries. The difficulty + is in getting the compiler to see this logic because tmpbuf[0] is + involved in determining the code page and is the indicator that + tmpbuf[2] is initialized. */ +DIAG_PUSH_NEEDS_COMMENT; +DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); #define BODY \ { \ uint32_t ch; \ @@ -645,6 +656,7 @@ enum /* Now that we wrote the output increment the input pointer. */ \ inptr += 4; \ } +DIAG_POP_NEEDS_COMMENT; #define EXTRA_LOOP_DECLS , int *setp #define INIT_PARAMS int set = (*setp >> 3) & CURRENT_MASK; \ int ann = (*setp >> 3) & ~CURRENT_MASK diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c index 3d891234d5..dce128ebfb 100644 --- a/iconvdata/iso-2022-cn.c +++ b/iconvdata/iso-2022-cn.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-CN. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/iso-2022-jp-3.c b/iconvdata/iso-2022-jp-3.c index 5d25474ebd..de259580c3 100644 --- a/iconvdata/iso-2022-jp-3.c +++ b/iconvdata/iso-2022-jp-3.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-JP-3. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998, and Bruno Haible <bruno@clisp.org>, 2002. diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c index 7f5592f3ac..80602202ea 100644 --- a/iconvdata/iso-2022-jp.c +++ b/iconvdata/iso-2022-jp.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-JP and ISO-2022-JP-2. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso-2022-kr.c b/iconvdata/iso-2022-kr.c index 22bfd67a58..b3b8a9b356 100644 --- a/iconvdata/iso-2022-kr.c +++ b/iconvdata/iso-2022-kr.c @@ -1,5 +1,5 @@ /* Conversion module for ISO-2022-KR. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso-ir-165.c b/iconvdata/iso-ir-165.c index eaf1817636..bfe8e71edb 100644 --- a/iconvdata/iso-ir-165.c +++ b/iconvdata/iso-ir-165.c @@ -1,6 +1,6 @@ /* Tables for conversion to and from ISO-IR-165. converting from UCS using gaps. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. diff --git a/iconvdata/iso-ir-165.h b/iconvdata/iso-ir-165.h index a3fab479d8..1b76835501 100644 --- a/iconvdata/iso-ir-165.h +++ b/iconvdata/iso-ir-165.h @@ -1,6 +1,6 @@ /* Tables for conversion to and from ISO-IR-165. converting from UCS using gaps. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. diff --git a/iconvdata/iso-ir-197.c b/iconvdata/iso-ir-197.c index 6a0aed556c..53966b9062 100644 --- a/iconvdata/iso-ir-197.c +++ b/iconvdata/iso-ir-197.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO-IR-197. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/iso-ir-209.c b/iconvdata/iso-ir-209.c index 88479b297b..1d460d011a 100644 --- a/iconvdata/iso-ir-209.c +++ b/iconvdata/iso-ir-209.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO-IR-209. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c index b048c2018e..1d3ac6a5f9 100644 --- a/iconvdata/iso646.c +++ b/iconvdata/iso646.c @@ -1,5 +1,5 @@ /* Conversion to and from the various ISO 646 CCS. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -60,9 +60,9 @@ enum direction from_iso646 }; +/* See names below, must be in the same order. */ enum variant { - illegal_var, GB, /* BS_4730 */ CA, /* CSA_Z243.4-1985-1 */ CA2, /* CSA_Z243.4-1985-2 */ @@ -88,33 +88,33 @@ enum variant SE2 /* SEN_850200_C */ }; -static const char *names[] = -{ - [GB] = "BS_4730//", - [CA] = "CSA_Z243.4-1985-1//", - [CA2] = "CSA_Z243.4-1985-2//", - [DE] = "DIN_66003//", - [DK] = "DS_2089//", - [ES] = "ES//", - [ES2] = "ES2//", - [CN] = "GB_1988-80//", - [IT] = "IT//", - [JP] = "JIS_C6220-1969-RO//", - [JP_OCR_B] = "JIS_C6229-1984-B//", - [YU] = "JUS_I.B1.002//", - [KR] = "KSC5636//", - [HU] = "MSZ_7795.3//", - [CU] = "NC_NC00-10//", - [FR] = "NF_Z_62-010//", - [FR1] = "NF_Z_62-010_1973//", /* Note that we don't have the parenthesis - in the name. */ - [NO] = "NS_4551-1//", - [NO2] = "NS_4551-2//", - [PT] = "PT//", - [PT2] = "PT2//", - [SE] = "SEN_850200_B//", - [SE2] = "SEN_850200_C//" -}; +/* Must be in the same order as enum variant above. */ +static const char names[] = + "BS_4730//\0" + "CSA_Z243.4-1985-1//\0" + "CSA_Z243.4-1985-2//\0" + "DIN_66003//\0" + "DS_2089//\0" + "ES//\0" + "ES2//\0" + "GB_1988-80//\0" + "IT//\0" + "JIS_C6220-1969-RO//\0" + "JIS_C6229-1984-B//\0" + "JUS_I.B1.002//\0" + "KSC5636//\0" + "MSZ_7795.3//\0" + "NC_NC00-10//\0" + "NF_Z_62-010//\0" + "NF_Z_62-010_1973//\0" /* Note that we don't have the parenthesis in + the name. */ + "NS_4551-1//\0" + "NS_4551-2//\0" + "PT//\0" + "PT2//\0" + "SEN_850200_B//\0" + "SEN_850200_C//\0" + "\0"; struct iso646_data { @@ -130,20 +130,24 @@ gconv_init (struct __gconv_step *step) /* Determine which direction. */ struct iso646_data *new_data; enum direction dir = illegal_dir; - enum variant var; int result; - for (var = sizeof (names) / sizeof (names[0]) - 1; var > illegal_var; --var) - if (__strcasecmp (step->__from_name, names[var]) == 0) - { - dir = from_iso646; - break; - } - else if (__strcasecmp (step->__to_name, names[var]) == 0) - { - dir = to_iso646; - break; - } + enum variant var = 0; + for (const char *name = names; *name != '\0'; + name = __rawmemchr (name, '\0') + 1) + { + if (__strcasecmp (step->__from_name, name) == 0) + { + dir = from_iso646; + break; + } + else if (__strcasecmp (step->__to_name, name) == 0) + { + dir = to_iso646; + break; + } + ++var; + } result = __GCONV_NOCONV; if (__builtin_expect (dir, from_iso646) != illegal_dir) diff --git a/iconvdata/iso8859-1.c b/iconvdata/iso8859-1.c index 33d72e672a..38c3c3bc10 100644 --- a/iconvdata/iso8859-1.c +++ b/iconvdata/iso8859-1.c @@ -1,5 +1,5 @@ /* Conversion to and from ISO 8859-1. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-10.c b/iconvdata/iso8859-10.c index d658b84bc3..81261ca794 100644 --- a/iconvdata/iso8859-10.c +++ b/iconvdata/iso8859-10.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-10. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-11.c b/iconvdata/iso8859-11.c index 0fb018990b..636728143b 100644 --- a/iconvdata/iso8859-11.c +++ b/iconvdata/iso8859-11.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-11. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso8859-13.c b/iconvdata/iso8859-13.c index c0c2a0b83a..ce646afbe0 100644 --- a/iconvdata/iso8859-13.c +++ b/iconvdata/iso8859-13.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-13. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso8859-14.c b/iconvdata/iso8859-14.c index ed7a470815..fd621a40d7 100644 --- a/iconvdata/iso8859-14.c +++ b/iconvdata/iso8859-14.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-14. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso8859-15.c b/iconvdata/iso8859-15.c index e3510016ed..470c1ce2c3 100644 --- a/iconvdata/iso8859-15.c +++ b/iconvdata/iso8859-15.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-15. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso8859-16.c b/iconvdata/iso8859-16.c index fe18db8577..80daec85f5 100644 --- a/iconvdata/iso8859-16.c +++ b/iconvdata/iso8859-16.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-16. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. diff --git a/iconvdata/iso8859-2.c b/iconvdata/iso8859-2.c index 6c8492c62d..6bf57217d7 100644 --- a/iconvdata/iso8859-2.c +++ b/iconvdata/iso8859-2.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-2. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-3.c b/iconvdata/iso8859-3.c index eca165ae2d..3d54560031 100644 --- a/iconvdata/iso8859-3.c +++ b/iconvdata/iso8859-3.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-3. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-4.c b/iconvdata/iso8859-4.c index 7e28eb62f4..7d5d22bc06 100644 --- a/iconvdata/iso8859-4.c +++ b/iconvdata/iso8859-4.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-4. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-5.c b/iconvdata/iso8859-5.c index 918a050210..d7a95bf018 100644 --- a/iconvdata/iso8859-5.c +++ b/iconvdata/iso8859-5.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-5. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-6.c b/iconvdata/iso8859-6.c index 6a0e84f23d..725415a85f 100644 --- a/iconvdata/iso8859-6.c +++ b/iconvdata/iso8859-6.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-6. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-7.c b/iconvdata/iso8859-7.c index 258d980085..43be6f5fc3 100644 --- a/iconvdata/iso8859-7.c +++ b/iconvdata/iso8859-7.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-7. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-8.c b/iconvdata/iso8859-8.c index 7a78d21975..f2e7b6f41f 100644 --- a/iconvdata/iso8859-8.c +++ b/iconvdata/iso8859-8.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-8. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-9.c b/iconvdata/iso8859-9.c index 5c7e7b8977..8679b6ec13 100644 --- a/iconvdata/iso8859-9.c +++ b/iconvdata/iso8859-9.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-9. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/iso8859-9e.c b/iconvdata/iso8859-9e.c index 9b0a45f5b0..fafa3d35f5 100644 --- a/iconvdata/iso8859-9e.c +++ b/iconvdata/iso8859-9e.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO 8859-9E. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/iso_10367-box.c b/iconvdata/iso_10367-box.c index 3b84760812..d2c9d6615c 100644 --- a/iconvdata/iso_10367-box.c +++ b/iconvdata/iso_10367-box.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_10367-BOX. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_11548-1.c b/iconvdata/iso_11548-1.c index d3e3596e4e..884f752046 100644 --- a/iconvdata/iso_11548-1.c +++ b/iconvdata/iso_11548-1.c @@ -1,5 +1,5 @@ /* Conversion to and from ISO 11548-1. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997, Samuel Thibault <samuel.thibault@ens-lyon.org>, 2005. diff --git a/iconvdata/iso_2033.c b/iconvdata/iso_2033.c index 8d97302d48..27ae417982 100644 --- a/iconvdata/iso_2033.c +++ b/iconvdata/iso_2033.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_2033-1983. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_5427-ext.c b/iconvdata/iso_5427-ext.c index 499f36d75e..9f535b7c73 100644 --- a/iconvdata/iso_5427-ext.c +++ b/iconvdata/iso_5427-ext.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_5427-EXT. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_5427.c b/iconvdata/iso_5427.c index 534dfb7178..5b0d0d3c18 100644 --- a/iconvdata/iso_5427.c +++ b/iconvdata/iso_5427.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_5427. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_5428.c b/iconvdata/iso_5428.c index f6831d9e02..fee534082c 100644 --- a/iconvdata/iso_5428.c +++ b/iconvdata/iso_5428.c @@ -1,5 +1,5 @@ /* Conversion from and to ISO_5428. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c index a98e557d4f..6594c8a282 100644 --- a/iconvdata/iso_6937-2.c +++ b/iconvdata/iso_6937-2.c @@ -1,5 +1,5 @@ /* Generic conversion to and from ISO 6937-2. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c index 66b3a86ed5..96320ccc8e 100644 --- a/iconvdata/iso_6937.c +++ b/iconvdata/iso_6937.c @@ -1,5 +1,5 @@ /* Generic conversion to and from ISO 6937. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0201.c b/iconvdata/jis0201.c index 579107f2d5..104620dbbc 100644 --- a/iconvdata/jis0201.c +++ b/iconvdata/jis0201.c @@ -1,5 +1,5 @@ /* Mapping tables for JIS0201 handling. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0201.h b/iconvdata/jis0201.h index f2fb26f6b5..c336cae144 100644 --- a/iconvdata/jis0201.h +++ b/iconvdata/jis0201.h @@ -1,5 +1,5 @@ /* Access functions for JISX0201 conversion. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0208.c b/iconvdata/jis0208.c index a36e8eb309..836a477907 100644 --- a/iconvdata/jis0208.c +++ b/iconvdata/jis0208.c @@ -1,5 +1,5 @@ /* Mapping tables for JIS0208 handling. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0208.h b/iconvdata/jis0208.h index d7f78df695..a71a88f34e 100644 --- a/iconvdata/jis0208.h +++ b/iconvdata/jis0208.h @@ -1,5 +1,5 @@ /* Access functions for JISX0208 conversion. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0212.c b/iconvdata/jis0212.c index 0687573d01..16ec64d1dd 100644 --- a/iconvdata/jis0212.c +++ b/iconvdata/jis0212.c @@ -1,5 +1,5 @@ /* Mapping tables for JIS0212 handling. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jis0212.h b/iconvdata/jis0212.h index 99be1b3098..f3d1861a25 100644 --- a/iconvdata/jis0212.h +++ b/iconvdata/jis0212.h @@ -1,5 +1,5 @@ /* Access functions for JISX0212 conversion. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/jisx0213.c b/iconvdata/jisx0213.c index 07b00cb9e3..13afef6db3 100644 --- a/iconvdata/jisx0213.c +++ b/iconvdata/jisx0213.c @@ -1,5 +1,5 @@ /* Mapping tables for JISX0213 character set. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/iconvdata/jisx0213.h b/iconvdata/jisx0213.h index a780523a8f..2962182245 100644 --- a/iconvdata/jisx0213.h +++ b/iconvdata/jisx0213.h @@ -1,5 +1,5 @@ /* Functions for JISX0213 conversion. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/iconvdata/johab.c b/iconvdata/johab.c index fd701128cf..351003357f 100644 --- a/iconvdata/johab.c +++ b/iconvdata/johab.c @@ -1,5 +1,5 @@ /* Mapping tables for JOHAB handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin <jshin@pantheon.yale.edu> and Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/koi-8.c b/iconvdata/koi-8.c index 7b4c89d2ab..d09459cc8c 100644 --- a/iconvdata/koi-8.c +++ b/iconvdata/koi-8.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI-8. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/koi8-r.c b/iconvdata/koi8-r.c index 6d3c08222d..57b6e92bad 100644 --- a/iconvdata/koi8-r.c +++ b/iconvdata/koi8-r.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI8-R. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/koi8-ru.c b/iconvdata/koi8-ru.c index fc3c83de7d..2397d3afb7 100644 --- a/iconvdata/koi8-ru.c +++ b/iconvdata/koi8-ru.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI8-RU. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 20077. diff --git a/iconvdata/koi8-t.c b/iconvdata/koi8-t.c index 3b053c98b4..94b25950fd 100644 --- a/iconvdata/koi8-t.c +++ b/iconvdata/koi8-t.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI8-T. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. diff --git a/iconvdata/koi8-u.c b/iconvdata/koi8-u.c index 523faa1f7f..dc93e940d0 100644 --- a/iconvdata/koi8-u.c +++ b/iconvdata/koi8-u.c @@ -1,5 +1,5 @@ /* Conversion from and to KOI8-U. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/ksc5601.c b/iconvdata/ksc5601.c index c2bcb28808..332e8fc62b 100644 --- a/iconvdata/ksc5601.c +++ b/iconvdata/ksc5601.c @@ -1,5 +1,5 @@ /* Conversion tables for KS C 5601-1992 based encoding conversion. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin <jshin@pantheon.yale.edu>, 1998. diff --git a/iconvdata/ksc5601.h b/iconvdata/ksc5601.h index fff0b3d27a..5588d3a14b 100644 --- a/iconvdata/ksc5601.h +++ b/iconvdata/ksc5601.h @@ -1,5 +1,5 @@ /* Access functions for KS C 5601-1992 based encoding conversion. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 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 diff --git a/iconvdata/latin-greek-1.c b/iconvdata/latin-greek-1.c index 083793fc3f..6b2665e5c1 100644 --- a/iconvdata/latin-greek-1.c +++ b/iconvdata/latin-greek-1.c @@ -1,5 +1,5 @@ /* Conversion from and to LATIN-GREEK-1. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/latin-greek.c b/iconvdata/latin-greek.c index b3d1ee0435..7d4f7001c9 100644 --- a/iconvdata/latin-greek.c +++ b/iconvdata/latin-greek.c @@ -1,5 +1,5 @@ /* Conversion from and to LATIN-GREEK. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/mac-centraleurope.c b/iconvdata/mac-centraleurope.c index d4379e2a01..558194dc9a 100644 --- a/iconvdata/mac-centraleurope.c +++ b/iconvdata/mac-centraleurope.c @@ -1,5 +1,5 @@ /* Conversion from and to MAC-CENTRALEUROPE. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2007. diff --git a/iconvdata/mac-is.c b/iconvdata/mac-is.c index 4816a6df61..c46234d5ab 100644 --- a/iconvdata/mac-is.c +++ b/iconvdata/mac-is.c @@ -1,5 +1,5 @@ /* Conversion from and to MAC-IS. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/mac-sami.c b/iconvdata/mac-sami.c index 6887f331af..6853fed15c 100644 --- a/iconvdata/mac-sami.c +++ b/iconvdata/mac-sami.c @@ -1,5 +1,5 @@ /* Conversion from and to MAC-SAMI. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/iconvdata/mac-uk.c b/iconvdata/mac-uk.c index 2fd5ee68fc..d06e7da170 100644 --- a/iconvdata/mac-uk.c +++ b/iconvdata/mac-uk.c @@ -1,5 +1,5 @@ /* Conversion from and to MAC-UK. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/macintosh.c b/iconvdata/macintosh.c index 80f7330a70..c8e9c20ad1 100644 --- a/iconvdata/macintosh.c +++ b/iconvdata/macintosh.c @@ -1,5 +1,5 @@ /* Conversion from and to MACINTOSH. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/mik.c b/iconvdata/mik.c index 57b24f1123..988d81e647 100644 --- a/iconvdata/mik.c +++ b/iconvdata/mik.c @@ -1,5 +1,5 @@ /* Conversion from and to MIK. - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Alexander Shopov <ash@contact.bg>, 2006. diff --git a/iconvdata/nats-dano.c b/iconvdata/nats-dano.c index 3558b876fc..9d912aa96e 100644 --- a/iconvdata/nats-dano.c +++ b/iconvdata/nats-dano.c @@ -1,5 +1,5 @@ /* Conversion from and to NATS-DANO. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/nats-sefi.c b/iconvdata/nats-sefi.c index 1753958ae4..226e87ec30 100644 --- a/iconvdata/nats-sefi.c +++ b/iconvdata/nats-sefi.c @@ -1,5 +1,5 @@ /* Conversion from and to NATS-SEFI. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/pt154.c b/iconvdata/pt154.c index 61bde1fafe..b2777f87e7 100644 --- a/iconvdata/pt154.c +++ b/iconvdata/pt154.c @@ -1,5 +1,5 @@ /* Conversion from and to PT154. - Copyright (C) 2004-2016 Free Software Foundation, Inc. + Copyright (C) 2004-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. diff --git a/iconvdata/rk1048.c b/iconvdata/rk1048.c index c065b8bca6..e8313d832a 100644 --- a/iconvdata/rk1048.c +++ b/iconvdata/rk1048.c @@ -1,5 +1,5 @@ /* Conversion from and to RK1048. - Copyright (C) 2004-2016 Free Software Foundation, Inc. + Copyright (C) 2004-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. diff --git a/iconvdata/run-iconv-test.sh b/iconvdata/run-iconv-test.sh index 2e7105a2d9..a4d9300f3b 100755 --- a/iconvdata/run-iconv-test.sh +++ b/iconvdata/run-iconv-test.sh @@ -1,6 +1,6 @@ #!/bin/sh -f # Run available iconv(1) tests. -# Copyright (C) 1998-2016 Free Software Foundation, Inc. +# Copyright (C) 1998-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. diff --git a/iconvdata/sami-ws2.c b/iconvdata/sami-ws2.c index 2c79305e40..2ddd0072cc 100644 --- a/iconvdata/sami-ws2.c +++ b/iconvdata/sami-ws2.c @@ -1,5 +1,5 @@ /* Conversion from and to SAMI-WS2. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/shift_jisx0213.c b/iconvdata/shift_jisx0213.c index f929b89276..8876adc7d0 100644 --- a/iconvdata/shift_jisx0213.c +++ b/iconvdata/shift_jisx0213.c @@ -1,5 +1,5 @@ /* Conversion from and to Shift_JISX0213. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c index c268308d94..8b2b3b480c 100644 --- a/iconvdata/sjis.c +++ b/iconvdata/sjis.c @@ -1,5 +1,5 @@ /* Mapping tables for SJIS handling. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c index 369250052d..c764151d5b 100644 --- a/iconvdata/t.61.c +++ b/iconvdata/t.61.c @@ -1,5 +1,5 @@ /* Generic conversion to and from T.61. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. diff --git a/iconvdata/tcvn5712-1.c b/iconvdata/tcvn5712-1.c index 5651973539..25dc8e0d52 100644 --- a/iconvdata/tcvn5712-1.c +++ b/iconvdata/tcvn5712-1.c @@ -1,5 +1,5 @@ /* Conversion to and from TCVN5712-1. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/iconvdata/tis-620.c b/iconvdata/tis-620.c index f14a0a7392..6a8b3d606f 100644 --- a/iconvdata/tis-620.c +++ b/iconvdata/tis-620.c @@ -1,5 +1,5 @@ /* Conversion from and to TIS-620. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/tscii.c b/iconvdata/tscii.c index 355c2565ee..6f464e4cf1 100644 --- a/iconvdata/tscii.c +++ b/iconvdata/tscii.c @@ -1,5 +1,5 @@ /* Conversion from and to TSCII. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/iconvdata/tst-e2big.c b/iconvdata/tst-e2big.c index bc0d3b7d45..95251bad01 100644 --- a/iconvdata/tst-e2big.c +++ b/iconvdata/tst-e2big.c @@ -1,5 +1,5 @@ /* Test for a tricky E2BIG situation. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <bruno@clisp.org>, 2002. diff --git a/iconvdata/tst-loading.c b/iconvdata/tst-loading.c index 465a751ba3..dda119a1ff 100644 --- a/iconvdata/tst-loading.c +++ b/iconvdata/tst-loading.c @@ -1,5 +1,5 @@ /* Tests for loading and unloading of iconv modules. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. @@ -181,6 +181,6 @@ do_test (void) return result; } -#define TIMEOUT 10 +#define TIMEOUT 30 #define TEST_FUNCTION do_test () #include "../test-skeleton.c" diff --git a/iconvdata/tst-table-charmap.sh b/iconvdata/tst-table-charmap.sh index a7faaaa02f..b842e312f1 100755 --- a/iconvdata/tst-table-charmap.sh +++ b/iconvdata/tst-table-charmap.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. # diff --git a/iconvdata/tst-table-from.c b/iconvdata/tst-table-from.c index 040ebf6149..d936166e8e 100644 --- a/iconvdata/tst-table-from.c +++ b/iconvdata/tst-table-from.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2016 Free Software Foundation, Inc. +/* Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. diff --git a/iconvdata/tst-table-to.c b/iconvdata/tst-table-to.c index 357832b483..ceb8712f70 100644 --- a/iconvdata/tst-table-to.c +++ b/iconvdata/tst-table-to.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2016 Free Software Foundation, Inc. +/* Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. diff --git a/iconvdata/tst-table.sh b/iconvdata/tst-table.sh index 0fbbf7bb56..89551c1d1f 100755 --- a/iconvdata/tst-table.sh +++ b/iconvdata/tst-table.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. # diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh index 620471d239..2ba74f80c6 100755 --- a/iconvdata/tst-tables.sh +++ b/iconvdata/tst-tables.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2000-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. # @@ -125,6 +125,7 @@ cat <<EOF | IBM855 IBM856 IBM857 + IBM858 IBM860 IBM861 IBM862 diff --git a/iconvdata/uhc.c b/iconvdata/uhc.c index fe932affb1..10f54b1c07 100644 --- a/iconvdata/uhc.c +++ b/iconvdata/uhc.c @@ -1,5 +1,5 @@ /* Mapping tables for UHC handling. - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jungshik Shin <jshin@pantheon.yale.edu>, 1998. diff --git a/iconvdata/unicode.c b/iconvdata/unicode.c index e5e4310da0..d0db423909 100644 --- a/iconvdata/unicode.c +++ b/iconvdata/unicode.c @@ -1,5 +1,5 @@ /* Conversion module for Unicode - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c index 2d74a1356e..ed5f5b2f1f 100644 --- a/iconvdata/utf-16.c +++ b/iconvdata/utf-16.c @@ -1,5 +1,5 @@ /* Conversion module for UTF-16. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -295,6 +295,12 @@ gconv_end (struct __gconv_step *data) { \ uint16_t u2; \ \ + if (__glibc_unlikely (u1 >= 0xdc00)) \ + { \ + /* This is no valid first word for a surrogate. */ \ + STANDARD_FROM_LOOP_ERR_HANDLER (2); \ + } \ + \ /* It's a surrogate character. At least the first word says \ it is. */ \ if (__glibc_unlikely (inptr + 4 > inend)) \ @@ -329,6 +335,12 @@ gconv_end (struct __gconv_step *data) } \ else \ { \ + if (__glibc_unlikely (u1 >= 0xdc00)) \ + { \ + /* This is no valid first word for a surrogate. */ \ + STANDARD_FROM_LOOP_ERR_HANDLER (2); \ + } \ + \ /* It's a surrogate character. At least the first word says \ it is. */ \ if (__glibc_unlikely (inptr + 4 > inend)) \ diff --git a/iconvdata/utf-32.c b/iconvdata/utf-32.c index 0d6fe30e0f..7ed0e9bdec 100644 --- a/iconvdata/utf-32.c +++ b/iconvdata/utf-32.c @@ -1,5 +1,5 @@ /* Conversion module for UTF-32. - Copyright (C) 1999-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2018 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 @@ -239,7 +239,7 @@ gconv_end (struct __gconv_step *data) if (swap) \ u1 = bswap_32 (u1); \ \ - if (__glibc_unlikely (u1 >= 0x110000)) \ + if (__glibc_unlikely (u1 >= 0x110000 || (u1 >= 0xd800 && u1 < 0xe000))) \ { \ /* This is illegal. */ \ STANDARD_FROM_LOOP_ERR_HANDLER (4); \ diff --git a/iconvdata/utf-7.c b/iconvdata/utf-7.c index b4998dbf55..a9c6824c89 100644 --- a/iconvdata/utf-7.c +++ b/iconvdata/utf-7.c @@ -1,5 +1,5 @@ /* Conversion module for UTF-7. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <haible@clisp.cons.org>, 2000. diff --git a/iconvdata/viscii.c b/iconvdata/viscii.c index 3c3060a2b3..ebc6e15f15 100644 --- a/iconvdata/viscii.c +++ b/iconvdata/viscii.c @@ -1,5 +1,5 @@ /* Conversion from and to VISCII. - Copyright (C) 2000-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. |