diff options
author | Rory Dudley | 2024-04-06 23:32:30 -0600 |
---|---|---|
committer | Rory Dudley | 2024-04-06 23:32:30 -0600 |
commit | f5db8d64828db756b80b6022322265a2b4f1c11b (patch) | |
tree | 68555331ad4dcab6c571c4016c1e8baa3a351ae7 /src/poem/anthology.rs | |
parent | 1415c8f9b89699000ef8d864ff8f0e1bebca4a5f (diff) | |
download | dwarvish-f5db8d64828db756b80b6022322265a2b4f1c11b.tar.gz |
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.
Diffstat (limited to 'src/poem/anthology.rs')
-rw-r--r-- | src/poem/anthology.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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<usize> { /// ... /// } /// ``` -pub fn incant(verse: &Verse, out: &mut String, index: usize, env: &mut Environment) -> i32 { +pub fn incant(verse: &Verse, out: &mut Vec<u8>, index: usize, env: &mut Environment) -> i32 { let verb = INDEX[index]; match verb { "alias" => alias::incant(verse, out, &mut env.aliases), |