summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-02-07 14:36:42 +0100
committerErich Eckner <git@eckner.net>2018-02-07 14:36:42 +0100
commitb6c02297232cf270bf7e9e884944090f3ccf1b34 (patch)
tree82ca0995e30d400dcf30b430c1b6e5cd75d09f67
parentcbf4ef2074d978fca6c7a6f884a8cea93b27679d (diff)
downloadMake-b6c02297232cf270bf7e9e884944090f3ccf1b34.tar.xz
tools.pas: testeSummen verwirft nun stderr, sodass "sha512sum -c" auch funktioniert, wenn viele Fehler auftreten
-rw-r--r--Make.lps133
-rw-r--r--tools.pas17
2 files changed, 78 insertions, 72 deletions
diff --git a/Make.lps b/Make.lps
index c006a4b..0417b99 100644
--- a/Make.lps
+++ b/Make.lps
@@ -7,33 +7,34 @@
<Unit0>
<Filename Value="Make.lpr"/>
<IsPartOfProject Value="True"/>
- <TopLine Value="52"/>
- <CursorPos X="19" Y="31"/>
- <UsageCount Value="112"/>
+ <TopLine Value="46"/>
+ <CursorPos X="61" Y="68"/>
+ <UsageCount Value="116"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
<Filename Value="Machdatei.txt"/>
<IsPartOfProject Value="True"/>
- <UsageCount Value="112"/>
+ <UsageCount Value="116"/>
<DefaultSyntaxHighlighter Value="None"/>
</Unit1>
<Unit2>
<Filename Value="tools.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="5"/>
- <TopLine Value="31"/>
- <CursorPos X="34" Y="235"/>
- <UsageCount Value="91"/>
+ <TopLine Value="503"/>
+ <CursorPos X="25" Y="520"/>
+ <FoldState Value=" T3iL03B picjO064 pl5lL0D5w"/>
+ <UsageCount Value="95"/>
<Loaded Value="True"/>
</Unit2>
<Unit3>
<Filename Value="../units/mystringlistunit.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="3"/>
- <TopLine Value="676"/>
- <CursorPos X="47" Y="693"/>
- <UsageCount Value="88"/>
+ <TopLine Value="459"/>
+ <CursorPos X="36" Y="377"/>
+ <UsageCount Value="92"/>
<Loaded Value="True"/>
</Unit3>
<Unit4>
@@ -42,10 +43,10 @@
<UnitName Value="dateiBeziehungen"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
- <TopLine Value="1094"/>
- <CursorPos X="44" Y="1122"/>
- <FoldState Value=" T3jb03C pjYkO0B4 pk5kQ0l3]I7kJ0!7]9AlH0F112]B0lf0G[944jQ032}"/>
- <UsageCount Value="80"/>
+ <TopLine Value="793"/>
+ <CursorPos X="44" Y="813"/>
+ <FoldState Value=" T3jb03C pjYkO0B4 pk5kQ0l3]I7kJ0!7]9AlH0F022]B0lf0G[944jQ033P"/>
+ <UsageCount Value="84"/>
<Loaded Value="True"/>
</Unit4>
<Unit5>
@@ -63,9 +64,9 @@
<Unit7>
<Filename Value="../units/lowlevelunit.pas"/>
<EditorIndex Value="4"/>
- <TopLine Value="145"/>
+ <TopLine Value="121"/>
<CursorPos Y="154"/>
- <UsageCount Value="23"/>
+ <UsageCount Value="25"/>
<Loaded Value="True"/>
</Unit7>
<Unit8>
@@ -104,9 +105,9 @@
<Unit13>
<Filename Value="../units/systemunit.pas"/>
<EditorIndex Value="2"/>
- <TopLine Value="121"/>
- <CursorPos X="21" Y="131"/>
- <UsageCount Value="17"/>
+ <TopLine Value="188"/>
+ <CursorPos X="17" Y="204"/>
+ <UsageCount Value="19"/>
<Loaded Value="True"/>
</Unit13>
<Unit14>
@@ -142,122 +143,122 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="dateibeziehungen.pas"/>
- <Caret Line="766" Column="22" TopLine="737"/>
+ <Caret Line="84" Column="23" TopLine="57"/>
</Position1>
<Position2>
<Filename Value="dateibeziehungen.pas"/>
- <Caret Line="833" Column="44" TopLine="809"/>
+ <Caret Line="105" Column="23" TopLine="76"/>
</Position2>
<Position3>
<Filename Value="dateibeziehungen.pas"/>
- <Caret Line="837" Column="32" TopLine="809"/>
+ <Caret Line="277" Column="44" TopLine="128"/>
</Position3>
<Position4>
<Filename Value="dateibeziehungen.pas"/>
- <Caret Line="1047" Column="54" TopLine="1024"/>
+ <Caret Line="765" Column="16" TopLine="740"/>
</Position4>
<Position5>
- <Filename Value="../units/lowlevelunit.pas"/>
- <Caret Line="1329" Column="30" TopLine="1306"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="735" TopLine="685"/>
</Position5>
<Position6>
<Filename Value="dateibeziehungen.pas"/>
- <Caret Line="1048" Column="24" TopLine="1024"/>
</Position6>
<Position7>
- <Filename Value="tools.pas"/>
- <Caret Line="49" Column="64" TopLine="30"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="102" Column="33" TopLine="73"/>
</Position7>
<Position8>
- <Filename Value="../units/lowlevelunit.pas"/>
- <Caret Line="1269" Column="44" TopLine="1252"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="768" Column="14" TopLine="654"/>
</Position8>
<Position9>
- <Filename Value="tools.pas"/>
- <Caret Line="545" Column="69" TopLine="530"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="916" Column="24" TopLine="900"/>
</Position9>
<Position10>
<Filename Value="tools.pas"/>
- <Caret Line="50" Column="31" TopLine="27"/>
+ <Caret Line="55" Column="21" TopLine="38"/>
</Position10>
<Position11>
- <Filename Value="tools.pas"/>
- <Caret Line="417" Column="31" TopLine="388"/>
+ <Filename Value="Make.lpr"/>
+ <Caret Line="68" Column="61" TopLine="46"/>
</Position11>
<Position12>
- <Filename Value="tools.pas"/>
- <Caret Line="419" TopLine="419"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="761" Column="75" TopLine="739"/>
</Position12>
<Position13>
- <Filename Value="tools.pas"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="102" Column="33" TopLine="84"/>
</Position13>
<Position14>
- <Filename Value="tools.pas"/>
- <Caret Line="50" Column="31" TopLine="21"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="765" Column="29" TopLine="737"/>
</Position14>
<Position15>
- <Filename Value="tools.pas"/>
- <Caret Line="449" TopLine="415"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="915" Column="56" TopLine="903"/>
</Position15>
<Position16>
<Filename Value="tools.pas"/>
- <Caret Line="472" Column="37" TopLine="455"/>
+ <Caret Line="514" Column="17" TopLine="504"/>
</Position16>
<Position17>
<Filename Value="tools.pas"/>
- <Caret Line="473" Column="27" TopLine="456"/>
+ <Caret Line="527" Column="90" TopLine="498"/>
</Position17>
<Position18>
<Filename Value="tools.pas"/>
- <Caret Line="400" Column="32" TopLine="372"/>
+ <Caret Line="517" Column="29" TopLine="510"/>
</Position18>
<Position19>
<Filename Value="tools.pas"/>
- <Caret Line="48" Column="68" TopLine="30"/>
+ <Caret Line="519" Column="75" TopLine="502"/>
</Position19>
<Position20>
- <Filename Value="tools.pas"/>
- <Caret Line="294" Column="70" TopLine="284"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="917" Column="43" TopLine="903"/>
</Position20>
<Position21>
<Filename Value="tools.pas"/>
- <Caret Line="295" Column="46" TopLine="284"/>
+ <Caret Line="519" Column="35" TopLine="502"/>
</Position21>
<Position22>
<Filename Value="tools.pas"/>
- <Caret Line="261" TopLine="253"/>
+ <Caret Line="513" Column="25" TopLine="499"/>
</Position22>
<Position23>
- <Filename Value="tools.pas"/>
- <Caret Line="283" Column="70" TopLine="255"/>
+ <Filename Value="dateibeziehungen.pas"/>
+ <Caret Line="813" Column="94" TopLine="793"/>
</Position23>
<Position24>
- <Filename Value="dateibeziehungen.pas"/>
- <Caret Line="109" Column="36" TopLine="91"/>
+ <Filename Value="../units/mystringlistunit.pas"/>
+ <Caret Line="40" Column="26" TopLine="25"/>
</Position24>
<Position25>
- <Filename Value="dateibeziehungen.pas"/>
- <Caret Line="109" Column="29" TopLine="91"/>
+ <Filename Value="../units/mystringlistunit.pas"/>
+ <Caret Line="377" Column="36" TopLine="459"/>
</Position25>
<Position26>
- <Filename Value="tools.pas"/>
- <Caret Line="45" Column="29" TopLine="27"/>
+ <Filename Value="../units/systemunit.pas"/>
+ <Caret Line="18" Column="21"/>
</Position26>
<Position27>
- <Filename Value="dateibeziehungen.pas"/>
- <Caret Line="1098" Column="20" TopLine="1090"/>
+ <Filename Value="../units/systemunit.pas"/>
+ <Caret Line="19" Column="22"/>
</Position27>
<Position28>
- <Filename Value="dateibeziehungen.pas"/>
- <Caret Line="115" Column="32" TopLine="97"/>
+ <Filename Value="../units/systemunit.pas"/>
+ <Caret Line="20" Column="22"/>
</Position28>
<Position29>
- <Filename Value="dateibeziehungen.pas"/>
- <Caret Line="399" Column="13" TopLine="372"/>
+ <Filename Value="../units/lowlevelunit.pas"/>
+ <Caret Line="154" TopLine="121"/>
</Position29>
<Position30>
- <Filename Value="dateibeziehungen.pas"/>
- <Caret Line="115" Column="32" TopLine="97"/>
+ <Filename Value="../units/systemunit.pas"/>
+ <Caret Line="276" TopLine="254"/>
</Position30>
</JumpHistory>
</ProjectSession>
diff --git a/tools.pas b/tools.pas
index 9d2a0dd..b9df964 100644
--- a/tools.pas
+++ b/tools.pas
@@ -58,7 +58,7 @@ function dateienMitGueltigerSumme(sumNam: string): tMyStringList;
implementation
uses
- lowlevelunit;
+ lowlevelunit, math;
// tDateienMitDaten ************************************************************
@@ -489,11 +489,12 @@ var
function testeSummen(sumNam: string): tMyStringListBArray;
var
- p: tProcess;
- rb,i: longint;
- s: string;
- erg: tStringList;
- gut: boolean;
+ p: tProcess;
+ rb,i: longint;
+ s: string;
+ erg: tStringList;
+ gut: boolean;
+ dummy: array of byte;
const leseHappen=65536;
begin
for i:=0 to length(summenVorrat)-1 do
@@ -513,7 +514,11 @@ begin
p.execute;
rb:=0;
s:='';
+ setLength(dummy,1024);
+ fillchar(dummy[0],length(dummy),0);
while p.running do begin
+ while p.stderr.numBytesAvailable>0 do
+ p.stderr.read(dummy[0],min(length(dummy),p.stderr.numBytesAvailable));
if p.output.numBytesAvailable=0 then sleep(10)
else begin
setLength(s,rb+leseHappen);