kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 19:46:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only add variables to environment if they are already set

Browse source
This commit is contained in:
MaxHearnden 2023-11-28 02:39:40 +00:00
parent c4e12161b7
commit 53d1c416be
1 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
sysa/wrap.c
View file

@ -225,18 +225,35 @@ int main(int argc, char **argv, char **envp) {
chroot (".");
}
free(cwd);
char **newenv = malloc(3 * sizeof(char *));
int newenv_index = 0;
require(newenv != NULL, "Failed to allocate space for new environment.");
char *ARCH = getenv("ARCH");
newenv[0] = malloc(6 + strlen(ARCH));
strcpy(newenv[0], "ARCH=");
strcpy(newenv[0] + 5, ARCH);
if (ARCH != NULL) {
newenv[0] = malloc(6 + strlen(ARCH));
require(newenv[0] != NULL, "Failed to allocate space for new environment.");
strcpy(newenv[0], "ARCH=");
strcpy(newenv[0] + 5, ARCH);
newenv_index += 1;
}
char *ARCH_DIR = getenv("ARCH_DIR");
newenv[1] = malloc(10 + strlen(ARCH_DIR));
strcpy(newenv[1], "ARCH_DIR=");
strcpy(newenv[1] + 9, ARCH_DIR);
newenv[2] = NULL;
if (ARCH_DIR != NULL) {
newenv[newenv_index] = malloc(10 + strlen(ARCH_DIR));
require(newenv[newenv_index] != NULL, "Failed to allocate space for new environment.");
strcpy(newenv[newenv_index], "ARCH_DIR=");
strcpy(newenv[newenv_index] + 9, ARCH_DIR);
newenv_index += 1;
}
newenv[newenv_index] = NULL;
#ifdef __M2__
return execve (argv[1], argv + sizeof(char *) , newenv);
return execve (argv[1], argv + sizeof(char *), newenv);
#else
return execve (argv[1], argv + 1, newenv);
#endif