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

fop(1): fixed trimming and handled unwraps (closes #58)

Browse Source
This commit is contained in:
Emma Tebibyte 2024-02-14 22:53:45 -07:00
parent d3470233ea
commit f8e3013563
Signed by: emma
GPG Key ID: 06FA419A1698C270
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/fop.rs
View File

@ -26,7 +26,7 @@ extern crate sysexits;
extern crate getopt; extern crate getopt;
use getopt::{ Opt, Parser }; use getopt::{ Opt, Parser };
use sysexits::{ EX_DATAERR, EX_USAGE }; use sysexits::{ EX_DATAERR, EX_IOERR, EX_UNAVAILABLE, EX_USAGE };
fn main() { fn main() {
let argv = args().collect::<Vec<String>>(); let argv = args().collect::<Vec<String>>();
@ -60,17 +60,24 @@ fn main() {
}); });
let mut buf = String::new(); let mut buf = String::new();
stdin().read_to_string(&mut buf).unwrap(); let _ = stdin().read_to_string(&mut buf);
let mut fields = buf.split(d).collect::<Vec<&str>>(); let mut fields = buf.split(d).collect::<Vec<&str>>();
let opts = argv.iter().clone().skip(command_arg + 1).collect::<Vec<&String>>(); let opts = argv
.iter()
.clone()
.skip(command_arg + 1)
.collect::<Vec<&String>>();
let mut spawned = Command::new(argv.get(command_arg).unwrap()) let mut spawned = Command::new(argv.get(command_arg).unwrap())
.args(opts) .args(opts)
.stdin(Stdio::piped()) .stdin(Stdio::piped())
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.spawn() .spawn()
.unwrap(); .unwrap_or_else( |_| {
eprintln!("{}: {}: Command not found.", argv[0], argv[command_arg]);
exit(EX_UNAVAILABLE);
});
let field = fields.get(index).unwrap_or_else(|| { let field = fields.get(index).unwrap_or_else(|| {
eprintln!( eprintln!(
@ -82,15 +89,28 @@ fn main() {
}); });
if let Some(mut child_stdin) = spawned.stdin.take() { if let Some(mut child_stdin) = spawned.stdin.take() {
child_stdin.write_all(field.as_bytes()).unwrap(); let _ = child_stdin.write_all(field.as_bytes());
drop(child_stdin); drop(child_stdin);
} }
let output = spawned.wait_with_output().unwrap(); let output = spawned.wait_with_output().unwrap_or_else(|| {
eprintln!("{}: {}: Command has no output.",
argv[0],
argv[command_arg]
);
exit(EX_IOERR);
});
let new_field = String::from_utf8(output.stdout).unwrap(); let new_field = String::from_utf8(output.stdout).unwrap_or_else(|_| {
eprintln!(
"{}: {}: Command output is invalid UTF-8.",
argv[0],
argv[command_arg]
);
exit(EX_IOERR);
});
fields[index] = &new_field; fields[index] = &new_field.trim_end();
print!("{}", fields.join(&d.to_string())); print!("{}", fields.join(&d.to_string()));
} }