diff options
author | Sendil Kumar <sendilkumarn@live.com> | 2019-08-22 20:50:13 +0200 |
---|---|---|
committer | Sendil Kumar <sendilkumarn@live.com> | 2019-08-22 20:50:13 +0200 |
commit | e7433361a4312a04be7a9d0250fffb99bfce45bc (patch) | |
tree | 6bfbc2f123063f52efd517ad95cde742239f83c3 /src | |
parent | ea102096803dd12acf5fc592fb5c581e9b9ff51d (diff) | |
download | nix-e7433361a4312a04be7a9d0250fffb99bfce45bc.zip |
update readlink to return the path instead of mangling the buffer
Diffstat (limited to 'src')
-rw-r--r-- | src/fcntl.rs | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/fcntl.rs b/src/fcntl.rs index f590e361..2adbb6ab 100644 --- a/src/fcntl.rs +++ b/src/fcntl.rs @@ -1,11 +1,11 @@ -use {Error, Result, NixPath}; +use {Result, NixPath}; use errno::Errno; use libc::{self, c_int, c_uint, c_char, size_t, ssize_t}; use sys::stat::Mode; use std::os::raw; use std::os::unix::io::RawFd; -use std::ffi::OsStr; -use std::os::unix::ffi::OsStrExt; +use std::ffi::OsString; +use std::os::unix::ffi::OsStringExt; #[cfg(any(target_os = "android", target_os = "linux"))] use std::ptr; // For splice and copy_file_range @@ -177,36 +177,33 @@ pub fn renameat<P1: ?Sized + NixPath, P2: ?Sized + NixPath>(old_dirfd: Option<Ra Errno::result(res).map(drop) } -fn wrap_readlink_result(buffer: &mut[u8], res: ssize_t) -> Result<&OsStr> { +fn wrap_readlink_result(v: &mut Vec<u8>, res: ssize_t) -> Result<OsString> { match Errno::result(res) { Err(err) => Err(err), Ok(len) => { - if len < 0 { - Err(Error::Sys(Errno::EINVAL)) - } else if (len as usize) > buffer.len() { - Err(Error::Sys(Errno::ENAMETOOLONG)) - } else { - Ok(OsStr::from_bytes(&buffer[..(len as usize)])) - } + unsafe { v.set_len(len as usize) } + Ok(OsString::from_vec(v.to_vec())) } } } -pub fn readlink<'a, P: ?Sized + NixPath>(path: &P, buffer: &'a mut [u8]) -> Result<&'a OsStr> { +pub fn readlink<'a, P: ?Sized + NixPath>(path: &P) -> Result<OsString> { + let mut v = vec![0u8; libc::PATH_MAX as usize]; let res = path.with_nix_path(|cstr| { - unsafe { libc::readlink(cstr.as_ptr(), buffer.as_mut_ptr() as *mut c_char, buffer.len() as size_t) } + unsafe { libc::readlink(cstr.as_ptr(), v.as_mut_ptr() as *mut c_char, v.len() as size_t) } })?; - - wrap_readlink_result(buffer, res) + + wrap_readlink_result(&mut v, res) } -pub fn readlinkat<'a, P: ?Sized + NixPath>(dirfd: RawFd, path: &P, buffer: &'a mut [u8]) -> Result<&'a OsStr> { +pub fn readlinkat<'a, P: ?Sized + NixPath>(dirfd: RawFd, path: &P) -> Result<OsString> { + let mut v = vec![0u8; libc::PATH_MAX as usize]; let res = path.with_nix_path(|cstr| { - unsafe { libc::readlinkat(dirfd, cstr.as_ptr(), buffer.as_mut_ptr() as *mut c_char, buffer.len() as size_t) } + unsafe { libc::readlinkat(dirfd, cstr.as_ptr(), v.as_mut_ptr() as *mut c_char, v.len() as size_t) } })?; - wrap_readlink_result(buffer, res) + wrap_readlink_result(&mut v, res) } /// Computes the raw fd consumed by a function of the form `*at`. |