nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-25 00:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add nix::execvpe

Browse Source
This commit is contained in:
Robert Hensing 2024-08-16 15:27:53 +02:00
parent 31f3f23ee6
commit c4192a6617
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libutil/unix/exec.hh Normal file
View File

@ -0,0 +1,13 @@
#pragma once
namespace nix {
/**
* `execvpe` is a GNU extension, so we need to implement it for other POSIX
* platforms.
*
* We use our own implementation unconditionally for consistency.
*/
int execvpe(const char * file0, char * const argv[], char * const envp[]);
}

1
src/libutil/unix/meson.build
View File

@ -13,6 +13,7 @@ sources += files(
include_dirs += include_directories('.') include_dirs += include_directories('.')
headers += files( headers += files(
'exec.hh',
'monitor-fd.hh', 'monitor-fd.hh',
'signals-impl.hh', 'signals-impl.hh',
) )

7
src/libutil/unix/processes.cc
View File

@ -1,5 +1,6 @@
#include "current-process.hh" #include "current-process.hh"
#include "environment-variables.hh" #include "environment-variables.hh"
#include "executable-path.hh"
#include "signals.hh" #include "signals.hh"
#include "processes.hh" #include "processes.hh"
#include "finally.hh" #include "finally.hh"
@ -419,4 +420,10 @@ bool statusOk(int status)
return WIFEXITED(status) && WEXITSTATUS(status) == 0; return WIFEXITED(status) && WEXITSTATUS(status) == 0;
} }
int execvpe(const char * file0, char * const argv[], char * const envp[])
{
auto file = ExecutablePath::load().findPath(file0).string();
return execve(file.c_str(), argv, envp);
}
} }