use PathBuf for unmocked_commands

Author: soenkehahn

src/protocol/mod.rs

@@ -349,7 +349,7 @@ impl Protocol {
 #[derive(Debug, PartialEq)]
 pub struct Protocols {
     pub protocols: Vec<Protocol>,
-    pub unmocked_commands: Vec<Vec<u8>>,
+    pub unmocked_commands: Vec<PathBuf>,
     pub interpreter: Option<Vec<u8>>,
 }
 
@@ -381,7 +381,7 @@ impl Protocols {
         if let Ok(unmocked_commands) = object.expect_field("unmockedCommands") {
             for unmocked_command in unmocked_commands.expect_array()? {
                 self.unmocked_commands
-                    .push(unmocked_command.expect_str()?.as_bytes().to_vec());
+                    .push(PathBuf::from(unmocked_command.expect_str()?));
             }
         }
         Ok(())
@@ -454,7 +454,7 @@ impl Protocols {
                     self.unmocked_commands
                         .iter()
                         .map(|unmocked_command| {
-                            Ok(Yaml::String(String::from_utf8(unmocked_command.to_vec())?))
+                            Ok(Yaml::String(path_to_string(unmocked_command)?.to_string()))
                         })
                         .collect::<R<Vec<Yaml>>>()?,
                 ),
@@ -833,7 +833,7 @@ mod load {
                     "
                 )?
                 .unmocked_commands
-                .map(|command| String::from_utf8(command).unwrap()),
+                .map(|path| path.to_string_lossy().to_string()),
                 vec!["foo"]
             );
             Ok(())
@@ -1071,7 +1071,7 @@ mod serialize {
     #[test]
     fn includes_unmocked_commands() -> R<()> {
         let mut protocols = Protocols::new(vec![Protocol::new(vec![])]);
-        protocols.unmocked_commands = vec![b"sed".to_vec()];
+        protocols.unmocked_commands = vec![PathBuf::from("sed")];
         roundtrip(protocols)
     }
 }

src/protocol_checker/mod.rs

@@ -19,7 +19,7 @@ use std::path::PathBuf;
 pub struct ProtocolChecker {
     context: Context,
     pub protocol: Protocol,
-    pub unmocked_commands: Vec<Vec<u8>>,
+    pub unmocked_commands: Vec<PathBuf>,
     pub result: CheckerResult,
     temporary_executables: Vec<ShortTempFile>,
 }
@@ -28,7 +28,7 @@ impl ProtocolChecker {
     pub fn new(
         context: &Context,
         protocol: Protocol,
-        unmocked_commands: &[Vec<u8>],
+        unmocked_commands: &[PathBuf],
     ) -> ProtocolChecker {
         ProtocolChecker {
             context: context.clone(),
@@ -103,7 +103,7 @@ impl SyscallMock for ProtocolChecker {
         if !self
             .unmocked_commands
             .iter()
-            .any(|c| protocol::compare_executables(&c, &executable))
+            .any(|c| protocol::compare_executables(&c.as_os_str().as_bytes(), &executable))
         {
             let mock_executable_path = self.handle_step(protocol::Command {
                 executable,

src/recorder/hole_recorder.rs

@@ -9,7 +9,7 @@ use crate::tracer::SyscallMock;
 use crate::{ExitCode, R};
 use libc::user_regs_struct;
 use nix::unistd::Pid;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 pub enum HoleRecorder {
     Checker {
@@ -24,7 +24,7 @@ pub enum HoleRecorder {
 impl HoleRecorder {
     pub fn new(
         context: &Context,
-        unmocked_commands: &[Vec<u8>],
+        unmocked_commands: &[PathBuf],
         protocol: Protocol,
     ) -> HoleRecorder {
         HoleRecorder::Checker {

src/recorder/mod.rs

@@ -8,11 +8,13 @@ use crate::tracer::SyscallMock;
 use crate::R;
 use libc::user_regs_struct;
 use nix::unistd::Pid;
+use std::os::unix::ffi::OsStrExt;
+use std::path::PathBuf;
 
 pub struct Recorder {
     protocol: Protocol,
     command: Option<Command>,
-    unmocked_commands: Vec<Vec<u8>>,
+    unmocked_commands: Vec<PathBuf>,
 }
 
 impl Recorder {
@@ -24,7 +26,7 @@ impl Recorder {
         }
     }
 
-    pub fn new(protocol: Protocol, unmocked_commands: &[Vec<u8>]) -> Recorder {
+    pub fn new(protocol: Protocol, unmocked_commands: &[PathBuf]) -> Recorder {
         Recorder {
             protocol,
             command: None,
@@ -43,11 +45,10 @@ impl SyscallMock for Recorder {
         executable: Vec<u8>,
         arguments: Vec<Vec<u8>>,
     ) -> R<()> {
-        if !self
-            .unmocked_commands
-            .iter()
-            .any(|unmocked_command| compare_executables(&unmocked_command, &executable))
-        {
+        let is_unmocked_command = self.unmocked_commands.iter().any(|unmocked_command| {
+            compare_executables(unmocked_command.as_os_str().as_bytes(), &executable)
+        });
+        if !is_unmocked_command {
             self.command = Some(Command {
                 executable,
                 arguments,

src/recorder/protocol_result.rs

@@ -9,7 +9,7 @@ use crate::tracer::stdio_redirecting::CaptureStderr;
 use crate::tracer::Tracer;
 use crate::{ExitCode, R};
 use std::fs::OpenOptions;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 #[derive(Debug, PartialEq)]
 pub enum ProtocolResult {
@@ -44,15 +44,15 @@ impl ProtocolResult {
         interpreter: &Option<Vec<u8>>,
         program: &Path,
         protocols: Vec<Protocol>,
-        unmocked_commands: &[Vec<u8>],
+        unmocked_commands: &[PathBuf],
     ) -> R<Vec<ProtocolResult>> {
         let mut results = vec![];
         for protocol in protocols.into_iter() {
             results.push(run_against_protocol(
                 context,
                 &interpreter,
                 program,
-                &unmocked_commands,
+                unmocked_commands,
                 protocol,
             )?);
         }
@@ -62,7 +62,7 @@ impl ProtocolResult {
     pub fn handle_results(
         context: &Context,
         protocols_file: &Path,
-        unmocked_commands: Vec<Vec<u8>>,
+        unmocked_commands: Vec<PathBuf>,
         results: &[ProtocolResult],
     ) -> R<ExitCode> {
         let checker_results = CheckerResults(
@@ -85,7 +85,7 @@ impl ProtocolResult {
     fn handle_recorded(
         context: &Context,
         protocols_file: &Path,
-        unmocked_commands: Vec<Vec<u8>>,
+        unmocked_commands: Vec<PathBuf>,
         results: &[ProtocolResult],
         checker_results: &CheckerResults,
     ) -> R<()> {
@@ -117,7 +117,7 @@ fn run_against_protocol(
     context: &Context,
     interpreter: &Option<Vec<u8>>,
     program: &Path,
-    unmocked_commands: &[Vec<u8>],
+    unmocked_commands: &[PathBuf],
     protocol: Protocol,
 ) -> R<ProtocolResult> {
     macro_rules! run_against_mock {