bonsai/harakit
5
4
Fork 3
Code Issues 41 Pull Requests 7 Projects 1 Releases 30 Activity

fop(1): changed to use strerror(3)

Browse Source
This commit is contained in:
Emma Tebibyte 2024-03-01 23:10:28 -07:00
parent e81703c6e1
commit 8f956d775c
Signed by: emma
GPG Key ID: 06FA419A1698C270
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fop.rs
View File

@ -22,10 +22,12 @@ use std::{
process::{ Command, exit, Stdio }, process::{ Command, exit, Stdio },
}; };
extern crate sysexits;
extern crate getopt; extern crate getopt;
extern crate strerror;
extern crate sysexits;
use getopt::{ Opt, Parser }; use getopt::{ Opt, Parser };
use strerror::c_error;
use sysexits::{ EX_DATAERR, EX_IOERR, EX_UNAVAILABLE, EX_USAGE }; use sysexits::{ EX_DATAERR, EX_IOERR, EX_UNAVAILABLE, EX_USAGE };
fn main() { fn main() {
@ -55,7 +57,7 @@ fn main() {
}); });
let index = argv[index_arg].parse::<usize>().unwrap_or_else(|e| { let index = argv[index_arg].parse::<usize>().unwrap_or_else(|e| {
eprintln!("{}: {}: {}.", argv[0], argv[1], e); eprintln!("{}: {}: {}", argv[0], argv[1], e);
exit(EX_DATAERR); exit(EX_DATAERR);
}); });
@ -75,13 +77,13 @@ fn main() {
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.spawn() .spawn()
.unwrap_or_else( |e| { .unwrap_or_else( |e| {
eprintln!("{}: {}: {}.", argv[0], argv[command_arg], e); eprintln!("{}: {}: {}", argv[0], argv[command_arg], c_error(e));
exit(EX_UNAVAILABLE); exit(EX_UNAVAILABLE);
}); });
let field = fields.get(index).unwrap_or_else(|| { let field = fields.get(index).unwrap_or_else(|| {
eprintln!( eprintln!(
"{}: {}: No such index in input.", "{}: {}: No such index in input",
argv[0], argv[0],
index.to_string(), index.to_string(),
); );
@ -94,7 +96,7 @@ fn main() {
} }
let output = spawned.wait_with_output().unwrap_or_else(|e| { let output = spawned.wait_with_output().unwrap_or_else(|e| {
eprintln!("{}: {}: {}.", argv[0], argv[command_arg], e); eprintln!("{}: {}: {}", argv[0], argv[command_arg], c_error(e));
exit(EX_IOERR); exit(EX_IOERR);
}); });
@ -103,7 +105,7 @@ fn main() {
if replace.pop() != Some(b'\n') { replace = output.stdout; } if replace.pop() != Some(b'\n') { replace = output.stdout; }
let new_field = String::from_utf8(replace).unwrap_or_else(|e| { let new_field = String::from_utf8(replace).unwrap_or_else(|e| {
eprintln!("{}: {}: {}.", argv[0], argv[command_arg], e); eprintln!("{}: {}: {}", argv[0], argv[command_arg], e);
exit(EX_IOERR); exit(EX_IOERR);
}); });
@ -111,8 +113,8 @@ fn main() {
stdout().write_all( stdout().write_all(
fields.join(&d.to_string()).as_bytes() fields.join(&d.to_string()).as_bytes()
).unwrap_or_else(|e|{ ).unwrap_or_else(|e| {
eprintln!("{}: {}.", argv[0], e); eprintln!("{}: {}", argv[0], c_error(e));
exit(EX_IOERR); exit(EX_IOERR);
}); });
} }