/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <config.h>
-#include "syntax-file.h"
+#include "language/syntax-file.h"
#include <stdio.h>
#include <errno.h>
#include <stdint.h>
#include <stdlib.h>
-#include <data/file-name.h>
-#include <data/settings.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/message.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <libpspp/verbose-msg.h>
-#include <libpspp/version.h>
-#include <output/table.h>
-
-#include <libpspp/ll.h>
-
-#include "prompt.h"
-
-#include "xalloc.h"
+#include "data/file-name.h"
+#include "data/settings.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/prompt.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/getl.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "libpspp/version.h"
+#include "output/tab.h"
+
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include <libpspp/getl.h>
-
-
struct syntax_file_source
{
struct getl_interface parent ;
struct syntax_file_source *sfs = UP_CAST (s, struct syntax_file_source,
parent);
- /* Open file, if not yet opened. */
if (sfs->syntax_file == NULL)
- {
- verbose_msg (1, _("opening \"%s\" as syntax file"), sfs->fn);
- 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. */
do
{
sfs->ln++;
+ ds_clear (line);
if (!ds_read_line (line, sfs->syntax_file, SIZE_MAX))
{
if (ferror (sfs->syntax_file))
msg (ME, _("Reading `%s': %s."), sfs->fn, strerror (errno));
return false;
}
- ds_chomp (line, '\n');
+ ds_chomp_byte (line, '\n');
}
while (sfs->ln == 1 && !memcmp (ds_cstr (line), "#!", 2));
- /* Echo to listing file, if configured to do so. */
- if (settings_get_echo ())
- tab_output_text (TAB_LEFT | TAB_FIX, ds_cstr (line));
-
return true;
}
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 ;