Fix lack of .redo-prefix in temporary files

[goredo.git] / cleanup.go

diff --git a/cleanup.go b/cleanup.go
index 8c757aeebcf4c58d2b1e96ba5e93fa10e0c4b271..d25aa3de02e91b31aabf7b758564f3de739eb244 100644 (file)
--- a/cleanup.go
+++ b/cleanup.go
@@ -1,6 +1,6 @@
 /*
 goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2020-2022 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
@@ -52,6 +52,7 @@ func redoDirClean(root, what string) error {
        if err != nil {
                return err
        }
+       defer dir.Close()
        for {
                fis, err := dir.Readdir(1 << 10)
                if err != nil {
@@ -88,7 +89,7 @@ func redoDirClean(root, what string) error {
                        }
                }
        }
-       return dir.Close()
+       return nil
 }
 
 func cleanupWalker(root, what string) error {
@@ -122,6 +123,12 @@ func cleanupWalker(root, what string) error {
                                        } else {
                                                err = redoDirClean(pth, what)
                                        }
+                               } else if (what == CleanupTmp || what == CleanupFull) &&
+                                       strings.HasPrefix(fi.Name(), TmpPrefix) {
+                                       fmt.Println(pthRel)
+                                       if !*DryRun {
+                                               err = os.RemoveAll(pth)
+                                       }
                                } else {
                                        err = cleanupWalker(pth, what)
                                }
@@ -141,5 +148,5 @@ func cleanupWalker(root, what string) error {
                        }
                }
        }
-       return dir.Close()
+       return nil
 }