projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* var.h: (struct variable) Make `init', `reinit' bool values.
[pspp]
/
src
/
dfm-read.c
diff --git
a/src/dfm-read.c
b/src/dfm-read.c
index 32b458e00f64be9f2b0255e38c2a9a510f6688d6..6d173cf3e929bdace5c73f4b0c3da606460fac23 100644
(file)
--- a/
src/dfm-read.c
+++ b/
src/dfm-read.c
@@
-27,12
+27,16
@@
#include "command.h"
#include "error.h"
#include "file-handle.h"
#include "command.h"
#include "error.h"
#include "file-handle.h"
+#include "file-handle-def.h"
#include "filename.h"
#include "filename.h"
-#include "getl
ine
.h"
+#include "getl.h"
#include "lexer.h"
#include "str.h"
#include "vfm.h"
#include "lexer.h"
#include "str.h"
#include "vfm.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
#include "debug-print.h"
/* Flags for DFM readers. */
#include "debug-print.h"
/* Flags for DFM readers. */
@@
-78,11
+82,12
@@
dfm_close_reader (struct dfm_reader *r)
assert (inline_open_cnt > 0);
still_open = --inline_open_cnt;
assert (inline_open_cnt > 0);
still_open = --inline_open_cnt;
- if (still_open)
+ if (
!
still_open)
{
/* Skip any remaining data on the inline file. */
{
/* Skip any remaining data on the inline file. */
- while ((r->flags & DFM_EOF) == 0)
- read_record (r);
+ if (r->flags & DFM_SAW_BEGIN_DATA)
+ while ((r->flags & DFM_EOF) == 0)
+ read_record (r);
inline_file = NULL;
}
}
inline_file = NULL;
}
}