sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Make write_data use write_data_iov

Browse Source
This commit is contained in:
Volker Lendecke 2008-12-22 22:17:59 +01:00
parent 82a152fcf9
commit afd70855b7
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source3/lib/util_sock.c
View File

@ -707,37 +707,37 @@ ssize_t write_data_iov(int fd, const struct iovec *orig_iov, int iovcnt)
Write data to a fd.
****************************************************************************/
/****************************************************************************
Write data to a fd.
****************************************************************************/
ssize_t write_data(int fd, const char *buffer, size_t N)
{
size_t total=0;
ssize_t ret;
char addr[INET6_ADDRSTRLEN];
struct iovec iov;
while (total < N) {
ret = sys_write(fd,buffer + total,N - total);
iov.iov_base = CONST_DISCARD(char *, buffer);
iov.iov_len = N;
if (ret == -1) {
if (fd == get_client_fd()) {
/* Try and give an error message saying
* what client failed. */
DEBUG(0,("write_data: write failure in "
"writing to client %s. Error %s\n",
get_peer_addr(fd,addr,sizeof(addr)),
strerror(errno) ));
} else {
DEBUG(0,("write_data: write failure. "
"Error = %s\n", strerror(errno) ));
}
return -1;
}
if (ret == 0) {
return total;
}
total += ret;
ret = write_data_iov(fd, &iov, 1);
if (ret >= 0) {
return ret;
}
return (ssize_t)total;
if (fd == get_client_fd()) {
char addr[INET6_ADDRSTRLEN];
/*
* Try and give an error message saying what client failed.
*/
DEBUG(0, ("write_data: write failure in writing to client %s. "
"Error %s\n", get_peer_addr(fd,addr,sizeof(addr)),
strerror(errno)));
} else {
DEBUG(0,("write_data: write failure. Error = %s\n",
strerror(errno) ));
}
return -1;
}
/****************************************************************************