[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-555-g710948c
Tim Prouty
tprouty at samba.org
Wed Mar 18 23:52:55 GMT 2009
The branch, master has been updated
via 710948c7885b228afe5e1b3bed005f50c57d519b (commit)
from f942cb616e981e5370fab122969127de0910b58b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 710948c7885b228afe5e1b3bed005f50c57d519b
Author: Tim Prouty <tprouty at samba.org>
Date: Wed Mar 18 21:49:50 2009 +0000
s3 onefs: Correctly error out when the read returns EOF
Also add some more debugging.
-----------------------------------------------------------------------
Summary of changes:
source3/modules/onefs_system.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c
index b8b059b..46f3826 100644
--- a/source3/modules/onefs_system.c
+++ b/source3/modules/onefs_system.c
@@ -591,8 +591,8 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T offset,
*/
while (total_rbytes < count) {
- DEBUG(0, ("shallow recvfile, reading %llu\n",
- count - total_rbytes));
+ DEBUG(0, ("shallow recvfile (%s), reading %llu\n",
+ strerror(errno), count - total_rbytes));
/*
* Read the remaining data into the spill buffer. recvfile
@@ -603,9 +603,13 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T offset,
spill_buffer + (total_rbytes - total_wbytes),
count - total_rbytes);
- if (ret == -1) {
- DEBUG(0, ("shallow recvfile read failed: %s\n",
- strerror(errno)));
+ if (ret <= 0) {
+ if (ret == 0) {
+ DEBUG(0, ("shallow recvfile read: EOF\n"));
+ } else {
+ DEBUG(0, ("shallow recvfile read failed: %s\n",
+ strerror(errno)));
+ }
/* Socket is dead, so treat as if it were drained. */
socket_drained = true;
goto out;
--
Samba Shared Repository
More information about the samba-cvs
mailing list