vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update unlink for new path format

Browse Source
This commit is contained in:
Ron Williams
2024-02-01 00:50:33 -08:00
parent e7d47d10c6
commit eeee40ae0c
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/syscall/fs.rs
+15 -21
View File
@@ -126,20 +126,18 @@ pub fn rmdir(raw_path: UserSliceRo) -> Result<()> {
let mut path_buf = BorrowedHtBuf::head()?;
let path = path_buf.use_for_string(raw_path)?;
*/
let path = copy_path_to_buf(raw_path, PATH_MAX)?;
let mut parts = path.splitn(2, ':');
let scheme_name = parts.next().ok_or(Error::new(EINVAL))?;
let reference = parts.next().unwrap_or("");
let path_buf = copy_path_to_buf(raw_path, PATH_MAX)?;
let path = RedoxPath::from_absolute(&path_buf).ok_or(Error::new(EINVAL))?;
let (scheme_name, reference) = path.as_parts();
let scheme = {
let schemes = scheme::schemes();
let (_scheme_id, scheme) = schemes
.get_name(scheme_ns, scheme_name)
.get_name(scheme_ns, scheme_name.as_ref())
.ok_or(Error::new(ENODEV))?;
scheme.clone()
};
scheme.rmdir(reference, caller_ctx)
scheme.rmdir(reference.as_ref(), caller_ctx)
}
/// Unlink syscall
@@ -151,20 +149,18 @@ pub fn unlink(raw_path: UserSliceRo) -> Result<()> {
let mut path_buf = BorrowedHtBuf::head()?;
let path = path_buf.use_for_string(raw_path)?;
*/
let path = copy_path_to_buf(raw_path, PATH_MAX)?;
let mut parts = path.splitn(2, ':');
let scheme_name = parts.next().ok_or(Error::new(EINVAL))?;
let reference = parts.next().unwrap_or("");
let path_buf = copy_path_to_buf(raw_path, PATH_MAX)?;
let path = RedoxPath::from_absolute(&path_buf).ok_or(Error::new(EINVAL))?;
let (scheme_name, reference) = path.as_parts();
let scheme = {
let schemes = scheme::schemes();
let (_scheme_id, scheme) = schemes
.get_name(scheme_ns, scheme_name)
.get_name(scheme_ns, scheme_name.as_ref())
.ok_or(Error::new(ENODEV))?;
scheme.clone()
};
scheme.unlink(reference, caller_ctx)
scheme.unlink(reference.as_ref(), caller_ctx)
}
/// Close syscall
@@ -380,16 +376,14 @@ pub fn frename(fd: FileHandle, raw_path: UserSliceRo) -> Result<()> {
let mut path_buf = BorrowedHtBuf::head()?;
let path = path_buf.use_for_string(raw_path)?;
*/
let path = copy_path_to_buf(raw_path, PATH_MAX)?;
let mut parts = path.splitn(2, ':');
let scheme_name = parts.next().ok_or(Error::new(ENOENT))?;
let reference = parts.next().unwrap_or("");
let path_buf = copy_path_to_buf(raw_path, PATH_MAX)?;
let path = RedoxPath::from_absolute(&path_buf).ok_or(Error::new(EINVAL))?;
let (scheme_name, reference) = path.as_parts();
let (scheme_id, scheme) = {
let schemes = scheme::schemes();
let (scheme_id, scheme) = schemes
.get_name(scheme_ns, scheme_name)
.get_name(scheme_ns, scheme_name.as_ref())
.ok_or(Error::new(ENODEV))?;
(scheme_id, scheme.clone())
};
@@ -400,7 +394,7 @@ pub fn frename(fd: FileHandle, raw_path: UserSliceRo) -> Result<()> {
return Err(Error::new(EXDEV));
}
scheme.frename(description.number, reference, caller_ctx)
scheme.frename(description.number, reference.as_ref(), caller_ctx)
}
/// File status