From ab9dcd3b6b30f1e4833189f8c413b6d1e5aef71e Mon Sep 17 00:00:00 2001 From: andersen Date: Tue, 20 Feb 2001 18:01:50 +0000 Subject: Commit a patch from Erik Gustavsson , to allow environment variables set from the kernel command line to be inherited bu application programs. Slightly changed to special case handling of TERM, so that it has sane defaults when on a serial console. -Erik git-svn-id: svn://busybox.net/trunk/busybox@1869 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- init/init.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'init') diff --git a/init/init.c b/init/init.c index 1332a1064..4c05c38e3 100644 --- a/init/init.c +++ b/init/init.c @@ -134,6 +134,7 @@ static _syscall2(int, bdflush, int, func, int, data); #define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ #endif +static const int MAXENV = 16; /* Number of env. vars */ static const int LOG = 0x1; static const int CONSOLE = 0x2; @@ -394,7 +395,8 @@ static void console_init() static pid_t run(char *command, char *terminal, int get_enter) { - int i, fd; + int i=0, j=0; + int fd; pid_t pid; char *tmpCmd; char *cmd[255], *cmdpath; @@ -406,15 +408,24 @@ static pid_t run(char *command, char *terminal, int get_enter) #endif "\nPlease press Enter to activate this console. "; - char *environment[] = { + char *environment[MAXENV+1] = { "HOME=/", "PATH=/usr/bin:/bin:/usr/sbin:/sbin", "SHELL=/bin/sh", termType, - "USER=root", - 0 + "USER=root" }; + while (environment[i]) i++; + while ((environ[j]) && (i < MAXENV)) { + if (strncmp(environ[j], "TERM=", 5)) + environment[i++] = environ[j]; + else { + snprintf(termType, sizeof(termType) - 1, environ[j]); + } + j++; + } + if ((pid = fork()) == 0) { /* Clean up */ ioctl(0, TIOCNOTTY, 0); -- cgit v1.2.3-55-g6feb