metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

fix: 🐛 improve chainofcommand expect() fn

This commit is contained in:
Berkus Decker 2022-03-01 01:08:58 +02:00
parent 072a06e7bb
commit b4ff5541a8
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/chainofcommand/src/main.rs
View File

@ -33,13 +33,23 @@ async fn expect(
m: &str, m: &str,
) -> Result<()> { ) -> Result<()> {
if let Some(buf) = from_serial.recv().await { if let Some(buf) = from_serial.recv().await {
if buf.len() == m.len() && String::from_utf8_lossy(buf.as_ref()) == m { if buf.len() >= m.len() && String::from_utf8_lossy(&buf[..m.len()]) == m {
if buf.len() > m.len() {
to_console2.send(buf[m.len()..].to_vec()).await?;
}
return Ok(()); return Ok(());
} }
to_console2.send(buf).await?; to_console2.send(buf.clone()).await?;
return Err(anyhow!("Failed to receive expected value")); return Err(anyhow!(
"Failed to receive expected value {:?}: got {:?}",
m,
buf
));
} }
Err(anyhow!("Failed to receive expected value")) Err(anyhow!(
"Failed to receive expected value {:?}: got empty buf",
m,
))
} }
async fn load_kernel<P>(to_console2: &mpsc::Sender<Vec<u8>>, kernel: P) -> Result<(File, u64)> async fn load_kernel<P>(to_console2: &mpsc::Sender<Vec<u8>>, kernel: P) -> Result<(File, u64)>