- djm@cvs.openbsd.org 2007/01/22 11:32:50

     [sftp-client.c]
     return error from do_upload() when a write fails. fixes bz#1252: zero
     exit status from sftp when uploading to a full device. report from
     jirkat AT atlas.cz; ok dtucker@

diff --git a/ChangeLog b/ChangeLog
index 77d5ddec0b43c3953f166812fe8d57c48062a546..b3e9f3862760ba3478cc964cd6ab3e7971e6d997 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,11 @@
    - stevesk@cvs.openbsd.org 2007/01/21 01:45:35
      [readconf.c]
      spaces
+   - djm@cvs.openbsd.org 2007/01/22 11:32:50
+     [sftp-client.c]
+     return error from do_upload() when a write fails. fixes bz#1252: zero
+     exit status from sftp when uploading to a full device. report from
+     jirkat AT atlas.cz; ok dtucker@
 
 20070128
  - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52)

diff --git a/sftp-client.c b/sftp-client.c
index 42eb2b41bfce2ddf31224f98502c93a9cf15609e..2746f32457a992db712476ad8966d11ab67ee64a 100644 (file)
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.75 2006/10/22 02:25:50 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.76 2007/01/22 11:32:50 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1140,6 +1140,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
                                close(local_fd);
                                xfree(data);
                                xfree(ack);
+                               status = -1;
                                goto done;
                        }
                        debug3("In write loop, ack for %u %u bytes at %llu",