projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
language
/
syntax-file.c
diff --git
a/src/language/syntax-file.c
b/src/language/syntax-file.c
index 5bd6fafacf50e6a541e4254926e12df4cb67a9d6..0771ade3a9e92dccc0c3063a7c14d13014c010e3 100644
(file)
--- a/
src/language/syntax-file.c
+++ b/
src/language/syntax-file.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-20,6
+20,7
@@
#include <stdio.h>
#include <errno.h>
#include <stdio.h>
#include <errno.h>
+#include <stdint.h>
#include <stdlib.h>
#include <data/file-name.h>
#include <stdlib.h>
#include <data/file-name.h>
@@
-99,7
+100,8
@@
read_syntax_file (struct getl_interface *s,
do
{
sfs->ln++;
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));
{
if (ferror (sfs->syntax_file))
msg (ME, _("Reading `%s': %s."), sfs->fn, strerror (errno));
@@
-110,7
+112,7
@@
read_syntax_file (struct getl_interface *s,
while (sfs->ln == 1 && !memcmp (ds_cstr (line), "#!", 2));
/* Echo to listing file, if configured to do so. */
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));
return true;
tab_output_text (TAB_LEFT | TAB_FIX, ds_cstr (line));
return true;