mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
Merge of transfer file code from 2.2, fix for readbraw.
Jeremy.
This commit is contained in:
Jeremy Allison
@ -68,8 +68,8 @@ struct vfs_ops {
|
||||
|
||||
int (*open)(struct connection_struct *conn, const char *fname, int flags, mode_t mode);
|
||||
int (*close)(struct files_struct *fsp, int fd);
|
||||
ssize_t (*read)(struct files_struct *fsp, int fd, char *data, size_t n);
|
||||
ssize_t (*write)(struct files_struct *fsp, int fd, const char *data, size_t n);
|
||||
ssize_t (*read)(struct files_struct *fsp, int fd, void *data, size_t n);
|
||||
ssize_t (*write)(struct files_struct *fsp, int fd, const void *data, size_t n);
|
||||
SMB_OFF_T (*lseek)(struct files_struct *fsp, int filedes, SMB_OFF_T offset, int whence);
|
||||
int (*rename)(struct connection_struct *conn, const char *old, const char *new);
|
||||
int (*fsync)(struct files_struct *fsp, int fd);
|
||||
|
||||
@ -511,82 +511,55 @@ int set_blocking(int fd, BOOL set)
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
transfer some data between two fd's
|
||||
Transfer some data between two fd's.
|
||||
****************************************************************************/
|
||||
SMB_OFF_T transfer_file(int infd,int outfd,SMB_OFF_T n,char *header,int headlen,int align)
|
||||
|
||||
ssize_t transfer_file_internal(int infd, int outfd, size_t n, ssize_t (*read_fn)(int, void *, size_t),
|
||||
ssize_t (*write_fn)(int, const void *, size_t))
|
||||
{
|
||||
static char *buf=NULL;
|
||||
static int size=0;
|
||||
char *buf1,*abuf;
|
||||
SMB_OFF_T total = 0;
|
||||
static char buf[16384];
|
||||
size_t total = 0;
|
||||
ssize_t read_ret;
|
||||
size_t write_total = 0;
|
||||
ssize_t write_ret;
|
||||
|
||||
DEBUG(4,("transfer_file n=%.0f (head=%d) called\n",(double)n,headlen));
|
||||
while (total < n) {
|
||||
size_t num_to_read_thistime = MIN((n - total), sizeof(buf));
|
||||
|
||||
if (size == 0) {
|
||||
size = lp_readsize();
|
||||
size = MAX(size,1024);
|
||||
read_ret = (*read_fn)(infd, buf + total, num_to_read_thistime);
|
||||
if (read_ret == -1) {
|
||||
DEBUG(0,("transfer_file_internal: read failure. Error = %s\n", strerror(errno) ));
|
||||
return -1;
|
||||
}
|
||||
if (read_ret == 0)
|
||||
break;
|
||||
|
||||
write_total = 0;
|
||||
|
||||
while (write_total < read_ret) {
|
||||
write_ret = (*write_fn)(outfd,buf + total, read_ret);
|
||||
|
||||
if (write_ret == -1) {
|
||||
DEBUG(0,("transfer_file_internal: write failure. Error = %s\n", strerror(errno) ));
|
||||
return -1;
|
||||
}
|
||||
if (write_ret == 0)
|
||||
return (ssize_t)total;
|
||||
|
||||
write_total += (size_t)write_ret;
|
||||
}
|
||||
|
||||
while (!buf && size>0) {
|
||||
buf = (char *)malloc(size+8);
|
||||
if (!buf) size /= 2;
|
||||
total += (size_t)read_ret;
|
||||
}
|
||||
|
||||
if (!buf) {
|
||||
DEBUG(0,("Can't allocate transfer buffer!\n"));
|
||||
exit(1);
|
||||
return (ssize_t)total;
|
||||
}
|
||||
|
||||
abuf = buf + (align%8);
|
||||
|
||||
if (header)
|
||||
n += headlen;
|
||||
|
||||
while (n > 0)
|
||||
SMB_OFF_T transfer_file(int infd,int outfd,SMB_OFF_T n)
|
||||
{
|
||||
int s = (int)MIN(n,(SMB_OFF_T)size);
|
||||
int ret,ret2=0;
|
||||
|
||||
ret = 0;
|
||||
|
||||
if (header && (headlen >= MIN(s,1024))) {
|
||||
buf1 = header;
|
||||
s = headlen;
|
||||
ret = headlen;
|
||||
headlen = 0;
|
||||
header = NULL;
|
||||
} else {
|
||||
buf1 = abuf;
|
||||
return (SMB_OFF_T)transfer_file_internal(infd, outfd, (size_t)n, read, write);
|
||||
}
|
||||
|
||||
if (header && headlen > 0)
|
||||
{
|
||||
ret = MIN(headlen,size);
|
||||
memcpy(buf1,header,ret);
|
||||
headlen -= ret;
|
||||
header += ret;
|
||||
if (headlen <= 0) header = NULL;
|
||||
}
|
||||
|
||||
if (s > ret)
|
||||
ret += read(infd,buf1+ret,s-ret);
|
||||
|
||||
if (ret > 0)
|
||||
{
|
||||
ret2 = (outfd>=0?write_data(outfd,buf1,ret):ret);
|
||||
if (ret2 > 0) total += ret2;
|
||||
/* if we can't write then dump excess data */
|
||||
if (ret2 != ret)
|
||||
transfer_file(infd,-1,n-(ret+headlen),NULL,0,0);
|
||||
}
|
||||
if (ret <= 0 || ret2 != ret)
|
||||
return(total);
|
||||
n -= ret;
|
||||
}
|
||||
return(total);
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************
|
||||
sleep for a specified number of milliseconds
|
||||
********************************************************************/
|
||||
|
||||
@ -78,7 +78,7 @@ static void check_magic(files_struct *fsp,connection_struct *conn)
|
||||
return;
|
||||
}
|
||||
|
||||
transfer_file(tmp_fd,outfd,st.st_size, NULL,0,0);
|
||||
transfer_file(tmp_fd,outfd,st.st_size);
|
||||
close(tmp_fd);
|
||||
close(outfd);
|
||||
}
|
||||
|
||||
@ -1880,9 +1880,20 @@ int reply_unlink(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
|
||||
return outsize;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
Fail for readbraw.
|
||||
****************************************************************************/
|
||||
|
||||
void fail_readraw(void)
|
||||
{
|
||||
pstring errstr;
|
||||
slprintf(errstr, sizeof(errstr)-1, "FAIL ! reply_readbraw: socket write fail (%s)\n",
|
||||
strerror(errno) );
|
||||
exit_server(errstr);
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
reply to a readbraw (core+ protocol)
|
||||
Reply to a readbraw (core+ protocol).
|
||||
****************************************************************************/
|
||||
|
||||
int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_size, int dum_buffsize)
|
||||
@ -1901,10 +1912,10 @@ int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_s
|
||||
* return a zero length response here.
|
||||
*/
|
||||
|
||||
if(global_oplock_break)
|
||||
{
|
||||
if(global_oplock_break) {
|
||||
_smb_setlen(header,0);
|
||||
transfer_file(0,smbd_server_fd(),(SMB_OFF_T)0,header,4,0);
|
||||
if (write_data(smbd_server_fd(),header,4) != 4)
|
||||
fail_readraw();
|
||||
DEBUG(5,("readbraw - oplock break finished\n"));
|
||||
END_PROFILE(SMBreadbraw);
|
||||
return -1;
|
||||
@ -1918,7 +1929,8 @@ int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_s
|
||||
*/
|
||||
DEBUG(3,("fnum %d not open in readbraw - cache prime?\n",(int)SVAL(inbuf,smb_vwv0)));
|
||||
_smb_setlen(header,0);
|
||||
transfer_file(0,smbd_server_fd(),(SMB_OFF_T)0,header,4,0);
|
||||
if (write_data(smbd_server_fd(),header,4) != 4)
|
||||
fail_readraw();
|
||||
END_PROFILE(SMBreadbraw);
|
||||
return(-1);
|
||||
}
|
||||
@ -1946,7 +1958,8 @@ int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_s
|
||||
DEBUG(0,("readbraw - large offset (%x << 32) used and we don't support \
|
||||
64 bit offsets.\n", (unsigned int)IVAL(inbuf,smb_vwv8) ));
|
||||
_smb_setlen(header,0);
|
||||
transfer_file(0,smbd_server_fd(),(SMB_OFF_T)0,header,4,0);
|
||||
if (write_data(smbd_server_fd(),header,4) != 4)
|
||||
fail_readraw();
|
||||
END_PROFILE(SMBreadbraw);
|
||||
return(-1);
|
||||
}
|
||||
@ -1954,10 +1967,10 @@ int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_s
|
||||
#endif /* LARGE_SMB_OFF_T */
|
||||
|
||||
if(startpos < 0) {
|
||||
DEBUG(0,("readbraw - negative 64 bit readraw offset (%.0f) !\n",
|
||||
(double)startpos ));
|
||||
DEBUG(0,("readbraw - negative 64 bit readraw offset (%.0f) !\n", (double)startpos ));
|
||||
_smb_setlen(header,0);
|
||||
transfer_file(0,smbd_server_fd(),(SMB_OFF_T)0,header,4,0);
|
||||
if (write_data(smbd_server_fd(),header,4) != 4)
|
||||
fail_readraw();
|
||||
END_PROFILE(SMBreadbraw);
|
||||
return(-1);
|
||||
}
|
||||
@ -1969,13 +1982,11 @@ int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_s
|
||||
maxcount = MIN(65535,maxcount);
|
||||
maxcount = MAX(mincount,maxcount);
|
||||
|
||||
if (!is_locked(fsp,conn,(SMB_BIG_UINT)maxcount,(SMB_BIG_UINT)startpos, READ_LOCK,False))
|
||||
{
|
||||
if (!is_locked(fsp,conn,(SMB_BIG_UINT)maxcount,(SMB_BIG_UINT)startpos, READ_LOCK,False)) {
|
||||
SMB_OFF_T size = fsp->size;
|
||||
SMB_OFF_T sizeneeded = startpos + maxcount;
|
||||
|
||||
if (size < sizeneeded)
|
||||
{
|
||||
if (size < sizeneeded) {
|
||||
SMB_STRUCT_STAT st;
|
||||
if (vfs_fstat(fsp,fsp->fd,&st) == 0)
|
||||
size = st.st_size;
|
||||
@ -1983,54 +1994,33 @@ int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_s
|
||||
fsp->size = size;
|
||||
}
|
||||
|
||||
if (startpos >= size)
|
||||
nread = 0;
|
||||
else
|
||||
nread = MIN(maxcount,(size - startpos));
|
||||
}
|
||||
|
||||
if (nread < mincount)
|
||||
nread = 0;
|
||||
|
||||
DEBUG( 3, ( "readbraw fnum=%d start=%.0f max=%d min=%d nread=%d\n",
|
||||
fsp->fnum, (double)startpos,
|
||||
DEBUG( 3, ( "readbraw fnum=%d start=%.0f max=%d min=%d nread=%d\n", fsp->fnum, (double)startpos,
|
||||
(int)maxcount, (int)mincount, (int)nread ) );
|
||||
|
||||
#if UNSAFE_READRAW
|
||||
{
|
||||
BOOL seek_fail = False;
|
||||
int predict=0;
|
||||
_smb_setlen(header,nread);
|
||||
|
||||
if ((nread-predict) > 0) {
|
||||
if(conn->vfs_ops.seek(fsp,fsp->fd,startpos + predict) == -1) {
|
||||
DEBUG(0,("reply_readbraw: ERROR: seek_file failed.\n"));
|
||||
ret = 0;
|
||||
seek_fail = True;
|
||||
}
|
||||
}
|
||||
|
||||
if(!seek_fail)
|
||||
ret = (ssize_t)vfs_transfer_file(-1, fsp, fsp->fd, Client, NULL,
|
||||
(SMB_OFF_T)(nread-predict),header,4+predict,
|
||||
startpos+predict);
|
||||
}
|
||||
|
||||
if (ret != nread+4)
|
||||
DEBUG(0,("ERROR: file read failure on %s at %d for %d bytes (%d)\n",
|
||||
fsp->fsp_name,startpos,nread,ret));
|
||||
|
||||
#else /* UNSAFE_READRAW */
|
||||
if (nread > 0) {
|
||||
ret = read_file(fsp,header+4,startpos,nread);
|
||||
if (ret < mincount) ret = 0;
|
||||
if (ret < mincount)
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
_smb_setlen(header,ret);
|
||||
transfer_file(0,smbd_server_fd(),0,header,4+ret,0);
|
||||
#endif /* UNSAFE_READRAW */
|
||||
if (write_data(smbd_server_fd(),header,4+ret) != 4+ret)
|
||||
fail_readraw();
|
||||
|
||||
DEBUG(5,("readbraw finished\n"));
|
||||
END_PROFILE(SMBreadbraw);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
reply to a lockread (core+ protocol)
|
||||
****************************************************************************/
|
||||
@ -2251,6 +2241,7 @@ int reply_writebraw(connection_struct *conn, char *inbuf,char *outbuf, int size,
|
||||
|
||||
/* We have to deal with slightly different formats depending
|
||||
on whether we are using the core+ or lanman1.0 protocol */
|
||||
|
||||
if(Protocol <= PROTOCOL_COREPLUS) {
|
||||
numtowrite = SVAL(smb_buf(inbuf),-2);
|
||||
data = smb_buf(inbuf);
|
||||
@ -2265,7 +2256,7 @@ int reply_writebraw(connection_struct *conn, char *inbuf,char *outbuf, int size,
|
||||
|
||||
if (is_locked(fsp,conn,(SMB_BIG_UINT)tcount,(SMB_BIG_UINT)startpos, WRITE_LOCK,False)) {
|
||||
END_PROFILE(SMBwritebraw);
|
||||
return ERROR_DOS(ERRDOS,ERRlock);
|
||||
return(ERROR_DOS(ERRDOS,ERRlock));
|
||||
}
|
||||
|
||||
if (numtowrite>0)
|
||||
@ -2281,8 +2272,7 @@ int reply_writebraw(connection_struct *conn, char *inbuf,char *outbuf, int size,
|
||||
|
||||
total_written = nwritten;
|
||||
|
||||
/* Return a message to the redirector to tell it
|
||||
to send more bytes */
|
||||
/* Return a message to the redirector to tell it to send more bytes */
|
||||
CVAL(outbuf,smb_com) = SMBwritebraw;
|
||||
SSVALS(outbuf,smb_vwv0,-1);
|
||||
outsize = set_message(outbuf,Protocol>PROTOCOL_COREPLUS?1:0,0,True);
|
||||
@ -2294,39 +2284,51 @@ int reply_writebraw(connection_struct *conn, char *inbuf,char *outbuf, int size,
|
||||
exit_server("secondary writebraw failed");
|
||||
}
|
||||
|
||||
/* Even though this is not an smb message, smb_len
|
||||
returns the generic length of an smb message */
|
||||
/* Even though this is not an smb message, smb_len returns the generic length of an smb message */
|
||||
numtowrite = smb_len(inbuf);
|
||||
|
||||
if (tcount > nwritten+numtowrite) {
|
||||
DEBUG(3,("Client overestimated the write %d %d %d\n",
|
||||
(int)tcount,(int)nwritten,(int)numtowrite));
|
||||
}
|
||||
|
||||
nwritten = vfs_transfer_file(smbd_server_fd(), NULL, -1, fsp,
|
||||
(SMB_OFF_T)numtowrite,NULL,0,
|
||||
startpos+nwritten);
|
||||
total_written += nwritten;
|
||||
|
||||
/* Set up outbuf to return the correct return */
|
||||
outsize = set_message(outbuf,1,0,True);
|
||||
CVAL(outbuf,smb_com) = SMBwritec;
|
||||
SSVAL(outbuf,smb_vwv0,total_written);
|
||||
|
||||
if (numtowrite != 0) {
|
||||
|
||||
if (numtowrite > BUFFER_SIZE) {
|
||||
DEBUG(0,("reply_writebraw: Oversize secondary write raw requested (%u). Terminating\n",
|
||||
(unsigned int)numtowrite ));
|
||||
exit_server("secondary writebraw failed");
|
||||
}
|
||||
|
||||
if (tcount > nwritten+numtowrite) {
|
||||
DEBUG(3,("Client overestimated the write %d %d %d\n",
|
||||
(int)tcount,(int)nwritten,(int)numtowrite));
|
||||
}
|
||||
|
||||
if (read_data( smbd_server_fd(), inbuf+4, numtowrite) != numtowrite ) {
|
||||
DEBUG(0,("reply_writebraw: Oversize secondary write raw read failed (%s). Terminating\n",
|
||||
strerror(errno) ));
|
||||
exit_server("secondary writebraw failed");
|
||||
}
|
||||
|
||||
nwritten = write_file(fsp,inbuf+4,startpos+nwritten,numtowrite);
|
||||
|
||||
if (nwritten < (ssize_t)numtowrite) {
|
||||
CVAL(outbuf,smb_rcls) = ERRHRD;
|
||||
SSVAL(outbuf,smb_err,ERRdiskfull);
|
||||
}
|
||||
|
||||
if ((lp_syncalways(SNUM(conn)) || write_through) &&
|
||||
lp_strict_sync(SNUM(conn)))
|
||||
if (nwritten > 0)
|
||||
total_written += nwritten;
|
||||
}
|
||||
|
||||
if ((lp_syncalways(SNUM(conn)) || write_through) && lp_strict_sync(SNUM(conn)))
|
||||
sync_file(conn,fsp);
|
||||
|
||||
DEBUG(3,("writebraw2 fnum=%d start=%.0f num=%d wrote=%d\n",
|
||||
fsp->fnum, (double)startpos, (int)numtowrite,(int)total_written));
|
||||
|
||||
/* we won't return a status if write through is not selected - this
|
||||
follows what WfWg does */
|
||||
/* we won't return a status if write through is not selected - this follows what WfWg does */
|
||||
END_PROFILE(SMBwritebraw);
|
||||
if (!write_through && total_written==tcount) {
|
||||
/*
|
||||
@ -3709,7 +3711,7 @@ int reply_mv(connection_struct *conn, char *inbuf,char *outbuf, int dum_size,
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
copy a file as part of a reply_copy
|
||||
Copy a file as part of a reply_copy.
|
||||
******************************************************************/
|
||||
|
||||
static BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun,
|
||||
@ -3740,14 +3742,15 @@ static BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun,
|
||||
fsp1 = open_file_shared(conn,src,&src_sbuf,SET_DENY_MODE(DENY_NONE)|SET_OPEN_MODE(DOS_OPEN_RDONLY),
|
||||
(FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),0,0,&Access,&action);
|
||||
|
||||
if (!fsp1) {
|
||||
if (!fsp1)
|
||||
return(False);
|
||||
}
|
||||
|
||||
if (!target_is_directory && count)
|
||||
ofun = FILE_EXISTS_OPEN;
|
||||
|
||||
vfs_stat(conn,dest,&sbuf2);
|
||||
if (vfs_stat(conn,dest,&sbuf2) == -1)
|
||||
ZERO_STRUCTP(&sbuf2);
|
||||
|
||||
fsp2 = open_file_shared(conn,dest,&sbuf2,SET_DENY_MODE(DENY_NONE)|SET_OPEN_MODE(DOS_OPEN_WRONLY),
|
||||
ofun,src_sbuf.st_mode,0,&Access,&action);
|
||||
|
||||
@ -3758,8 +3761,7 @@ static BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun,
|
||||
|
||||
if ((ofun&3) == 1) {
|
||||
if(conn->vfs_ops.lseek(fsp2,fsp2->fd,0,SEEK_END) == -1) {
|
||||
DEBUG(0,("copy_file: error - sys_lseek returned error %s\n",
|
||||
strerror(errno) ));
|
||||
DEBUG(0,("copy_file: error - vfs lseek returned error %s\n", strerror(errno) ));
|
||||
/*
|
||||
* Stop the copy from occurring.
|
||||
*/
|
||||
@ -3769,7 +3771,7 @@ static BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun,
|
||||
}
|
||||
|
||||
if (src_sbuf.st_size)
|
||||
ret = vfs_transfer_file(-1, fsp1, -1, fsp2, src_sbuf.st_size, NULL, 0, 0);
|
||||
ret = vfs_transfer_file(fsp1, fsp2, src_sbuf.st_size);
|
||||
|
||||
close_file(fsp1,False);
|
||||
/*
|
||||
@ -3783,8 +3785,6 @@ static BOOL copy_file(char *src,char *dest1,connection_struct *conn, int ofun,
|
||||
return(ret == (SMB_OFF_T)src_sbuf.st_size);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
reply to a file copy.
|
||||
****************************************************************************/
|
||||
|
||||
@ -190,7 +190,7 @@ int vfswrap_close(files_struct *fsp, int fd)
|
||||
return result;
|
||||
}
|
||||
|
||||
ssize_t vfswrap_read(files_struct *fsp, int fd, char *data, size_t n)
|
||||
ssize_t vfswrap_read(files_struct *fsp, int fd, void *data, size_t n)
|
||||
{
|
||||
ssize_t result;
|
||||
|
||||
@ -207,7 +207,7 @@ ssize_t vfswrap_read(files_struct *fsp, int fd, char *data, size_t n)
|
||||
return result;
|
||||
}
|
||||
|
||||
ssize_t vfswrap_write(files_struct *fsp, int fd, const char *data, size_t n)
|
||||
ssize_t vfswrap_write(files_struct *fsp, int fd, const void *data, size_t n)
|
||||
{
|
||||
ssize_t result;
|
||||
|
||||
|
||||
@ -395,92 +395,28 @@ int vfs_set_filelen(files_struct *fsp, SMB_OFF_T len)
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
Transfer some data between two file_struct's.
|
||||
Transfer some data (n bytes) between two file_struct's.
|
||||
****************************************************************************/
|
||||
|
||||
SMB_OFF_T vfs_transfer_file(int in_fd, files_struct *in_fsp,
|
||||
int out_fd, files_struct *out_fsp,
|
||||
SMB_OFF_T n, char *header, int headlen, int align)
|
||||
static files_struct *in_fsp;
|
||||
static files_struct *out_fsp;
|
||||
|
||||
static ssize_t read_fn(int fd, void *buf, size_t len)
|
||||
{
|
||||
static char *buf=NULL;
|
||||
static int size=0;
|
||||
char *buf1,*abuf;
|
||||
SMB_OFF_T total = 0;
|
||||
|
||||
DEBUG(4,("vfs_transfer_file n=%.0f (head=%d) called\n",(double)n,headlen));
|
||||
|
||||
/* Check we have at least somewhere to read from */
|
||||
|
||||
SMB_ASSERT((in_fd != -1) || (in_fsp != NULL));
|
||||
|
||||
if (size == 0) {
|
||||
size = lp_readsize();
|
||||
size = MAX(size,1024);
|
||||
return in_fsp->conn->vfs_ops.read(in_fsp, fd, buf, len);
|
||||
}
|
||||
|
||||
while (!buf && size>0) {
|
||||
buf = (char *)Realloc(buf,size+8);
|
||||
if (!buf) size /= 2;
|
||||
}
|
||||
|
||||
if (!buf) {
|
||||
DEBUG(0,("Can't allocate transfer buffer!\n"));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
abuf = buf + (align%8);
|
||||
|
||||
if (header)
|
||||
n += headlen;
|
||||
|
||||
while (n > 0)
|
||||
static ssize_t write_fn(int fd, const void *buf, size_t len)
|
||||
{
|
||||
int s = (int)MIN(n,(SMB_OFF_T)size);
|
||||
int ret,ret2=0;
|
||||
|
||||
ret = 0;
|
||||
|
||||
if (header && (headlen >= MIN(s,1024))) {
|
||||
buf1 = header;
|
||||
s = headlen;
|
||||
ret = headlen;
|
||||
headlen = 0;
|
||||
header = NULL;
|
||||
} else {
|
||||
buf1 = abuf;
|
||||
return out_fsp->conn->vfs_ops.write(out_fsp, fd, buf, len);
|
||||
}
|
||||
|
||||
if (header && headlen > 0)
|
||||
SMB_OFF_T vfs_transfer_file(files_struct *in, files_struct *out, SMB_OFF_T n)
|
||||
{
|
||||
ret = MIN(headlen,size);
|
||||
memcpy(buf1,header,ret);
|
||||
headlen -= ret;
|
||||
header += ret;
|
||||
if (headlen <= 0) header = NULL;
|
||||
}
|
||||
in_fsp = in;
|
||||
out_fsp = out;
|
||||
|
||||
if (s > ret) {
|
||||
ret += in_fsp ?
|
||||
in_fsp->conn->vfs_ops.read(in_fsp,in_fsp->fd,buf1+ret,s-ret) : read(in_fd,buf1+ret,s-ret);
|
||||
}
|
||||
|
||||
if (ret > 0) {
|
||||
if (out_fsp)
|
||||
ret2 = out_fsp->conn->vfs_ops.write(out_fsp,out_fsp->fd,buf1,ret);
|
||||
else
|
||||
ret2= (out_fd != -1) ? write_data(out_fd,buf1,ret) : ret;
|
||||
}
|
||||
|
||||
if (ret2 > 0) total += ret2;
|
||||
/* if we can't write then dump excess data */
|
||||
if (ret2 != ret)
|
||||
vfs_transfer_file(in_fd, in_fsp, -1,NULL,n-(ret+headlen),NULL,0,0);
|
||||
|
||||
if (ret <= 0 || ret2 != ret)
|
||||
return(total);
|
||||
n -= ret;
|
||||
}
|
||||
return(total);
|
||||
return transfer_file_internal(in_fsp->fd, out_fsp->fd, n, read_fn, write_fn);
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
|
||||
Reference in New Issue
Block a user