X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fdata-list.c;h=3b091404f80f491edfe04418cf7c6b6830a16e72;hb=c9ba3a14c478461aac8305599c070824113299c2;hp=d07eae5c554f7cb19b665175e2a45f9146e08102;hpb=a1efcf97ca2f75f4be6a0389ff2372c03ed2d4e1;p=pspp-builds.git

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index d07eae5c..3b091404 100644
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -75,8 +75,9 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
   struct dictionary *dict;
   struct data_parser *parser;
   struct dfm_reader *reader;
-  struct variable *end;
-  struct file_handle *fh;
+  struct variable *end = NULL;
+  struct file_handle *fh = NULL;
+  struct string encoding = DS_EMPTY_INITIALIZER;
 
   int table;
   enum data_parser_type type;
@@ -87,8 +88,6 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
   dict = in_input_program () ? dataset_dict (ds) : dict_create ();
   parser = data_parser_create ();
   reader = NULL;
-  end = NULL;
-  fh = NULL;
 
   table = -1;                /* Print table if nonzero, -1=undecided. */
   has_type = false;
@@ -103,6 +102,16 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
 	  if (fh == NULL)
 	    goto error;
 	}
+      else if (lex_match_id (lexer, "ENCODING"))
+	{
+	  lex_match (lexer, '=');
+	  if (!lex_force_string (lexer))
+	    goto error;
+
+	  ds_init_string (&encoding, lex_tokstr (lexer));
+
+	  lex_get (lexer);
+	}
       else if (lex_match_id (lexer, "RECORDS"))
 	{
 	  lex_match (lexer, '=');
@@ -228,6 +237,14 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
     }
   type = data_parser_get_type (parser);
 
+  if (! ds_is_empty (&encoding))
+    {
+      if ( NULL == fh)
+	msg (MW, _("Encoding should not be specified for inline data. It will be ignored."));
+      else
+	dict_set_encoding (dict, ds_cstr (&encoding));
+    }
+
   if (fh == NULL)
     fh = fh_inline_file ();
   fh_set_default_handle (fh);