Browse Source

* FileSearch needs to check first the file in the
current dir

git-svn-id: trunk@10128 -

peter 17 years ago
parent
commit
3ffcb2244e
1 changed files with 8 additions and 9 deletions
  1. 8 9
      rtl/objpas/sysutils/sysutils.inc

+ 8 - 9
rtl/objpas/sysutils/sysutils.inc

@@ -24,9 +24,12 @@
       Temp : String;
       Temp : String;
 
 
     begin
     begin
-      Result:='';
-			temp:=SetDirSeparators(DirList);
+      // Start with checking the file in the current directory
+      Result:=Name;
+      temp:=SetDirSeparators(DirList);
       repeat
       repeat
+        If (Result<>'') and FileExists(Result) Then
+          exit;
         I:=pos(PathSeparator,Temp);
         I:=pos(PathSeparator,Temp);
         If I<>0 then
         If I<>0 then
           begin
           begin
@@ -38,14 +41,10 @@
             Result:=Temp;
             Result:=Temp;
             Temp:='';
             Temp:='';
           end;
           end;
-			  if Result<>'' then
-				  begin		
-            Result:=IncludeTrailingPathDelimiter(Result)+name;
-            If FileExists(Result) Then
-				      exit;
- 				  end;			
+        if Result<>'' then
+          Result:=IncludeTrailingPathDelimiter(Result)+name;
       until temp='';
       until temp='';
-			result:='';
+      result:='';
     end;
     end;
 
 
   {$ifndef OS_FILEISREADONLY}
   {$ifndef OS_FILEISREADONLY}