Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

A patch from Andreas Neuhaus to be especially careful to not dup

Browse Source 
any env variables when spawning child processes.
This commit is contained in:
Eric Andersen 2001-03-16 01:14:04 +00:00
parent 4aaefc2a50
commit 7f1978570f
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
init.c
View File

@ -396,10 +396,10 @@ static void console_init()
static pid_t run(char *command, char *terminal, int get_enter)
{
int i=0, j=0;
int i, j;
int fd;
pid_t pid;
char *tmpCmd;
char *tmpCmd, *s;
char *cmd[255], *cmdpath;
char buf[255];
static const char press_enter[] =
@ -410,18 +410,25 @@ static pid_t run(char *command, char *terminal, int get_enter)
"\nPlease press Enter to activate this console. ";
char *environment[MAXENV+1] = {
termType,
"HOME=/",
"PATH=/usr/bin:/bin:/usr/sbin:/sbin",
"SHELL=/bin/sh",
termType,
"USER=root"
"USER=root",
NULL
};
while (environment[i]) i++;
while ((environ[j]) && (i < MAXENV)) {
if (strncmp(environ[j], "TERM=", 5))
environment[i++] = environ[j];
j++;
/* inherit environment to the child, merging our values -andy */
for (i=0; environ[i]; i++) {
for (j=0; environment[j]; j++) {
s = strchr(environment[j], '=');
if (!strncmp(environ[i], environment[j], s - environment[j]))
break;
}
if (!environment[j]) {
environment[j++] = environ[i];
environment[j] = NULL;
}
}
if ((pid = fork()) == 0) {

25
init/init.c
View File

@ -396,10 +396,10 @@ static void console_init()
static pid_t run(char *command, char *terminal, int get_enter)
{
int i=0, j=0;
int i, j;
int fd;
pid_t pid;
char *tmpCmd;
char *tmpCmd, *s;
char *cmd[255], *cmdpath;
char buf[255];
static const char press_enter[] =
@ -410,18 +410,25 @@ static pid_t run(char *command, char *terminal, int get_enter)
"\nPlease press Enter to activate this console. ";
char *environment[MAXENV+1] = {
termType,
"HOME=/",
"PATH=/usr/bin:/bin:/usr/sbin:/sbin",
"SHELL=/bin/sh",
termType,
"USER=root"
"USER=root",
NULL
};
while (environment[i]) i++;
while ((environ[j]) && (i < MAXENV)) {
if (strncmp(environ[j], "TERM=", 5))
environment[i++] = environ[j];
j++;
/* inherit environment to the child, merging our values -andy */
for (i=0; environ[i]; i++) {
for (j=0; environment[j]; j++) {
s = strchr(environment[j], '=');
if (!strncmp(environ[i], environment[j], s - environment[j]))
break;
}
if (!environment[j]) {
environment[j++] = environ[i];
environment[j] = NULL;
}
}
if ((pid = fork()) == 0) {