X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fsyntax-file.c;h=97f73fd6fca44f344a163be35038d7d77aa55754;hb=97cb2acd10045679031d3abe971f7896de575790;hp=5521972477f270a1a046b9a99f5b0b3e5a117f69;hpb=f51ecb48027e6b1eb46840ae25888a25b429f012;p=pspp-builds.git diff --git a/src/language/syntax-file.c b/src/language/syntax-file.c index 55219724..97f73fd6 100644 --- a/src/language/syntax-file.c +++ b/src/language/syntax-file.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -85,17 +84,8 @@ read_syntax_file (struct getl_interface *s, struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source, parent); - /* Open file, if not yet opened. */ if (sfs->syntax_file == NULL) - { - sfs->syntax_file = fn_open (sfs->fn, "r"); - - if (sfs->syntax_file == NULL) - { - msg (ME, _("Opening `%s': %s."), sfs->fn, strerror (errno)); - return false; - } - } + return false; /* Read line from file and remove new-line. Skip initial "#! /usr/bin/pspp" line. */ @@ -142,6 +132,9 @@ create_syntax_file_source (const char *fn) struct syntax_file_source *ss = xzalloc (sizeof (*ss)); ss->fn = xstrdup (fn); + ss->syntax_file = fn_open (ss->fn, "r"); + if (ss->syntax_file == NULL) + msg (ME, _("Opening `%s': %s."), ss->fn, strerror (errno)); ss->parent.interactive = always_false; ss->parent.read = read_syntax_file ;