summaryrefslogtreecommitdiff
path: root/sftp-server.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-07-17 03:51:32 +0000
committerDamien Miller <djm@mindrot.org>2020-07-17 13:52:46 +1000
commit287dc6396e0f9cb2393f901816dbd7f2a7dfbb5f (patch)
tree316c54cad2d199539429f71b94a087e9982f35e1 /sftp-server.c
parent8df5774a42d2eaffe057bd7f293fc6a4b1aa411c (diff)
upstream: log error message for process_write() write failures
OpenBSD-Commit-ID: f733d7b3b05e3c68967dc18dfe39b9e8fad29851
Diffstat (limited to 'sftp-server.c')
-rw-r--r--sftp-server.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sftp-server.c b/sftp-server.c
index b1d8c88cb..55386fa9a 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.118 2020/06/22 05:52:05 djm Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.119 2020/07/17 03:51:32 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
4 * 4 *
@@ -799,18 +799,19 @@ process_write(u_int32_t id)
799 if (!(handle_to_flags(handle) & O_APPEND) && 799 if (!(handle_to_flags(handle) & O_APPEND) &&
800 lseek(fd, off, SEEK_SET) == -1) { 800 lseek(fd, off, SEEK_SET) == -1) {
801 status = errno_to_portable(errno); 801 status = errno_to_portable(errno);
802 error("process_write: seek failed"); 802 error("%s: seek failed", __func__);
803 } else { 803 } else {
804/* XXX ATOMICIO ? */ 804/* XXX ATOMICIO ? */
805 ret = write(fd, data, len); 805 ret = write(fd, data, len);
806 if (ret == -1) { 806 if (ret == -1) {
807 error("process_write: write failed"); 807 error("%s: write: %s", __func__,
808 strerror(errno));
808 status = errno_to_portable(errno); 809 status = errno_to_portable(errno);
809 } else if ((size_t)ret == len) { 810 } else if ((size_t)ret == len) {
810 status = SSH2_FX_OK; 811 status = SSH2_FX_OK;
811 handle_update_write(handle, ret); 812 handle_update_write(handle, ret);
812 } else { 813 } else {
813 debug2("nothing at all written"); 814 debug2("%s: nothing at all written", __func__);
814 status = SSH2_FX_FAILURE; 815 status = SSH2_FX_FAILURE;
815 } 816 }
816 } 817 }