projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up careful_string_filter and add some extra transliterations.
[dcpomatic.git]
/
src
/
lib
/
file_log.cc
diff --git
a/src/lib/file_log.cc
b/src/lib/file_log.cc
index 481624c2a865136f3cc3aac83b6dc64663efe661..adb06b7f04fb71f4f6e986cdd930ffdc1ba3b602 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,18
+18,22
@@
*/
*/
+
#include "file_log.h"
#include "cross.h"
#include "config.h"
#include "file_log.h"
#include "cross.h"
#include "config.h"
+#include <dcp/file.h>
#include <cstdio>
#include <iostream>
#include <cerrno>
#include <cstdio>
#include <iostream>
#include <cerrno>
+
using std::cout;
using std::string;
using std::max;
using std::shared_ptr;
using std::cout;
using std::string;
using std::max;
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)
@@
-37,25
+41,27
@@
FileLog::FileLog (boost::filesystem::path file)
set_types (Config::instance()->log_types());
}
set_types (Config::instance()->log_types());
}
+
FileLog::FileLog (boost::filesystem::path file, int types)
: _file (file)
{
set_types (types);
}
FileLog::FileLog (boost::filesystem::path file, int types)
: _file (file)
{
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");
+
dcp::File f
(_file, "a");
if (!f) {
cout << "(could not log to " << _file.string() << " error " << errno << "): " << entry->get() << "\n";
return;
}
if (!f) {
cout << "(could not log to " << _file.string() << " error " << errno << "): " << entry->get() << "\n";
return;
}
- fprintf (f, "%s\n", entry->get().c_str ());
- fclose (f);
+ fprintf(f.get(), "%s\n", entry->get().c_str());
}
}
+
string
FileLog::head_and_tail (int amount) const
{
string
FileLog::head_and_tail (int amount) const
{
@@
-63,38
+69,39
@@
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");
+
dcp::File f
(_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 = f
read (buffer, 1, head_amount, f
);
+ int N = f
.read(buffer.data(), 1, head_amount
);
buffer[N] = '\0';
buffer[N] = '\0';
- out += string (buffer);
+ out += string (buffer
.data()
);
if (tail_amount > 0) {
out += "\n .\n .\n .\n";
if (tail_amount > 0) {
out += "\n .\n .\n .\n";
- f
seek (f,
- tail_amount - 1, SEEK_END);
+ f
.seek(
- tail_amount - 1, SEEK_END);
- N = f
read (buffer, 1, tail_amount, f
);
+ N = f
.read(buffer.data(), 1, tail_amount
);
buffer[N] = '\0';
buffer[N] = '\0';
- out += string
(buffer
) + "\n";
+ out += string
(buffer.data()
) + "\n";
}
}
- delete[] buffer;
- fclose (f);
-
return out;
}
return out;
}