From 7472b754bf406f5972d1ff74b44df5ae7f2b64f0 Mon Sep 17 00:00:00 2001 From: Andreas Baulig Date: Wed, 18 Aug 2021 20:55:44 +0000 Subject: [PATCH 1/3] Fix wrong seconds to milliseconds conversion --- rescuesdriq/rescuesdriq.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rescuesdriq/rescuesdriq.go b/rescuesdriq/rescuesdriq.go index 07c616844..7bcc86e0b 100644 --- a/rescuesdriq/rescuesdriq.go +++ b/rescuesdriq/rescuesdriq.go @@ -161,7 +161,7 @@ func main() { } else if *timeNow { headerOrigin.StartTimestamp = int64(time.Now().UnixNano() / int64(time.Millisecond)) } else if !*assumeMilliseconds { - headerOrigin.StartTimestamp = headerOrigin.StartTimestamp * (int64(time.Millisecond) / int64(time.Second)) + headerOrigin.StartTimestamp = headerOrigin.StartTimestamp * (int64(time.Second) / int64(time.Millisecond)) } fmt.Println("\nHeader is now") From d158c2776e2761ad5c67cc4088b126f519ffad64 Mon Sep 17 00:00:00 2001 From: Andreas Baulig Date: Wed, 18 Aug 2021 20:56:32 +0000 Subject: [PATCH 2/3] Fix writing miscellaneous bytes after EOF --- rescuesdriq/rescuesdriq.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/rescuesdriq/rescuesdriq.go b/rescuesdriq/rescuesdriq.go index 7bcc86e0b..39b3b86d0 100644 --- a/rescuesdriq/rescuesdriq.go +++ b/rescuesdriq/rescuesdriq.go @@ -84,18 +84,15 @@ func copyContent(reader *bufio.Reader, writer *bufio.Writer, blockSize uint) { for { n, err := reader.Read(p) - if err != nil { + if err == nil || err == io.EOF { + writer.Write(p[0:n]) + sz += int64(n) if err == io.EOF { - writer.Write(p[0:n]) - sz += int64(n) - break - } else { - fmt.Println("An error occurred during content copy. Aborting") break } } else { - writer.Write(p) - sz += int64(blockSize) * 4096 + fmt.Println("An error occurred during content copy. Aborting") + break } fmt.Printf("Wrote %d bytes\r", sz) From fa66bf0160e6eb32b50e14fd8d80eaef58867eb2 Mon Sep 17 00:00:00 2001 From: Andreas Baulig Date: Wed, 18 Aug 2021 21:01:12 +0000 Subject: [PATCH 3/3] Perform sec to msec upconversion before first printout --- rescuesdriq/rescuesdriq.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rescuesdriq/rescuesdriq.go b/rescuesdriq/rescuesdriq.go index 39b3b86d0..e7a286e8c 100644 --- a/rescuesdriq/rescuesdriq.go +++ b/rescuesdriq/rescuesdriq.go @@ -130,6 +130,11 @@ func main() { // make a read buffer reader := bufio.NewReader(fi) var headerOrigin HeaderStd = analyze(reader) + + if !*assumeMilliseconds { + headerOrigin.StartTimestamp = headerOrigin.StartTimestamp * (int64(time.Second) / int64(time.Millisecond)) + } + printHeader(&headerOrigin) if flagSeen["out"] { @@ -157,8 +162,6 @@ func main() { } } else if *timeNow { headerOrigin.StartTimestamp = int64(time.Now().UnixNano() / int64(time.Millisecond)) - } else if !*assumeMilliseconds { - headerOrigin.StartTimestamp = headerOrigin.StartTimestamp * (int64(time.Second) / int64(time.Millisecond)) } fmt.Println("\nHeader is now")