sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

Correctly increment offset in cli_smbwrite.

Browse Source 
Jeremy.
(This used to be commit 5b04b5f1df3ee509e7314064966be09e2202b0ef)
This commit is contained in:
Jeremy Allison 2002-03-20 01:47:31 +00:00
parent 6586062d1a
commit a1249aca90
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/libsmb/clireadwrite.c
View File

@ -366,6 +366,8 @@ ssize_t cli_smbwrite(struct cli_state *cli,
size1 -= size; size1 -= size;
total += size; total += size;
offset += size;
} while (size1); } while (size1);
return total; return total;

32
source3/torture/torture.c
View File

@ -555,7 +555,7 @@ static BOOL run_readwritelarge(int dummy)
int fnum1; int fnum1;
char *lockfname = "\\large.dat"; char *lockfname = "\\large.dat";
size_t fsize; size_t fsize;
char buf[0x10000]; char buf[126*1024];
BOOL correct = True; BOOL correct = True;
if (!torture_open_connection(&cli1)) { if (!torture_open_connection(&cli1)) {
@ -564,7 +564,7 @@ static BOOL run_readwritelarge(int dummy)
cli_sockopt(&cli1, sockops); cli_sockopt(&cli1, sockops);
memset(buf,'\0',sizeof(buf)); memset(buf,'\0',sizeof(buf));
cli1.max_xmit = 0x11000; cli1.max_xmit = 128*1024;
printf("starting readwritelarge\n"); printf("starting readwritelarge\n");
@ -578,13 +578,8 @@ static BOOL run_readwritelarge(int dummy)
cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf)); cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf));
if (!cli_close(&cli1, fnum1)) { if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
printf("close failed (%s)\n", cli_errstr(&cli1)); printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
correct = False;
}
if (!cli_qpathinfo(&cli1, lockfname, NULL, NULL, NULL, &fsize, NULL)) {
printf("qpathinfo failed (%s)\n", cli_errstr(&cli1));
correct = False; correct = False;
} }
@ -595,6 +590,11 @@ static BOOL run_readwritelarge(int dummy)
correct = False; correct = False;
} }
if (!cli_close(&cli1, fnum1)) {
printf("close failed (%s)\n", cli_errstr(&cli1));
correct = False;
}
if (!cli_unlink(&cli1, lockfname)) { if (!cli_unlink(&cli1, lockfname)) {
printf("unlink failed (%s)\n", cli_errstr(&cli1)); printf("unlink failed (%s)\n", cli_errstr(&cli1));
correct = False; correct = False;
@ -606,8 +606,22 @@ static BOOL run_readwritelarge(int dummy)
return False; return False;
} }
cli1.max_xmit = 4*1024;
cli_smbwrite(&cli1, fnum1, buf, 0, sizeof(buf)); cli_smbwrite(&cli1, fnum1, buf, 0, sizeof(buf));
if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
correct = False;
}
if (fsize == sizeof(buf))
printf("readwritelarge test 2 succeeded (size = %x)\n", fsize);
else {
printf("readwritelarge test 2 failed (size = %x)\n", fsize);
correct = False;
}
if (!cli_close(&cli1, fnum1)) { if (!cli_close(&cli1, fnum1)) {
printf("close failed (%s)\n", cli_errstr(&cli1)); printf("close failed (%s)\n", cli_errstr(&cli1));
correct = False; correct = False;