diff --git a/pbs-client/src/catalog_shell.rs b/pbs-client/src/catalog_shell.rs index 349bb7cb..f568f667 100644 --- a/pbs-client/src/catalog_shell.rs +++ b/pbs-client/src/catalog_shell.rs @@ -705,7 +705,7 @@ impl Shell { let file = Self::walk_pxar_archive(&self.accessor, &mut stack).await?; std::io::stdout() - .write_all(crate::pxar::format_multi_line_entry(file.entry()).as_bytes())?; + .write_all(crate::pxar::tools::format_multi_line_entry(file.entry()).as_bytes())?; Ok(()) } diff --git a/pbs-client/src/pxar/mod.rs b/pbs-client/src/pxar/mod.rs index 334759df..66150178 100644 --- a/pbs-client/src/pxar/mod.rs +++ b/pbs-client/src/pxar/mod.rs @@ -52,7 +52,7 @@ pub(crate) mod dir_stack; pub(crate) mod extract; pub(crate) mod look_ahead_cache; pub(crate) mod metadata; -pub(crate) mod tools; +pub mod tools; mod flags; pub use flags::Flags; @@ -69,5 +69,3 @@ pub use extract::{ /// memory, so we restrict the number of allowed entries to limit /// maximum memory usage. pub const ENCODER_MAX_ENTRIES: usize = 1024 * 1024; - -pub use tools::{format_multi_line_entry, format_single_line_entry}; diff --git a/pbs-client/src/pxar/tools.rs b/pbs-client/src/pxar/tools.rs index 27e5185a..9d4ad6a4 100644 --- a/pbs-client/src/pxar/tools.rs +++ b/pbs-client/src/pxar/tools.rs @@ -10,7 +10,7 @@ use nix::sys::stat::Mode; use pxar::{format::StatxTimestamp, mode, Entry, EntryKind, Metadata}; /// Get the file permissions as `nix::Mode` -pub fn perms_from_metadata(meta: &Metadata) -> Result { +pub(crate) fn perms_from_metadata(meta: &Metadata) -> Result { let mode = meta.stat.get_permission_bits(); u32::try_from(mode) @@ -22,12 +22,14 @@ pub fn perms_from_metadata(meta: &Metadata) -> Result { } /// Make sure path is relative and not '.' or '..'. -pub fn assert_relative_path + ?Sized>(path: &S) -> Result<(), Error> { +pub(crate) fn assert_relative_path + ?Sized>(path: &S) -> Result<(), Error> { assert_relative_path_do(Path::new(path)) } /// Make sure path is a single component and not '.' or '..'. -pub fn assert_single_path_component + ?Sized>(path: &S) -> Result<(), Error> { +pub(crate) fn assert_single_path_component + ?Sized>( + path: &S, +) -> Result<(), Error> { assert_single_path_component_do(Path::new(path)) } diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index 9d822eae..2fc0d1bb 100644 --- a/pxar-bin/src/main.rs +++ b/pxar-bin/src/main.rs @@ -12,9 +12,9 @@ use futures::select; use tokio::signal::unix::{signal, SignalKind}; use pathpatterns::{MatchEntry, MatchType, PatternFlag}; +use pbs_client::pxar::tools::format_single_line_entry; use pbs_client::pxar::{ - format_single_line_entry, Flags, OverwriteFlags, PxarExtractOptions, PxarWriters, - ENCODER_MAX_ENTRIES, + Flags, OverwriteFlags, PxarExtractOptions, PxarWriters, ENCODER_MAX_ENTRIES, }; use pxar::EntryKind;