dateibeziehungen.pas: tMach.sammleDateien repariert

2 files changed, 65 insertions, 45 deletions

diff --git a/Make.lps b/Make.lps
index c013b8a..afb70ff 100644
--- a/Make.lps
+++ b/Make.lps
@@ -7,8 +7,8 @@
       <Unit0>
         <Filename Value="Make.lpr"/>
         <IsPartOfProject Value="True"/>
-        <TopLine Value="48"/>
-        <CursorPos X="18" Y="31"/>
+        <TopLine Value="30"/>
+        <CursorPos X="19" Y="31"/>
         <UsageCount Value="108"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -30,7 +30,6 @@
       <Unit3>
         <Filename Value="../units/mystringlistunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="3"/>
         <TopLine Value="655"/>
         <CursorPos X="57" Y="672"/>
@@ -41,9 +40,10 @@
         <Filename Value="dateibeziehungen.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="dateiBeziehungen"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="580"/>
-        <CursorPos X="21" Y="588"/>
+        <TopLine Value="84"/>
+        <CursorPos X="38" Y="102"/>
         <FoldState Value=" T3ja03C pjYkO0B4]9ZkD0l317,"/>
         <UsageCount Value="76"/>
         <Loaded Value="True"/>
@@ -132,117 +132,126 @@
         <DefaultSyntaxHighlighter Value="None"/>
       </Unit16>
     </Units>
-    <JumpHistory Count="28" HistoryIndex="27">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="../units/mystringlistunit.pas"/>
-        <Caret Line="47" Column="32" TopLine="32"/>
+        <Caret Line="47" Column="25" TopLine="31"/>
       </Position1>
       <Position2>
-        <Filename Value="../units/mystringlistunit.pas"/>
-        <Caret Line="679" TopLine="650"/>
+        <Filename Value="../units/systemunit.pas"/>
+        <Caret Line="329" Column="3" TopLine="295"/>
       </Position2>
       <Position3>
-        <Filename Value="../units/mystringlistunit.pas"/>
-        <Caret Line="670" Column="44" TopLine="652"/>
+        <Filename Value="../units/systemunit.pas"/>
+        <Caret Line="31" Column="38"/>
       </Position3>
       <Position4>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="106" Column="28" TopLine="88"/>
+        <Caret Line="599" Column="41" TopLine="574"/>
       </Position4>
       <Position5>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="971" TopLine="755"/>
+        <Filename Value="../units/mystringlistunit.pas"/>
+        <Caret Line="47" Column="88" TopLine="32"/>
       </Position5>
       <Position6>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="78" Column="29" TopLine="61"/>
+        <Caret Line="599" Column="41" TopLine="574"/>
       </Position6>
       <Position7>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="566" Column="50" TopLine="210"/>
+        <Caret Line="603" Column="15" TopLine="586"/>
       </Position7>
       <Position8>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="955" TopLine="673"/>
+        <Caret Line="633" Column="74" TopLine="607"/>
       </Position8>
       <Position9>
         <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="603" TopLine="579"/>
       </Position9>
       <Position10>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="78" Column="29" TopLine="49"/>
+        <Caret Line="608" Column="25" TopLine="593"/>
       </Position10>
       <Position11>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="573" Column="38" TopLine="573"/>
+        <Filename Value="../units/systemunit.pas"/>
+        <Caret Line="24" Column="16" TopLine="7"/>
       </Position11>
       <Position12>
-        <Filename Value="../units/mystringlistunit.pas"/>
-        <Caret Line="47" Column="25" TopLine="31"/>
+        <Filename Value="../units/systemunit.pas"/>
+        <Caret Line="324" Column="6" TopLine="300"/>
       </Position12>
       <Position13>
-        <Filename Value="../units/systemunit.pas"/>
-        <Caret Line="329" Column="3" TopLine="295"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="590" Column="13" TopLine="572"/>
       </Position13>
       <Position14>
-        <Filename Value="../units/systemunit.pas"/>
-        <Caret Line="31" Column="38"/>
+        <Filename Value="dateibeziehungen.pas"/>
       </Position14>
       <Position15>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="599" Column="41" TopLine="574"/>
+        <Caret Line="590" Column="20" TopLine="476"/>
       </Position15>
       <Position16>
-        <Filename Value="../units/mystringlistunit.pas"/>
-        <Caret Line="47" Column="88" TopLine="32"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="603" Column="20" TopLine="575"/>
       </Position16>
       <Position17>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="599" Column="41" TopLine="574"/>
+        <Caret Line="632" Column="20" TopLine="598"/>
       </Position17>
       <Position18>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="603" Column="15" TopLine="586"/>
+        <Caret Line="588" Column="21" TopLine="580"/>
       </Position18>
       <Position19>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="633" Column="74" TopLine="607"/>
+        <Caret Line="837" Column="76" TopLine="809"/>
       </Position19>
       <Position20>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="603" TopLine="579"/>
+        <Caret Line="102" Column="27" TopLine="84"/>
       </Position20>
       <Position21>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="608" Column="25" TopLine="593"/>
+        <Caret Line="834" Column="29" TopLine="806"/>
       </Position21>
       <Position22>
-        <Filename Value="../units/systemunit.pas"/>
-        <Caret Line="24" Column="16" TopLine="7"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="929" Column="67" TopLine="917"/>
       </Position22>
       <Position23>
-        <Filename Value="../units/systemunit.pas"/>
-        <Caret Line="324" Column="6" TopLine="300"/>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="102" Column="45" TopLine="84"/>
       </Position23>
       <Position24>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="590" Column="13" TopLine="572"/>
+        <Caret Line="834" Column="60" TopLine="816"/>
       </Position24>
       <Position25>
         <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="922" Column="56" TopLine="905"/>
       </Position25>
       <Position26>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="590" Column="20" TopLine="476"/>
+        <Caret Line="929" Column="73" TopLine="914"/>
       </Position26>
       <Position27>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="603" Column="20" TopLine="575"/>
+        <Caret Line="937" TopLine="918"/>
       </Position27>
       <Position28>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="632" Column="20" TopLine="598"/>
+        <Caret Line="102" Column="14" TopLine="84"/>
       </Position28>
+      <Position29>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="936" Column="21" TopLine="918"/>
+      </Position29>
+      <Position30>
+        <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="942" Column="73" TopLine="915"/>
+      </Position30>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/dateibeziehungen.pas b/dateibeziehungen.pas
index f7fb94a..4fb444f 100644
--- a/dateibeziehungen.pas
+++ b/dateibeziehungen.pas
@@ -924,19 +924,30 @@ var
   sR:        tSearchRec;
   err,i:     longint;
   weglassen: boolean;
+  rest:      string;
 begin
   result:=0;
-  err:=findFirst(wo,fareadOnly or faHidden or faSysFile or (byte(rekursiv)*faDirectory),sR);
+  rest:='';
+  if pos('*',wo)>0 then begin // wir müssen globben
+    rest:=wo;
+    erstesArgument(rest,'*',false);
+    erstesArgument(rest,'/',false);
+    if rest<>'' then
+      delete(wo,length(wo)-length(rest),length(rest)+1);
+  end;
+  if (rest='') and rekursiv then        // rekursive Suche angefordert
+    rest:='*';
+  err:=findFirst(wo,fareadOnly or faHidden or faSysFile or (byte(rest<>'')*faDirectory),sR);
   while err=0 do begin
     weglassen:=false;
     for i:=0 to length(_ign)-1 do
       weglassen:=weglassen or _ign[i].exec(extractFilePath(wo)+sR.name);
     if not weglassen then begin
       if sR.attr and faDirectory <> 0 then begin
-        if rekursiv and
+        if (rest<>'') and
           (sR.name<>'.') and
           (sR.name<>'..') then
-            result:=result+sammleDateien(extractFilePath(wo)+sR.name+'/*',rekursiv);
+            result:=result+sammleDateien(extractFilePath(wo)+sR.name+'/'+rest,rekursiv);
       end
       else begin
         inc(result);