paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 21:29:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fsearch was still worng for multiple pathes

Browse Source
This commit is contained in:
pierre 2000-01-11 13:45:19 +00:00
parent 6a582a3902
commit 496f16ef2d
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rtl/win32/dos.pp
View File

@ -653,6 +653,7 @@ var temp : PChar;
value : Array [0..255] of char; value : Array [0..255] of char;
i : Longint; i : Longint;
dir,dir2 : dirstr; dir,dir2 : dirstr;
lastchar : char;
name : namestr; name : namestr;
ext : extstr; ext : extstr;
begin begin
@ -665,8 +666,10 @@ begin
if dirlist[i]='/' then if dirlist[i]='/' then
dirlist[i]:='\'; dirlist[i]:='\';
{ allow slash as backslash } { allow slash as backslash }
repeat StringToPchar(name);
StringToPchar(ext);
repeat
i:=pos(';',dirlist); i:=pos(';',dirlist);
while i=1 do while i=1 do
begin begin
@ -683,9 +686,15 @@ begin
dir2:=Copy(dirlist,1,i-1); dir2:=Copy(dirlist,1,i-1);
dirlist:=Copy(dirlist,i+1,255); dirlist:=Copy(dirlist,i+1,255);
end; end;
dir2:=dir2+dir; { don't add anything if dir2 is empty string }
StringToPchar(name); if dir2<>'' then
StringToPchar(ext); lastchar:=dir2[length(dir2)]
else
lastchar:='\';
if (lastchar<>'\') and (lastchar<>':') then
dir2:=dir2+'\'+dir
else
dir2:=dir2+dir;
StringToPchar(dir2); StringToPchar(dir2);
if SearchPath(@dir2, @name, @ext, 255, @value, temp)>0 then if SearchPath(@dir2, @name, @ext, 255, @value, temp)>0 then
begin begin
@ -843,7 +852,10 @@ End;
end. end.
{ {
$Log$ $Log$
Revision 1.29 2000-01-11 12:49:26 pierre Revision 1.30 2000-01-11 13:45:19 pierre
* fsearch was still worng for multiple pathes
Revision 1.29 2000/01/11 12:49:26 pierre
* fsearch bugs and fexpand memory leak fixed * fsearch bugs and fexpand memory leak fixed
Revision 1.28 2000/01/07 16:41:52 daniel Revision 1.28 2000/01/07 16:41:52 daniel