added c-main dependency
This commit is contained in:
parent
03e02b9882
commit
19e5f4e2f4
10
Cargo.lock
generated
10
Cargo.lock
generated
@ -30,6 +30,15 @@ version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "c-main"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "797bbff8bd2bcddb7f0ee638b55398686adac15174689a86da5ffc0f51219f75"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cexpr"
|
||||
version = "0.6.0"
|
||||
@ -205,6 +214,7 @@ dependencies = [
|
||||
name = "tomcat"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"c-main",
|
||||
"toml",
|
||||
"yacexits",
|
||||
]
|
||||
|
@ -6,5 +6,6 @@ license = "AGPL-3.0-or-later"
|
||||
authors = [ "Emma Tebibyte <emma@tebibyte.media>" ]
|
||||
|
||||
[dependencies]
|
||||
c-main = "1.0.1"
|
||||
toml = "0.5.9"
|
||||
yacexits = "0.1.2"
|
||||
|
17
src/main.rs
17
src/main.rs
@ -16,8 +16,9 @@
|
||||
* along with this program. If not, see https://www.gnu.org/licenses/.
|
||||
*/
|
||||
|
||||
#![no_main]
|
||||
|
||||
use std::{
|
||||
env,
|
||||
fs::File,
|
||||
io::Read,
|
||||
iter::Peekable,
|
||||
@ -26,6 +27,7 @@ use std::{
|
||||
str::FromStr,
|
||||
};
|
||||
|
||||
use c_main::Args;
|
||||
use toml::Value;
|
||||
use yacexits::*;
|
||||
|
||||
@ -97,8 +99,9 @@ fn parse_toml(
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let argv: Vec<String> = env::args().collect();
|
||||
#[no_mangle]
|
||||
fn rust_main(args: Args) {
|
||||
let argv: Vec<&str> = args.into_iter().collect();
|
||||
let usage_info = format!("Usage: {} [table.]key[[index]] [file...]", argv[0]);
|
||||
|
||||
if argv.len() <= 1 {
|
||||
@ -106,15 +109,11 @@ fn main() {
|
||||
exit(EX_USAGE);
|
||||
}
|
||||
|
||||
let input: &str;
|
||||
|
||||
if let Some(arg) = argv.get(2) {
|
||||
input = arg;
|
||||
} else { input = &""; }
|
||||
let input = argv.get(2).unwrap_or(&"");
|
||||
|
||||
let mut content = Vec::new();
|
||||
|
||||
match input {
|
||||
match input.to_owned() {
|
||||
"-" | "" => unsafe { File::from_raw_fd(0) },
|
||||
_ => {
|
||||
File::open(Path::new(&input)).unwrap_or_else(|_| {
|
||||
|
Loading…
Reference in New Issue
Block a user