aboutsummaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/Makefile4
-rw-r--r--iconvdata/TESTS1
-rw-r--r--iconvdata/gconv-modules4
-rw-r--r--iconvdata/koi8-r.c4
-rw-r--r--iconvdata/koi8-ru.c29
-rwxr-xr-xiconvdata/tst-tables.sh1
6 files changed, 39 insertions, 4 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index e3ec8468f9..8256bca2fc 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -59,7 +59,7 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 \
IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804 \
IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF \
- MAC-CENTRALEUROPE
+ MAC-CENTRALEUROPE KOI8-RU
modules.so := $(addsuffix .so, $(modules))
@@ -240,7 +240,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \
iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t \
georgian-ps georgian-academy iso-ir-209 mac-sami \
iso8859-11 ibm866nav pt154 rk1048 mik brf \
- mac-centraleurope
+ mac-centraleurope koi8-ru
gen-special-modules := iso8859-7jp
diff --git a/iconvdata/TESTS b/iconvdata/TESTS
index 251f24b731..4e1fdcd264 100644
--- a/iconvdata/TESTS
+++ b/iconvdata/TESTS
@@ -169,3 +169,4 @@ MIK MIK Y UTF8
BRF BRF - UTF8
MAC-SAMI MAC-SAMI Y UTF8
MAC-CENTRALEUROPE MAC-CENTRALEUROPE Y UTF8
+KOI8-RU KOI8-RU Y UTF8
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index fc8e3cdb2c..ae4cf5fdc9 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1916,3 +1916,7 @@ module INTERNAL BRF// BRF 1
alias CP1282// MAC-CENTRALEUROPE//
module MAC-CENTRALEUROPE// INTERNAL MAC-CENTRALEUROPE 1
module INTERNAL MAC-CENTRALEUROPE// MAC-CENTRALEUROPE 1
+
+# from to module cost
+module KOI8-RU// INTERNAL KOI8-RU 1
+module INTERNAL KOI8-RU// KOI8-RU 1
diff --git a/iconvdata/koi8-r.c b/iconvdata/koi8-r.c
index 88fe157a03..2e7934d0b0 100644
--- a/iconvdata/koi8-r.c
+++ b/iconvdata/koi8-r.c
@@ -1,5 +1,5 @@
/* Conversion from and to KOI8-R.
- Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -24,6 +24,6 @@
#define TABLES <koi8-r.h>
#define CHARSET_NAME "KOI8-R//"
-#define HAS_HOLES 1 /* Not all 256 character are defined. */
+#define HAS_HOLES 0 /* All 256 character are defined. */
#include <8bit-gap.c>
diff --git a/iconvdata/koi8-ru.c b/iconvdata/koi8-ru.c
new file mode 100644
index 0000000000..ce1b1cff59
--- /dev/null
+++ b/iconvdata/koi8-ru.c
@@ -0,0 +1,29 @@
+/* Conversion from and to KOI8-RU.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 20077.
+
+ 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <stdint.h>
+
+/* Specify the conversion table. */
+#define TABLES <koi8-ru.h>
+
+#define CHARSET_NAME "KOI8-RU//"
+#define HAS_HOLES 0 /* All 256 character are defined. */
+
+#include <8bit-gap.c>
diff --git a/iconvdata/tst-tables.sh b/iconvdata/tst-tables.sh
index a9f8427399..b9eecd0683 100755
--- a/iconvdata/tst-tables.sh
+++ b/iconvdata/tst-tables.sh
@@ -210,6 +210,7 @@ cat <<EOF |
MIK
BRF
MAC-CENTRALEUROPE
+ KOI8-RU
#
# Multibyte encodings come here
#