diff --git a/rtl/inc/ustringh.inc b/rtl/inc/ustringh.inc index 86ce519d7c..aef9f8b75a 100644 --- a/rtl/inc/ustringh.inc +++ b/rtl/inc/ustringh.inc @@ -145,3 +145,6 @@ Procedure SetUnicodeStringManager (Const New : TUnicodeStringManager; Var Old: T function StringElementSize(const S : UnicodeString): Word; overload; function StringRefCount(const S : UnicodeString): SizeInt; overload; function StringCodePage(const S : UnicodeString): TSystemCodePage; overload; + +Function ToSingleByteFileSystemEncodedFileName(const Str: UnicodeString): RawByteString; +Function ToSingleByteFileSystemEncodedFileName(const Str: RawByteString): RawByteString; diff --git a/rtl/inc/ustrings.inc b/rtl/inc/ustrings.inc index 270ee1648f..07db9ebfca 100644 --- a/rtl/inc/ustrings.inc +++ b/rtl/inc/ustrings.inc @@ -2281,3 +2281,16 @@ procedure initunicodestringmanager; end; {$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; diff --git a/rtl/objpas/sysutils/filutil.inc b/rtl/objpas/sysutils/filutil.inc index 9862bd091d..e11e9c0322 100644 --- a/rtl/objpas/sysutils/filutil.inc +++ b/rtl/objpas/sysutils/filutil.inc @@ -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}