commit 86b781c179911d609bd0e3cfa3992f510cd56413
author Damien Miller <djm@mindrot.org> Fri Jan 10 21:44:48 2003 +1100
committer Damien Miller <djm@mindrot.org> Fri Jan 10 21:44:48 2003 +1100
tree 1393ce990884738c92b908dda0b016332c5fa868
parent a7f3aaadc30b1533def73449081263a5d42d4aa4

   - djm@cvs.openbsd.org 2003/01/10 10:29:35
     [scp.c]
     Don't ftruncate after write error, creating sparse files of
     incorrect length
     mindrot bug #403, reported by rusr@cup.hp.com; ok markus@

scp.c

diff --git a/scp.c b/scp.c
index 44b5b45..616dd37 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.97 2003/01/10 08:19:07 fgsch Exp $");
+RCSID("$OpenBSD: scp.c,v 1.98 2003/01/10 10:29:35 djm Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -864,7 +864,7 @@
 			wrerr = YES;
 			wrerrno = j >= 0 ? EIO : errno;
 		}
-		if (ftruncate(ofd, size)) {
+		if (wrerr == NO && ftruncate(ofd, size) != 0) {
 			run_err("%s: truncate: %s", np, strerror(errno));
 			wrerr = DISPLAYED;
 		}