X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Futf8.c;h=1d2552b4ea93a39456107ed1daec2375844f41a9;hp=7e294d4c0ba1f0f54fc684edd7dae683ba3efcde;hb=8375be590a8640cd5673106bc828dd6d4711be28;hpb=b41a475db81d89458d4267b27e98f302c4519316 diff --git a/src/utf8.c b/src/utf8.c index 7e294d4..1d2552b 100644 --- a/src/utf8.c +++ b/src/utf8.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ /** @@ -38,7 +38,7 @@ static size_t init_utf8(yaz_iconv_t cd, yaz_iconv_decoder_t d, return 0; } -unsigned long yaz_read_UTF8_char(unsigned char *inp, +unsigned long yaz_read_UTF8_char(const unsigned char *inp, size_t inbytesleft, size_t *no_read, int *error) { @@ -80,7 +80,7 @@ unsigned long yaz_read_UTF8_char(unsigned char *inp, } else *error = YAZ_ICONV_EILSEQ; - } + } else if (inp[0] <= 0xf7 && inbytesleft >= 4) { if ((inp[1] & 0xc0) == 0x80 && (inp[2] & 0xc0) == 0x80 @@ -166,7 +166,7 @@ size_t yaz_write_UTF8_char(unsigned long x, { *outp++ = (unsigned char) x; (*outbytesleft)--; - } + } else if (x <= 0x7ff && *outbytesleft >= 2) { *outp++ = (unsigned char) ((x >> 6) | 0xc0); @@ -207,7 +207,7 @@ size_t yaz_write_UTF8_char(unsigned long x, *outp++ = (unsigned char) ((x & 0x3f) | 0x80); (*outbytesleft) -= 6; } - else + else { *error = YAZ_ICONV_E2BIG; /* not room for output */ return (size_t)(-1); @@ -218,7 +218,7 @@ size_t yaz_write_UTF8_char(unsigned long x, yaz_iconv_encoder_t yaz_utf8_encoder(const char *tocode, yaz_iconv_encoder_t e) - + { if (!yaz_matchstr(tocode, "UTF8")) { @@ -257,7 +257,7 @@ int yaz_utf8_check(const char *str) inbytesleft -= no_read; } return 1; -} +} /* * Local variables: