From dbabfc92d4e1864f793f167a438e532673afdc14 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Aug 2024 15:42:09 -0400
Subject: [PATCH] Make sure we have an `execvpe` on Windows too

Necessary to fix a build (that was already broken in other ways) after
PR #11021.
---
 src/libutil/{unix => }/exec.hh   | 7 ++++++-
 src/libutil/meson.build          | 1 +
 src/libutil/unix/meson.build     | 1 -
 src/libutil/unix/processes.cc    | 8 +++++---
 src/libutil/windows/processes.cc | 8 ++++++++
 5 files changed, 20 insertions(+), 5 deletions(-)
 rename src/libutil/{unix => }/exec.hh (53%)

diff --git a/src/libutil/unix/exec.hh b/src/libutil/exec.hh
similarity index 53%
rename from src/libutil/unix/exec.hh
rename to src/libutil/exec.hh
index e6b80889a..405e19268 100644
--- a/src/libutil/unix/exec.hh
+++ b/src/libutil/exec.hh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "os-string.hh"
+
 namespace nix {
 
 /**
@@ -8,6 +10,9 @@ namespace nix {
  *
  * We use our own implementation unconditionally for consistency.
  */
-int execvpe(const char * file0, char * const argv[], char * const envp[]);
+int execvpe(
+    const OsString::value_type * file0,
+    const OsString::value_type * const argv[],
+    const OsString::value_type * const envp[]);
 
 }
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
index 200eeb4e9..72ff461ca 100644
--- a/src/libutil/meson.build
+++ b/src/libutil/meson.build
@@ -129,6 +129,7 @@ sources = files(
   'english.cc',
   'environment-variables.cc',
   'error.cc',
+  'exec.hh',
   'executable-path.cc',
   'exit.cc',
   'experimental-features.cc',
diff --git a/src/libutil/unix/meson.build b/src/libutil/unix/meson.build
index d36152db9..1c5bf27fb 100644
--- a/src/libutil/unix/meson.build
+++ b/src/libutil/unix/meson.build
@@ -13,7 +13,6 @@ sources += files(
 include_dirs += include_directories('.')
 
 headers += files(
-  'exec.hh',
   'monitor-fd.hh',
   'signals-impl.hh',
 )
diff --git a/src/libutil/unix/processes.cc b/src/libutil/unix/processes.cc
index 09acba35a..43d9179d9 100644
--- a/src/libutil/unix/processes.cc
+++ b/src/libutil/unix/processes.cc
@@ -420,10 +420,12 @@ bool statusOk(int status)
     return WIFEXITED(status) && WEXITSTATUS(status) == 0;
 }
 
-int execvpe(const char * file0, char * const argv[], char * const envp[])
+int execvpe(const char * file0, const char * const argv[], const char * const envp[])
 {
-    auto file = ExecutablePath::load().findPath(file0).string();
-    return execve(file.c_str(), argv, envp);
+    auto file = ExecutablePath::load().findPath(file0);
+    // `const_cast` is safe. See the note in
+    // https://pubs.opengroup.org/onlinepubs/9799919799/functions/exec.html
+    return execve(file.c_str(), const_cast<char *const *>(argv), const_cast<char *const *>(envp));
 }
 
 }
diff --git a/src/libutil/windows/processes.cc b/src/libutil/windows/processes.cc
index 9cd714f84..7f34c5632 100644
--- a/src/libutil/windows/processes.cc
+++ b/src/libutil/windows/processes.cc
@@ -1,6 +1,7 @@
 #include "current-process.hh"
 #include "environment-variables.hh"
 #include "error.hh"
+#include "executable-path.hh"
 #include "file-descriptor.hh"
 #include "file-path.hh"
 #include "signals.hh"
@@ -377,4 +378,11 @@ bool statusOk(int status)
 {
     return status == 0;
 }
+
+int execvpe(const wchar_t * file0, const wchar_t * const argv[], const wchar_t * const envp[])
+{
+    auto file = ExecutablePath::load().findPath(file0);
+    return _wexecve(file.c_str(), argv, envp);
+}
+
 }