citadel/citadel-tools
5
0
Fork 0
forked from brl/citadel-tools
Code Pull Requests Activity

updated with changes to library

Browse Source
This commit is contained in:
Bruce Leidl 2019-04-02 15:17:46 -04:00
parent 8a65aa1708
commit 92cd59eb65
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libcitadel/src/lib.rs
View File

@ -3,40 +3,9 @@
#[macro_use] extern crate serde_derive;
#[macro_use] extern crate lazy_static;
#[macro_export]
macro_rules! info {
($e:expr) => { if $crate::verbose() { println!("[+] {}", $e);} };
($fmt:expr, $($arg:tt)+) => { if $crate::verbose() { println!("[+] {}", format!($fmt, $($arg)+));} };
}
#[macro_export]
macro_rules! warn {
($e:expr) => { println!("WARNING: {}", $e); };
($fmt:expr, $($arg:tt)+) => { println!("WARNING: {}", format!($fmt, $($arg)+)); };
}
#[macro_export]
macro_rules! notify {
($e:expr) => { println!("[+] {}", $e); };
($fmt:expr, $($arg:tt)+) => { println!("[+] {}", format!($fmt, $($arg)+)); };
}
use std::cell::RefCell;
use std::result;
use failure::Error;
thread_local! {
pub static VERBOSE: RefCell<bool> = RefCell::new(false);
}
pub fn verbose() -> bool {
VERBOSE.with(|f| { *f.borrow() })
}
pub fn set_verbose(val: bool) {
VERBOSE.with(|f| { *f.borrow_mut() = val });
}
pub fn format_error(err: &Error) -> String {
let mut output = err.to_string();
let mut prev = err.as_fail();
@ -48,6 +17,8 @@ pub fn format_error(err: &Error) -> String {
output
}
#[macro_use] mod log;
#[macro_use] mod exec;
mod blockdev;
mod config;
mod keys;
@ -57,9 +28,13 @@ mod partition;
mod resource;
pub mod util;
pub mod verity;
mod mount;
mod realmfs;
mod keyring;
pub mod symlink;
mod realm;
pub mod terminal;
mod system;
pub use crate::config::OsRelease;
pub use crate::blockdev::BlockDev;
@ -67,10 +42,20 @@ pub use crate::cmdline::CommandLine;
pub use crate::header::{ImageHeader,MetaInfo};
pub use crate::partition::Partition;
pub use crate::resource::ResourceImage;
pub use crate::keys::{KeyPair,PublicKey};
pub use crate::mount::Mount;
pub use crate::realmfs::RealmFS;
pub use crate::keyring::KeyRing;
pub use crate::keys::{KeyPair,PublicKey,Signature};
pub use crate::realmfs::{RealmFS,Mountpoint,Activation};
pub use crate::keyring::{KeyRing,KernelKey};
pub use crate::exec::{Exec,FileRange};
pub use crate::realmfs::resizer::{ImageResizer,ResizeSize};
pub use crate::realm::overlay::RealmOverlay;
pub use crate::realm::realm::Realm;
pub use crate::realm::config::{RealmConfig,OverlayType,GLOBAL_CONFIG};
pub use crate::realm::events::RealmEvent;
pub use crate::realm::realms::Realms;
pub use crate::realm::manager::RealmManager;
pub use crate::log::{LogLevel,Logger,DefaultLogOutput,LogOutput};
pub use crate::system::{FileLock,Mounts,LoopDevice,UtsName};
const DEVKEYS_HEX: &str = "bc02a3a4fd4a0471a8cb2f96d8be0a0a2d060798c024e60d7a98482f23197fc0";
@ -106,3 +91,4 @@ pub fn public_key_for_channel(channel: &str) -> Result<Option<PublicKey>> {
pub type Result<T> = result::Result<T,Error>;
pub const BLOCK_SIZE: usize = 4096;