commit b9fdea72bddc8e60fb10c458574418616c4d004d
parent 2e20a5ac9f7945a79961df7807f2dbc12fef7f99
Author: Kris Maglione <jg@suckless.org>
Date: Wed, 28 Nov 2007 18:26:09 -0500
Merge.
Diffstat:
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libixp/client.c b/libixp/client.c
@@ -145,6 +145,7 @@ ixp_mountfd(int fd) {
c->mintag = 0;
c->maxtag = 255;
+ c->msize = fcall.msize;
allocmsg(c, fcall.msize);
ixp_freefcall(&fcall);
@@ -424,13 +425,13 @@ _pwrite(IxpCFid *f, const void *buf, long count, vlong offset) {
n = min(count-len, f->iounit);
fcall.type = TWrite;
fcall.fid = f->fid;
- fcall.offset = f->offset;
+ fcall.offset = offset;
fcall.data = (char*)buf + len;
fcall.count = n;
if(dofcall(f->client, &fcall) == 0)
return -1;
- f->offset += fcall.count;
+ offset += fcall.count;
len += fcall.count;
ixp_freefcall(&fcall);
diff --git a/mk/ixp.mk b/mk/ixp.mk
@@ -1,4 +1,4 @@
-VERSION = 0.3
+VERSION = 0.4
${ROOT}/include/ixp.h: ${ROOT}/config.mk