kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct handling of offset - partial merge from volker mildes patch. at date only disk.c uses offset, so there wont be any problem.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@612 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Kallden 2004-02-23 10:34:18 +00:00
parent 714cbcd099
commit ce2181a3d3
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
disk.c
View File

@ -407,8 +407,8 @@ disk_read(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * re
} }
#endif #endif
if (offset)
lseek(handle, offset, SEEK_SET); lseek(handle, offset, SEEK_SET);
n = read(handle, data, length); n = read(handle, data, length);
if (n < 0) if (n < 0)
@ -434,7 +434,6 @@ disk_write(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * r
{ {
int n; int n;
if (offset)
lseek(handle, offset, SEEK_SET); lseek(handle, offset, SEEK_SET);
n = write(handle, data, length); n = write(handle, data, length);

16
rdpdr.c
View File

@ -82,7 +82,8 @@ convert_to_unix_filename(char *filename)
/* Add a new io request to the table containing pending io requests so it won't block rdesktop */ /* Add a new io request to the table containing pending io requests so it won't block rdesktop */
BOOL BOOL
add_async_iorequest(uint32 device, uint32 file, uint32 id, uint32 major, uint32 length, add_async_iorequest(uint32 device, uint32 file, uint32 id, uint32 major, uint32 length,
DEVICE_FNS * fns, uint32 total_timeout, uint32 interval_timeout, uint8 * buffer) DEVICE_FNS * fns, uint32 total_timeout, uint32 interval_timeout, uint8 * buffer,
uint32 offset)
{ {
struct async_iorequest *iorq; struct async_iorequest *iorq;
@ -121,6 +122,7 @@ add_async_iorequest(uint32 device, uint32 file, uint32 id, uint32 major, uint32
iorq->timeout = total_timeout; iorq->timeout = total_timeout;
iorq->itv_timeout = interval_timeout; iorq->itv_timeout = interval_timeout;
iorq->buffer = buffer; iorq->buffer = buffer;
iorq->offset = offset;
return True; return True;
} }
@ -412,7 +414,7 @@ rdpdr_process_irp(STREAM s)
serial_get_timeout(file, length, &total_timeout, &interval_timeout); serial_get_timeout(file, length, &total_timeout, &interval_timeout);
if (add_async_iorequest if (add_async_iorequest
(device, file, id, major, length, fns, total_timeout, interval_timeout, (device, file, id, major, length, fns, total_timeout, interval_timeout,
pst_buf)) pst_buf, offset))
{ {
status = STATUS_PENDING; status = STATUS_PENDING;
break; break;
@ -453,7 +455,7 @@ rdpdr_process_irp(STREAM s)
in_uint8a(s, pst_buf, length); in_uint8a(s, pst_buf, length);
if (add_async_iorequest if (add_async_iorequest
(device, file, id, major, length, fns, 0, 0, pst_buf)) (device, file, id, major, length, fns, 0, 0, pst_buf, offset))
{ {
status = STATUS_PENDING; status = STATUS_PENDING;
break; break;
@ -794,8 +796,9 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
/* never read larger chunks than 8k - chances are that it will block */ /* never read larger chunks than 8k - chances are that it will block */
status = fns->read(iorq->fd, status = fns->read(iorq->fd,
iorq->buffer + iorq->partial_len, iorq->buffer + iorq->partial_len,
req_size, 0, &result); req_size, iorq->offset, &result);
iorq->partial_len += result; iorq->partial_len += result;
iorq->offset += result;
#if WITH_DEBUG_RDP5 #if WITH_DEBUG_RDP5
DEBUG(("RDPDR: %d bytes of data read\n", result)); DEBUG(("RDPDR: %d bytes of data read\n", result));
@ -845,9 +848,10 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
/* never write larger chunks than 8k - chances are that it will block */ /* never write larger chunks than 8k - chances are that it will block */
status = fns->write(iorq->fd, status = fns->write(iorq->fd,
iorq->buffer + iorq->buffer +
iorq->partial_len, req_size, 0, iorq->partial_len, req_size,
&result); iorq->offset, &result);
iorq->partial_len += result; iorq->partial_len += result;
iorq->offset += result;
#if WITH_DEBUG_RDP5 #if WITH_DEBUG_RDP5
DEBUG(("RDPDR: %d bytes of data written\n", DEBUG(("RDPDR: %d bytes of data written\n",
result)); result));