Raise copyright years

[tofuproxy.git] / warc / record.go

diff --git a/warc/record.go b/warc/record.go
index 039850848e1548370f24ccac04a9cbc8c8ed25a3..e5dc633bcd1cedb91aad1f015791dce68bcd0ecb 100644 (file)
--- a/warc/record.go
+++ b/warc/record.go
@@ -1,7 +1,7 @@
 /*
 tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
              manager, WARC/geminispace browser
-Copyright (C) 2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2021-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ type SelfRecordReader struct {
 }
 
 func (srr *SelfRecordReader) Read(p []byte) (n int, err error) {
-       n, err = srr.rrr.Read(p)
+       n, err = srr.lr.Read(p)
        if err != nil {
                srr.Close()
        }
@@ -73,7 +73,11 @@ func (rec *Record) selfReader(noHdr bool, offsets []Offset) (*SelfRecordReader,
        if err != nil {
                return nil, err
        }
-       return &SelfRecordReader{lr: &io.LimitedReader{R: rrr, N: rec.Size}, rrr: rrr}, nil
+       size := rec.Size
+       if !noHdr {
+               size += int64(rec.HdrLen)
+       }
+       return &SelfRecordReader{lr: &io.LimitedReader{R: rrr, N: size}, rrr: rrr}, nil
 }
 
 type RecordReader struct {