Collision resistant .log-rec extension

diff --git a/buildlog.go b/buildlog.go
index 0564beda167552d9764e47cd979b142892fb572e..fc12ac78e894b24697729933f0ae0a930701ea0f 100644 (file)
--- a/buildlog.go
+++ b/buildlog.go
@@ -76,7 +76,7 @@ func init() {
 }
 
 func parseBuildLogRec(dir, tgt string) (map[string][]string, error) {
-       fd, err := os.Open(path.Join(dir, RedoDir, tgt+LogSuffix+DepSuffix))
+       fd, err := os.Open(path.Join(dir, RedoDir, tgt+LogRecSuffix))
        if err != nil {
                return nil, err
        }

diff --git a/cleanup.go b/cleanup.go
index dff0ee0a64fb217bbe03a9bc465388fbd187c147..8c757aeebcf4c58d2b1e96ba5e93fa10e0c4b271 100644 (file)
--- a/cleanup.go
+++ b/cleanup.go
@@ -66,7 +66,7 @@ func redoDirClean(root, what string) error {
                        switch what {
                        case CleanupLog:
                                if strings.HasSuffix(fi.Name(), LogSuffix) ||
-                                       strings.HasSuffix(fi.Name(), LogSuffix+DepSuffix) {
+                                       strings.HasSuffix(fi.Name(), LogRecSuffix) {
                                        fmt.Println(pth)
                                        if !*DryRun {
                                                if err = os.Remove(pth); err != nil {

diff --git a/doc/news.texi b/doc/news.texi
index b00f197ac580138ac38c09bcb73970be6520d51c..650c12c0968d5e814068d91670f61de14178cfe1 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -1,6 +1,15 @@
 @node News
 @unnumbered News
 
+@anchor{Release 1_13_0}
+@section Release 1.13.0
+@itemize
+@item
+    Use @file{.log-rec} extension, instead of @file{.log.rec}, that
+    won't collide with already existing @file{.log} and @file{.rec} in
+    @file{.redo} directory.
+@end itemize
+
 @anchor{Release 1_12_0}
 @section Release 1.12.0
 @itemize

diff --git a/run.go b/run.go
index 1d1138b0287f07460afbdd0cf54dc6a9aceae08b..ca8eebbcd9ca542dd7c9f31e77dfaca18eb4b7de 100644 (file)
--- a/run.go
+++ b/run.go
@@ -52,11 +52,12 @@ const (
        EnvStderrSilent = "REDO_SILENT"
        EnvNoSync       = "REDO_NO_SYNC"
 
-       RedoDir    = ".redo"
-       LockSuffix = ".lock"
-       DepSuffix  = ".rec"
-       TmpPrefix  = ".redo."
-       LogSuffix  = ".log"
+       RedoDir      = ".redo"
+       LockSuffix   = ".lock"
+       DepSuffix    = ".rec"
+       TmpPrefix    = ".redo."
+       LogSuffix    = ".log"
+       LogRecSuffix = ".log-rec"
 )
 
 var (
@@ -447,7 +448,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                        fdStdout.Close()
                        if fdStderr != nil {
                                fdStderr.Close()
-                               logRecPath := path.Join(redoDir, tgt+LogSuffix+DepSuffix)
+                               logRecPath := path.Join(redoDir, tgt+LogRecSuffix)
                                if fdStderr, err = os.OpenFile(
                                        logRecPath,
                                        os.O_WRONLY|os.O_CREATE|os.O_TRUNC,

diff --git a/usage.go b/usage.go
index 38ebb38f4e7136d0c666f4fe57400de14685e4f6..c002eeb2ad1589663c40a4611a53e309e0fa80b5 100644 (file)
--- a/usage.go
+++ b/usage.go
@@ -24,7 +24,7 @@ import (
 )
 
 const (
-       Version  = "1.12.0"
+       Version  = "1.13.0"
        Warranty = `Copyright (C) 2020-2021 Sergey Matveev
 
 This program is free software: you can redistribute it and/or modify