sys-file-reader: Take string encoding into account for text records.

[pspp] / src / data / sys-file-reader.c

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 7e5a9e0fe1c6396306060abce27938460cf6869f..aa94e6d63dbeae583f39fd3153d9f5044c50860d 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -430,6 +430,7 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dictp,
      how the rest of the header data is to be interpreted. */
   dict = dict_create (choose_encoding (r, extensions[EXT_INTEGER],
                                        extensions[EXT_ENCODING]));
+  r->encoding = dict_get_encoding (dict);
 
   /* These records don't use variables at all. */
   if (document != NULL)
@@ -974,7 +975,7 @@ parse_variable_records (struct sfm_reader *r, struct dictionary *dict,
 
           utf8_label = recode_string_pool ("UTF-8", dict_encoding,
                                            rec->label, -1, r->pool);
-          var_set_label (var, utf8_label, NULL, false);
+          var_set_label (var, utf8_label, false);
         }
 
       /* Set missing values. */