X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flog.cpp;h=2782c930160ad1e8b3a042981ff90d8d8bf0d7b0;hb=5c28b6dbf7aa20441c8a51f484f4f64b1966f7e3;hp=e4d410673d9bea7f8e4f3ea215980e31636c0567;hpb=99c569a1257cc13ddd2201870266c9ef83ee3fcc;p=virtualjaguar

diff --git a/src/log.cpp b/src/log.cpp
index e4d4106..2782c93 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -1,22 +1,35 @@
 //
 // Log handler
 //
-// by Cal2
+// Originally by David Raingeard (Cal2)
 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
-// Cleanups/new stuff by James L. Hammons
+// Cleanups/new stuff by James Hammons
+// (C) 2010 Underground Software
+//
+// JLH = James Hammons <jlhamm@acm.org>
+//
+// Who  When        What
+// ---  ----------  -------------------------------------------------------------
+// JLH  01/16/2010  Created this log ;-)
+// JLH  07/11/2011  Instead of dumping out on max log file size being reached, we
+//                  now just silently ignore any more output. 10 megs ought to be
+//                  enough for anybody. ;-) Except when it isn't. :-P
 //
 
-#include "types.h"
 #include "log.h"
 
+#include <stdlib.h>
+#include <stdarg.h>
+#include "types.h"
+
 #define MAX_LOG_SIZE		10000000				// Maximum size of log file (10 MB)
 
 static FILE * log_stream = NULL;
 static uint32 logSize = 0;
 
-int log_init(char * path)
+int LogInit(const char * path)
 {
-	log_stream = fopen(path, "wrt");
+	log_stream = fopen(path, "w");
 
 	if (log_stream == NULL)
 		return 0;
@@ -24,14 +37,15 @@ int log_init(char * path)
 	return 1;
 }
 
-FILE * log_get(void)
+FILE * LogGet(void)
 {
 	return log_stream;
 }
 
-void log_done(void)
+void LogDone(void)
 {
-	fclose(log_stream);
+	if (log_stream != NULL)
+		fclose(log_stream);
 }
 
 //
@@ -41,16 +55,23 @@ void log_done(void)
 void WriteLog(const char * text, ...)
 {
 	va_list arg;
-
 	va_start(arg, text);
+
+	if (log_stream == NULL)
+	{
+		va_end(arg);
+		return;
+	}
+
 	logSize += vfprintf(log_stream, text, arg);
 
 	if (logSize > MAX_LOG_SIZE)
 	{
+		// Instead of dumping out, we just close the file and ignore any more output.
 		fflush(log_stream);
 		fclose(log_stream);
-		exit(1);
-	}//*/
+		log_stream = NULL;
+	}
 
 	va_end(arg);
 	fflush(log_stream);					// Make sure that text is written!