X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire.c;h=02415d68bc3df8a6250d0a115f622c52de6c787f;hb=a2bd2e76dfd5b22649c624abfe56c1d6cb14c2d9;hp=b1551fbb15f137f81cc548cc48f3f49a80f70fb3;hpb=65190c89174ad703a008c89bfc70154dff12def0;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index b1551fbb..02415d68 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -72,9 +72,7 @@ struct dataset * the_dataset = NULL;
 static void
 replace_casereader (struct casereader *s)
 {
-  PsppireCaseFile *pcf = psppire_case_file_new (s);
-
-  psppire_data_store_set_case_file (the_data_store, pcf);
+  psppire_data_store_set_reader (the_data_store, s);
 }
 
 #define _(msgid) gettext (msgid)
@@ -263,7 +261,13 @@ parse_non_options (int key, char *arg, struct argp_state *state)
 	if (pfm_detect (fp))
 	  {
 	    ds_init_cstr (&syntax, "IMPORT FILE=");
+	    goto close;
 	  }
+
+	fclose (fp);
+	msg (ME, _("%s is neither a system nor portable file"), arg);
+	break;
+
       close:
 	fclose (fp);