paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-27 09:03:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

jcf: support utf8 paths

Browse Source 
git-svn-id: trunk@23606 -
This commit is contained in:
paul 2010-01-31 14:53:11 +00:00
parent 198567241a
commit 2747daddbd
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/jcf2/Settings/JcfSettings.pas
View File

@ -169,7 +169,7 @@ implementation
uses
{ delphi }
{$IFNDEF FPC}Windows,{$ENDIF} SysUtils, Dialogs,
{$IFNDEF FPC}Windows,{$ELSE}FileUtil,{$ENDIF} SysUtils, Dialogs,
{ local }
JcfStringUtils,
JcfSetBase,
@ -282,12 +282,16 @@ var
lsText: string;
lcFile: TSettingsInputString;
begin
if FileExists(psFileName) then
if {$ifdef FPC}FileExistsUTF8(psFileName){$else}FileExists(psFileName){$endif} then
begin
// debug ShowMessage('Reading settings from file ' + lsSettingsFileName);
// now we know the file exists - try get settings from it
{$ifdef FPC}
lsText := string(FileToString(UTF8ToSys(psFileName)));
{$else}
lsText := string(FileToString(psFileName));
{$endif}
lcFile := TSettingsInputString.Create(lsText);
try
FromStream(lcFile);
@ -335,7 +339,11 @@ begin
if lcReg.FormatConfigFileName = '' then
exit;
{$ifdef FPC}
if FileExistsUTF8(lcReg.FormatConfigFileName) and FileIsReadOnlyUTF8(lcReg.FormatConfigFileName) then
{$else}
if FileExists(lcReg.FormatConfigFileName) and FileIsReadOnly(lcReg.FormatConfigFileName) then
{$endif}
begin
{ fail quietly? }
if lcReg.FormatFileWriteOption = eAlwaysWrite then
@ -347,7 +355,11 @@ begin
try
// use the Settings file name
{$ifdef FPC}
lcFile := TSettingsStreamOutput.Create(UTF8ToSys(GetRegSettings.FormatConfigFileName));
{$else}
lcFile := TSettingsStreamOutput.Create(GetRegSettings.FormatConfigFileName);
{$endif}
try
ToStream(lcFile);