From 58d2c92e3af0b91d19bc1ca7a8bbad45916cb087 Mon Sep 17 00:00:00 2001 From: Hiers Date: Sun, 17 Dec 2023 21:33:24 +0000 Subject: [PATCH] Fix some bugs on empty inputs. --- src/main.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2881202..f53cced 100644 --- a/src/main.rs +++ b/src/main.rs @@ -44,8 +44,9 @@ fn main() -> Result<(), ureq::Error> { loop { query.clear(); - if options.interactive || query.trim().is_empty() { - while query.trim().is_empty() || query.trim() == ":" || query.trim() == ":" { + query = options.query.trim().to_string().clone(); + if options.interactive || options.query.trim().is_empty() { + while query.is_empty() || query == ":" || query == ":" || query == "_" || query == "_" { query.clear(); print!("=> "); stdout().flush().unwrap(); @@ -55,12 +56,10 @@ fn main() -> Result<(), ureq::Error> { } } } else { - query = options.query.clone(); - if query.trim() == ":" || query.trim() == ":" || query.trim() == "_" || query.trim() == "_" { + if query == ":" || query == ":" || query == "_" || query == "_" { return Ok(()); } } - query = query.trim().to_string(); let mut lines_output = 0; let mut output = String::with_capacity(51200); /* Give output 50KiB of buffer; Should be enough to avoid reallocs*/ @@ -111,7 +110,7 @@ fn main() -> Result<(), ureq::Error> { } else { print!("{}", output); } - if !options.interactive { + if !options.interactive && !options.query.trim().is_empty() { break; } }