From 10ef93c27c30c3f028b428f9e4b4624dc65e19c1 Mon Sep 17 00:00:00 2001
From: marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2>
Date: Sun, 13 Mar 2011 01:17:34 +0000
Subject:  * patch to allow append for TEventlog, from Ido. Mantis 18355

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@17127 3ad0048d-3df7-0310-abae-a5850022a9f2
---
 packages/fcl-base/src/eventlog.pp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'packages/fcl-base')

diff --git a/packages/fcl-base/src/eventlog.pp b/packages/fcl-base/src/eventlog.pp
index 00c679abb4..d17d5881f5 100644
--- a/packages/fcl-base/src/eventlog.pp
+++ b/packages/fcl-base/src/eventlog.pp
@@ -29,6 +29,7 @@ Type
 
   TEventLog = Class(TComponent)
   Private
+    fAppendContent : Boolean;
     FEventIDOffset : DWord;
     FLogHandle : Pointer;
     FStream : TFileStream;
@@ -84,6 +85,7 @@ Type
     Procedure Info (const Msg : String); {$ifndef fpc }Overload;{$endif}
     Procedure Info (const Fmt : String; Args : Array of const); {$ifndef fpc }Overload;{$endif}
   Published
+    Property AppendContent : Boolean Read fAppendContent Write fAppendContent;
     Property Identification : String Read FIdentification Write SetIdentification;
     Property LogType : TLogType Read Flogtype Write SetlogType;
     Property Active : Boolean Read FActive write SetActive;
@@ -240,12 +242,19 @@ begin
 end;
 
 Procedure TEventLog.ActivateFileLog;
-
+var
+  fFileFlags : Word;
 begin
   If (FFileName='') then
     FFileName:=DefaultFileName;
   // This will raise an exception if the file cannot be opened for writing !
-  FStream:=TFileStream.Create(FFileName,fmCreate or fmShareDenyWrite);
+  if fAppendContent and FileExists(FFileName) then
+    fFileFlags := fmOpenWrite
+  else
+    fFileFlags := fmCreate;
+
+  fFileFlags := fFileFlags or fmShareDenyWrite;
+  FStream:=TFileStream.Create(FFileName,fFileFlags);
 end;
 
 Procedure TEventLog.DeActivateFileLog;
-- 
cgit v1.2.1


From e47cab69424304cdd124ece1e9c1916e5166fe9c Mon Sep 17 00:00:00 2001
From: michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>
Date: Sat, 2 Apr 2011 16:25:43 +0000
Subject: * Fix exception propagation in TiniFile.Free (bug 19046)

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@17230 3ad0048d-3df7-0310-abae-a5850022a9f2
---
 packages/fcl-base/src/inifiles.pp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'packages/fcl-base')

diff --git a/packages/fcl-base/src/inifiles.pp b/packages/fcl-base/src/inifiles.pp
index eb4164bc1b..f75416d5e9 100644
--- a/packages/fcl-base/src/inifiles.pp
+++ b/packages/fcl-base/src/inifiles.pp
@@ -657,7 +657,11 @@ end;
 destructor TIniFile.destroy;
 begin
   If FDirty and FCacheUpdates then
-    UpdateFile;
+    try
+      UpdateFile;
+    except
+      // Eat exception. Compatible to D7 behaviour, see comments to bug 19046
+    end;  
   inherited destroy;
 end;
 
-- 
cgit v1.2.1