aboutsummaryrefslogtreecommitdiff
path: root/iconvdata/sjis.c
diff options
context:
space:
mode:
Diffstat (limited to 'iconvdata/sjis.c')
-rw-r--r--iconvdata/sjis.c407
1 files changed, 144 insertions, 263 deletions
diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c
index 33dc2f1d65..d65b905b32 100644
--- a/iconvdata/sjis.c
+++ b/iconvdata/sjis.c
@@ -18,12 +18,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <gconv.h>
#include <stdint.h>
-#include <string.h>
#include <wchar.h>
-static const wchar_t halfkana_to_ucs4[] =
+static const uint32_t halfkana_to_ucs4[] =
{
0xff61, 0xff62, 0xff63, 0xff64, 0xff65, 0xff66, 0xff67, 0xff68,
0xff69, 0xff6a, 0xff6b, 0xff6c, 0xff6d, 0xff6e, 0xff6f, 0xff70,
@@ -3981,268 +3979,151 @@ static const char from_ucs4_cjk[32657][2] =
};
-/* Direction of the transformation. */
-static int to_sjis_object;
-static int from_sjis_object;
+/* Definitions used in the body of the `gconv' function. */
+#define CHARSET_NAME "SJIS"
+#define FROM_LOOP from_sjis
+#define TO_LOOP to_sjis
+#define DEFINE_INIT 1
+#define DEFINE_FINI 1
+#define MIN_NEEDED_FROM 1
+#define MAX_NEEDED_FROM 2
+#define MIN_NEEDED_TO 4
+/* First define the conversion function from SJIS to UCS4. */
+#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
+#define MAX_NEEDED_INPUT MAX_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
+#define LOOPFCT FROM_LOOP
+#define BODY \
+ { \
+ uint32_t ch = *inptr; \
+ \
+ if (ch == 0x5c) \
+ { \
+ ch = 0xa5; \
+ ++inptr; \
+ } \
+ else if (ch == 0x7e) \
+ { \
+ ch = 0x203e; \
+ ++inptr; \
+ } \
+ else if (ch < 0x7e) \
+ ++inptr; \
+ else if (ch >= 0xa1 && ch <= 0xdf) \
+ { \
+ ch = halfkana_to_ucs4[ch - 0xa1]; \
+ ++inptr; \
+ } \
+ else if (ch > 0xea || ch == 0xa0 || ch == 0x7f || ch == 0x80) \
+ { \
+ /* These are illegal. */ \
+ result = GCONV_ILLEGAL_INPUT; \
+ break; \
+ } \
+ else \
+ { \
+ /* Two-byte character. First test whether the next character \
+ is also available. */ \
+ uint32_t ch2; \
+ uint_fast32_t idx; \
+ \
+ if (NEED_LENGTH_TEST && inptr + 1 >= inend) \
+ { \
+ /* The second character is not available. Store \
+ the intermediate result. */ \
+ result = GCONV_INCOMPLETE_INPUT; \
+ break; \
+ } \
+ \
+ ch2 = inptr[1]; \
+ idx = ch * 256 + ch2; \
+ if (idx < 0x8140 || (idx > 0x84be && idx < 0x889f) \
+ || (idx > 0x89fc && idx < 0x9040) \
+ || (idx > 0x9ffc && idx < 0xe040) || idx > 0xeaa4) \
+ { \
+ /* This is illegal. */ \
+ result = GCONV_ILLEGAL_INPUT; \
+ break; \
+ } \
+ else \
+ { \
+ /* We could pack the data a bit more dense. The second \
+ byte will never be 0x7f and it will also be never \
+ >0xfc. But this would mean yet more `if's. */ \
+ if (idx <= 0x84be) \
+ ch = cjk_block1[(ch - 0x81) * 192 + ch2 - 0x40]; \
+ else if (idx <= 0x89fc) \
+ ch = cjk_block2[(ch - 0x88) * 192 + ch2 - 0x9f]; \
+ else if (idx <= 0x9ffc) \
+ ch = cjk_block3[(ch - 0x90) * 192 + ch2 - 0x40]; \
+ else \
+ ch = cjk_block4[(ch - 0xe0) * 192 + ch2 - 0x40]; \
+ } \
+ \
+ if (ch == 0) \
+ { \
+ /* This is an illegal character. */ \
+ result = GCONV_ILLEGAL_INPUT; \
+ break; \
+ } \
+ } \
+ \
+ *((uint32_t *) outptr)++ = ch; \
+ }
+#include <iconv/loop.c>
-int
-gconv_init (struct gconv_step *step)
-{
- /* Determine which direction. */
- if (strcasestr (step->from_name, "SJIS") != NULL)
- step->data = &from_sjis_object;
- else if (strcasestr (step->to_name, "SJIS") != NULL)
- step->data = &to_sjis_object;
- else
- return GCONV_NOCONV;
-
- return GCONV_OK;
-}
-
-
-void
-gconv_end (struct gconv_step *data)
-{
- /* Nothing to do. */
-}
-
-
-int
-gconv (struct gconv_step *step, struct gconv_step_data *data,
- const char *inbuf, size_t *inbufsize, size_t *written, int do_flush)
-{
- struct gconv_step *next_step = step + 1;
- struct gconv_step_data *next_data = data + 1;
- gconv_fct fct = next_step->fct;
- size_t do_write;
- int result;
-
- /* If the function is called with no input this means we have to reset
- to the initial state. The possibly partly converted input is
- dropped. */
- if (do_flush)
- {
- do_write = 0;
-
- /* Call the steps down the chain if there are any. */
- if (data->is_last)
- result = GCONV_OK;
- else
- {
- result = (*fct) (next_step, next_data, NULL, 0, written, 1);
-
- /* Clear output buffer. */
- data->outbufavail = 0;
- }
- }
- else
- {
- do_write = 0;
-
- do
- {
- result = GCONV_OK;
-
- if (step->data == &from_sjis_object)
- {
- size_t inchars = *inbufsize;
- size_t outwchars = data->outbufavail;
- char *outbuf = data->outbuf;
- size_t cnt = 0;
-
- while (cnt < inchars
- && (outwchars + sizeof (wchar_t) <= data->outbufsize))
- {
- int inchar = inbuf[cnt];
- wchar_t ch;
-
- if (inchar == 0x5c)
- ch = L'\xa5';
- else if (inchar == 0x7e)
- ch = 0x203e;
- else if (inchar < 0x7e)
- ch = (wchar_t) inchar;
- else if (inchar >= 0xa1 && inchar <= 0xdf)
- ch = halfkana_to_ucs4[inchar - 0xa1];
- else if (inchar > 0xea || inchar == 0xa0 || inchar == 0x7f
- || inchar == 0x80)
- /* These are illegal. */
- ch = L'\0';
- else
- {
- /* Two-byte character. First test whether the next
- character is also available. */
- int inchar2;
- int idx;
-
- if (cnt + 1 >= inchars)
- {
- /* The second character is not available. Store
- the intermediate result. */
- result = GCONV_INCOMPLETE_INPUT;
- break;
- }
-
- inchar2 = inbuf[++cnt];
- idx = inchar * 256 + inchar2;
- if (idx < 0x8140 || (idx > 0x84be && idx < 0x889f)
- || (idx > 0x89fc && idx < 0x9040)
- || (idx > 0x9ffc && idx < 0xe040) || idx > 0xeaa4)
- /* This is illegal. */
- ch = L'\0';
- else
- {
- /* We could pack the data a bit more dense.
- The second byte will never be 0x7f and it
- will also be never >0xfc. But this would
- mean yet more `if's. */
- if (idx <= 0x84be)
- ch = cjk_block1[(inchar - 0x81) * 192
- + inchar2 - 0x40];
- else if (idx <= 0x89fc)
- ch = cjk_block2[(inchar - 0x88) * 192
- + inchar2 - 0x9f];
- else if (idx <= 0x9ffc)
- ch = cjk_block3[(inchar - 0x90) * 192
- + inchar2 - 0x40];
- else
- ch = cjk_block4[(inchar - 0xe0) * 192
- + inchar2 - 0x40];
- }
-
- if (ch == L'\0')
- --cnt;
- }
-
- if (ch == L'\0' && inbuf[cnt] != '\0')
- {
- /* This is an illegal character. */
- result = GCONV_ILLEGAL_INPUT;
- break;
- }
-
- *((wchar_t *) (outbuf + outwchars)) = ch;
- ++do_write;
- outwchars += sizeof (wchar_t);
- ++cnt;
- }
- *inbufsize -= cnt;
- inbuf += cnt;
- data->outbufavail = outwchars;
- }
- else
- {
- size_t inwchars = *inbufsize;
- size_t outchars = data->outbufavail;
- char *outbuf = data->outbuf;
- size_t cnt = 0;
- int extra = 0;
-
- while (inwchars >= cnt + sizeof (wchar_t)
- && outchars < data->outbufsize)
- {
- int ch = *((wchar_t *) (inbuf + cnt));
- const char *cp;
-
- if (ch >= (sizeof (from_ucs4_lat1)
- / sizeof (from_ucs4_lat1[0])))
- {
- if (ch >= 0x0391 && ch <= 0x0451)
- cp = from_ucs4_greek[ch - 0x391];
- else if (ch >= 0x2010 && ch <= 0x9fa0)
- cp = from_ucs4_cjk[ch - 0x02010];
- else
- /* Illegal character. */
- break;
- }
- else
- cp = from_ucs4_lat1[ch];
-
- if (cp[0] == '\0' && ch != 0)
- /* Illegal character. */
- break;
-
- outbuf[outchars] = cp[0];
- /* Now test for a possible second byte and write this
- if possible. */
- if (cp[1] != '\0')
- {
- if (outchars + 1 >= data->outbufsize)
- {
- /* The result does not fit into the buffer. */
- extra = 1;
- break;
- }
- outbuf[++outchars] = cp[1];
- }
-
- ++do_write;
- ++outchars;
- cnt += sizeof (wchar_t);
- }
- *inbufsize -= cnt;
- inbuf += cnt;
- data->outbufavail = outchars;
-
- if (outchars + extra < data->outbufsize)
- {
- /* If there is still room in the output buffer something
- is wrong with the input. */
- if (inwchars >= cnt + sizeof (wchar_t))
- {
- /* An error occurred. */
- result = GCONV_ILLEGAL_INPUT;
- break;
- }
- if (inwchars != cnt)
- {
- /* There are some unprocessed bytes at the end of the
- input buffer. */
- result = GCONV_INCOMPLETE_INPUT;
- break;
- }
- }
- }
-
- if (result != GCONV_OK)
- break;
-
- if (data->is_last)
- {
- /* This is the last step. */
- result = (*inbufsize > (step->data == &from_sjis_object
- ? 0 : sizeof (wchar_t) - 1)
- ? GCONV_FULL_OUTPUT : GCONV_EMPTY_INPUT);
- break;
- }
-
- /* Status so far. */
- result = GCONV_EMPTY_INPUT;
-
- if (data->outbufavail > 0)
- {
- /* Call the functions below in the chain. */
- size_t newavail = data->outbufavail;
-
- result = (*fct) (next_step, next_data, data->outbuf, &newavail,
- written, 0);
- /* Correct the output buffer. */
- if (newavail != data->outbufavail && newavail > 0)
- {
- memmove (data->outbuf,
- &data->outbuf[data->outbufavail - newavail],
- newavail);
- data->outbufavail = newavail;
- }
- }
- }
- while (*inbufsize > 0 && result == GCONV_EMPTY_INPUT);
- }
+/* Next, define the other direction. */
+#define MIN_NEEDED_INPUT MIN_NEEDED_TO
+#define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
+#define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
+#define LOOPFCT TO_LOOP
+#define BODY \
+ { \
+ uint32_t ch = *((uint32_t *) inptr); \
+ const char *cp; \
+ \
+ if (ch >= (sizeof (from_ucs4_lat1) / sizeof (from_ucs4_lat1[0]))) \
+ { \
+ if (ch >= 0x0391 && ch <= 0x0451) \
+ cp = from_ucs4_greek[ch - 0x391]; \
+ else if (ch >= 0x2010 && ch <= 0x9fa0) \
+ cp = from_ucs4_cjk[ch - 0x02010]; \
+ else \
+ { \
+ /* Illegal character. */ \
+ result = GCONV_ILLEGAL_INPUT; \
+ break; \
+ } \
+ } \
+ else \
+ cp = from_ucs4_lat1[ch]; \
+ \
+ if (cp[0] == '\0' && ch != 0) \
+ { \
+ /* Illegal character. */ \
+ result = GCONV_ILLEGAL_INPUT; \
+ break; \
+ } \
+ \
+ *outptr++ = cp[0]; \
+ /* Now test for a possible second byte and write this if possible. */ \
+ if (cp[1] != '\0') \
+ { \
+ if (NEED_LENGTH_TEST && outptr >= outend) \
+ { \
+ /* The result does not fit into the buffer. */ \
+ result = GCONV_FULL_OUTPUT; \
+ break; \
+ } \
+ *outptr++ = cp[1]; \
+ } \
+ \
+ inptr += 4; \
+ }
+#include <iconv/loop.c>
- if (written != NULL && data->is_last)
- *written = do_write;
- return result;
-}
+/* Now define the toplevel functions. */
+#include <iconv/skeleton.c>