Intermediate .nock packets step

[nncp.git] / src / cmd / nncp-rm / main.go

diff --git a/src/cmd/nncp-rm/main.go b/src/cmd/nncp-rm/main.go
index d5609e609514a5ce76d2dea516ab766deb0e6957..0802f51dcebc99ac06bd96301dcb243976039d31 100644 (file)
--- a/src/cmd/nncp-rm/main.go
+++ b/src/cmd/nncp-rm/main.go
@@ -39,6 +39,7 @@ func usage() {
        fmt.Fprintf(os.Stderr, "       %s [options] -lock\n", os.Args[0])
        fmt.Fprintf(os.Stderr, "       %s [options] -node NODE -part\n", os.Args[0])
        fmt.Fprintf(os.Stderr, "       %s [options] -node NODE -seen\n", os.Args[0])
+       fmt.Fprintf(os.Stderr, "       %s [options] -node NODE -nock\n", os.Args[0])
        fmt.Fprintf(os.Stderr, "       %s [options] -node NODE {-rx|-tx}\n", os.Args[0])
        fmt.Fprintf(os.Stderr, "       %s [options] -node NODE -pkt PKT\n", os.Args[0])
        fmt.Fprintln(os.Stderr, "-older option's time units are: (s)econds, (m)inutes, (h)ours, (d)ays")
@@ -56,6 +57,7 @@ func main() {
                doTx      = flag.Bool("tx", false, "Process transfered packets")
                doPart    = flag.Bool("part", false, "Remove only .part files")
                doSeen    = flag.Bool("seen", false, "Remove only .seen files")
+               doNoCK    = flag.Bool("nock", false, "Remove only .nock files")
                older     = flag.String("older", "", "XXX{smhd}: only older than XXX number of time units")
                dryRun    = flag.Bool("dryrun", false, "Do not actually remove files")
                pktRaw    = flag.String("pkt", "", "Packet to remove")
@@ -183,6 +185,13 @@ func main() {
                                        }
                                        return os.Remove(path)
                                }
+                               if *doNoCK && strings.HasSuffix(info.Name(), nncp.NoCKSuffix) {
+                                       ctx.LogI("nncp-rm", nncp.LEs{{K: "File", V: path}}, "")
+                                       if *dryRun {
+                                               return nil
+                                       }
+                                       return os.Remove(path)
+                               }
                                if *doPart && strings.HasSuffix(info.Name(), nncp.PartSuffix) {
                                        ctx.LogI("nncp-rm", nncp.LEs{{K: "File", V: path}}, "")
                                        if *dryRun {
@@ -198,6 +207,7 @@ func main() {
                                        return os.Remove(path)
                                }
                                if !*doSeen &&
+                                       !*doNoCK &&
                                        !*doPart &&
                                        (*doRx || *doTx) &&
                                        ((*doRx && xx == nncp.TRx) || (*doTx && xx == nncp.TTx)) {
@@ -210,7 +220,7 @@ func main() {
                                return nil
                        })
        }
-       if *pktRaw != "" || *doRx || *doSeen || *doPart {
+       if *pktRaw != "" || *doRx || *doSeen || *doNoCK || *doPart {
                if err = remove(nncp.TRx); err != nil {
                        log.Fatalln("Can not remove:", err)
                }