projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace some raw arrays with std::vectors.
[dcpomatic.git]
/
src
/
lib
/
file_log.cc
diff --git
a/src/lib/file_log.cc
b/src/lib/file_log.cc
index be532c10fb648adab268b13c6d3c2401b5d72aae..a9522bad507dc722033074c9a5abd45c7770dcf5 100644
(file)
--- 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.
This file is part of DCP-o-matic.
@@
-18,44
+18,50
@@
*/
*/
+
#include "file_log.h"
#include "cross.h"
#include "config.h"
#include <cstdio>
#include <iostream>
#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 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)
{
/** @param file Filename to write log to */
FileLog::FileLog (boost::filesystem::path file)
: _file (file)
{
- _config_connection = Config::instance()->Changed.connect (boost::bind (&FileLog::config_changed, this));
- config_changed ();
+ set_types (Config::instance()->log_types());
}
}
-void
-FileLog::config_changed ()
+
+FileLog::FileLog (boost::filesystem::path file, int types)
+ : _file (file)
{
{
- set_types (
Config::instance()->log_types ()
);
+ set_types (
types
);
}
}
+
void
FileLog::do_log (shared_ptr<const LogEntry> entry)
{
void
FileLog::do_log (shared_ptr<const LogEntry> entry)
{
-
FILE*
f = fopen_boost (_file, "a");
+
auto
f = fopen_boost (_file, "a");
if (!f) {
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;
}
return;
}
- fprintf (f, "%s\n", entry->get().c_str
());
+ fprintf (f, "%s\n", entry->get().c_str());
fclose (f);
}
fclose (f);
}
+
string
FileLog::head_and_tail (int amount) const
{
string
FileLog::head_and_tail (int amount) const
{
@@
-63,37
+69,40
@@
FileLog::head_and_tail (int amount) const
uintmax_t head_amount = amount;
uintmax_t tail_amount = amount;
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;
}
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;
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';
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);
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';
buffer[N] = '\0';
- out += string (buffer) + "\n";
+ out += string (buffer
.data()
) + "\n";
}
}
- delete[] buffer;
fclose (f);
return out;
fclose (f);
return out;