X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdfm-read.c;h=238b808056fe3babcd706d22ef5f2056802b8dde;hb=bbe7ad1a7454599693c188fe1eaf8f5d6e154206;hp=e12864ac7c7ceff8bf1fe1d4c4fa9c6d716f77af;hpb=b321086267ad1014dc5d09886396cde30f094437;p=pspp

diff --git a/src/dfm-read.c b/src/dfm-read.c
index e12864ac7c..238b808056 100644
--- a/src/dfm-read.c
+++ b/src/dfm-read.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "dfm-read.h"
@@ -26,13 +26,16 @@
 #include "alloc.h"
 #include "command.h"
 #include "error.h"
-#include "file-handle.h"
+#include "file-handle-def.h"
 #include "filename.h"
-#include "getline.h"
+#include "getl.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. */
@@ -81,8 +84,9 @@ dfm_close_reader (struct dfm_reader *r)
       if (!still_open) 
         {
           /* 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;
         }
     }
@@ -326,7 +330,7 @@ dfm_eof (struct dfm_reader *r)
    which is not null-terminated.  The caller must not free or
    modify the returned string.  */
 void
-dfm_get_record (struct dfm_reader *r, struct len_string *line)
+dfm_get_record (struct dfm_reader *r, struct fixed_string *line)
 {
   assert ((r->flags & DFM_ADVANCE) == 0);
   assert ((r->flags & DFM_EOF) == 0);