tobimai/smbc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Finished up Read directory

Browse Source
This commit is contained in:
Tobias Maier
2021-11-27 16:22:12 +01:00
parent 03844f85d2
commit ade1518d48
1 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/smbc.rs
View File

@@ -125,10 +125,10 @@ pub struct SmbFile<'a: 'b, 'b> {
fd: *mut SMBCFILE, fd: *mut SMBCFILE,
} }
pub struct SmbDirectory<'a: 'b, 'b> { // pub struct SmbDirectory<'a: 'b, 'b> {
smbc: &'b SmbClient<'a>, // smbc: &'b SmbClient<'a>,
pub fd: *mut smbc_dirent, // pub dir_struct: Vec<&str>,
} // }
// 1}}} // 1}}}
/// Default (dummy) credential `WORKGROUP\guest` with empty password /// Default (dummy) credential `WORKGROUP\guest` with empty password
@@ -213,7 +213,7 @@ impl<'a> SmbClient<'a> {
/// Opens [`SmbFile`](struct.SmbFile.html) defined by SMB `path` with `options`. /// Opens [`SmbFile`](struct.SmbFile.html) defined by SMB `path` with `options`.
/// ///
/// See [OpenOptions](struct.OpenOptions.html). /// See [OpenOptions](struct.OpenOptions.html).Vec<smbc_dirent>
pub fn open_with<'b, P: AsRef<str>>( pub fn open_with<'b, P: AsRef<str>>(
&'b self, &'b self,
path: P, path: P,
@@ -238,58 +238,39 @@ impl<'a> SmbClient<'a> {
Ok(SmbFile { smbc: &self, fd }) Ok(SmbFile { smbc: &self, fd })
} }
/// READ DIR
///
/// See [OpenOptions](struct.OpenOptions.html).
pub fn read_dir<'b, P: AsRef<str>>(&'b self,path: P) -> Result<SmbDirectory<'a, 'b>>{
let read_dir_fn = self.get_fn(smbc_getFunctionReaddir)?;
let open_dir_fn = self.get_fn(smbc_getFunctionOpendir)?;
let path = cstring(path)?;
trace!(target: "smbc", "opening {:?} with {:?}", path, read_dir_fn);
let dir = result_from_ptr_mut(open_dir_fn(self.ctx, path.as_ptr()))?;
let fd = result_from_ptr_mut(read_dir_fn(self.ctx, dir))?;
if (fd as i64) < 0 {
trace!(target: "smbc", "neg fd");
}
Ok(SmbDirectory { smbc: &self, fd })
}
/// READ DIR /// READ DIR
/// ///
/// See [OpenOptions](struct.OpenOptions.html). /// See [OpenOptions](struct.OpenOptions.html).
pub fn read_dirents<'b, P: AsRef<str>>(&'b self,path: P) -> Result<SmbDirectory<'a, 'b>>{ pub fn read_directory<'b, P: AsRef<str>>(&'b self,path: P) -> Result<Vec<String>>{
let read_dir_fn = self.get_fn(smbc_getFunctionReaddir)?; let read_dir_fn = self.get_fn(smbc_getFunctionReaddir)?;
let open_dir_fn = self.get_fn(smbc_getFunctionOpendir)?; let open_dir_fn = self.get_fn(smbc_getFunctionOpendir)?;
let get_dents_fn = self.get_fn(smbc_getFunctionGetdents)?;
let path = cstring(path)?; let path = cstring(path)?;
trace!(target: "smbc", "opening {:?} with {:?}", path, read_dir_fn); trace!(target: "smbc", "opening {:?} with {:?}", path, read_dir_fn);
let dir = result_from_ptr_mut(open_dir_fn(self.ctx, path.as_ptr()))?; let dir = result_from_ptr_mut(open_dir_fn(self.ctx, path.as_ptr()))?;
let fd = result_from_ptr_mut(read_dir_fn(self.ctx, dir)).expect("Can't read file");
let _fd = result_from_ptr_mut(read_dir_fn(self.ctx, dir)).expect("Can't read file");
let _fd = result_from_ptr_mut(read_dir_fn(self.ctx, dir)).expect("Can't read file");
let _fd = result_from_ptr_mut(read_dir_fn(self.ctx, dir)).expect("Can't read file");
let _fd = result_from_ptr_mut(read_dir_fn(self.ctx, dir)).expect("Can't read file");
let _fd = result_from_ptr_mut(read_dir_fn(self.ctx, dir)).expect("Can't read file");
let _fd = result_from_ptr_mut(read_dir_fn(self.ctx, dir)).is_err();
println!("{}", _fd);
//let mut return_dirs= HashSet::new();
let mut return_dirs= Vec::new();
//Returns number of read bytes use std::ffi::CStr;
//let out_test = get_dents_fn(self.ctx, dir, fd, 200); loop {
if (fd as i64) < 0 { match result_from_ptr_mut(read_dir_fn(self.ctx, dir)) {
trace!(target: "smbc", "neg fd"); Ok(dir_struct) => {
} print!("Success: ");
// let out_test = get_dents_fn(self.ctx, dir, fd, 2); unsafe{
// let out_test = get_dents_fn(self.ctx, dir, fd, 2); let c_str: &CStr = CStr::from_ptr(&(*dir_struct).name[0]) ;
//println!("{}", out_test); println!("{}", c_str.to_str().unwrap());
let test = Cow::Borrowed(c_str.to_str().unwrap()).into_owned();
return_dirs.push(test);
}
}
Err(_) => break
};
};
Ok(SmbDirectory { smbc: &self, fd }) Ok(return_dirs )
} }
/// Open read-only [`SmbFile`](struct.SmbFile.html) defined by SMB `path`. /// Open read-only [`SmbFile`](struct.SmbFile.html) defined by SMB `path`.