diff options
Diffstat (limited to 'src/sys/os')
| -rw-r--r-- | src/sys/os/os_filedes.c | 21 | ||||
| -rw-r--r-- | src/sys/os/vfs_subr.c | 6 |
2 files changed, 22 insertions, 5 deletions
diff --git a/src/sys/os/os_filedes.c b/src/sys/os/os_filedes.c index 9ba0c63..948bad2 100644 --- a/src/sys/os/os_filedes.c +++ b/src/sys/os/os_filedes.c @@ -227,8 +227,9 @@ write(int fd, const void *buf, size_t count) { struct proc *self = proc_self(); struct filedesc *fdp; - int error; + ssize_t retval; char kbuf[1024]; + int error; if (self == NULL) { return -ESRCH; @@ -267,7 +268,13 @@ write(int fd, const void *buf, size_t count) if (fdp->vp == NULL) { return -EIO; } - return vop_write(fdp->vp, kbuf, count); + retval = vop_write(fdp->vp, kbuf, fdp->off, count); + if (retval <= 0) { + return retval; + } + + /* Move away from where we wrote */ + fdp->off += count; } return count; @@ -278,6 +285,7 @@ read(int fd, void *buf, size_t count) { struct proc *self = proc_self(); struct filedesc *fdp; + ssize_t retval; int error; if (buf == NULL) { @@ -304,7 +312,14 @@ read(int fd, void *buf, size_t count) return -EIO; } - return vop_read(fdp->vp, buf, count); + /* Read the file */ + retval = vop_read(fdp->vp, buf, fdp->off, count); + if (retval <= 0) { + return retval; + } + + fdp->off += count; + return retval; } /* diff --git a/src/sys/os/vfs_subr.c b/src/sys/os/vfs_subr.c index 47ed468..a06b64f 100644 --- a/src/sys/os/vfs_subr.c +++ b/src/sys/os/vfs_subr.c @@ -145,7 +145,7 @@ vfs_cmp_cnt(const char *path) } ssize_t -vop_write(struct vnode *vp, char *data, size_t len) +vop_write(struct vnode *vp, char *data, off_t off, size_t len) { struct vop_rw_data rwdata; struct vop *vops; @@ -170,11 +170,12 @@ vop_write(struct vnode *vp, char *data, size_t len) rwdata.data = data; rwdata.len = len; rwdata.vp = vp; + rwdata.off = off; return vops->write(&rwdata); } ssize_t -vop_read(struct vnode *vp, char *data, size_t len) +vop_read(struct vnode *vp, char *data, off_t off, size_t len) { struct vop_rw_data rwdata; struct vop *vops; @@ -199,5 +200,6 @@ vop_read(struct vnode *vp, char *data, size_t len) rwdata.data = data; rwdata.len = len; rwdata.vp = vp; + rwdata.off = off; return vops->read(&rwdata); } |