projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct name of function fn_is_special. Thanks to John McCabe-Dansted
[pspp]
/
src
/
language
/
utilities
/
include.c
diff --git
a/src/language/utilities/include.c
b/src/language/utilities/include.c
index c812c97238a9588fddf3586ed366766248372f92..2f1fdeb2c1781c2c66fbc6254f5b8faf4471668a 100644
(file)
--- a/
src/language/utilities/include.c
+++ b/
src/language/utilities/include.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-36,6
+35,7
@@
int
cmd_include (struct lexer *lexer, struct dataset *ds UNUSED)
{
int
cmd_include (struct lexer *lexer, struct dataset *ds UNUSED)
{
+ struct source_stream *ss;
char *found_fn;
char *target_fn;
char *found_fn;
char *target_fn;
@@
-52,13
+52,12
@@
cmd_include (struct lexer *lexer, struct dataset *ds UNUSED)
target_fn = ds_cstr (lex_tokstr (lexer));
target_fn = ds_cstr (lex_tokstr (lexer));
- found_fn = fn_search_path (target_fn,
- getl_include_path (),
- NULL);
+ ss = lex_get_source_stream (lexer);
+ found_fn = fn_search_path (target_fn, getl_include_path ( ss ));
if (found_fn != NULL)
{
if (found_fn != NULL)
{
- getl_include_source (create_syntax_file_source (found_fn));
+ getl_include_source (
ss,
create_syntax_file_source (found_fn));
free (found_fn);
}
else
free (found_fn);
}
else