diff options
author | Erich Eckner <git@eckner.net> | 2018-01-12 15:33:12 +0100 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2018-01-12 15:33:12 +0100 |
commit | b9e8a86939aef6fba5a0fa08d59a0ea0dc09b2e6 (patch) | |
tree | ee31c51c19befdcad53143f764059cc6021b61e6 | |
parent | 2c55053cb2f874fb2699eb719f2b51f72fce045f (diff) | |
download | Make-b9e8a86939aef6fba5a0fa08d59a0ea0dc09b2e6.tar.xz |
only open existent files
-rw-r--r-- | Make.lps | 94 | ||||
-rw-r--r-- | dateibeziehungen.pas | 8 | ||||
-rw-r--r-- | tools.pas | 4 |
3 files changed, 54 insertions, 52 deletions
@@ -7,7 +7,7 @@ <Unit0> <Filename Value="Make.lpr"/> <IsPartOfProject Value="True"/> - <TopLine Value="53"/> + <TopLine Value="52"/> <CursorPos X="19" Y="31"/> <UsageCount Value="112"/> <Loaded Value="True"/> @@ -21,9 +21,10 @@ <Unit2> <Filename Value="tools.pas"/> <IsPartOfProject Value="True"/> + <IsVisibleTab Value="True"/> <EditorIndex Value="5"/> - <TopLine Value="255"/> - <CursorPos X="67" Y="283"/> + <TopLine Value="224"/> + <CursorPos X="34" Y="235"/> <UsageCount Value="91"/> <Loaded Value="True"/> </Unit2> @@ -40,11 +41,10 @@ <Filename Value="dateibeziehungen.pas"/> <IsPartOfProject Value="True"/> <UnitName Value="dateiBeziehungen"/> - <IsVisibleTab Value="True"/> <EditorIndex Value="1"/> - <TopLine Value="672"/> - <CursorPos X="33" Y="987"/> - <FoldState Value=" T3jb03C pjYkO0B4]9ZkD0l3]97kJ0!7]9AlH0F112]B0lf0G[944jQ033S"/> + <TopLine Value="1031"/> + <CursorPos X="31" Y="1028"/> + <FoldState Value=" T3jb03C pjYkO0B4]9ZkD0l3]97kJ0!7]9AlH0F112]B0lf0G114?"/> <UsageCount Value="80"/> <Loaded Value="True"/> </Unit4> @@ -141,123 +141,123 @@ </Units> <JumpHistory Count="30" HistoryIndex="29"> <Position1> - <Filename Value="../units/lowlevelunit.pas"/> - <Caret Line="1287" Column="23" TopLine="1284"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="95" Column="24" TopLine="77"/> </Position1> <Position2> - <Filename Value="../units/lowlevelunit.pas"/> - <Caret Line="1309" Column="33" TopLine="1297"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="729" Column="22" TopLine="636"/> </Position2> <Position3> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1049" Column="60" TopLine="1027"/> + <Caret Line="766" Column="22" TopLine="737"/> </Position3> <Position4> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="95" Column="24" TopLine="77"/> + <Caret Line="833" Column="44" TopLine="809"/> </Position4> <Position5> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="729" Column="22" TopLine="636"/> + <Caret Line="837" Column="32" TopLine="809"/> </Position5> <Position6> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="766" Column="22" TopLine="737"/> + <Caret Line="1047" Column="54" TopLine="1024"/> </Position6> <Position7> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="833" Column="44" TopLine="809"/> + <Filename Value="../units/lowlevelunit.pas"/> + <Caret Line="1329" Column="30" TopLine="1306"/> </Position7> <Position8> <Filename Value="dateibeziehungen.pas"/> - <Caret Line="837" Column="32" TopLine="809"/> + <Caret Line="1048" Column="24" TopLine="1024"/> </Position8> <Position9> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1047" Column="54" TopLine="1024"/> + <Filename Value="tools.pas"/> + <Caret Line="49" Column="64" TopLine="30"/> </Position9> <Position10> <Filename Value="../units/lowlevelunit.pas"/> - <Caret Line="1329" Column="30" TopLine="1306"/> + <Caret Line="1269" Column="44" TopLine="1252"/> </Position10> <Position11> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="1048" Column="24" TopLine="1024"/> + <Filename Value="tools.pas"/> + <Caret Line="545" Column="69" TopLine="530"/> </Position11> <Position12> <Filename Value="tools.pas"/> - <Caret Line="49" Column="64" TopLine="30"/> + <Caret Line="50" Column="31" TopLine="27"/> </Position12> <Position13> - <Filename Value="../units/lowlevelunit.pas"/> - <Caret Line="1269" Column="44" TopLine="1252"/> + <Filename Value="tools.pas"/> + <Caret Line="417" Column="31" TopLine="388"/> </Position13> <Position14> <Filename Value="tools.pas"/> - <Caret Line="545" Column="69" TopLine="530"/> + <Caret Line="419" TopLine="419"/> </Position14> <Position15> <Filename Value="tools.pas"/> - <Caret Line="50" Column="31" TopLine="27"/> </Position15> <Position16> <Filename Value="tools.pas"/> - <Caret Line="417" Column="31" TopLine="388"/> + <Caret Line="50" Column="31" TopLine="21"/> </Position16> <Position17> <Filename Value="tools.pas"/> - <Caret Line="419" TopLine="419"/> + <Caret Line="449" TopLine="415"/> </Position17> <Position18> <Filename Value="tools.pas"/> + <Caret Line="472" Column="37" TopLine="455"/> </Position18> <Position19> <Filename Value="tools.pas"/> - <Caret Line="50" Column="31" TopLine="21"/> + <Caret Line="473" Column="27" TopLine="456"/> </Position19> <Position20> <Filename Value="tools.pas"/> - <Caret Line="449" TopLine="415"/> + <Caret Line="400" Column="32" TopLine="372"/> </Position20> <Position21> <Filename Value="tools.pas"/> - <Caret Line="472" Column="37" TopLine="455"/> + <Caret Line="48" Column="68" TopLine="30"/> </Position21> <Position22> <Filename Value="tools.pas"/> - <Caret Line="473" Column="27" TopLine="456"/> + <Caret Line="294" Column="70" TopLine="284"/> </Position22> <Position23> <Filename Value="tools.pas"/> - <Caret Line="400" Column="32" TopLine="372"/> + <Caret Line="295" Column="46" TopLine="284"/> </Position23> <Position24> <Filename Value="tools.pas"/> - <Caret Line="48" Column="68" TopLine="30"/> + <Caret Line="261" TopLine="253"/> </Position24> <Position25> <Filename Value="tools.pas"/> - <Caret Line="294" Column="70" TopLine="284"/> + <Caret Line="283" Column="70" TopLine="255"/> </Position25> <Position26> - <Filename Value="tools.pas"/> - <Caret Line="295" Column="46" TopLine="284"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="109" Column="36" TopLine="91"/> </Position26> <Position27> - <Filename Value="tools.pas"/> - <Caret Line="261" TopLine="253"/> + <Filename Value="Make.lpr"/> + <Caret Line="31" Column="19" TopLine="52"/> </Position27> <Position28> - <Filename Value="tools.pas"/> - <Caret Line="283" Column="70" TopLine="255"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="109" Column="29" TopLine="91"/> </Position28> <Position29> - <Filename Value="Make.lpr"/> - <Caret Line="31" Column="19" TopLine="53"/> + <Filename Value="dateibeziehungen.pas"/> + <Caret Line="1028" Column="31" TopLine="1031"/> </Position29> <Position30> - <Filename Value="dateibeziehungen.pas"/> - <Caret Line="109" Column="36" TopLine="91"/> + <Filename Value="tools.pas"/> + <Caret Line="45" Column="29" TopLine="27"/> </Position30> </JumpHistory> </ProjectSession> diff --git a/dateibeziehungen.pas b/dateibeziehungen.pas index d55fe43..6c67fe2 100644 --- a/dateibeziehungen.pas +++ b/dateibeziehungen.pas @@ -731,14 +731,14 @@ begin // machDatei teilweise prüfen und setzen if machDatei='' then begin machDatei:=pwd+'/'; - while (machDatei<>'/') and not fileexists(machDatei+'Machdatei') do begin + while (machDatei<>'/') and not fileExists(machDatei+'Machdatei') do begin delete(machDatei,length(machDatei),1); machDatei:=extractFilePath(machDatei); end; machDatei:=machDatei+'Machdatei'; end; _machDatei:=machDatei; - if not fileexists(_machDatei) then + if not fileExists(_machDatei) then fehler('Datei '''+_machDatei+''' existiert nicht!'); // pruefSummenDatei teilweise prüfen und setzen @@ -890,12 +890,12 @@ begin exit; end; - if not fileexists(_pruefSummenDatei) then begin + if not fileExists(_pruefSummenDatei) then begin assignFile(f,_pruefSummenDatei); rewrite(f); closeFile(f); end; - if not fileexists(_pruefSummenDatei) then begin + if not fileExists(_pruefSummenDatei) then begin gibAus('Fehler: Ich bin nicht in der Lage, die bisher nicht existierende Datei '''+_pruefSummenDatei+''' anzulegen!',3); exit; end; @@ -329,6 +329,8 @@ begin else begin sl:=tMyStringList.create; for i:=0 to dateien.count-1 do begin + if not fileExists(dateien[i]) then + continue; sl.loadFromFile(dateien[i]); sl.shellSubst(env); if exe='epost' then begin @@ -373,7 +375,7 @@ begin s:=leftStr(woraus,notQuotedPos(' ',woraus)); delete(woraus,1,length(s)); s:=trim(s); - if fileexists(s) or dateiListe.hatZeile(s,false) then + if fileExists(s) or dateiListe.hatZeile(s,false) then result.add(s); end; end; |