Changeset 2426 in kBuild

Timestamp:

Nov 15, 2010 1:03:52 PM (14 years ago)

Author:

bird

Message:

kmk/read.c: Must adjust s1 after calling variable_expand_string_2 to produce s2 in conditonal_line. Fixes #98.

File:

• trunk/src/kmk/read.c (modified) (3 diffs)

trunk/src/kmk/read.c

@@ -2094 +2094 @@
       char termin = *line == '(' ? ',' : *line;
 #ifdef CONFIG_WITH_VALUE_LENGTH
-      char *buf_pos;
+      char *s1_end, *s2_end;
 #endif
 
@@ -2147 +2147 @@
       memcpy (s1, s2, l + 1);
 #else
-      s1 = variable_expand_string_2 (NULL, s1, l, &buf_pos);
-      ++buf_pos;
+      s1 = variable_expand_string_2 (NULL, s1, l, &s1_end);
 #endif
 
@@ -2199 +2198 @@
       s2 = variable_expand (s2);
 #else
-      if ((size_t)buf_pos & 7)
-        buf_pos = variable_buffer_output (buf_pos, "\0\0\0\0\0\0\0\0",
-                                          8 - ((size_t)buf_pos & 7));
-      s2 = variable_expand_string_2 (buf_pos, s2, l, &buf_pos);
+      s2 = variable_expand_string_2 (s1_end + 1, s2, l, &s2_end);
+      if (s2 != s1_end + 1)
+        s1 += s2 - s1_end - 1;  /* the variable buffer was reallocated */
 #endif
 #ifdef CONFIG_WITH_SET_CONDITIONALS