* more cleanup in FindFirst/FindNext

* implemented FindClose, no more leaking of file locks

rtl/morphos/dos.pp

@@ -580,19 +580,16 @@ Begin
 end;
 
 
-Procedure FindFirst(const Path: PathStr; Attr: Word; Var f: SearchRec);
+procedure FindFirst(const Path: PathStr; Attr: Word; Var f: SearchRec);
 var
- tmpStr: Array[0..255] of char;
+ tmpStr: array[0..255] of Char;
- Anchor: pAnchorPath;
+ Anchor: PAnchorPath;
- Result: Longint;
+ Result: LongInt;
- index : Integer;
+begin
- s     : string;
- j     : integer;
-Begin
   tmpStr:=PathConv(path)+#0;
   DosError:=0;
 
- New(Anchor);
+  new(Anchor);
   FillChar(Anchor^,sizeof(TAnchorPath),#0);
 
   Result:=MatchFirst(@tmpStr,Anchor);
@@ -600,33 +597,22 @@ Begin
   if Result = ERROR_NO_MORE_ENTRIES then 
     DosError:=18
   else
- if Result <> 0 then
+    if Result<>0 then DosError:=3;
-   DosError:=3;
+
- { If there is an error, deallocate }
+  if DosError=0 then begin
- { the anchorpath structure         }
- if DosError <> 0 then
-   Begin
-     MatchEnd(Anchor);
-     if assigned(Anchor) then
-       Dispose(Anchor);
-   end
- else
     {-------------------------------------------------------------------}
     { Here we fill up the SearchRec attribute, but we also do check     }
     { something else, if the it does not match the mask we are looking  }
     { for we should go to the next file or directory.                   }
     {-------------------------------------------------------------------}
-   begin
+    with Anchor^.ap_Info do begin
-         with Anchor^.ap_Info do
-          Begin
       f.Time := fib_Date.ds_Days * (24 * 60 * 60) +
                 fib_Date.ds_Minute * 60 +
                 fib_Date.ds_Tick div 50;
       {*------------------------------------*}
       {* Determine if is a file or a folder *}
       {*------------------------------------*}
-           if fib_DirEntryType > 0 then
+      if fib_DirEntryType>0 then f.attr:=f.attr OR DIRECTORY;
-               f.attr:=f.attr OR DIRECTORY;
 
       {*------------------------------------*}
       {* Determine if Read only             *}
@@ -635,53 +621,40 @@ Begin
       {* Should we check also that EXEC     *}
       {* is zero? for read only?            *}
       {*------------------------------------*}
-           if   ((fib_Protection and FIBF_READ) <> 0)
+      if ((fib_Protection and FIBF_READ) <> 0) and
-            AND ((fib_Protection and FIBF_WRITE) = 0)
+         ((fib_Protection and FIBF_WRITE) = 0) then f.attr:=f.attr or READONLY;
-           then
-              f.attr:=f.attr or READONLY;
       f.Name := strpas(fib_FileName);
       f.Size := fib_Size;
     end; { end with }
   end;
-End;
+end;
 
 
-Procedure FindNext(Var f: SearchRec);
+procedure FindNext(Var f: SearchRec);
 var
  Result: longint;
- Anchor : pAnchorPath;
+ Anchor: PAnchorPath;
-Begin
+begin
   DosError:=0;
   Result:=MatchNext(f.AnchorPtr);
   if Result = ERROR_NO_MORE_ENTRIES then 
     DosError:=18
   else 
- if Result <> 0 then
+    if Result <> 0 then DosError:=3;
-   DosError:=3;
+
- { If there is an error, deallocate }
+  if DosError=0 then begin
- { the anchorpath structure         }
- if DosError <> 0 then
-   Begin
-     MatchEnd(f.AnchorPtr);
-     if assigned(f.AnchorPtr) then
-       {Dispose}FreeMem(f.AnchorPtr);
-   end
- else
     { Fill up the Searchrec information     }
     { and also check if the files are with  }
     { the correct attributes                }
-   Begin
     Anchor:=pAnchorPath(f.AnchorPtr);
-         with Anchor^.ap_Info do
+    with Anchor^.ap_Info do begin
-          Begin
       f.Time := fib_Date.ds_Days * (24 * 60 * 60) +
                 fib_Date.ds_Minute * 60 +
                 fib_Date.ds_Tick div 50;
       {*------------------------------------*}
       {* Determine if is a file or a folder *}
       {*------------------------------------*}
-           if fib_DirEntryType > 0 then
+      if fib_DirEntryType > 0 then f.attr:=f.attr OR DIRECTORY;
-               f.attr:=f.attr OR DIRECTORY;
 
       {*------------------------------------*}
       {* Determine if Read only             *}
@@ -690,19 +663,21 @@ Begin
       {* Should we check also that EXEC     *}
       {* is zero? for read only?            *}
       {*------------------------------------*}
-           if   ((fib_Protection and FIBF_READ) <> 0)
+      if ((fib_Protection and FIBF_READ) <> 0) and
-            AND ((fib_Protection and FIBF_WRITE) = 0)
+         ((fib_Protection and FIBF_WRITE) = 0) then f.attr:=f.attr or READONLY;
-           then
-              f.attr:=f.attr or READONLY;
       f.Name := strpas(fib_FileName);
       f.Size := fib_Size;
     end; { end with }
   end;
-End;
+end;
+
+procedure FindClose(Var f: SearchRec);
+begin
+  MatchEnd(f.AnchorPtr);
+  if assigned(f.AnchorPtr) then
+    Dispose(PAnchorPath(f.AnchorPtr));
+end;
 
-    Procedure FindClose(Var f: SearchRec);
-      begin
-      end;
 
 {******************************************************************************
                                --- File ---
@@ -719,10 +694,6 @@ begin
   if (pos('?',path)<>0) or (pos('*',path)<>0) or (path='') then
     FSearch:=''
   else begin  
-    { allow slash as backslash }
-    for counter:=1 to length(dirlist) do
-      if dirlist[counter]='\' then dirlist[counter]:='/';
-    
     repeat
       p1:=pos(';',dirlist);
       if p1<>0 then begin
@@ -1032,7 +1003,11 @@ End.
 
 {
   $Log$
-  Revision 1.12  2004-12-06 20:01:20  karoly
+  Revision 1.13  2004-12-07 13:35:53  karoly
+    * more cleanup in FindFirst/FindNext
+    * implemented FindClose, no more leaking of file locks
+
+  Revision 1.12  2004/12/06 20:01:20  karoly
 
     * made it compile again after changes by Tomas
     * cleaned up FindFirst mess (still more things to do, as usual)