From 42315809a391845d9b94eb989245b7b911d86b09 Mon Sep 17 00:00:00 2001
From: bart <9132501-flyingsheep@users.noreply.gitlab.com>
Date: Thu, 23 May 2013 17:26:47 +0000
Subject: [PATCH] LazUtils: move more Utf8 file routines to LazFileUtils (and
 inline them in FileUtil): ForceDirectoriesUTF8.

git-svn-id: trunk@41374 -
---
 components/lazutils/fileutil.inc     | 44 +--------------------------
 components/lazutils/fileutil.pas     |  2 +-
 components/lazutils/lazfileutils.pas | 45 +++++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/components/lazutils/fileutil.inc b/components/lazutils/fileutil.inc
index 07a21e565c..72bacf925d 100644
--- a/components/lazutils/fileutil.inc
+++ b/components/lazutils/fileutil.inc
@@ -1282,50 +1282,8 @@ end;
   function ForceDirectoriesUTF8(const Dir: string): Boolean;
  ------------------------------------------------------------------------------}
 function ForceDirectoriesUTF8(const Dir: string): Boolean;
-
-  var
-    E: EInOutError;
-    ADrv : String;
-
-  function DoForceDirectories(Const Dir: string): Boolean;
-  var
-    ADir : String;
-    APath: String;
-  begin
-    Result:=True;
-    ADir:=ExcludeTrailingPathDelimiter(Dir);
-    if (ADir='') then Exit;
-    if Not DirectoryExistsUTF8(ADir) then
-      begin
-        APath := ExtractFilePath(ADir);
-        //this can happen on Windows if user specifies Dir like \user\name/test/
-        //and would, if not checked for, cause an infinite recusrsion and a stack overflow
-        if (APath = ADir) then
-          Result := False
-        else
-          Result:=DoForceDirectories(APath);
-        if Result then
-          Result := CreateDirUTF8(ADir);
-      end;
-  end;
-
-  function IsUncDrive(const Drv: String): Boolean;
-  begin
-    Result := (Length(Drv) > 2) and (Drv[1] = PathDelim) and (Drv[2] = PathDelim);
-  end;
-
 begin
-  Result := False;
-  ADrv := ExtractFileDrive(Dir);
-  if (ADrv<>'') and (not DirectoryExistsUTF8(ADrv))
-  {$IFNDEF FORCEDIR_NO_UNC_SUPPORT} and (not IsUncDrive(ADrv)){$ENDIF} then Exit;
-  if Dir='' then
-    begin
-      E:=EInOutError.Create(SCannotCreateEmptyDir);
-      E.ErrorCode:=3;
-      Raise E;
-    end;
-  Result := DoForceDirectories(SetDirSeparators(Dir));
+  Result := LazFileUtils.ForceDirectoriesUTF8(Dir);
 end;
 
 {------------------------------------------------------------------------------
diff --git a/components/lazutils/fileutil.pas b/components/lazutils/fileutil.pas
index aa4ffe7d87..59e333b227 100644
--- a/components/lazutils/fileutil.pas
+++ b/components/lazutils/fileutil.pas
@@ -261,7 +261,7 @@ function GetCurrentDirUTF8: String; inline;
 function SetCurrentDirUTF8(const NewDir: String): Boolean; inline;
 function CreateDirUTF8(const NewDir: String): Boolean; inline;
 function RemoveDirUTF8(const Dir: String): Boolean; inline;
-function ForceDirectoriesUTF8(const Dir: string): Boolean;
+function ForceDirectoriesUTF8(const Dir: string): Boolean; inline;
 function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle; inline;
 function FileCreateUTF8(Const FileName : string) : THandle; overload; inline;
 function FileCreateUTF8(Const FileName : string; Rights: Cardinal) : THandle; overload; inline;
diff --git a/components/lazutils/lazfileutils.pas b/components/lazutils/lazfileutils.pas
index eb102863bb..b4a0e2a5ce 100644
--- a/components/lazutils/lazfileutils.pas
+++ b/components/lazutils/lazfileutils.pas
@@ -6,6 +6,7 @@ interface
 
 uses
   Classes, SysUtils, LazUTF8, LazUtf8Classes,
+  SysConst,
   {$IFDEF Windows}
   LUResStrings,
   {$ENDIF}
@@ -1020,10 +1021,52 @@ end;
 
 
 function ForceDirectoriesUTF8(const Dir: string): Boolean;
+var
+  E: EInOutError;
+  ADrv : String;
+
+  function DoForceDirectories(Const Dir: string): Boolean;
+  var
+    ADir : String;
+    APath: String;
+  begin
+    Result:=True;
+    ADir:=ExcludeTrailingPathDelimiter(Dir);
+    if (ADir='') then Exit;
+    if Not DirectoryExistsUTF8(ADir) then
+      begin
+        APath := ExtractFilePath(ADir);
+        //this can happen on Windows if user specifies Dir like \user\name/test/
+        //and would, if not checked for, cause an infinite recusrsion and a stack overflow
+        if (APath = ADir) then
+          Result := False
+        else
+          Result:=DoForceDirectories(APath);
+        if Result then
+          Result := CreateDirUTF8(ADir);
+      end;
+  end;
+
+  function IsUncDrive(const Drv: String): Boolean;
+  begin
+    Result := (Length(Drv) > 2) and (Drv[1] = PathDelim) and (Drv[2] = PathDelim);
+  end;
+
 begin
-  Result:=SysUtils.ForceDirectories(UTF8ToSys(Dir));
+  Result := False;
+  ADrv := ExtractFileDrive(Dir);
+  if (ADrv<>'') and (not DirectoryExistsUTF8(ADrv))
+  {$IFNDEF FORCEDIR_NO_UNC_SUPPORT} and (not IsUncDrive(ADrv)){$ENDIF} then Exit;
+  if Dir='' then
+    begin
+      E:=EInOutError.Create(SCannotCreateEmptyDir);
+      E.ErrorCode:=3;
+      Raise E;
+    end;
+  Result := DoForceDirectories(SetDirSeparators(Dir));
 end;
 
+
 procedure InvalidateFileStateCache(const Filename: string);
 begin
   if Assigned(OnInvalidateFileStateCache) then