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

* moved ToSingleByteFileSystemEncodedFileName() to the system unit and

Browse Source 
export it so it can be used in all rtl units

git-svn-id: branches/cpstrrtl@24960 -
This commit is contained in:
Jonas Maebe 2013-06-24 09:40:00 +00:00
parent e6c812a60a
commit 3694b4f003
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtl/inc/ustringh.inc
View File

@ -145,3 +145,6 @@ Procedure SetUnicodeStringManager (Const New : TUnicodeStringManager; Var Old: T
function StringElementSize(const S : UnicodeString): Word; overload; function StringElementSize(const S : UnicodeString): Word; overload;
function StringRefCount(const S : UnicodeString): SizeInt; overload; function StringRefCount(const S : UnicodeString): SizeInt; overload;
function StringCodePage(const S : UnicodeString): TSystemCodePage; overload; function StringCodePage(const S : UnicodeString): TSystemCodePage; overload;
Function ToSingleByteFileSystemEncodedFileName(const Str: UnicodeString): RawByteString;
Function ToSingleByteFileSystemEncodedFileName(const Str: RawByteString): RawByteString;

13
rtl/inc/ustrings.inc
View File

@ -2281,3 +2281,16 @@ procedure initunicodestringmanager;
end; end;
{$endif FPC_HAS_BUILTIN_WIDESTR_MANAGER} {$endif FPC_HAS_BUILTIN_WIDESTR_MANAGER}
Function ToSingleByteFileSystemEncodedFileName(const Str: UnicodeString): RawByteString;
Begin
widestringmanager.Unicode2AnsiMoveProc(punicodechar(Str),Result,
DefaultFileSystemCodePage,Length(Str));
End;
Function ToSingleByteFileSystemEncodedFileName(const Str: RawByteString): RawByteString;
Begin
Result:=Str;
SetCodePage(Result,DefaultFileSystemCodePage,True);
End;

12
rtl/objpas/sysutils/filutil.inc
View File

@ -13,18 +13,6 @@
**********************************************************************} **********************************************************************}
Function ToSingleByteFileSystemEncodedFileName(const Str: UnicodeString): RawByteString;
Begin
widestringmanager.Unicode2AnsiMoveProc(punicodechar(Str),Result,
DefaultFileSystemCodePage,Length(Str));
End;
Function ToSingleByteFileSystemEncodedFileName(const Str: RawByteString): RawByteString;
Begin
Result:=Str;
SetCodePage(Result,DefaultFileSystemCodePage,True);
End;
{$ifndef SYSUTILS_HAS_UNICODESTR_FILEUTIL_IMPL} {$ifndef SYSUTILS_HAS_UNICODESTR_FILEUTIL_IMPL}