Commit: 39a76e97a70b0bcaccf8dbc0e28c62ac06c5cbda - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revisión: 39a76e97a70b0bcaccf8dbc0e28c62ac06c5cbda (tree)
• Tiempo: 2013-06-16 17:06:07
• Autor: Andy Ross <andy.ross@wind...>
• Commiter: Chih-Wei Huang

Log Message

Allow for overriding environment variables in export

Don't silently append duplicates, delete the older version. Also
increase the size limit, as the set of shell variables on my test
system is already at 28.

Change-Id: Id2373cc197662ae14fabad4de5e4516fe30d44cc
For: AXIA-2870
Signed-off-by: Andy Ross <[e-mail]>

Cambiar Resumen

• modified: init/init.c

Diferencia incremental

--- a/init/init.c
+++ b/init/init.c
@@ -100,14 +100,24 @@ static int have_console;
 static char *console_name = "/dev/console";
 static time_t process_needs_restart;
 
-static const char *ENV[32];
+static const char *ENV[128];
 
 /* add_environment - add "key=value" to the current environment */
 int add_environment(const char *key, const char *val)
 {
-    int n;
-
-    for (n = 0; n < 31; n++) {
+    unsigned int n, kesz;
+    char keyeq[128];
+    int max_vars = sizeof(ENV)/sizeof(ENV[0]) - 1; /* final null for execve */
+
+    snprintf(keyeq, sizeof(keyeq), "%s=", key);
+    kesz = strlen(keyeq);
+
+    for (n = 0; n < max_vars; n++) {
+        if (ENV[n] && strncmp(ENV[n], keyeq, kesz) == 0) {
+            /* Override */
+            free((char*)ENV[n]);
+            ENV[n] = NULL;
+        }
         if (!ENV[n]) {
             size_t len = strlen(key) + strlen(val) + 2;
             char *entry = malloc(len);