Changeset 1617 in kBuild for trunk

Timestamp:

May 12, 2008 5:07:26 PM (17 years ago)

Author:

bird

Message:

Don't append empty strings to variables. (foo +=)

Location:

trunk/src/kmk

Files:

• expand.c (modified) (2 diffs)
• variable.c (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -616 +616 @@
     /* fast path */
     append_string_to_variable (v,value, value_len, append);
-  else
+  else if (value_len)
     {
       unsigned int off_dollar = p - (char *)value;
@@ -662 +662 @@
       restore_variable_buffer (saved_buffer, saved_buffer_length);
     }
+  /* else: Drop empty strings. Use $(NO_SUCH_VARIABLE) if a space is wanted. */
 }
 #endif /* CONFIG_WITH_VALUE_LENGTH */

trunk/src/kmk/variable.c

@@ -1601 +1601 @@
   int done_1st_prepend_copy = 0;
 
+  /* Drop empty strings. Use $(NO_SUCH_VARIABLE) if a space is wanted. */
+  if (!value_len)
+      return;
+
   /* adjust the size. */
   if ((unsigned)v->value_alloc_len <= new_value_len + 1)