Fix log head/tail functions.

[dcpomatic.git] / src / lib / log.cc

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 156f8cf8bb3bc38e2c0964dfd19c243b095f802f..934664915b0e5d9d4608a2e81276315ba7553544 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -124,12 +124,12 @@ FileLog::do_log (string m)
 }
 
 string
-FileLog::head_and_tail () const
+FileLog::head_and_tail (int amount) const
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       uintmax_t head_amount = 1024;
-       uintmax_t tail_amount = 1024;
+       uintmax_t head_amount = amount;
+       uintmax_t tail_amount = amount;
        uintmax_t size = boost::filesystem::file_size (_file);
 
        if (size < (head_amount + tail_amount)) {
@@ -148,16 +148,19 @@ FileLog::head_and_tail () const
        
        int N = fread (buffer, 1, head_amount, f);
        buffer[N] = '\0';
-       out += buffer;
+       out += string (buffer);
 
-       fseek (f, tail_amount, SEEK_END);
-       
-       N = fread (buffer, 1, tail_amount, f);
-       buffer[N] = '\0';
-       out += buffer;
+       if (tail_amount > 0) {
+               out +=  "\n.\n.\n.\n";
 
-       delete[] buffer;
+               fseek (f, - tail_amount - 1, SEEK_END);
+               
+               N = fread (buffer, 1, tail_amount, f);
+               buffer[N] = '\0';
+               out += string (buffer) + "\n";
+       }
 
+       delete[] buffer;
        fclose (f);
 
        return out;