Operations progress

[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 765ed4942660655fe8c252cafcd0bbe3548446e8..31c04921881c0e7c739877e19b0c2b2a5a15d73c 100644 (file)
--- a/src/cmd/nncp-rm/main.go
+++ b/src/cmd/nncp-rm/main.go
@@ -70,23 +70,25 @@ func main() {
                return
        }
 
-       ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, "", *quiet, *debug)
+       ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, "", *quiet, false, false, *debug)
        if err != nil {
                log.Fatalln("Error during initialization:", err)
        }
        ctx.Umask()
 
        if *doTmp {
-               err = filepath.Walk(filepath.Join(ctx.Spool, "tmp"), func(path string, info os.FileInfo, err error) error {
-                       if err != nil {
-                               return err
-                       }
-                       if info.IsDir() {
-                               return nil
-                       }
-                       ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
-                       return os.Remove(path)
-               })
+               err = filepath.Walk(
+                       filepath.Join(ctx.Spool, "tmp"),
+                       func(path string, info os.FileInfo, err error) error {
+                               if err != nil {
+                                       return err
+                               }
+                               if info.IsDir() {
+                                       return nil
+                               }
+                               ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
+                               return os.Remove(path)
+                       })
                if err != nil {
                        log.Fatalln("Error during walking:", err)
                }
@@ -120,34 +122,36 @@ func main() {
                log.Fatalln("Invalid -node specified:", err)
        }
        remove := func(xx nncp.TRxTx) error {
-               return filepath.Walk(filepath.Join(ctx.Spool, node.Id.String(), string(xx)), func(path string, info os.FileInfo, err error) error {
-                       if err != nil {
-                               return err
-                       }
-                       if info.IsDir() {
+               return filepath.Walk(
+                       filepath.Join(ctx.Spool, node.Id.String(), string(xx)),
+                       func(path string, info os.FileInfo, err error) error {
+                               if err != nil {
+                                       return err
+                               }
+                               if info.IsDir() {
+                                       return nil
+                               }
+                               if *doSeen && strings.HasSuffix(info.Name(), nncp.SeenSuffix) {
+                                       ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
+                                       return os.Remove(path)
+                               }
+                               if *doPart && strings.HasSuffix(info.Name(), nncp.PartSuffix) {
+                                       ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
+                                       return os.Remove(path)
+                               }
+                               if *pktRaw != "" && filepath.Base(info.Name()) == *pktRaw {
+                                       ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
+                                       return os.Remove(path)
+                               }
+                               if !*doSeen &&
+                                       !*doPart &&
+                                       (*doRx || *doTx) &&
+                                       ((*doRx && xx == nncp.TRx) || (*doTx && xx == nncp.TTx)) {
+                                       ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
+                                       return os.Remove(path)
+                               }
                                return nil
-                       }
-                       if *doSeen && strings.HasSuffix(info.Name(), nncp.SeenSuffix) {
-                               ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
-                               return os.Remove(path)
-                       }
-                       if *doPart && strings.HasSuffix(info.Name(), nncp.PartSuffix) {
-                               ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
-                               return os.Remove(path)
-                       }
-                       if *pktRaw != "" && filepath.Base(info.Name()) == *pktRaw {
-                               ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
-                               return os.Remove(path)
-                       }
-                       if !*doSeen &&
-                               !*doPart &&
-                               (*doRx || *doTx) &&
-                               ((*doRx && xx == nncp.TRx) || (*doTx && xx == nncp.TTx)) {
-                               ctx.LogI("nncp-rm", nncp.SDS{"file": path}, "")
-                               return os.Remove(path)
-                       }
-                       return nil
-               })
+                       })
        }
        if *pktRaw != "" || *doRx || *doSeen || *doPart {
                if err = remove(nncp.TRx); err != nil {