paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-02 12:29:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Use UTF-8 as fallback in GetSystemCodepage.

Browse Source 
git-svn-id: trunk@23673 -
This commit is contained in:
yury 2013-02-28 19:48:56 +00:00
parent 0ed82d7218
commit b0d79b7854
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtl/unix/unixcp.pp
View File

@ -693,7 +693,7 @@ begin
exit;
end;
{ rawbytestring (or better raise an error?) }
result:=65535;
result:=CP_NONE;
end;
function GetSystemCodepage: TSystemCodePage;
@ -702,14 +702,14 @@ var
lang: ansistring;
begin
// Get one of non-empty environment variables in the next order:
// LC_ALL, LC_CTYPE, LANG. Default is 'ASCII'.
// LC_ALL, LC_CTYPE, LANG. Default is CP_UTF8.
lang:=FpGetEnv('LC_ALL');
if lang='' then
lang:=FpGetEnv('LC_CTYPE');
if lang='' then
lang:=FpGetEnv('LANG');
if lang='' then
Result:=0
Result:=CP_UTF8
else
begin
// clean up, for example en_US.UTF-8 => UTF-8
@ -718,6 +718,8 @@ begin
p:=Pos('@',lang);
if p>0 then Delete(lang,p,length(lang)-p+1);
Result:=GetCodepageByName(lang);
if Result = CP_NONE then
Result:=CP_UTF8;
end;
end;