summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2021-01-22 08:00:37 +0100
committerJustus Winter <justus@sequoia-pgp.org>2021-01-22 08:33:14 +0100
commitcfa56685eb6e196d88d25a985197ba9746be09b1 (patch)
tree55512dfd18b55d08477cd9c4ac767f3f925bb7ad
parent2e770949e3d1f5de46c3d4c38e6fdf70f07b9f1e (diff)
sq: Use buffered_reader::Dup::data in the armor detection.
- This works around the bug fixed in acbcd3360bdc0091769d2367c7bd97363b8aa087 and thus fixes armor detection when compiled using buffered-reader 1.0.0.
-rw-r--r--sq/src/sq.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/sq/src/sq.rs b/sq/src/sq.rs
index c7968704..4f5cfcba 100644
--- a/sq/src/sq.rs
+++ b/sq/src/sq.rs
@@ -2,7 +2,7 @@
use anyhow::Context as _;
use std::fs::OpenOptions;
-use std::io::{self, Read, Write};
+use std::io::{self, Write};
use std::path::{Path, PathBuf};
use std::time::Duration;
use chrono::{DateTime, offset::Utc};
@@ -465,8 +465,7 @@ fn main() -> Result<()> {
let mut reader =
armor::Reader::new(&mut dup,
armor::ReaderMode::Tolerant(None));
- let mut buf = [0; 8];
- (reader.read(&mut buf).is_ok(), reader.kind())
+ (reader.data(8).is_ok(), reader.kind())
};
let mut input =
dup.as_boxed().into_inner().unwrap().into_inner().unwrap();