Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Iconv: add ISO-8859-1 support. (Second most popular encoding on the web today.)

Browse Source 
git-svn-id: svn://kolibrios.org@7085 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2017-10-10 22:05:43 +00:00
parent 9378825c03
commit 824c13ffef
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/develop/libraries/iconv/iconv.c
View File

@ -26,12 +26,14 @@ typedef int iconv_t;
#define ISO8859_5 4
#define UTF_8 5
#define KOI8_R 6
#define ISO8859_1 7
#include "cp866.h"
#include "cp1251.h"
#include "cp1252.h"
#include "koi8_r.h"
#include "koi8_ru.h"
#include "iso8859_1.h"
#include "iso8859_5.h"
#include "utf8.h"
@ -54,6 +56,7 @@ int encoding(const char *someencoding) {
if (!strcasecmp(what,"windows-1252")) return CP1252;
if (!strcasecmp(what,"KOI8-R")) return KOI8_R;
if (!strcasecmp(what,"KOI8-RU")) return KOI8_RU;
if (!strcasecmp(what,"ISO8859-1")) return ISO8859_1;
if (!strcasecmp(what,"ISO8859-5")) return ISO8859_5;
if (!strcasecmp(what,"UTF-8")) return UTF_8;
return -1;
@ -94,6 +97,7 @@ size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft,
case CP866: mbtowc=cp866_mbtowc; break;
case CP1251: mbtowc=cp1251_mbtowc; break;
case CP1252: mbtowc=cp1252_mbtowc; break;
case ISO8859_1: mbtowc=iso8859_1_mbtowc; break;
case ISO8859_5: mbtowc=iso8859_5_mbtowc; break;
case KOI8_R: mbtowc=koi8_r_mbtowc; break;
case KOI8_RU: mbtowc=koi8_ru_mbtowc; break;
@ -106,6 +110,7 @@ size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft,
case CP866: wctomb=cp866_wctomb; break;
case CP1251: wctomb=cp1251_wctomb; break;
case CP1252: wctomb=cp1252_wctomb; break;
case ISO8859_1: wctomb=iso8859_1_wctomb; break;
case ISO8859_5: wctomb=iso8859_5_wctomb; break;
case KOI8_R: wctomb=koi8_r_wctomb; break;
case KOI8_RU: wctomb=koi8_ru_wctomb; break;

41
programs/develop/libraries/iconv/iso8859_1.h Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright (C) 1999-2001 Free Software Foundation, Inc.
* This file is part of the GNU LIBICONV Library.
*
* The GNU LIBICONV Library is free software; you can redistribute it
* and/or modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* The GNU LIBICONV 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place -
* Suite 330, Boston, MA 02111-1307, USA.
*/
/*
* ISO-8859-1
*/
static int
iso8859_1_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
{
unsigned char c = *s;
*pwc = (ucs4_t) c;
return 1;
}
static int
iso8859_1_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
{
if (wc < 0x0100) {
*r = wc;
return 1;
}
return RET_ILUNI;
}