paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 19:39:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

rtl: transliterate characters if possible intead of replacing them with "?" chars while converting between codepages

Browse Source 
git-svn-id: trunk@19522 -
This commit is contained in:
paul 2011-10-21 03:23:23 +00:00
parent 3b3f1ac8a5
commit 5d7d143300
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rtl/unix/cwstring.pp
View File

@ -134,6 +134,15 @@ const
{ breaks backwards compatibility every now and then } { breaks backwards compatibility every now and then }
MB_CUR_MAX = 10; MB_CUR_MAX = 10;
{ Requests for iconvctl }
ICONV_TRIVIALP = 0; // int *argument
ICONV_GET_TRANSLITERATE = 1; // int *argument
ICONV_SET_TRANSLITERATE = 2; // const int *argument
ICONV_GET_DISCARD_ILSEQ = 3; // int *argument
ICONV_SET_DISCARD_ILSEQ = 4; // const int *argument
ICONV_SET_HOOKS = 5; // const struct iconv_hooks *argument
ICONV_SET_FALLBACKS = 6; // const struct iconv_fallbacks *argument
type type
piconv_t = ^iconv_t; piconv_t = ^iconv_t;
iconv_t = pointer; iconv_t = pointer;
@ -151,10 +160,12 @@ type
function iconv_open(__tocode:pchar; __fromcode:pchar):iconv_t;cdecl;external libiconvname name 'iconv_open'; function iconv_open(__tocode:pchar; __fromcode:pchar):iconv_t;cdecl;external libiconvname name 'iconv_open';
function iconv(__cd:iconv_t; __inbuf:ppchar; __inbytesleft:psize_t; __outbuf:ppchar; __outbytesleft:psize_t):size_t;cdecl;external libiconvname name 'iconv'; function iconv(__cd:iconv_t; __inbuf:ppchar; __inbytesleft:psize_t; __outbuf:ppchar; __outbytesleft:psize_t):size_t;cdecl;external libiconvname name 'iconv';
function iconv_close(__cd:iconv_t):cint;cdecl;external libiconvname name 'iconv_close'; function iconv_close(__cd:iconv_t):cint;cdecl;external libiconvname name 'iconv_close';
function iconvctl(__cd:iconv_t; __request:cint; __argument:pointer):cint;cdecl;external libiconvname name 'iconvctl';
{$else} {$else}
function iconv_open(__tocode:pchar; __fromcode:pchar):iconv_t;cdecl;external libiconvname name 'libiconv_open'; function iconv_open(__tocode:pchar; __fromcode:pchar):iconv_t;cdecl;external libiconvname name 'libiconv_open';
function iconv(__cd:iconv_t; __inbuf:ppchar; __inbytesleft:psize_t; __outbuf:ppchar; __outbytesleft:psize_t):size_t;cdecl;external libiconvname name 'libiconv'; function iconv(__cd:iconv_t; __inbuf:ppchar; __inbytesleft:psize_t; __outbuf:ppchar; __outbytesleft:psize_t):size_t;cdecl;external libiconvname name 'libiconv';
function iconv_close(__cd:iconv_t):cint;cdecl;external libiconvname name 'libiconv_close'; function iconv_close(__cd:iconv_t):cint;cdecl;external libiconvname name 'libiconv_close';
function iconvctl(__cd:iconv_t; __request:cint; __argument:pointer):cint;cdecl;external libiconvname name 'libiconvctl';
{$endif} {$endif}
procedure fpc_rangeerror; [external name 'FPC_RANGEERROR']; procedure fpc_rangeerror; [external name 'FPC_RANGEERROR'];
@ -179,6 +190,7 @@ procedure InitThread;
{$if not(defined(darwin) and defined(arm))} {$if not(defined(darwin) and defined(arm))}
var var
iconvname: rawbytestring; iconvname: rawbytestring;
transliterate: cint;
{$endif} {$endif}
begin begin
current_DefaultSystemCodePage:=DefaultSystemCodePage; current_DefaultSystemCodePage:=DefaultSystemCodePage;
@ -191,6 +203,8 @@ begin
iconv_wide2ansi:=iconv_open('UTF-8',unicode_encoding2); iconv_wide2ansi:=iconv_open('UTF-8',unicode_encoding2);
iconv_ansi2wide:=iconv_open(unicode_encoding2,'UTF-8'); iconv_ansi2wide:=iconv_open(unicode_encoding2,'UTF-8');
{$endif} {$endif}
transliterate:=1;
iconvctl(iconv_wide2ansi,ICONV_SET_TRANSLITERATE,@transliterate);
end; end;
@ -233,7 +247,8 @@ procedure Wide2AnsiMove(source:pwidechar; var dest:RawByteString; cp:TSystemCode
destpos: pchar; destpos: pchar;
mynil : pchar; mynil : pchar;
my0 : size_t; my0 : size_t;
err: cint; err,
transliterate: cint;
free_iconv: boolean; free_iconv: boolean;
begin begin
if (cp=DefaultSystemCodePage) then if (cp=DefaultSystemCodePage) then
@ -257,6 +272,8 @@ procedure Wide2AnsiMove(source:pwidechar; var dest:RawByteString; cp:TSystemCode
unsafe normally, but these are constant strings -> no unsafe normally, but these are constant strings -> no
problem } problem }
use_iconv:=iconv_open(pchar(win2iconv(cp)),unicode_encoding2); use_iconv:=iconv_open(pchar(win2iconv(cp)),unicode_encoding2);
transliterate:=1;
iconvctl(use_iconv,ICONV_SET_TRANSLITERATE,@transliterate);
free_iconv:=true; free_iconv:=true;
end; end;
{ unsupported encoding -> default move } { unsupported encoding -> default move }