From fbc836b553cba70ce482905638f4f118c5612f6f Mon Sep 17 00:00:00 2001
From: Jonah Caplan <jonahcaplan@gmail.com>
Date: Sat, 16 Oct 2021 14:02:44 -0400
Subject: [PATCH] Revert -X stuff

This reverts commit 91860bf68205f1fbd41e6c01a5bf0decbbbfe0c4.
---
 src/exec/job.rs | 36 +++++++++---------------------------
 src/exec/mod.rs |  5 ++++-
 src/main.rs     |  2 +-
 src/walk.rs     | 11 ++---------
 tests/tests.rs  | 11 -----------
 5 files changed, 16 insertions(+), 49 deletions(-)

diff --git a/src/exec/job.rs b/src/exec/job.rs
index d940707..83abf1a 100644
--- a/src/exec/job.rs
+++ b/src/exec/job.rs
@@ -2,10 +2,8 @@ use std::path::PathBuf;
 use std::sync::mpsc::Receiver;
 use std::sync::{Arc, Mutex};
 
-use crate::config::Config;
 use crate::error::print_error;
 use crate::exit_codes::{merge_exitcodes, ExitCode};
-use crate::filesystem::strip_current_dir;
 use crate::walk::WorkerResult;
 
 use super::CommandTemplate;
@@ -19,7 +17,6 @@ pub fn job(
     out_perm: Arc<Mutex<()>>,
     show_filesystem_errors: bool,
     buffer_output: bool,
-    config: &Arc<Config>,
 ) -> ExitCode {
     let mut results: Vec<ExitCode> = Vec::new();
     loop {
@@ -39,15 +36,10 @@ pub fn job(
             Err(_) => break,
         };
 
-        let path = if config.no_strip {
-            value
-        } else {
-            strip_current_dir(&value).to_path_buf()
-        };
         // Drop the lock so that other threads can read from the receiver.
         drop(lock);
         // Generate a command, execute it and store its exit code.
-        results.push(cmd.generate_and_execute(&path, Arc::clone(&out_perm), buffer_output))
+        results.push(cmd.generate_and_execute(&value, Arc::clone(&out_perm), buffer_output))
     }
     // Returns error in case of any error.
     merge_exitcodes(results)
@@ -58,25 +50,15 @@ pub fn batch(
     cmd: &CommandTemplate,
     show_filesystem_errors: bool,
     buffer_output: bool,
-    config: &Arc<Config>,
 ) -> ExitCode {
-    let paths = rx
-        .iter()
-        .filter_map(|value| match value {
-            WorkerResult::Entry(val) => Some(val),
-            WorkerResult::Error(err) => {
-                if show_filesystem_errors {
-                    print_error(err.to_string());
-                }
-                None
+    let paths = rx.iter().filter_map(|value| match value {
+        WorkerResult::Entry(val) => Some(val),
+        WorkerResult::Error(err) => {
+            if show_filesystem_errors {
+                print_error(err.to_string());
             }
-        })
-        .map(|m| {
-            if config.no_strip {
-                m
-            } else {
-                strip_current_dir(&m).to_path_buf()
-            }
-        });
+            None
+        }
+    });
     cmd.generate_and_execute_batch(paths, buffer_output)
 }
diff --git a/src/exec/mod.rs b/src/exec/mod.rs
index 15e1ae5..a364e86 100644
--- a/src/exec/mod.rs
+++ b/src/exec/mod.rs
@@ -14,6 +14,7 @@ use lazy_static::lazy_static;
 use regex::Regex;
 
 use crate::exit_codes::ExitCode;
+use crate::filesystem::strip_current_dir;
 
 use self::command::execute_command;
 use self::input::{basename, dirname, remove_extension};
@@ -144,6 +145,8 @@ impl CommandTemplate {
         out_perm: Arc<Mutex<()>>,
         buffer_output: bool,
     ) -> ExitCode {
+        let input = strip_current_dir(input);
+
         let mut cmd = Command::new(self.args[0].generate(&input, self.path_separator.as_deref()));
         for arg in &self.args[1..] {
             cmd.arg(arg.generate(&input, self.path_separator.as_deref()));
@@ -175,7 +178,7 @@ impl CommandTemplate {
                 // A single `Tokens` is expected
                 // So we can directly consume the iterator once and for all
                 for path in &mut paths {
-                    cmd.arg(arg.generate(path, self.path_separator.as_deref()));
+                    cmd.arg(arg.generate(strip_current_dir(path), self.path_separator.as_deref()));
                     has_path = true;
                 }
             } else {
diff --git a/src/main.rs b/src/main.rs
index e9ad6f7..47e68bd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -376,7 +376,7 @@ fn construct_config(matches: clap::ArgMatches, pattern_regex: &str) -> Result<Co
                 }
             }),
         no_strip: matches.is_present("path") || matches.is_present("search-path"),
-    })
+        })
 }
 
 fn extract_command(
diff --git a/src/walk.rs b/src/walk.rs
index f51cd71..7850ad7 100644
--- a/src/walk.rs
+++ b/src/walk.rs
@@ -179,13 +179,7 @@ fn spawn_receiver(
         // This will be set to `Some` if the `--exec` argument was supplied.
         if let Some(ref cmd) = config.command {
             if cmd.in_batch_mode() {
-                exec::batch(
-                    rx,
-                    cmd,
-                    show_filesystem_errors,
-                    enable_output_buffering,
-                    &config,
-                )
+                exec::batch(rx, cmd, show_filesystem_errors, enable_output_buffering)
             } else {
                 let shared_rx = Arc::new(Mutex::new(rx));
 
@@ -197,7 +191,7 @@ fn spawn_receiver(
                     let rx = Arc::clone(&shared_rx);
                     let cmd = Arc::clone(cmd);
                     let out_perm = Arc::clone(&out_perm);
-                    let config = Arc::clone(&config);
+
                     // Spawn a job thread that will listen for and execute inputs.
                     let handle = thread::spawn(move || {
                         exec::job(
@@ -206,7 +200,6 @@ fn spawn_receiver(
                             out_perm,
                             show_filesystem_errors,
                             enable_output_buffering,
-                            &config,
                         )
                     });
 
diff --git a/tests/tests.rs b/tests/tests.rs
index add4ab9..d873f84 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -1935,15 +1935,4 @@ fn test_no_strip() {
         ./one/two/three/directory_foo
         ./symlink",
     );
-
-    te.assert_output(
-        &["c.foo", "./", "-x", "echo"],
-        "./one/two/c.foo
-        ./one/two/C.Foo2",
-    );
-
-    te.assert_output(
-        &["c.foo", "./", "-X", "echo"],
-        "./one/two/C.Foo2 ./one/two/c.foo",
-    )
 }