openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 85dfe988: am 796fccb8: Merge "Fix environment variable assignment in init" 

* commit '85dfe98830c78f1c3d400ca7be4ac594bfcdd275':
  Fix environment variable assignment in init
This commit is contained in:
Elliott Hughes 2014-07-12 19:36:57 +00:00 committed by Android Git Automerger
parent 923e740879 85dfe98830
commit ecba4dc037
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
init/builtins.c
View File

@ -48,7 +48,7 @@
#include <private/android_filesystem_config.h>
void add_environment(const char *name, const char *value);
int add_environment(const char *name, const char *value);
extern int init_module(void *, unsigned long, const char *);
@ -261,8 +261,7 @@ int do_exec(int nargs, char **args)
int do_export(int nargs, char **args)
{
add_environment(args[1], args[2]);
return 0;
return add_environment(args[1], args[2]);
}
int do_hostname(int nargs, char **args)

25
init/init.c
View File

@ -96,11 +96,24 @@ static const char *ENV[32];
/* add_environment - add "key=value" to the current environment */
int add_environment(const char *key, const char *val)
{
int n;
size_t n;
size_t key_len = strlen(key);
for (n = 0; n < 31; n++) {
if (!ENV[n]) {
size_t len = strlen(key) + strlen(val) + 2;
/* The last environment entry is reserved to terminate the list */
for (n = 0; n < (ARRAY_SIZE(ENV) - 1); n++) {
/* Delete any existing entry for this key */
if (ENV[n] != NULL) {
size_t entry_key_len = strcspn(ENV[n], "=");
if ((entry_key_len == key_len) && (strncmp(ENV[n], key, entry_key_len) == 0)) {
free((char*)ENV[n]);
ENV[n] = NULL;
}
}
/* Add entry if a free slot is available */
if (ENV[n] == NULL) {
size_t len = key_len + strlen(val) + 2;
char *entry = malloc(len);
snprintf(entry, len, "%s=%s", key, val);
ENV[n] = entry;
@ -108,7 +121,9 @@ int add_environment(const char *key, const char *val)
}
}
return 1;
ERROR("No env. room to store: '%s':'%s'\n", key, val);
return -1;
}
static void zap_stdio(void)