Skip to content

Commit 1abaacd

Browse files
committed
Support File::seek for Hermit
1 parent 32d0c4e commit 1abaacd

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

library/std/src/sys/fs/hermit.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -417,12 +417,12 @@ impl File {
417417
Ok(())
418418
}
419419

420-
pub fn seek(&self, _pos: SeekFrom) -> io::Result<u64> {
421-
Err(Error::from_raw_os_error(22))
420+
pub fn seek(&self, pos: SeekFrom) -> io::Result<u64> {
421+
self.0.seek(pos)
422422
}
423423

424424
pub fn tell(&self) -> io::Result<u64> {
425-
self.seek(SeekFrom::Current(0))
425+
self.0.tell()
426426
}
427427

428428
pub fn duplicate(&self) -> io::Result<File> {

library/std/src/sys/pal/hermit/fd.rs

+19-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
use super::hermit_abi;
44
use crate::cmp;
5-
use crate::io::{self, IoSlice, IoSliceMut, Read};
6-
use crate::os::hermit::io::{FromRawFd, OwnedFd, RawFd, *};
5+
use crate::io::{self, IoSlice, IoSliceMut, Read, SeekFrom};
6+
use crate::os::hermit::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
77
use crate::sys::{cvt, unsupported};
88
use crate::sys_common::{AsInner, FromInner, IntoInner};
99

@@ -66,9 +66,26 @@ impl FileDesc {
6666
true
6767
}
6868

69+
pub fn seek(&self, pos: SeekFrom) -> io::Result<u64> {
70+
let (whence, pos) = match pos {
71+
// Casting to `i64` is fine, too large values will end up as
72+
// negative which will cause an error in `lseek`.
73+
SeekFrom::Start(off) => (hermit_abi::SEEK_SET, off as i64),
74+
SeekFrom::End(off) => (hermit_abi::SEEK_END, off),
75+
SeekFrom::Current(off) => (hermit_abi::SEEK_CUR, off),
76+
};
77+
let n = cvt(unsafe { hermit_abi::lseek(self.as_raw_fd(), pos as isize, whence) })?;
78+
Ok(n as u64)
79+
}
80+
81+
pub fn tell(&self) -> io::Result<u64> {
82+
self.seek(SeekFrom::Current(0))
83+
}
84+
6985
pub fn duplicate(&self) -> io::Result<FileDesc> {
7086
self.duplicate_path(&[])
7187
}
88+
7289
pub fn duplicate_path(&self, _path: &[u8]) -> io::Result<FileDesc> {
7390
unsupported()
7491
}

0 commit comments

Comments
 (0)