Changed DFM from open-at-first-access to explicit-open. Before,

[pspp-builds.git] / src / matrix-data.c

diff --git a/src/matrix-data.c b/src/matrix-data.c
index 277cde38232dbf4e7a118fb50683cd04fcfc7e20..5835e8229286d7072039ec9935cc2a8b0bcbcf32 100644 (file)
--- a/src/matrix-data.c
+++ b/src/matrix-data.c
@@ -153,9 +153,6 @@ cmd_matrix_data (void)
   
   unsigned seen = 0;
   
-  lex_match_id ("MATRIX");
-  lex_match_id ("DATA");
-
   discard_variables ();
 
   pool = pool_create ();
@@ -600,6 +597,9 @@ cmd_matrix_data (void)
   debug_print ();
 #endif
 
+  if (!dfm_open_for_reading (mx->data_file))
+    goto lossage;
+
   if (mx->explicit_rowtype)
     read_matrices_with_rowtype (mx);
   else