Skip to content

[WRAPPER] Refined exec family envp wrapping #4339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptitSeb merged 1 commit into from
Sep 1, 2026
+58 −38
Merged

[WRAPPER] Refined exec family envp wrapping #4339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 58 additions & 38 deletions src/wrapped/wrappedlibc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2768,6 +2768,30 @@ EXPORT char** my_environ = NULL;
EXPORT char** my__environ = NULL;
EXPORT char** my___environ = NULL; // all aliases

static char** spawn_env_with_arg0(char* const envp[], const char* name, const char* arg0, char** added)
{
size_t n = 0;
size_t replace = (size_t)-1;
size_t name_len = strlen(name);

while (envp && envp[n]) {
if (!strncmp(envp[n], name, name_len) && envp[n][name_len] == '=')
replace = n;
++n;
}

char** ret = (char**)box_calloc(n + (replace == (size_t)-1 ? 2 : 1), sizeof(char*));
if (n)
memcpy(ret, envp, n * sizeof(char*));
*added = (char*)box_malloc(name_len + strlen(arg0) + 2);
sprintf(*added, "%s=%s", name, arg0);
if (replace == (size_t)-1)
ret[n] = *added;
else
ret[replace] = *added;
return ret;
}

EXPORT int32_t my_execv(x64emu_t* emu, const char* path, char* const argv[])
{
int ret;
Expand Down Expand Up @@ -2835,25 +2859,33 @@ EXPORT int32_t my_execv(x64emu_t* emu, const char* path, char* const argv[])
if(script) newargv[1] = emu->context->bashpath; // script needs to be launched with bash
if(python) newargv[1] = emu->context->pythonpath; // python scripts need box64-python
memcpy(newargv+toadd, argv+skip_first, sizeof(char*)*(n+1-skip_first));
char** envv = NULL;
if (my_environ != my_context->envv) envv = my_environ;
if (my__environ != my_context->envv) envv = my__environ;
if (my___environ != my_context->envv) envv = my___environ;
char* arg0_env = NULL;
if(self)
newargv[1] = emu->context->fullpath;
else {
// TODO check if envp is not environ and add the value on a copy
if(strcmp(newargv[toadd], skip_first?argv[skip_first]:path))
setenv(x86?"BOX86_ARG0":"BOX64_ARG0", newargv[toadd], 1);
if (strcmp(newargv[toadd], skip_first ? argv[skip_first] : path)) {
if (envv)
envv = spawn_env_with_arg0(envv, x86 ? "BOX86_ARG0" : "BOX64_ARG0", newargv[toadd], &arg0_env);
else
setenv(x86 ? "BOX86_ARG0" : "BOX64_ARG0", newargv[toadd], 1);
}
newargv[toadd] = skip_first?argv[skip_first]:path;
}
printf_log(LOG_DEBUG, " => execv(\"%s\", %p [\"%s\", \"%s\", \"%s\"...:%d])\n", newargv[0], newargv, newargv[0], n?newargv[1]:"", (n>1)?newargv[2]:"",n);
char** envv = NULL;
if(my_environ!=my_context->envv) envv = my_environ;
if(my__environ!=my_context->envv) envv = my__environ;
if(my___environ!=my_context->envv) envv = my___environ;
printf_log(LOG_DEBUG, " => execv(\"%s\", %p [\"%s\", \"%s\", \"%s\"...:%d])\n", newargv[0], newargv, newargv[0], n ? newargv[1] : "", (n > 1) ? newargv[2] : "", n);

int ret;
if(envv)
ret = execve(newargv[0], (char* const*)newargv, envv);
else
ret = execv(newargv[0], (char* const*)newargv);
if (arg0_env) {
box_free(arg0_env);
box_free(envv);
}
box_free(newargv);
return ret;
}
Expand Down Expand Up @@ -2897,15 +2929,21 @@ EXPORT int32_t my_execve(x64emu_t* emu, const char* path, char* const argv[], ch
if(script) newargv[1] = emu->context->bashpath; // script needs to be launched with bash
if(python) newargv[1] = emu->context->pythonpath; // script needs to be launched with bash
memcpy(newargv+toadd, argv+skip_first, sizeof(char*)*(n+1-skip_first));
char* arg0_env = NULL;
if(self) newargv[toadd] = emu->context->fullpath;
else {
// TODO check if envp is not environ and add the value on a copy
if(strcmp(newargv[toadd], path))
setenv(x86?"BOX86_ARG0":"BOX64_ARG0", newargv[toadd], 1);
if (strcmp(newargv[toadd], path)) {
if (!envp) envp = environ;
envp = spawn_env_with_arg0(envp, x86 ? "BOX86_ARG0" : "BOX64_ARG0", newargv[toadd], &arg0_env);
}
newargv[toadd] = path;
}
printf_log(LOG_DEBUG, " => execve(\"%s\", %p [\"%s\", \"%s\", \"%s\"...:%d], %p)\n", newargv[0], newargv, newargv[0], (n+toadd-skip_first)?newargv[1]:"", ((n+toadd-skip_first)>1)?newargv[2]:"",n, envp);
int ret = execve(newargv[0], (char* const*)newargv, envp);
if (arg0_env) {
box_free(arg0_env);
box_free((char**)envp);
}
return ret;
}
if(!strcmp(path + strlen(path) - strlen("/uname"), "/uname")
Expand Down Expand Up @@ -3168,18 +3206,24 @@ EXPORT int32_t my_execvpe(x64emu_t* emu, const char* path, char* argv[], char* c
if(python) newargv[1] = emu->context->pythonpath; // python scripts need box64-python
for (int j=0; j<i; ++j)
newargv[j+toadd] = argv[j];
char* arg0_env = NULL;
if(self) newargv[1] = emu->context->fullpath;
//else if(script) newargv[2] = fullpath;
else {
// TODO check if envp is not environ and add the value on a copy
if(strcmp(newargv[toadd], path))
setenv(x86?"BOX86_ARG0":"BOX64_ARG0", newargv[toadd], 1);
if (strcmp(newargv[toadd], path)) {
if (!envp) envp = environ;
envp = spawn_env_with_arg0(envp, x86 ? "BOX86_ARG0" : "BOX64_ARG0", newargv[toadd], &arg0_env);
}
newargv[toadd] = fullpath;
}

printf_log(LOG_DEBUG, " => execvpe(\"%s\", %p [\"%s\", \"%s\"...:%d])\n", newargv[0], newargv, newargv[1], i?newargv[2]:"", i);
int ret;
ret = execvpe(newargv[0], newargv, envp);
if (arg0_env) {
box_free(arg0_env);
box_free((char**)envp);
}
box_free(fullpath);
return ret;
}
Expand Down Expand Up @@ -3238,30 +3282,6 @@ EXPORT int32_t my_execlp(x64emu_t* emu, const char* path)
return my_execvp(emu, path, argv);
}

static char** spawn_env_with_arg0(char* const envp[], const char* name, const char* arg0, char** added)
{
size_t n = 0;
size_t replace = (size_t)-1;
size_t name_len = strlen(name);

while (envp && envp[n]) {
if (!strncmp(envp[n], name, name_len) && envp[n][name_len] == '=')
replace = n;
++n;
}

char** ret = (char**)box_calloc(n + (replace == (size_t)-1 ? 2 : 1), sizeof(char*));
if (n)
memcpy(ret, envp, n * sizeof(char*));
*added = (char*)box_malloc(name_len + strlen(arg0) + 2);
sprintf(*added, "%s=%s", name, arg0);
if (replace == (size_t)-1)
ret[n] = *added;
else
ret[replace] = *added;
return ret;
}

EXPORT int32_t my_posix_spawn(x64emu_t* emu, pid_t* pid, const char* fullpath,
const posix_spawn_file_actions_t *actions, const posix_spawnattr_t* attrp, char* const argv[], char* const envp[])
{
Expand Down
Loading