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

Timestamp:

Mar 30, 2008, 6:13:55 AM (17 years ago)

Author:

bird

Message:

Added comp-cmds-ex, commands, commands-sc and commands-usr. Added a '%' command prefix that make the commands functions skip the line. Added a -c flag to append that'll make it call commands on each argument (similar to -v). Fixed a little bug in comp-cmds/vars.

File:

• trunk/src/kmk/expand.c (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -506 +506 @@
 
 
+#ifdef CONFIG_WITH_COMMANDS_FUNC
+/* Expand LINE for FILE.  Error messages refer to the file and line where
+   FILE's commands were found.  Expansion uses FILE's variable set list.
+
+   Differs from variable_expand_for_file in that it takes a pointer to
+   where in the variable buffer to start outputting the expanded string.  */
+
+char *
+variable_expand_for_file_2 (char *o, const char *line, struct file *file)
+{
+  char *result;
+  struct variable_set_list *save;
+
+  if (file == 0)
+    return variable_expand_string (o, line, (long)-1);
+
+  save = current_variable_set_list;
+  current_variable_set_list = file->variables;
+  if (file->cmds && file->cmds->fileinfo.filenm)
+    reading_file = &file->cmds->fileinfo;
+  else
+    reading_file = 0;
+  result = variable_expand_string (o, line, (long)-1);
+  current_variable_set_list = save;
+  reading_file = 0;
+
+  return result;
+}
+
+
+#endif /* CONFIG_WITH_COMMANDS_FUNC */
 /* Like allocated_variable_expand, but for += target-specific variables.
    First recursively construct the variable value from its appended parts in