Browse Source

+ Replaced OSDirSeparator with PathDelim

michael 24 years ago
parent
commit
1cfa601556
2 changed files with 13 additions and 8 deletions
  1. 9 6
      rtl/objpas/fina.inc
  2. 4 2
      rtl/objpas/finah.inc

+ 9 - 6
rtl/objpas/fina.inc

@@ -114,7 +114,7 @@ Var Source, Dest : String;
     Sc,Dc,I,J    : Longint;
     Sc,Dc,I,J    : Longint;
     SD,DD        : Array[1..MaxDirs] of PChar;
     SD,DD        : Array[1..MaxDirs] of PChar;
 
 
-Const OneLevelBack = '..'+OSDirSeparator;
+Const OneLevelBack = '..'+PathDelim;
 
 
 begin
 begin
   If Upcase(ExtractFileDrive(BaseName))<>Upcase(ExtractFileDrive(DestName)) Then
   If Upcase(ExtractFileDrive(BaseName))<>Upcase(ExtractFileDrive(DestName)) Then
@@ -136,7 +136,7 @@ begin
     end;
     end;
   Result:='';
   Result:='';
   For J:=I to SC-1 do Result:=Result+OneLevelBack;
   For J:=I to SC-1 do Result:=Result+OneLevelBack;
-  For J:=I to DC-1 do Result:=Result+DD[J]+OsDirSeparator;
+  For J:=I to DC-1 do Result:=Result+DD[J]+PathDelim;
   Result:=Result+ExtractFileName(DestNAme);
   Result:=Result+ExtractFileName(DestNAme);
 end;
 end;
 
 
@@ -147,7 +147,7 @@ VAr I : longint;
 begin
 begin
   For I:=1 to Length(FileName) do
   For I:=1 to Length(FileName) do
     If FileName[I] in DirSeparators then
     If FileName[I] in DirSeparators then
-      FileName[i]:=OSDirSeparator;
+      FileName[i]:=PathDelim;
 end;
 end;
 
 
 
 
@@ -163,7 +163,7 @@ end;
   Dirs is an array of pchars, pointing to these directory names.
   Dirs is an array of pchars, pointing to these directory names.
   The function returns the number of directories found, or -1
   The function returns the number of directories found, or -1
   if none were found.
   if none were found.
-  DirName must contain only OSDirSeparator as Directory separator chars.
+  DirName must contain only PathDelim as Directory separator chars.
 }
 }
 
 
 Function GetDirs (Var DirName : String; Var Dirs : Array of pchar) : Longint;
 Function GetDirs (Var DirName : String; Var Dirs : Array of pchar) : Longint;
@@ -175,7 +175,7 @@ begin
   Result:=-1;
   Result:=-1;
   While I<=Length(DirName) do
   While I<=Length(DirName) do
     begin
     begin
-    If DirName[i]=OsDirSeparator then
+    If DirName[i]=PathDelim then
       begin
       begin
       DirName[i]:=#0;
       DirName[i]:=#0;
       Inc(Result);
       Inc(Result);
@@ -188,7 +188,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.4  2001-01-21 20:21:40  marco
+  Revision 1.5  2001-11-08 12:56:47  michael
+  + Replaced OSDirSeparator with PathDelim
+
+  Revision 1.4  2001/01/21 20:21:40  marco
    * Rename fest II. Rtl OK
    * Rename fest II. Rtl OK
 
 
   Revision 1.3  2000/11/13 14:41:20  marco
   Revision 1.3  2000/11/13 14:41:20  marco

+ 4 - 2
rtl/objpas/finah.inc

@@ -23,7 +23,6 @@
 
 
 Const
 Const
   DirSeparators : set of char = ['/','\'];  
   DirSeparators : set of char = ['/','\'];  
-  OSDirSeparator = system.pathdelim;
    
    
 
 
 function ChangeFileExt(const FileName, Extension: string): string;
 function ChangeFileExt(const FileName, Extension: string): string;
@@ -41,7 +40,10 @@ Function GetDirs (Var DirName : String; Var Dirs : Array of pchar) : Longint;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.5  2001-11-07 14:58:24  michael
+  Revision 1.6  2001-11-08 12:56:48  michael
+  + Replaced OSDirSeparator with PathDelim
+
+  Revision 1.5  2001/11/07 14:58:24  michael
   + Added PathDelim,DriveDelim,PathSep; Removed PathSeparator
   + Added PathDelim,DriveDelim,PathSep; Removed PathSeparator
 
 
   Revision 1.4  2001/11/07 13:57:26  michael
   Revision 1.4  2001/11/07 13:57:26  michael