redo-ifchange -f is not a common option

[goredo.git] / main.go

diff --git a/main.go b/main.go
index 0b893dac172389ca199dcc70a08a2358d88c502e..bfebadfcf5501ff9f7c547adbdb145bb4c298a3f 100644 (file)
--- a/main.go
+++ b/main.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
@@ -55,6 +55,7 @@ const (
        CmdNameRedoStamp    = "redo-stamp"
        CmdNameRedoTargets  = "redo-targets"
        CmdNameRedoWhichdo  = "redo-whichdo"
+       CmdNameRedoDepFix   = "redo-depfix"
 )
 
 var (
@@ -112,6 +113,7 @@ func main() {
                        CmdNameRedoAffects,
                        CmdNameRedoAlways,
                        CmdNameRedoCleanup,
+                       CmdNameRedoDepFix,
                        CmdNameRedoDot,
                        CmdNameRedoIfchange,
                        CmdNameRedoIfcreate,
@@ -138,10 +140,6 @@ func main() {
                log.Fatalln(err)
        }
 
-       NoColor = os.Getenv(EnvNoColor) != ""
-       NoSync = os.Getenv(EnvNoSync) == "1"
-       InodeTrust = os.Getenv(EnvInodeNoTrust) == ""
-
        TopDir = os.Getenv(EnvTopDir)
        if TopDir == "" {
                TopDir = "/"
@@ -198,6 +196,20 @@ func main() {
        } else if flagTrace != nil {
                traced = *flagTrace
        }
+       NoColor = os.Getenv(EnvNoColor) != ""
+       NoSync = os.Getenv(EnvNoSync) == "1"
+       StopIfMod = os.Getenv(EnvStopIfMod) == "1"
+       switch s := os.Getenv(EnvInodeTrust); s {
+       case "none":
+               InodeTrust = InodeTrustNone
+       case "", "ctime":
+               InodeTrust = InodeTrustCtime
+       case "mtime":
+               InodeTrust = InodeTrustMtime
+       default:
+               log.Fatalln("unknown", EnvInodeTrust, "value")
+       }
+       tracef(CDebug, "inode-trust: %s", InodeTrust)
 
        // Those are internal envs
        FdOODTgts, err = ioutil.TempFile("", "ood-tgts")
@@ -218,7 +230,11 @@ func main() {
        if v := os.Getenv(EnvOODTgtsFd); v != "" {
                fd := mustParseFd(v, EnvOODTgtsFd)
                fdLock := mustParseFd(v, EnvOODTgtsLockFd)
-               if err = unix.Flock(int(fdLock.Fd()), unix.LOCK_EX); err != nil {
+               flock := unix.Flock_t{
+                       Type:   unix.F_WRLCK,
+                       Whence: io.SeekStart,
+               }
+               if err = unix.FcntlFlock(fdLock.Fd(), unix.F_SETLKW, &flock); err != nil {
                        log.Fatalln(err)
                }
                if _, err = fd.Seek(0, io.SeekStart); err != nil {
@@ -228,7 +244,8 @@ func main() {
                if err != nil {
                        log.Fatalln(err)
                }
-               if err = unix.Flock(int(fdLock.Fd()), unix.LOCK_UN); err != nil {
+               flock.Type = unix.F_UNLCK
+               if err = unix.FcntlFlock(fdLock.Fd(), unix.F_SETLK, &flock); err != nil {
                        log.Fatalln(err)
                }
                OODTgts = map[string]struct{}{}
@@ -318,7 +335,7 @@ CmdSwitch:
                        }
                }
        case CmdNameRedoIfchange:
-               ok, err = ifchange(tgts, false, traced)
+               ok, err = ifchange(tgts, *flagForcedIfchange, traced)
                if err == nil {
                        err = depsWrite(fdDep, tgts)
                }
@@ -328,8 +345,8 @@ CmdSwitch:
                }
                for _, tgt := range tgts {
                        tgtRel, err := filepath.Rel(
-                               filepath.Join(Cwd, DirPrefix),
-                               filepath.Join(Cwd, tgt),
+                               path.Join(Cwd, DirPrefix),
+                               path.Join(Cwd, tgt),
                        )
                        if err != nil {
                                break
@@ -480,6 +497,8 @@ CmdSwitch:
                for _, src := range srcs {
                        fmt.Println(src)
                }
+       case CmdNameRedoDepFix:
+               err = depFix(Cwd)
        default:
                log.Fatalln("unknown command", cmdName)
        }