execve: allow argv propagation
This commit is contained in:
parent
eb0797b7ed
commit
49efebaad7
@ -1,15 +1,26 @@
|
|||||||
{ lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
{
|
rec {
|
||||||
execve = name: { filename, argv, envp ? {}, destination ? "" }:
|
execve = name: { filename, argv ? null, envp ? {}, destination ? "" }: let
|
||||||
writeC name { inherit destination; } ''
|
in writeC name { inherit destination; } ''
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
int main () {
|
|
||||||
const char *filename = ${toC filename};
|
static char *const filename = ${toC filename};
|
||||||
char *const argv[] = ${toC (argv ++ [null])};
|
|
||||||
char *const envp[] = ${toC (
|
${if argv == null
|
||||||
|
then /* Propagate arguments */ ''
|
||||||
|
#define MAIN_ARGS int argc, char **argv
|
||||||
|
''
|
||||||
|
else /* Provide fixed arguments */ ''
|
||||||
|
#define MAIN_ARGS void
|
||||||
|
static char *const argv[] = ${toC (argv ++ [null])};
|
||||||
|
''}
|
||||||
|
|
||||||
|
static char *const envp[] = ${toC (
|
||||||
mapAttrsToList (k: v: "${k}=${v}") envp ++ [null]
|
mapAttrsToList (k: v: "${k}=${v}") envp ++ [null]
|
||||||
)};
|
)};
|
||||||
|
|
||||||
|
int main (MAIN_ARGS) {
|
||||||
execve(filename, argv, envp);
|
execve(filename, argv, envp);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user