X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffile_log.cc;h=a9522bad507dc722033074c9a5abd45c7770dcf5;hb=efe153ab23b54cdbf28c653f2ccb0f25ca6bd015;hp=c2a33d4252b3a7a582fa2ae1c45a48508e1c270d;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/file_log.cc b/src/lib/file_log.cc
index c2a33d425..a9522bad5 100644
--- a/src/lib/file_log.cc
+++ b/src/lib/file_log.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,36 +18,50 @@
 
 */
 
+
 #include "file_log.h"
 #include "cross.h"
+#include "config.h"
 #include <cstdio>
 #include <iostream>
+#include <cerrno>
+
 
 using std::cout;
 using std::string;
 using std::max;
-using boost::shared_ptr;
+using std::shared_ptr;
+
 
 /** @param file Filename to write log to */
 FileLog::FileLog (boost::filesystem::path file)
 	: _file (file)
 {
+	set_types (Config::instance()->log_types());
+}
+
 
+FileLog::FileLog (boost::filesystem::path file, int types)
+	: _file (file)
+{
+	set_types (types);
 }
 
+
 void
 FileLog::do_log (shared_ptr<const LogEntry> entry)
 {
-	FILE* f = fopen_boost (_file, "a");
+	auto f = fopen_boost (_file, "a");
 	if (!f) {
-		cout << "(could not log to " << _file.string() << "): " << entry.get() << "\n";
+		cout << "(could not log to " << _file.string() << " error " << errno << "): " << entry->get() << "\n";
 		return;
 	}
 
-	fprintf (f, "%s\n", entry->get().c_str ());
+	fprintf (f, "%s\n", entry->get().c_str());
 	fclose (f);
 }
 
+
 string
 FileLog::head_and_tail (int amount) const
 {
@@ -55,37 +69,40 @@ FileLog::head_and_tail (int amount) const
 
 	uintmax_t head_amount = amount;
 	uintmax_t tail_amount = amount;
-	uintmax_t size = boost::filesystem::file_size (_file);
+	boost::system::error_code ec;
+	uintmax_t size = boost::filesystem::file_size (_file, ec);
+	if (size == static_cast<uintmax_t>(-1)) {
+		return "";
+	}
 
 	if (size < (head_amount + tail_amount)) {
 		head_amount = size;
 		tail_amount = 0;
 	}
 
-	FILE* f = fopen_boost (_file, "r");
+	auto f = fopen_boost (_file, "r");
 	if (!f) {
 		return "";
 	}
 
 	string out;
 
-	char* buffer = new char[max(head_amount, tail_amount) + 1];
+	std::vector<char> buffer(max(head_amount, tail_amount) + 1);
 
-	int N = fread (buffer, 1, head_amount, f);
+	int N = fread (buffer.data(), 1, head_amount, f);
 	buffer[N] = '\0';
-	out += string (buffer);
+	out += string (buffer.data());
 
 	if (tail_amount > 0) {
 		out +=  "\n .\n .\n .\n";
 
 		fseek (f, - tail_amount - 1, SEEK_END);
 
-		N = fread (buffer, 1, tail_amount, f);
+		N = fread (buffer.data(), 1, tail_amount, f);
 		buffer[N] = '\0';
-		out += string (buffer) + "\n";
+		out += string (buffer.data()) + "\n";
 	}
 
-	delete[] buffer;
 	fclose (f);
 
 	return out;