Cargo.lock

@@ -30,15 +30,6 @@ 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"
@@ -214,7 +205,6 @@ dependencies = [
 name = "tomcat"
 version = "0.0.1"
 dependencies = [
- "c-main",
  "toml",
  "yacexits",
 ]

Cargo.toml

@@ -6,6 +6,5 @@ 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"

src/main.rs

@@ -16,18 +16,18 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
-#![no_main]
-
 use std::{
+  env,
   fs::File,
-  io::Read,
+  io::{
+    Read,
+    stdin,
+  },
   iter::Peekable,
-  os::fd::{ FromRawFd },
   path::Path,
   str::FromStr,
 };
 
-use c_main::Args;
 use toml::Value;
 use yacexits::*;
 
@@ -48,15 +48,21 @@ fn parse_toml(
 
     match value {
       Value::Table(table) => {
-        if tabkey.peek().is_some() {
+        match tabkey.peek() {
+          Some(_) => {
             root = toml::Value::Table(table.to_owned());
             continue;
+          },
+          None => {}, // out.push_str(table.as_str()),
         };
       },
       _ => {
-        if tabkey.peek().is_some() {
+        match tabkey.peek() {
-          return Err((format!("{}: Not a table.", item), EX_DATAERR));
+          Some(_) => {
-        }
+            return Err((format!("{}: Not a table.", item), EX_DATAERR));
+          },
+          None => {},
+        };
       },
     };
 
@@ -99,46 +105,54 @@ fn parse_toml(
   Ok(out)
 }
 
-#[no_mangle]
+fn main() {
-fn rust_main(args: Args) {
+  let argv: Vec<String> = env::args().collect();
-  let argv: Vec<&str> = args.into_iter().collect();
   let usage_info = format!("Usage: {} [table.]key[[index]] [file...]", argv[0]);
 
   if argv.len() <= 1 {
     eprintln!("{}", usage_info);
-    exit(EX_USAGE);
+    exit(64); // sysexits(3) EX_USAGE
   }
-
+  
-  let input = argv.get(2).unwrap_or(&"");
+  let input = match argv.get(2) {
-
+    Some(val) => val,
+    None => {
+      eprintln!("{}", usage_info);
+      exit(EX_USAGE);
+    },
+  };
   let mut content = Vec::new();
   
-  match input.to_owned() {
+  let file = Path::new(&input);
-    "-" | "" => unsafe { File::from_raw_fd(0) },
-    _ => {
-      File::open(Path::new(&input)).unwrap_or_else(|_| {
-        eprintln!(
-          "{}: {}: No such file or directory.",
-          argv[0],
-          &input
-        );
-        exit(EX_UNAVAILABLE);
-      })
-    },
-  }.read_to_end(&mut content)
-    .unwrap_or_else(|_| {
-      eprintln!("{}: Could not read input.", argv[0]);
-      exit(EX_OSERR);
-    });
 
+  if input == &"-" {
+    match stdin().lock().read_to_end(&mut content) {
+      Ok(_) => {},
+      Err(_) => {
+        eprintln!("{}: Could not read from standard input.", argv[0]);
+        exit(EX_OSERR);
+      },
+    };
+  } else {
+    match File::open(file).unwrap().read_to_end(&mut content) {
+      Ok(_) => {},
+      Err(_) => {
+        eprintln!("{}: {:?}: No such file or directory.", argv[0], file);
+        exit(EX_UNAVAILABLE);
+      },
+    };
+  }
 
   let mut tabkey: Vec<&str> = argv[1].split(".").collect();
   let mut indexvec = Vec::new();
   let mut index: Option<usize> = None;
 
-  if tabkey.iter().skip(1).peekable().peek().is_some() {
+  match tabkey.iter().skip(1).peekable().peek() {
+    Some(_) => {
       indexvec = tabkey[1].split(&['[', ']'][..]).collect();
       tabkey[1] = indexvec.remove(0);
+    },
+    None => {},
   };
 
   if ! indexvec.is_empty() {
@@ -152,16 +166,13 @@ fn rust_main(args: Args) {
     };
   }
 
-  let root = String::from_utf8(content)
+  let root = match String::from_utf8(content).unwrap().parse::<Value>() {
-    .unwrap_or_else(|_| {
+    Ok(toml) => toml,
-      eprintln!("{}: Input is not valid UTF-8.", argv[0]);
+    Err(_) => {
-      exit(EX_DATAERR);
-    })
-    .parse::<Value>()
-    .unwrap_or_else(|_| {
       eprintln!("{}: Unable to parse TOML.", argv[0]);
       exit(EX_DATAERR);
-    });
+    },
+  };
 
   let valiter = tabkey.iter().peekable();
   println!(