From f5db8d64828db756b80b6022322265a2b4f1c11b Mon Sep 17 00:00:00 2001 From: Rory Dudley Date: Sat, 6 Apr 2024 23:32:30 -0600 Subject: Capture STDOUT as bytes, and convert to string when necessary Previously, the recite() function created the 'out' variable, which was a String, that got passed to the various incant functions, in order to capture STDOUT in certain situations. In cases where STDOUT was captured, it was first converted to a String, and then appended to the 'out' variable, by means of String::from_utf8_lossy(). This works for basic text, however, does NOT work for binary data. This becomes problematic, when for example, downling a tar file with curl/wget, that is then piped ('|') to the tar program. Using from_utf8_lossy() in this case can corrupt the tar file. This patch makes it so that out is stored as bytes by default, and only converted to a String when necessary. --- src/poem/anthology.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/poem/anthology.rs') diff --git a/src/poem/anthology.rs b/src/poem/anthology.rs index 79f48f2..7766f62 100644 --- a/src/poem/anthology.rs +++ b/src/poem/anthology.rs @@ -43,7 +43,7 @@ pub fn lookup(verb: &str) -> Option { /// ... /// } /// ``` -pub fn incant(verse: &Verse, out: &mut String, index: usize, env: &mut Environment) -> i32 { +pub fn incant(verse: &Verse, out: &mut Vec, index: usize, env: &mut Environment) -> i32 { let verb = INDEX[index]; match verb { "alias" => alias::incant(verse, out, &mut env.aliases), -- cgit v1.2.3