Browse Source

* fix for relativepath, fixes #10224

git-svn-id: trunk@9312 -
peter 17 years ago
parent
commit
544cf539e1
1 changed files with 5 additions and 5 deletions
  1. 5 5
      rtl/objpas/sysutils/fina.inc

+ 5 - 5
rtl/objpas/sysutils/fina.inc

@@ -159,12 +159,12 @@ begin
     Result:=DestName;
     exit;
     end;
-  Source:=ExtractFilePath(BaseName);
-  Dest:=ExtractFilePath(DestName);
+  Source:=ExcludeTrailingPathDelimiter(ExtractFilePath(BaseName));
+  Dest:=ExcludeTrailingPathDelimiter(ExtractFilePath(DestName));
   SC:=GetDirs (Source,SD);
   DC:=GetDirs (Dest,DD);
   I:=1;
-  While (I<DC) and (I<SC) do
+  While (I<=DC) and (I<=SC) do
     begin
     If StrIcomp(DD[i],SD[i])=0 then
       Inc(i)
@@ -172,8 +172,8 @@ begin
       Break;
     end;
   Result:='';
-  For J:=I to SC-1 do Result:=Result+OneLevelBack;
-  For J:=I to DC-1 do Result:=Result+DD[J]+PathDelim;
+  For J:=I to SC do Result:=Result+OneLevelBack;
+  For J:=I to DC do Result:=Result+DD[J]+PathDelim;
   Result:=Result+ExtractFileName(DestNAme);
 end;