mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-01 23:18:21 +00:00
devfs: maxseek
This commit is contained in:
@@ -201,6 +201,14 @@ int devfs_ioctl(vnode_t *node, unsigned long request, void *arg, int *ret) {
|
|||||||
return devnode->devops->ioctl ? devnode->devops->ioctl(devnode->attr.rdevminor, request, arg, ret) : ENOTTY;
|
return devnode->devops->ioctl ? devnode->devops->ioctl(devnode->attr.rdevminor, request, arg, ret) : ENOTTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int devfs_maxseek(vnode_t *node, size_t *max) {
|
||||||
|
devnode_t *devnode = (devnode_t *)node;
|
||||||
|
if (devnode->master)
|
||||||
|
devnode = devnode->master;
|
||||||
|
|
||||||
|
return devnode->devops->maxseek ? devnode->devops->maxseek(devnode->attr.rdevminor, max) : ENOTTY;
|
||||||
|
}
|
||||||
|
|
||||||
int devfs_inactive(vnode_t *node) {
|
int devfs_inactive(vnode_t *node) {
|
||||||
VOP_LOCK(node);
|
VOP_LOCK(node);
|
||||||
devnode_t *devnode = (devnode_t *)node;
|
devnode_t *devnode = (devnode_t *)node;
|
||||||
@@ -325,6 +333,7 @@ static vops_t vnops = {
|
|||||||
.getdents = devfs_getdents,
|
.getdents = devfs_getdents,
|
||||||
.isatty = devfs_isatty,
|
.isatty = devfs_isatty,
|
||||||
.ioctl = devfs_ioctl,
|
.ioctl = devfs_ioctl,
|
||||||
|
.maxseek = devfs_maxseek,
|
||||||
.resize = devfs_enodev
|
.resize = devfs_enodev
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ typedef struct {
|
|||||||
int (*munmap)(int minor, void *addr, uintmax_t offset, int flags);
|
int (*munmap)(int minor, void *addr, uintmax_t offset, int flags);
|
||||||
int (*isatty)(int minor);
|
int (*isatty)(int minor);
|
||||||
int (*ioctl)(int minor, unsigned long request, void *arg, int *result);
|
int (*ioctl)(int minor, unsigned long request, void *arg, int *result);
|
||||||
|
int (*maxseek)(int minor, size_t *max);
|
||||||
} devops_t;
|
} devops_t;
|
||||||
|
|
||||||
typedef struct devnode_t {
|
typedef struct devnode_t {
|
||||||
|
|||||||
@@ -96,6 +96,7 @@ typedef struct vops_t {
|
|||||||
int (*getdents)(vnode_t *node, dent_t *buffer, size_t count, uintmax_t offset, size_t *readcount);
|
int (*getdents)(vnode_t *node, dent_t *buffer, size_t count, uintmax_t offset, size_t *readcount);
|
||||||
int (*isatty)(vnode_t *node);
|
int (*isatty)(vnode_t *node);
|
||||||
int (*ioctl)(vnode_t *node, unsigned long request, void *arg, int *result);
|
int (*ioctl)(vnode_t *node, unsigned long request, void *arg, int *result);
|
||||||
|
int (*maxseek)(vnode_t *node, size_t *max);
|
||||||
int (*resize)(vnode_t *node, size_t newsize, cred_t *cred);
|
int (*resize)(vnode_t *node, size_t newsize, cred_t *cred);
|
||||||
} vops_t;
|
} vops_t;
|
||||||
|
|
||||||
@@ -142,6 +143,7 @@ typedef struct vops_t {
|
|||||||
#define VOP_POLL(v, d, p) (v)->ops->poll(v, d, p)
|
#define VOP_POLL(v, d, p) (v)->ops->poll(v, d, p)
|
||||||
#define VOP_ISATTY(v) ((v)->ops->isatty ? (v)->ops->isatty(v) : ENOTTY)
|
#define VOP_ISATTY(v) ((v)->ops->isatty ? (v)->ops->isatty(v) : ENOTTY)
|
||||||
#define VOP_IOCTL(v, r, a, rp) ((v)->ops->ioctl ? (v)->ops->ioctl(v, r, a, rp) : ENOTTY)
|
#define VOP_IOCTL(v, r, a, rp) ((v)->ops->ioctl ? (v)->ops->ioctl(v, r, a, rp) : ENOTTY)
|
||||||
|
#define VOP_MAXSEEK(v, rp) ((v)->ops->maxseek ? (v)->ops->maxseek(v, rp) : ENOTTY)
|
||||||
#define VOP_RESIZE(v, s, c) (v)->ops->resize(v, s, c)
|
#define VOP_RESIZE(v, s, c) (v)->ops->resize(v, s, c)
|
||||||
#define VOP_HOLD(v) __atomic_add_fetch(&(v)->refcount, 1, __ATOMIC_SEQ_CST)
|
#define VOP_HOLD(v) __atomic_add_fetch(&(v)->refcount, 1, __ATOMIC_SEQ_CST)
|
||||||
#define VOP_RELEASE(v) {\
|
#define VOP_RELEASE(v) {\
|
||||||
|
|||||||
@@ -9,7 +9,8 @@
|
|||||||
|
|
||||||
syscallret_t syscall_seek(context_t *context, int fd, off_t offset, int whence) {
|
syscallret_t syscall_seek(context_t *context, int fd, off_t offset, int whence) {
|
||||||
syscallret_t ret = {
|
syscallret_t ret = {
|
||||||
.ret = -1
|
.ret = -1,
|
||||||
|
.errno = 0
|
||||||
};
|
};
|
||||||
|
|
||||||
if (whence > 2) {
|
if (whence > 2) {
|
||||||
@@ -28,15 +29,30 @@ syscallret_t syscall_seek(context_t *context, int fd, off_t offset, int whence)
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO device check seek
|
size_t size = -1;
|
||||||
|
|
||||||
uintmax_t curroffset = file->offset;
|
uintmax_t curroffset = file->offset;
|
||||||
uintmax_t newoffset = 0;
|
uintmax_t newoffset = 0;
|
||||||
|
|
||||||
|
// determine size
|
||||||
|
|
||||||
|
if (file->vnode->type == V_TYPE_CHDEV) {
|
||||||
|
ret.errno = VOP_MAXSEEK(file->vnode, &size);
|
||||||
|
if (ret.errno) {
|
||||||
|
ret.errno = ESPIPE;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
vattr_t attr;
|
||||||
|
ret.errno = VOP_GETATTR(file->vnode, &attr, &_cpu()->thread->proc->cred);
|
||||||
|
if (ret.errno)
|
||||||
|
goto cleanup;
|
||||||
|
size = attr.size;
|
||||||
|
}
|
||||||
|
|
||||||
switch (whence) {
|
switch (whence) {
|
||||||
case SEEK_SET:
|
case SEEK_SET:
|
||||||
newoffset = offset;
|
newoffset = offset;
|
||||||
break;
|
break;
|
||||||
case SEEK_CUR:
|
case SEEK_CUR:
|
||||||
newoffset = curroffset + offset;
|
newoffset = curroffset + offset;
|
||||||
if (offset > 0 && newoffset < curroffset) {
|
if (offset > 0 && newoffset < curroffset) {
|
||||||
@@ -48,14 +64,9 @@ syscallret_t syscall_seek(context_t *context, int fd, off_t offset, int whence)
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SEEK_END: {
|
case SEEK_END:
|
||||||
vattr_t attr;
|
newoffset = size;
|
||||||
ret.errno = VOP_GETATTR(file->vnode, &attr, &_cpu()->thread->proc->cred);
|
|
||||||
if (ret.errno)
|
|
||||||
goto cleanup;
|
|
||||||
newoffset = attr.size;
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
file->offset = newoffset;
|
file->offset = newoffset;
|
||||||
|
|||||||
Reference in New Issue
Block a user