X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=cleanup.go;h=efc2e97e9f5956b4fe16b0c3465141a7349479b3;hb=refs%2Fheads%2Fmaster;hp=dff0ee0a64fb217bbe03a9bc465388fbd187c147;hpb=368922086630cdcf1980d372006eb4bf6b459d5a;p=goredo.git

diff --git a/cleanup.go b/cleanup.go
index dff0ee0..efc2e97 100644
--- a/cleanup.go
+++ b/cleanup.go
@@ -1,19 +1,17 @@
-/*
-goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2021 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
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// goredo -- djb's redo implementation on pure Go
+// Copyright (C) 2020-2024 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
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
@@ -24,7 +22,6 @@ import (
 	"log"
 	"os"
 	"path"
-	"path/filepath"
 	"strings"
 )
 
@@ -32,6 +29,7 @@ const (
 	CleanupFull = "full"
 	CleanupLog  = "log"
 	CleanupTmp  = "tmp"
+	CleanupLock = "lock"
 )
 
 var DryRun *bool
@@ -44,84 +42,94 @@ func init() {
 }
 
 func redoDirClean(root, what string) error {
-	root, err := filepath.Abs(root)
-	if err != nil {
-		panic(err)
-	}
+	root = mustAbs(root)
 	dir, err := os.Open(root)
 	if err != nil {
-		return err
+		return ErrLine(err)
 	}
+	defer dir.Close()
 	for {
-		fis, err := dir.Readdir(1 << 10)
+		entries, err := dir.ReadDir(1 << 10)
 		if err != nil {
 			if err == io.EOF {
 				break
 			}
-			return err
+			return ErrLine(err)
 		}
 		var pth string
-		for _, fi := range fis {
-			pth = cwdMustRel(root, fi.Name())
+		for _, entry := range entries {
+			pth = cwdMustRel(root, entry.Name())
 			switch what {
 			case CleanupLog:
-				if strings.HasSuffix(fi.Name(), LogSuffix) ||
-					strings.HasSuffix(fi.Name(), LogSuffix+DepSuffix) {
+				if strings.HasSuffix(entry.Name(), LogSuffix) ||
+					strings.HasSuffix(entry.Name(), LogRecSuffix) {
+					fmt.Println(pth)
+					if !*DryRun {
+						if err = os.Remove(pth); err != nil {
+							return ErrLine(err)
+						}
+					}
+				}
+			case CleanupLock:
+				if strings.HasSuffix(entry.Name(), LockSuffix) {
 					fmt.Println(pth)
 					if !*DryRun {
 						if err = os.Remove(pth); err != nil {
-							return err
+							return ErrLine(err)
 						}
 					}
 				}
 			case CleanupTmp:
-				if strings.HasPrefix(fi.Name(), TmpPrefix) {
+				if strings.HasPrefix(entry.Name(), TmpPrefix) {
 					fmt.Println(pth)
 					if !*DryRun {
 						if err = os.Remove(pth); err != nil {
-							return err
+							return ErrLine(err)
 						}
 					}
 				}
 			default:
-				log.Fatalln("unknown cleanup target")
+				log.Fatal("unknown cleanup target")
 			}
 		}
 	}
-	return dir.Close()
+	return nil
 }
 
 func cleanupWalker(root, what string) error {
-	root, err := filepath.Abs(root)
-	if err != nil {
-		panic(err)
-	}
+	root = mustAbs(root)
 	dir, err := os.Open(root)
 	if err != nil {
-		return err
+		return ErrLine(err)
 	}
 	defer dir.Close()
 	for {
-		fis, err := dir.Readdir(1 << 10)
+		entries, err := dir.ReadDir(1 << 10)
 		if err != nil {
 			if err == io.EOF {
 				break
 			}
-			return err
+			return ErrLine(err)
 		}
-		for _, fi := range fis {
-			pth := path.Join(root, fi.Name())
-			pthRel := cwdMustRel(root, fi.Name())
-			if fi.IsDir() {
-				if fi.Name() == RedoDir {
+		for _, entry := range entries {
+			pth := path.Join(root, entry.Name())
+			pthRel := cwdMustRel(root, entry.Name())
+			if entry.IsDir() {
+				if entry.Name() == RedoDir {
 					if what == CleanupFull {
 						fmt.Println(pthRel)
 						if !*DryRun {
-							err = os.RemoveAll(pth)
+							err = ErrLine(os.RemoveAll(pth))
 						}
 					} else {
 						err = redoDirClean(pth, what)
 					}
+				} else if (what == CleanupTmp || what == CleanupFull) &&
+					strings.HasPrefix(entry.Name(), TmpPrefix) {
+					fmt.Println(pthRel)
+					if !*DryRun {
+						err = ErrLine(os.RemoveAll(pth))
+					}
 				} else {
 					err = cleanupWalker(pth, what)
 				}
@@ -131,15 +139,15 @@ func cleanupWalker(root, what string) error {
 				continue
 			}
 			if (what == CleanupTmp || what == CleanupFull) &&
-				strings.HasPrefix(fi.Name(), TmpPrefix) {
+				strings.HasPrefix(entry.Name(), TmpPrefix) {
 				fmt.Println(pthRel)
 				if !*DryRun {
 					if err = os.Remove(pth); err != nil {
-						return err
+						return ErrLine(err)
 					}
 				}
 			}
 		}
 	}
-	return dir.Close()
+	return nil
 }