X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-bundle%2Fmain.go;h=52ce4f61fe0eb1016d8effa4118d68718033eff4;hb=712399b4547bd499528a20209d469b2eb1aaff28;hp=9911395b7c60daad5f3a26fc1682f19ebdb4ad27;hpb=9136be1f8cfcd1ab65eef07d7f4867eef85cb1c5;p=nncp.git

diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go
index 9911395..52ce4f6 100644
--- a/src/cmd/nncp-bundle/main.go
+++ b/src/cmd/nncp-bundle/main.go
@@ -187,7 +187,7 @@ func main() {
 					if err = os.Remove(job.Path); err != nil {
 						log.Fatalln("Error during deletion:", err)
 					} else if ctx.HdrUsage {
-						os.Remove(job.Path + nncp.HdrSuffix)
+						os.Remove(nncp.JobPath2Hdr(job.Path))
 					}
 				}
 				ctx.LogI(
@@ -376,7 +376,7 @@ func main() {
 					if !*dryRun {
 						os.Remove(dstPath)
 						if ctx.HdrUsage {
-							os.Remove(dstPath + nncp.HdrSuffix)
+							os.Remove(nncp.JobPath2Hdr(dstPath))
 						}
 					}
 				} else {
@@ -416,7 +416,9 @@ func main() {
 				})
 				continue
 			}
-			if _, err = os.Stat(dstPath + nncp.SeenSuffix); err == nil || !os.IsNotExist(err) {
+			if _, err = os.Stat(filepath.Join(
+				dstDirPath, nncp.SeenDir, pktName,
+			)); err == nil || !os.IsNotExist(err) {
 				ctx.LogD("bundle-rx-seen", les, func(les nncp.LEs) string {
 					return logMsg(les) + ": packet already seen"
 				})