From fb35dbfdc5a9446fbb856dae5542b23963e28b89 Mon Sep 17 00:00:00 2001 From: Thomas Bertschinger Date: Mon, 15 Jan 2024 23:41:01 -0700 Subject: remove library from bcachefs-tools Rust package When bcachefs was a C program that had some functions implemented in Rust, it was necessary to make a static library containing the Rust functions available for the C program to link. Now that bcachefs is a Rust program, that library is no longer needed. Instead, the Rust executable links in libbachefs.a. This patch updates the crate structure to reflect that. The command functions are moved into their own module. There could be a need to create a "libbachefs-tools" library in the future that exposes an API for bcachefs functionality to other userspace programs. That will be a different, external API as opposed to the previous library functions which were an internal API for the bcachefs tool itself. Signed-off-by: Thomas Bertschinger Signed-off-by: Kent Overstreet --- rust-src/src/bcachefs.rs | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'rust-src/src/bcachefs.rs') diff --git a/rust-src/src/bcachefs.rs b/rust-src/src/bcachefs.rs index 3d7af3d4..95f5e1f0 100644 --- a/rust-src/src/bcachefs.rs +++ b/rust-src/src/bcachefs.rs @@ -1,11 +1,24 @@ +mod commands; +mod key; + use std::ffi::CString; -use bcachefs::cmd_completions::cmd_completions; -use bcachefs::cmd_list::cmd_list; -use bcachefs::cmd_mount::cmd_mount; -use bcachefs::logger::SimpleLogger; +use commands::cmd_completions::cmd_completions; +use commands::cmd_list::cmd_list; +use commands::cmd_mount::cmd_mount; +use commands::logger::SimpleLogger; use bch_bindgen::c; +#[derive(Debug)] +pub struct ErrnoError(pub errno::Errno); +impl std::fmt::Display for ErrnoError { + fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> { + self.0.fmt(f) + } +} + +impl std::error::Error for ErrnoError {} + fn handle_c_command(args: Vec, symlink_cmd: Option<&str>) -> i32 { let mut argv: Vec<_> = args.clone(); -- cgit v1.2.3