summaryrefslogtreecommitdiffstats
path: root/fs/nls/nls_iso8859-6.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nls/nls_iso8859-6.c')
-rw-r--r--fs/nls/nls_iso8859-6.c160
1 files changed, 93 insertions, 67 deletions
diff --git a/fs/nls/nls_iso8859-6.c b/fs/nls/nls_iso8859-6.c
index 877fde7cc..3fce9a66e 100644
--- a/fs/nls/nls_iso8859-6.c
+++ b/fs/nls/nls_iso8859-6.c
@@ -11,88 +11,89 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/nls.h>
+#include <linux/errno.h>
-static struct nls_unicode charset2uni[256] = {
+static wchar_t charset2uni[256] = {
/* 0x00*/
- {0x00, 0x00}, {0x01, 0x00}, {0x02, 0x00}, {0x03, 0x00},
- {0x04, 0x00}, {0x05, 0x00}, {0x06, 0x00}, {0x07, 0x00},
- {0x08, 0x00}, {0x09, 0x00}, {0x0a, 0x00}, {0x0b, 0x00},
- {0x0c, 0x00}, {0x0d, 0x00}, {0x0e, 0x00}, {0x0f, 0x00},
+ 0x0000, 0x0001, 0x0002, 0x0003,
+ 0x0004, 0x0005, 0x0006, 0x0007,
+ 0x0008, 0x0009, 0x000a, 0x000b,
+ 0x000c, 0x000d, 0x000e, 0x000f,
/* 0x10*/
- {0x10, 0x00}, {0x11, 0x00}, {0x12, 0x00}, {0x13, 0x00},
- {0x14, 0x00}, {0x15, 0x00}, {0x16, 0x00}, {0x17, 0x00},
- {0x18, 0x00}, {0x19, 0x00}, {0x1a, 0x00}, {0x1b, 0x00},
- {0x1c, 0x00}, {0x1d, 0x00}, {0x1e, 0x00}, {0x1f, 0x00},
+ 0x0010, 0x0011, 0x0012, 0x0013,
+ 0x0014, 0x0015, 0x0016, 0x0017,
+ 0x0018, 0x0019, 0x001a, 0x001b,
+ 0x001c, 0x001d, 0x001e, 0x001f,
/* 0x20*/
- {0x20, 0x00}, {0x21, 0x00}, {0x22, 0x00}, {0x23, 0x00},
- {0x24, 0x00}, {0x25, 0x00}, {0x26, 0x00}, {0x27, 0x00},
- {0x28, 0x00}, {0x29, 0x00}, {0x2a, 0x00}, {0x2b, 0x00},
- {0x2c, 0x00}, {0x2d, 0x00}, {0x2e, 0x00}, {0x2f, 0x00},
+ 0x0020, 0x0021, 0x0022, 0x0023,
+ 0x0024, 0x0025, 0x0026, 0x0027,
+ 0x0028, 0x0029, 0x002a, 0x002b,
+ 0x002c, 0x002d, 0x002e, 0x002f,
/* 0x30*/
- {0x60, 0x06}, {0x61, 0x06}, {0x62, 0x06}, {0x63, 0x06},
- {0x64, 0x06}, {0x65, 0x06}, {0x66, 0x06}, {0x67, 0x06},
- {0x68, 0x06}, {0x69, 0x06}, {0x3a, 0x00}, {0x3b, 0x00},
- {0x3c, 0x00}, {0x3d, 0x00}, {0x3e, 0x00}, {0x3f, 0x00},
+ 0x0660, 0x0661, 0x0662, 0x0663,
+ 0x0664, 0x0665, 0x0666, 0x0667,
+ 0x0668, 0x0669, 0x003a, 0x003b,
+ 0x003c, 0x003d, 0x003e, 0x003f,
/* 0x40*/
- {0x40, 0x00}, {0x41, 0x00}, {0x42, 0x00}, {0x43, 0x00},
- {0x44, 0x00}, {0x45, 0x00}, {0x46, 0x00}, {0x47, 0x00},
- {0x48, 0x00}, {0x49, 0x00}, {0x4a, 0x00}, {0x4b, 0x00},
- {0x4c, 0x00}, {0x4d, 0x00}, {0x4e, 0x00}, {0x4f, 0x00},
+ 0x0040, 0x0041, 0x0042, 0x0043,
+ 0x0044, 0x0045, 0x0046, 0x0047,
+ 0x0048, 0x0049, 0x004a, 0x004b,
+ 0x004c, 0x004d, 0x004e, 0x004f,
/* 0x50*/
- {0x50, 0x00}, {0x51, 0x00}, {0x52, 0x00}, {0x53, 0x00},
- {0x54, 0x00}, {0x55, 0x00}, {0x56, 0x00}, {0x57, 0x00},
- {0x58, 0x00}, {0x59, 0x00}, {0x5a, 0x00}, {0x5b, 0x00},
- {0x5c, 0x00}, {0x5d, 0x00}, {0x5e, 0x00}, {0x5f, 0x00},
+ 0x0050, 0x0051, 0x0052, 0x0053,
+ 0x0054, 0x0055, 0x0056, 0x0057,
+ 0x0058, 0x0059, 0x005a, 0x005b,
+ 0x005c, 0x005d, 0x005e, 0x005f,
/* 0x60*/
- {0x60, 0x00}, {0x61, 0x00}, {0x62, 0x00}, {0x63, 0x00},
- {0x64, 0x00}, {0x65, 0x00}, {0x66, 0x00}, {0x67, 0x00},
- {0x68, 0x00}, {0x69, 0x00}, {0x6a, 0x00}, {0x6b, 0x00},
- {0x6c, 0x00}, {0x6d, 0x00}, {0x6e, 0x00}, {0x6f, 0x00},
+ 0x0060, 0x0061, 0x0062, 0x0063,
+ 0x0064, 0x0065, 0x0066, 0x0067,
+ 0x0068, 0x0069, 0x006a, 0x006b,
+ 0x006c, 0x006d, 0x006e, 0x006f,
/* 0x70*/
- {0x70, 0x00}, {0x71, 0x00}, {0x72, 0x00}, {0x73, 0x00},
- {0x74, 0x00}, {0x75, 0x00}, {0x76, 0x00}, {0x77, 0x00},
- {0x78, 0x00}, {0x79, 0x00}, {0x7a, 0x00}, {0x7b, 0x00},
- {0x7c, 0x00}, {0x7d, 0x00}, {0x7e, 0x00}, {0x7f, 0x00},
+ 0x0070, 0x0071, 0x0072, 0x0073,
+ 0x0074, 0x0075, 0x0076, 0x0077,
+ 0x0078, 0x0079, 0x007a, 0x007b,
+ 0x007c, 0x007d, 0x007e, 0x007f,
/* 0x80*/
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x90*/
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
/* 0xa0*/
- {0xa0, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0xa4, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x0c, 0x06}, {0xad, 0x00}, {0x00, 0x00}, {0x00, 0x00},
+ 0x00a0, 0x0000, 0x0000, 0x0000,
+ 0x00a4, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x060c, 0x00ad, 0x0000, 0x0000,
/* 0xb0*/
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x1b, 0x06},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x1f, 0x06},
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x061b,
+ 0x0000, 0x0000, 0x0000, 0x061f,
/* 0xc0*/
- {0x00, 0x00}, {0x21, 0x06}, {0x22, 0x06}, {0x23, 0x06},
- {0x24, 0x06}, {0x25, 0x06}, {0x26, 0x06}, {0x27, 0x06},
- {0x28, 0x06}, {0x29, 0x06}, {0x2a, 0x06}, {0x2b, 0x06},
- {0x2c, 0x06}, {0x2d, 0x06}, {0x2e, 0x06}, {0x2f, 0x06},
+ 0x0000, 0x0621, 0x0622, 0x0623,
+ 0x0624, 0x0625, 0x0626, 0x0627,
+ 0x0628, 0x0629, 0x062a, 0x062b,
+ 0x062c, 0x062d, 0x062e, 0x062f,
/* 0xd0*/
- {0x30, 0x06}, {0x31, 0x06}, {0x32, 0x06}, {0x33, 0x06},
- {0x34, 0x06}, {0x35, 0x06}, {0x36, 0x06}, {0x37, 0x06},
- {0x38, 0x06}, {0x39, 0x06}, {0x3a, 0x06}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
+ 0x0630, 0x0631, 0x0632, 0x0633,
+ 0x0634, 0x0635, 0x0636, 0x0637,
+ 0x0638, 0x0639, 0x063a, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
/* 0xe0*/
- {0x40, 0x06}, {0x41, 0x06}, {0x42, 0x06}, {0x43, 0x06},
- {0x44, 0x06}, {0x45, 0x06}, {0x46, 0x06}, {0x47, 0x06},
- {0x48, 0x06}, {0x49, 0x06}, {0x4a, 0x06}, {0x4b, 0x06},
- {0x4c, 0x06}, {0x4d, 0x06}, {0x4e, 0x06}, {0x4f, 0x06},
+ 0x0640, 0x0641, 0x0642, 0x0643,
+ 0x0644, 0x0645, 0x0646, 0x0647,
+ 0x0648, 0x0649, 0x064a, 0x064b,
+ 0x064c, 0x064d, 0x064e, 0x064f,
/* 0xf0*/
- {0x50, 0x06}, {0x51, 0x06}, {0x52, 0x06}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
- {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00},
+ 0x0650, 0x0651, 0x0652, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000,
};
static unsigned char page00[256] = {
@@ -243,10 +244,35 @@ static unsigned char charset2upper[256] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xf8-0xff */
};
+static int uni2char(wchar_t uni, unsigned char *out, int boundlen)
+{
+ unsigned char *uni2charset;
+ unsigned char cl = uni & 0x00ff;
+ unsigned char ch = (uni & 0xff00) >> 8;
+
+ if (boundlen <= 0)
+ return -ENAMETOOLONG;
+
+ uni2charset = page_uni2charset[ch];
+ if (uni2charset && uni2charset[cl])
+ out[0] = uni2charset[cl];
+ else
+ return -EINVAL;
+ return 1;
+}
+
+static int char2uni(const unsigned char *rawstring, int boundlen, wchar_t *uni)
+{
+ *uni = charset2uni[*rawstring];
+ if (*uni == 0x0000)
+ return -EINVAL;
+ return 1;
+}
+
static struct nls_table table = {
"iso8859-6",
- page_uni2charset,
- charset2uni,
+ uni2char,
+ char2uni,
charset2lower,
charset2upper,
THIS_MODULE,