Changeset 1847 for trunk/src/kmk/expand.c

Timestamp:

Oct 12, 2008, 6:25:03 PM (17 years ago)

Author:

bird

Message:

kmk: Some optimizations for expand_deps.

File:

• trunk/src/kmk/expand.c (modified) (2 diffs)

trunk/src/kmk/expand.c

@@ -753 +753 @@
 expand_argument (const char *str, const char *end)
 {
+#ifndef CONFIG_WITH_VALUE_LENGTH /** @todo the hacks are no longer required. Clean up !! */
   char *tmp;
+#endif
 
   if (str == end)
@@ -823 +825 @@
 
    Differs from variable_expand_for_file in that it takes a pointer to
-   where in the variable buffer to start outputting the expanded string.  */
+   where in the variable buffer to start outputting the expanded string,
+   and that it can returned the length of the string if you wish.  */
 
 char *
-variable_expand_for_file_2 (char *o, const char *line, struct file *file)
+variable_expand_for_file_2 (char *o, const char *line, unsigned int length,
+                            struct file *file, unsigned int *value_lenp)
 {
   char *result;
   struct variable_set_list *save;
   const struct floc *reading_file_saved;
+  long len = length == ~0U ? (long)-1 : (long)length;
   char *eol;
 
+  if (!o)
+    o = initialize_variable_output();
+
   if (file == 0)
-    return variable_expand_string_2 (o, line, (long)-1, &eol);
-
-  save = current_variable_set_list;
-  current_variable_set_list = file->variables;
-  reading_file_saved = reading_file;
-  if (file->cmds && file->cmds->fileinfo.filenm)
-    reading_file = &file->cmds->fileinfo;
+     result = variable_expand_string_2 (o, line, len, &eol);
   else
-    reading_file = 0;
-  result = variable_expand_string_2 (o, line, (long)-1, &eol);
-  current_variable_set_list = save;
-  reading_file = reading_file_saved;
+    {
+      save = current_variable_set_list;
+      current_variable_set_list = file->variables;
+      reading_file_saved = reading_file;
+      if (file->cmds && file->cmds->fileinfo.filenm)
+        reading_file = &file->cmds->fileinfo;
+      else
+        reading_file = 0;
+      result = variable_expand_string_2 (o, line, len, &eol);
+      current_variable_set_list = save;
+      reading_file = reading_file_saved;
+    }
+
+  if (value_lenp)
+    *value_lenp = eol - result;
 
   return result;