Changeset 1968 in kBuild for trunk

Timestamp:

Oct 26, 2008 9:29:56 PM (16 years ago)

Author:

bird

Message:

kmk: main.c, variable.c: shell_var must have a valid name length or we'll get duplicates in target_environment(). fixed strcache issue with it as well.

Location:

trunk/src/kmk

Files:

• main.c (modified) (1 diff)
• variable.c (modified) (1 diff)

trunk/src/kmk/main.c

@@ -1617 +1617 @@
                 v->export = v_noexport;
 #endif
+#ifndef CONFIG_WITH_STRCACHE2
                 shell_var.name = "SHELL";
+#else
+                shell_var.name = v->name;
+#endif
+                shell_var.length = 5; /* bird - gotta set the length too! */
+#ifndef CONFIG_WITH_VALUE_LENGTH
                 shell_var.value = xstrdup (ep + 1);
+#else
+                shell_var.value = savestring (v->value, v->value_length);
+                shell_var.value_length = v->value_length;
+#endif
+
               }
 

trunk/src/kmk/variable.c

@@ -1533 +1533 @@
             new_slot = (struct variable **) hash_find_slot (&table, v);
 #else  /* CONFIG_WITH_STRCACHE2 */
+            assert (strcache2_is_cached (&variable_strcache, v->name));
             new_slot = (struct variable **) hash_find_slot_strcached (&table, v);
 #endif /* CONFIG_WITH_STRCACHE2 */