From a94019907222057e5c2ab6baa6816fcab73c686b Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Tue, 19 Jun 2007 04:47:58 +0000 Subject: Fix a core dump when reading_file is 0 (20033). Fix some manual typos (20018). --- expand.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'expand.c') diff --git a/expand.c b/expand.c index cc8ede4..3d0229c 100644 --- a/expand.c +++ b/expand.c @@ -460,20 +460,25 @@ char * variable_expand_for_file (const char *line, struct file *file) { char *result; - struct variable_set_list *save; + struct variable_set_list *savev; + const struct floc *savef; if (file == 0) return variable_expand (line); - save = current_variable_set_list; + savev = current_variable_set_list; current_variable_set_list = file->variables; + + savef = reading_file; if (file->cmds && file->cmds->fileinfo.filenm) reading_file = &file->cmds->fileinfo; else reading_file = 0; + result = variable_expand (line); - current_variable_set_list = save; - reading_file = 0; + + current_variable_set_list = savev; + reading_file = savef; return result; } -- cgit v1.2.3