/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009 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 <stdio.h>
#include <errno.h>
+#include <stdint.h>
#include <stdlib.h>
#include <data/file-name.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include "prompt.h"
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
/* Reads a line from syntax file source S into LINE.
Returns true if successful, false at end of file. */
-bool
+static bool
read_syntax_file (struct getl_interface *s,
- struct string *line, enum getl_syntax *syntax)
+ struct string *line)
{
struct syntax_file_source *sfs = (struct syntax_file_source *) s;
do
{
sfs->ln++;
- if (!ds_read_line (line, sfs->syntax_file))
+ 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));
while (sfs->ln == 1 && !memcmp (ds_cstr (line), "#!", 2));
/* Echo to listing file, if configured to do so. */
- if (get_echo ())
+ if (settings_get_echo ())
tab_output_text (TAB_LEFT | TAB_FIX, ds_cstr (line));
- *syntax = GETL_BATCH;
return true;
}