Changeset 5

Timestamp:

Jul 31, 2015, 11:43:28 AM (9 years ago)

Author:

chronos

Message:

• Modified: Detect all three line ending types at the same time.

File:

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

trunk/linetime.lpr

@@ -28 +28 @@
     TermString: string;
     TermStringIndex: Integer;
+    function FindLineEnding(Buffer: string; var LineEndingLength: Integer): Integer;
     procedure WriteRaw(Text: string);
     procedure WriteLog(Text: string);
@@ -102 +103 @@
 end;
 
+function TMyApplication.FindLineEnding(Buffer: string; var LineEndingLength: Integer): Integer;
+const
+  LineEnding1 = #13#10;
+  LineEnding2 = #10;
+  LineEnding3 = #13;
+var
+  P: Integer;
+begin
+  Result := 0;
+  LineEndingLength := 0;
+
+  P := Pos(LineEnding1, Buffer);
+  if (P > 0) and (((Result > 0) and (P < Result)) or (Result = 0)) then begin
+    Result := P;
+    LineEndingLength := Length(LineEnding1);
+  end;
+  P := Pos(LineEnding2, Buffer);
+  if (P > 0) and (((Result > 0) and (P < Result)) or (Result = 0)) then begin
+    Result := P;
+    LineEndingLength := Length(LineEnding2);
+  end;
+  P := Pos(LineEnding3, Buffer);
+  if (P > 0) and (((Result > 0) and (P < Result)) or (Result = 0)) then begin
+    Result := P;
+    LineEndingLength := Length(LineEnding3);
+  end;
+end;
+
 procedure TMyApplication.WriteRaw(Text: string);
 begin
@@ -152 +181 @@
   I: Integer;
   Part: string;
+  LineEndingLength: Integer;
 begin
   repeat
-    P := Pos(LineEnding, Buffer);
+    P := FindLineEnding(Buffer, LineEndingLength);
     if P > 0 then begin
       Part := Copy(Buffer, 1, P - 1);
@@ -160 +190 @@
         Part := StringReplace(Part, '"', '""', [rfReplaceAll]);
       PrintOutput(Part);
-      Delete(Buffer, 1, P + Length(LineEnding) - 1);
+      Delete(Buffer, 1, P + LineEndingLength - 1);
       NewLine := True;
       ShowTime := True;