From 743232bf04d8ade18cfa2c791ed466ce48519878 Mon Sep 17 00:00:00 2001
From: Greg Pfeil <greg@technomadic.org>
Date: Thu, 30 Nov 2023 00:17:25 -0700
Subject: [PATCH 1/2] =?UTF-8?q?Don=E2=80=99t=20use=20`execvp`=20when=20we?=
 =?UTF-8?q?=20know=20the=20path?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nix/develop.cc |  2 +-
 src/nix/fmt.cc     |  2 +-
 src/nix/run.cc     | 10 +++++++---
 src/nix/run.hh     |  1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 38482ed42..ae9be79a3 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -662,7 +662,7 @@ struct CmdDevelop : Common, MixEnvironment
             }
         }
 
-        runProgramInStore(store, shell, args, buildEnvironment.getSystem());
+        runProgramInStore(store, true, shell, args, buildEnvironment.getSystem());
     }
 };
 
diff --git a/src/nix/fmt.cc b/src/nix/fmt.cc
index c85eacded..396c93dbb 100644
--- a/src/nix/fmt.cc
+++ b/src/nix/fmt.cc
@@ -49,7 +49,7 @@ struct CmdFmt : SourceExprCommand {
             }
         }
 
-        runProgramInStore(store, app.program, programArgs);
+        runProgramInStore(store, false, app.program, programArgs);
     };
 };
 
diff --git a/src/nix/run.cc b/src/nix/run.cc
index ea0a17897..d531f712d 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -25,6 +25,7 @@ std::string chrootHelperName = "__run_in_chroot";
 namespace nix {
 
 void runProgramInStore(ref<Store> store,
+    bool search,
     const std::string & program,
     const Strings & args,
     std::optional<std::string_view> system)
@@ -58,7 +59,10 @@ void runProgramInStore(ref<Store> store,
     if (system)
         setPersonality(*system);
 
-    execvp(program.c_str(), stringsToCharPtrs(args).data());
+    if (search)
+        execvp(program.c_str(), stringsToCharPtrs(args).data());
+    else
+        execv(program.c_str(), stringsToCharPtrs(args).data());
 
     throw SysError("unable to execute '%s'", program);
 }
@@ -132,7 +136,7 @@ struct CmdShell : InstallablesCommand, MixEnvironment
         Strings args;
         for (auto & arg : command) args.push_back(arg);
 
-        runProgramInStore(store, *command.begin(), args);
+        runProgramInStore(store, true, *command.begin(), args);
     }
 };
 
@@ -194,7 +198,7 @@ struct CmdRun : InstallableValueCommand
         Strings allArgs{app.program};
         for (auto & i : args) allArgs.push_back(i);
 
-        runProgramInStore(store, app.program, allArgs);
+        runProgramInStore(store, false, app.program, allArgs);
     }
 };
 
diff --git a/src/nix/run.hh b/src/nix/run.hh
index 97ddef19b..c62287e7e 100644
--- a/src/nix/run.hh
+++ b/src/nix/run.hh
@@ -6,6 +6,7 @@
 namespace nix {
 
 void runProgramInStore(ref<Store> store,
+    bool search,
     const std::string & program,
     const Strings & args,
     std::optional<std::string_view> system = std::nullopt);

From ea2dd166235e049699cf7f70c243c2b83089f824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@tweag.io>
Date: Fri, 1 Dec 2023 15:35:21 +0100
Subject: [PATCH 2/2] Use a proper enum rather than a boolean in
 runProgramInStore

Makes the call-site much easier to understand.
---
 src/nix/develop.cc | 2 +-
 src/nix/fmt.cc     | 2 +-
 src/nix/run.cc     | 8 ++++----
 src/nix/run.hh     | 7 ++++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index ae9be79a3..606b044b0 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -662,7 +662,7 @@ struct CmdDevelop : Common, MixEnvironment
             }
         }
 
-        runProgramInStore(store, true, shell, args, buildEnvironment.getSystem());
+        runProgramInStore(store, UseSearchPath::Use, shell, args, buildEnvironment.getSystem());
     }
 };
 
diff --git a/src/nix/fmt.cc b/src/nix/fmt.cc
index 396c93dbb..059904150 100644
--- a/src/nix/fmt.cc
+++ b/src/nix/fmt.cc
@@ -49,7 +49,7 @@ struct CmdFmt : SourceExprCommand {
             }
         }
 
-        runProgramInStore(store, false, app.program, programArgs);
+        runProgramInStore(store, UseSearchPath::DontUse, app.program, programArgs);
     };
 };
 
diff --git a/src/nix/run.cc b/src/nix/run.cc
index d531f712d..efc0c56a1 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -25,7 +25,7 @@ std::string chrootHelperName = "__run_in_chroot";
 namespace nix {
 
 void runProgramInStore(ref<Store> store,
-    bool search,
+    UseSearchPath useSearchPath,
     const std::string & program,
     const Strings & args,
     std::optional<std::string_view> system)
@@ -59,7 +59,7 @@ void runProgramInStore(ref<Store> store,
     if (system)
         setPersonality(*system);
 
-    if (search)
+    if (useSearchPath == UseSearchPath::Use)
         execvp(program.c_str(), stringsToCharPtrs(args).data());
     else
         execv(program.c_str(), stringsToCharPtrs(args).data());
@@ -136,7 +136,7 @@ struct CmdShell : InstallablesCommand, MixEnvironment
         Strings args;
         for (auto & arg : command) args.push_back(arg);
 
-        runProgramInStore(store, true, *command.begin(), args);
+        runProgramInStore(store, UseSearchPath::Use, *command.begin(), args);
     }
 };
 
@@ -198,7 +198,7 @@ struct CmdRun : InstallableValueCommand
         Strings allArgs{app.program};
         for (auto & i : args) allArgs.push_back(i);
 
-        runProgramInStore(store, false, app.program, allArgs);
+        runProgramInStore(store, UseSearchPath::DontUse, app.program, allArgs);
     }
 };
 
diff --git a/src/nix/run.hh b/src/nix/run.hh
index c62287e7e..a55917b06 100644
--- a/src/nix/run.hh
+++ b/src/nix/run.hh
@@ -5,8 +5,13 @@
 
 namespace nix {
 
+enum struct UseSearchPath {
+    Use,
+    DontUse
+};
+
 void runProgramInStore(ref<Store> store,
-    bool search,
+    UseSearchPath useSearchPath,
     const std::string & program,
     const Strings & args,
     std::optional<std::string_view> system = std::nullopt);