Changeset 7

Timestamp:

Sep 3, 2015, 1:32:33 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Proper evaluation of termination string.

File:

• trunk/linetime.lpr (modified) (4 diffs)

trunk/linetime.lpr

@@ -34 +34 @@
     TermString: string;
     TermStringIndex: Integer;
+    procedure TermCheckString(Buffer: string);
     function FindLineEnding(Buffer: string; var FoundLineEnding: string): Integer;
     procedure WriteRaw(Text: string);
@@ -118 +119 @@
 end;
 
+procedure TMyApplication.TermCheckString(Buffer: string);
+var
+  I: Integer;
+begin
+  // Search for termination string
+  if TermString <> '' then
+  for I := 1 to Length(Buffer) do begin
+    if TermStringIndex > Length(TermString) then begin
+      Terminate;
+      Break;
+    end;
+    if Buffer[I] = TermString[TermStringIndex] then
+      Inc(TermStringIndex)
+      else TermStringIndex := 1;
+  end;
+end;
+
 function TMyApplication.FindLineEnding(Buffer: string; var FoundLineEnding: string): Integer;
 const
@@ -161 +179 @@
 procedure TMyApplication.PrintOutput(Output: string);
 begin
+  TermCheckString(Output);
   if NewLine then begin
     if not FirstLine then begin
@@ -227 +246 @@
     end;
 
-    // Search for termination string
-    if TermString <> '' then
-    for I := 1 to Length(Buffer) - 1 do begin
-      if TermStringIndex > Length(TermString) then begin
-        Terminate;
-        Break;
-      end;
-      if Buffer[I] = TermString[TermStringIndex] then
-        Inc(TermStringIndex)
-        else TermStringIndex := 1;
-    end;
   until P = 0;
   PrintOutput(Buffer);