X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffile_log.cc;h=5cc9c556942b4868de44a835ce305f2b0eebab12;hb=53d7976f1ff72d0aab97f93b37e9528db2fce3f4;hp=f6eaa58f8ebaf85b4e02630fee9ab869f91115c2;hpb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;p=dcpomatic.git

diff --git a/src/lib/file_log.cc b/src/lib/file_log.cc
index f6eaa58f8..5cc9c5569 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,16 +18,20 @@
 
 */
 
+
 #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)
@@ -36,19 +40,28 @@ FileLog::FileLog (boost::filesystem::path 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
 {
@@ -63,14 +76,14 @@ FileLog::head_and_tail (int amount) const
 		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];
+	auto buffer = new char[max(head_amount, tail_amount) + 1];
 
 	int N = fread (buffer, 1, head_amount, f);
 	buffer[N] = '\0';