X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-xfer%2Fmain.go;h=a1ef5fa5d51c438179b33450f7876352d62d5242;hb=2cad23b498bbb9fc1e929b4900b40e520017c614;hp=41e8c61c8e157f087d9fa5096990d92231bf316d;hpb=48a641aeb2476f7dabb5cd4977108a4788e78f24;p=nncp.git

diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go
index 41e8c61..a1ef5fa 100644
--- a/src/cmd/nncp-xfer/main.go
+++ b/src/cmd/nncp-xfer/main.go
@@ -266,7 +266,7 @@ func main() {
 				fd.Close()
 				continue
 			}
-			if _, err = fd.Seek(0, 0); err != nil {
+			if _, err = fd.Seek(0, io.SeekStart); err != nil {
 				log.Fatalln(err)
 			}
 			tmp, err := ctx.NewTmpFileWHash()
@@ -284,7 +284,7 @@ func main() {
 					w.CloseWithError(err)
 				}
 			}()
-			if _, err = nncp.CopyProgressed(
+			_, err = nncp.CopyProgressed(
 				tmp.W, r, "Rx",
 				append(
 					les,
@@ -292,13 +292,24 @@ func main() {
 					nncp.LE{K: "FullSize", V: fiInt.Size()},
 				),
 				ctx.ShowPrgrs,
-			); err != nil {
+			)
+			fd.Close()
+			if err != nil {
 				ctx.LogE("xfer-rx", les, err, logMsg)
+				tmp.Cancel()
 				isBad = true
+				continue
 			}
-			fd.Close()
-			if isBad {
+			if err = tmp.W.Flush(); err != nil {
+				ctx.LogE("xfer-rx", les, err, logMsg)
+				tmp.Cancel()
+				isBad = true
+				continue
+			}
+			if tmp.Checksum() != fiInt.Name() {
+				ctx.LogE("xfer-rx", les, errors.New("checksum mismatch"), logMsg)
 				tmp.Cancel()
+				isBad = true
 				continue
 			}
 			if err = tmp.Commit(filepath.Join(
@@ -477,13 +488,15 @@ Tx:
 				isBad = true
 				continue
 			}
-			if err = tmp.Sync(); err != nil {
-				tmp.Close()
-				ctx.LogE("xfer-tx-sync", les, err, func(les nncp.LEs) string {
-					return logMsg(les) + ": syncing"
-				})
-				isBad = true
-				continue
+			if !nncp.NoSync {
+				if err = tmp.Sync(); err != nil {
+					tmp.Close()
+					ctx.LogE("xfer-tx-sync", les, err, func(les nncp.LEs) string {
+						return logMsg(les) + ": syncing"
+					})
+					isBad = true
+					continue
+				}
 			}
 			if err = tmp.Close(); err != nil {
 				ctx.LogE("xfer-tx-close", les, err, func(les nncp.LEs) string {