added exit_no_std and better builds

This commit is contained in:
2022-12-19 20:55:48 -05:00
parent a74b0fede2
commit 7128f8d673
5 changed files with 67 additions and 15 deletions
+8 -8
View File
@@ -19,7 +19,7 @@ use std::env;
use std::fs::File;
use std::io::Read;
use std::path::Path;
use std::process;
use exit_no_std::exit;
use std::str::FromStr;
use toml::Value;
@@ -29,7 +29,7 @@ fn main() {
let argv0 = arguments.remove(0);
if arguments[1].is_empty() {
eprintln!("Usage: {} [table...].[value[index]] [file...]", argv0);
process::exit(64); // sysexits(3) EX_USAGE
exit(64); // sysexits(3) EX_USAGE
}
let input = &arguments[1];
let mut content = String::new();
@@ -53,7 +53,7 @@ fn main() {
Ok(i) => index = i,
Err(_) => {
eprintln!("{}: {}: Cannot index by given value.", argv0, istr);
process::exit(65); // sysexits(3) EX_DATAERR
exit(64); // sysexits(3) EX_USAGE
},
};
}
@@ -75,7 +75,7 @@ fn main() {
match valiter.peek() {
Some(_) => {
eprintln!("{}: {}: Not a table.", argv0, item);
process::exit(65); // sysexits(3) EX_DATAERR
exit(65); // sysexits(3) EX_DATAERR
},
None => {
match array.get(index) {
@@ -86,7 +86,7 @@ fn main() {
eprintln!(
"{}: {:?}: No value at given index.", argv0, index
);
process::exit(65); // sysexits(3) EX_DATAERR
exit(65); // sysexits(3) EX_DATAERR
},
};
},
@@ -94,7 +94,7 @@ fn main() {
eprintln!(
"{}: {:?}: No value at given index.", argv0, index
);
process::exit(65); // sysexits(3) EX_DATAERR
exit(65); // sysexits(3) EX_DATAERR
},
};
},
@@ -108,7 +108,7 @@ fn main() {
match valiter.peek() {
Some(_) => {
eprintln!("{}: {}: Not a table.", argv0, item);
process::exit(65); // sysexits(3) EX_DATAERR
exit(65); // sysexits(3) EX_DATAERR
},
None => out.push_str(string.as_str()),
};
@@ -125,7 +125,7 @@ fn main() {
},
None => {
eprintln!("{}: {}: No such table or key.", argv0, item);
process::exit(65); // sysexits(3) EX_DATAERR
exit(65); // sysexits(3) EX_DATAERR
},
};
}