tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pxar: Include symlink target in DirectoryEntry

Browse Source 
This allows to read the target path of a symbolic link in the
Decoder::read_directory_entry() function and stores it in the DirectoryEntry.
By this the Decoder::read_link() function becomes obsolete and is therefore
removed.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner
2020-01-17 11:21:44 +01:00
committed by Dietmar Maurer
parent 138910bcd4
commit a8aff3535d
2 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pxar/fuse.rs
View File

@ -7,7 +7,7 @@ use std::convert::TryFrom;
use std::ffi::{CStr, CString, OsStr};
use std::fs::File;
use std::io::BufReader;
use std::os::unix::ffi::{OsStrExt, OsStringExt};
use std::os::unix::ffi::OsStrExt;
use std::path::Path;
use std::sync::Mutex;
@ -445,11 +445,8 @@ impl Session {
extern "C" fn readlink(req: Request, inode: u64) {
Self::run_in_context(req, inode, |ctx| {
let (target, _) = ctx
.decoder
.read_link(ctx.ino_offset)
.map_err(|_| libc::EIO)?;
let link = CString::new(target.into_os_string().into_vec()).map_err(|_| libc::EIO)?;
let target = ctx.entry.target.as_ref().ok_or_else(|| libc::EIO)?;
let link = CString::new(target.as_os_str().as_bytes()).map_err(|_| libc::EIO)?;
let _ret = unsafe { fuse_reply_readlink(req, link.as_ptr()) };
Ok(())