X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsys-file-reader.c;h=ec8ae3b32fd654c9f9ee0fcbbca007c0049fc075;hb=f27a6796fc45eafdce618237eded1a84cd9955b3;hp=1745d1dcf2db165bf8c3f3f149bd405532e634f3;hpb=bf03b53a3c0f0d1066062f37919015a8fa6ad436;p=pspp diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c index 1745d1dcf2..ec8ae3b32f 100644 --- a/src/data/sys-file-reader.c +++ b/src/data/sys-file-reader.c @@ -203,6 +203,7 @@ struct sfm_reader size_t sfm_var_cnt; /* Number of variables. */ int case_cnt; /* Number of cases */ const char *encoding; /* String encoding. */ + bool written_by_readstat; /* From https://github.com/WizardMac/ReadStat? */ /* Decompression. */ enum any_compression compression; @@ -233,10 +234,6 @@ sfm_reader_cast (const struct any_reader *r_) static bool sfm_close (struct any_reader *); -static struct variable *lookup_var_by_index (struct sfm_reader *, off_t, - const struct sfm_var_record *, - size_t n, int idx); - static void sys_msg (struct sfm_reader *r, off_t, int class, const char *format, va_list args) PRINTF_FORMAT (4, 0); @@ -282,7 +279,7 @@ static bool read_variable_record (struct sfm_reader *, struct sfm_var_record *); static bool read_value_label_record (struct sfm_reader *, struct sfm_value_label_record *); -static struct sfm_document_record *read_document_record (struct sfm_reader *); +static bool read_document_record (struct sfm_reader *); static bool read_extension_record (struct sfm_reader *, int subtype, struct sfm_extension_record **); static bool skip_extension_record (struct sfm_reader *, int subtype); @@ -357,10 +354,10 @@ static void parse_long_var_name_map (struct sfm_reader *, static bool parse_long_string_map (struct sfm_reader *, const struct sfm_extension_record *, struct dictionary *); -static bool parse_value_labels (struct sfm_reader *, struct dictionary *, - const struct sfm_var_record *, - size_t n_var_recs, - const struct sfm_value_label_record *); +static void parse_value_labels (struct sfm_reader *, struct dictionary *); +static struct variable *parse_weight_var (struct sfm_reader *, + const struct sfm_var_record *, size_t n_var_recs, + int idx); static void parse_data_file_attributes (struct sfm_reader *, const struct sfm_extension_record *, struct dictionary *); @@ -496,12 +493,8 @@ read_record (struct sfm_reader *r, int type, case 6: if (r->document != NULL) - { - sys_error (r, r->pos, _("Duplicate type 6 (document) record.")); - return false; - } - r->document = read_document_record (r); - return r->document != NULL; + sys_warn (r, r->pos, _("Duplicate type 6 (document) record.")); + return read_document_record (r); case 7: if (!read_int (r, &subtype)) @@ -647,6 +640,13 @@ add_id (struct get_strings_aux *aux, const char *id, const char *title, ...) va_end (args); } +static const char * +skip_prefix (const char *s, const char *prefix) +{ + size_t prefix_len = strlen (prefix); + return !strncmp (s, prefix, prefix_len) ? s + prefix_len : s; +} + /* Retrieves significant string data from R in its raw format, to allow the caller to try to detect the encoding in use. @@ -696,7 +696,7 @@ sfm_get_strings (const struct any_reader *r_, struct pool *pool, add_string (&aux, r->header.creation_date, _("Creation Date")); add_string (&aux, r->header.creation_time, _("Creation Time")); - add_string (&aux, r->header.eye_catcher, _("Product")); + add_string (&aux, skip_prefix (r->header.eye_catcher, "@(#) "), _("Product")); add_string (&aux, r->header.file_label, _("File Label")); if (r->extensions[EXT_PRODUCT_INFO]) @@ -761,7 +761,6 @@ sfm_decode (struct any_reader *r_, const char *encoding, { struct sfm_reader *r = sfm_reader_cast (r_); struct dictionary *dict; - size_t i; if (encoding == NULL) { @@ -808,25 +807,10 @@ sfm_decode (struct any_reader *r_, const char *encoding, /* Parse value labels and the weight variable immediately after the variable records. These records use indexes into var_recs[], so we must parse them before those indexes become invalidated by very long string variables. */ - for (i = 0; i < r->n_labels; i++) - if (!parse_value_labels (r, dict, r->vars, r->n_vars, &r->labels[i])) - goto error; + parse_value_labels (r, dict); if (r->header.weight_idx != 0) - { - struct variable *weight_var; - - weight_var = lookup_var_by_index (r, 76, r->vars, r->n_vars, - r->header.weight_idx); - if (weight_var != NULL) - { - if (var_is_numeric (weight_var)) - dict_set_weight (dict, weight_var); - else - sys_warn (r, -1, _("Ignoring string variable `%s' set " - "as weighting variable."), - var_get_name (weight_var)); - } - } + dict_set_weight (dict, parse_weight_var (r, r->vars, r->n_vars, + r->header.weight_idx)); if (r->extensions[EXT_DISPLAY] != NULL) parse_display_parameters (r, r->extensions[EXT_DISPLAY], dict); @@ -862,7 +846,7 @@ sfm_decode (struct any_reader *r_, const char *encoding, amount that the header claims. SPSS version 13 gets this wrong when very long strings are involved, so don't warn in that case. */ - if (r->header.nominal_case_size != -1 + if (r->header.nominal_case_size > 0 && r->header.nominal_case_size != r->n_vars && r->info.version_major != 13) sys_warn (r, -1, _("File header claims %d variable positions but " @@ -891,7 +875,7 @@ sfm_decode (struct any_reader *r_, const char *encoding, error: sfm_close (r_); - dict_destroy (dict); + dict_unref (dict); *dictp = NULL; return NULL; } @@ -968,6 +952,8 @@ read_header (struct sfm_reader *r, struct any_read_info *info, if (!read_string (r, header->magic, sizeof header->magic) || !read_string (r, header->eye_catcher, sizeof header->eye_catcher)) return false; + r->written_by_readstat = strstr (header->eye_catcher, + "https://github.com/WizardMac/ReadStat"); if (!strcmp (ASCII_MAGIC, header->magic) || !strcmp (EBCDIC_MAGIC, header->magic)) @@ -1033,7 +1019,7 @@ read_header (struct sfm_reader *r, struct any_read_info *info, if (!read_int (r, &r->case_cnt)) return false; - if ( r->case_cnt > INT_MAX / 2) + if (r->case_cnt > INT_MAX / 2) r->case_cnt = -1; /* Identify floating-point format and obtain compression bias. */ @@ -1229,33 +1215,35 @@ read_value_label_record (struct sfm_reader *r, return true; } -/* Reads a document record from R and returns it. */ -static struct sfm_document_record * +/* Reads a document record from R. Returns true if successful, false on + error. */ +static bool read_document_record (struct sfm_reader *r) { - struct sfm_document_record *record; int n_lines; - - record = pool_malloc (r->pool, sizeof *record); - record->pos = r->pos; - if (!read_int (r, &n_lines)) - return NULL; - if (n_lines <= 0 || n_lines >= INT_MAX / DOC_LINE_LENGTH) + return false; + else if (n_lines == 0) + return true; + else if (n_lines < 0 || n_lines >= INT_MAX / DOC_LINE_LENGTH) { - sys_error (r, record->pos, + sys_error (r, r->pos, _("Number of document lines (%d) " "must be greater than 0 and less than %d."), n_lines, INT_MAX / DOC_LINE_LENGTH); - return NULL; + return false; } + struct sfm_document_record *record; + record = pool_malloc (r->pool, sizeof *record); + record->pos = r->pos; record->n_lines = n_lines; record->documents = pool_malloc (r->pool, DOC_LINE_LENGTH * n_lines); if (!read_bytes (r, record->documents, DOC_LINE_LENGTH * n_lines)) - return NULL; + return false; - return record; + r->document = record; + return true; } static bool @@ -1408,6 +1396,15 @@ parse_header (struct sfm_reader *r, const struct sfm_header_record *header, info->product = ss_xstrdup (product); } +static struct variable * +add_var_with_generated_name (struct dictionary *dict, int width) +{ + char *name = dict_make_unique_var_name (dict, NULL, NULL); + struct variable *var = dict_create_var_assert (dict, name, width); + free (name); + return var; +} + /* Reads a variable (type 2) record from R and adds the corresponding variable to DICT. Also skips past additional variable records for long string @@ -1420,9 +1417,8 @@ parse_variable_records (struct sfm_reader *r, struct dictionary *dict, struct sfm_var_record *rec; int n_warnings = 0; - for (rec = var_recs; rec < &var_recs[n_var_recs]; ) + for (rec = var_recs; rec < &var_recs[n_var_recs];) { - struct variable *var; size_t n_values; char *name; size_t i; @@ -1431,13 +1427,6 @@ parse_variable_records (struct sfm_reader *r, struct dictionary *dict, rec->name, -1, r->pool); name[strcspn (name, " ")] = '\0'; - if (!dict_id_is_valid (dict, name, false) - || name[0] == '$' || name[0] == '#') - { - sys_error (r, rec->pos, _("Invalid variable name `%s'."), name); - return false; - } - if (rec->width < 0 || rec->width > 255) { sys_error (r, rec->pos, @@ -1445,19 +1434,30 @@ parse_variable_records (struct sfm_reader *r, struct dictionary *dict, return false; } - var = rec->var = dict_create_var (dict, name, rec->width); - if (var == NULL) + struct variable *var; + if (!dict_id_is_valid (dict, name, false) + || name[0] == '$' || name[0] == '#') { - char *new_name = dict_make_unique_var_name (dict, NULL, NULL); - sys_warn (r, rec->pos, _("Renaming variable with duplicate name " - "`%s' to `%s'."), - name, new_name); - var = rec->var = dict_create_var_assert (dict, new_name, rec->width); - free (new_name); + var = add_var_with_generated_name (dict, rec->width); + sys_warn (r, rec->pos, _("Renaming variable with invalid name " + "`%s' to `%s'."), name, var_get_name (var)); + } + else + { + var = dict_create_var (dict, name, rec->width); + if (var == NULL) + { + var = add_var_with_generated_name (dict, rec->width); + sys_warn (r, rec->pos, _("Renaming variable with duplicate name " + "`%s' to `%s'."), + name, var_get_name (var)); + } } + rec->var = var; - /* Set the short name the same as the long name. */ - var_set_short_name (var, 0, name); + /* Set the short name the same as the long name (even if we renamed + it). */ + var_set_short_name (var, 0, var_get_name (var)); /* Get variable label, if any. */ if (rec->label) @@ -1538,22 +1538,9 @@ parse_format_spec (struct sfm_reader *r, off_t pos, unsigned int format, int *n_warnings) { const int max_warnings = 8; - uint8_t raw_type = format >> 16; - uint8_t w = format >> 8; - uint8_t d = format; struct fmt_spec f; - bool ok; - - f.w = w; - f.d = d; - - msg_disable (); - ok = (fmt_from_io (raw_type, &f.type) - && fmt_check_output (&f) - && fmt_check_width_compat (&f, var_get_width (v))); - msg_enable (); - if (ok) + if (fmt_from_u32 (format, var_get_width (v), false, &f)) { if (which == PRINT_FORMAT) var_set_print_format (v, &f); @@ -1707,9 +1694,9 @@ parse_mrsets (struct sfm_reader *r, const struct sfm_extension_record *record, text = open_text_record (r, record, false); for (;;) { - struct sfm_mrset *mrset; - size_t allocated_vars; - char delimiter; + struct sfm_mrset *mrset = NULL; + size_t allocated_vars = 0; + char delimiter = '4'; /* Skip extra line feeds if present. */ while (text_match (text, '\n')) @@ -1756,7 +1743,12 @@ parse_mrsets (struct sfm_reader *r, const struct sfm_extension_record *record, } number = text_get_token (text, ss_cstr (" "), NULL); - if (!strcmp (number, "11")) + if (!number) + sys_warn (r, record->pos, + _("Missing label source value " + "following `E' at offset %zu in MRSETS record."), + text_pos (text)); + else if (!strcmp (number, "11")) mrset->label_from_var_label = true; else if (strcmp (number, "1")) sys_warn (r, record->pos, @@ -1827,10 +1819,9 @@ decode_mrsets (struct sfm_reader *r, struct dictionary *dict) size_t i; name = recode_string ("UTF-8", r->encoding, s->name, -1); - if (name[0] != '$') + if (!mrset_is_valid_name (name, dict_get_encoding (dict), false)) { - sys_warn (r, -1, _("Multiple response set name `%s' does not begin " - "with `$'."), + sys_warn (r, -1, _("Invalid multiple response set name `%s'."), name); free (name); continue; @@ -1992,8 +1983,9 @@ parse_display_parameters (struct sfm_reader *r, } static void -rename_var_and_save_short_names (struct dictionary *dict, struct variable *var, - const char *new_name) +rename_var_and_save_short_names (struct sfm_reader *r, off_t pos, + struct dictionary *dict, + struct variable *var, const char *new_name) { size_t n_short_names; char **short_names; @@ -2011,7 +2003,8 @@ rename_var_and_save_short_names (struct dictionary *dict, struct variable *var, } /* Set long name. */ - dict_rename_var (dict, var, new_name); + if (!dict_try_rename_var (dict, var, new_name)) + sys_warn (r, pos, _("Duplicate long variable name `%s'."), new_name); /* Restore short names. */ for (i = 0; i < n_short_names; i++) @@ -2045,7 +2038,7 @@ parse_long_var_name_map (struct sfm_reader *r, char *new_name; new_name = utf8_to_lower (var_get_name (var)); - rename_var_and_save_short_names (dict, var, new_name); + rename_var_and_save_short_names (r, -1, dict, var, new_name); free (new_name); } @@ -2070,16 +2063,7 @@ parse_long_var_name_map (struct sfm_reader *r, continue; } - /* Identify any duplicates. */ - if (utf8_strcasecmp (var_get_short_name (var, 0), long_name) - && dict_lookup_var (dict, long_name) != NULL) - { - sys_warn (r, record->pos, - _("Duplicate long variable name `%s'."), long_name); - continue; - } - - rename_var_and_save_short_names (dict, var, long_name); + rename_var_and_save_short_names (r, record->pos, dict, var, long_name); } close_text_record (r, text); } @@ -2160,61 +2144,99 @@ parse_long_string_map (struct sfm_reader *r, return true; } -static bool -parse_value_labels (struct sfm_reader *r, struct dictionary *dict, - const struct sfm_var_record *var_recs, size_t n_var_recs, - const struct sfm_value_label_record *record) +#define MAX_LABEL_WARNINGS 5 + +/* Displays a warning for offset OFFSET in the file. */ +static void +value_label_warning (struct sfm_reader *r, off_t offset, int *n_label_warnings, + const char *format, ...) { - struct variable **vars; - char **utf8_labels; - size_t i; + if (++*n_label_warnings > MAX_LABEL_WARNINGS) + return; - utf8_labels = pool_nmalloc (r->pool, record->n_labels, sizeof *utf8_labels); - for (i = 0; i < record->n_labels; i++) + va_list args; + + va_start (args, format); + sys_msg (r, offset, MW, format, args); + va_end (args); +} + +#define MAX_LABEL_WARNINGS 5 + +static void +parse_one_value_label_set (struct sfm_reader *r, struct dictionary *dict, + const struct sfm_var_record *var_recs, + size_t n_var_recs, + const struct sfm_value_label_record *record, + int *n_label_warnings) +{ + char **utf8_labels + = pool_nmalloc (r->pool, record->n_labels, sizeof *utf8_labels); + for (size_t i = 0; i < record->n_labels; i++) utf8_labels[i] = recode_string_pool ("UTF-8", dict_get_encoding (dict), record->labels[i].label, -1, r->pool); - vars = pool_nmalloc (r->pool, record->n_vars, sizeof *vars); - for (i = 0; i < record->n_vars; i++) + struct variable **vars = pool_nmalloc (r->pool, + record->n_vars, sizeof *vars); + unsigned int n_vars = 0; + for (size_t i = 0; i < record->n_vars; i++) { - vars[i] = lookup_var_by_index (r, record->pos, - var_recs, n_var_recs, record->vars[i]); - if (vars[i] == NULL) - return false; + int idx = record->vars[i]; + if (idx < 1 || idx > n_var_recs) + { + value_label_warning ( + r, record->pos, n_label_warnings, + _("Value label variable index %d not in valid range 1...%zu."), + idx, n_var_recs); + continue; + } + + const struct sfm_var_record *rec = &var_recs[idx - 1]; + if (rec->var == NULL) + { + value_label_warning ( + r, record->pos, n_label_warnings, + _("Value label variable index %d " + "refers to long string continuation."), idx); + continue; + } + + vars[n_vars++] = rec->var; } + if (!n_vars) + return; - for (i = 1; i < record->n_vars; i++) + for (size_t i = 1; i < n_vars; i++) if (var_get_type (vars[i]) != var_get_type (vars[0])) { - sys_error (r, record->pos, - _("Variables associated with value label are not all of " - "identical type. Variable %s is %s, but variable " - "%s is %s."), - var_get_name (vars[0]), - var_is_numeric (vars[0]) ? _("numeric") : _("string"), - var_get_name (vars[i]), - var_is_numeric (vars[i]) ? _("numeric") : _("string")); - return false; + value_label_warning ( + r, record->pos, n_label_warnings, + _("Variables associated with value label are not all of " + "identical type. Variable %s is %s, but variable " + "%s is %s."), + var_get_name (vars[0]), + var_is_numeric (vars[0]) ? _("numeric") : _("string"), + var_get_name (vars[i]), + var_is_numeric (vars[i]) ? _("numeric") : _("string")); + return; } - for (i = 0; i < record->n_vars; i++) + for (size_t i = 0; i < n_vars; i++) { struct variable *var = vars[i]; - int width; - size_t j; - - width = var_get_width (var); + int width = var_get_width (var); if (width > 8) { - sys_error (r, record->pos, - _("Value labels may not be added to long string " - "variables (e.g. %s) using records types 3 and 4."), - var_get_name (var)); - return false; + value_label_warning ( + r, record->pos, n_label_warnings, + _("Value labels may not be added to long string " + "variables (e.g. %s) using records types 3 and 4."), + var_get_name (var)); + continue; } - for (j = 0; j < record->n_labels; j++) + for (size_t j = 0; j < record->n_labels; j++) { struct sfm_value_label *label = &record->labels[j]; union value value; @@ -2223,19 +2245,27 @@ parse_value_labels (struct sfm_reader *r, struct dictionary *dict, if (width == 0) value.f = parse_float (r, label->value, 0); else - memcpy (value_str_rw (&value, width), label->value, width); + memcpy (value.s, label->value, width); if (!var_add_value_label (var, &value, utf8_labels[j])) { - if (var_is_numeric (var)) - sys_warn (r, record->pos, - _("Duplicate value label for %g on %s."), - value.f, var_get_name (var)); + if (r->written_by_readstat) + { + /* Ignore the problem. ReadStat is buggy and emits value + labels whose values are longer than string variables' + widths, that are identical in the actual width of the + variable, e.g. both values "ABC123" and "ABC456" for a + string variable with width 3. */ + } + else if (var_is_numeric (var)) + value_label_warning (r, record->pos, n_label_warnings, + _("Duplicate value label for %g on %s."), + value.f, var_get_name (var)); else - sys_warn (r, record->pos, - _("Duplicate value label for `%.*s' on %s."), - width, value_str (&value, width), - var_get_name (var)); + value_label_warning ( + r, record->pos, n_label_warnings, + _("Duplicate value label for `%.*s' on %s."), + width, value.s, var_get_name (var)); } value_destroy (&value, width); @@ -2243,38 +2273,59 @@ parse_value_labels (struct sfm_reader *r, struct dictionary *dict, } pool_free (r->pool, vars); - for (i = 0; i < record->n_labels; i++) + for (size_t i = 0; i < record->n_labels; i++) pool_free (r->pool, utf8_labels[i]); pool_free (r->pool, utf8_labels); +} - return true; +static void +parse_value_labels (struct sfm_reader *r, struct dictionary *dict) +{ + int n_label_warnings = 0; + for (size_t i = 0; i < r->n_labels; i++) + parse_one_value_label_set (r, dict, r->vars, r->n_vars, &r->labels[i], + &n_label_warnings); + if (n_label_warnings > MAX_LABEL_WARNINGS) + sys_warn (r, -1, + _("Suppressed %d additional warnings for value labels."), + n_label_warnings - MAX_LABEL_WARNINGS); } static struct variable * -lookup_var_by_index (struct sfm_reader *r, off_t offset, - const struct sfm_var_record *var_recs, size_t n_var_recs, - int idx) +parse_weight_var (struct sfm_reader *r, + const struct sfm_var_record *var_recs, size_t n_var_recs, + int idx) { - const struct sfm_var_record *rec; + off_t offset = 76; /* Offset to variable index in header. */ if (idx < 1 || idx > n_var_recs) { - sys_error (r, offset, - _("Variable index %d not in valid range 1...%zu."), - idx, n_var_recs); + sys_warn (r, offset, + _("Weight variable index %d not in valid range 1...%zu. " + "Treating file as unweighted."), + idx, n_var_recs); return NULL; } - rec = &var_recs[idx - 1]; + const struct sfm_var_record *rec = &var_recs[idx - 1]; if (rec->var == NULL) { - sys_error (r, offset, - _("Variable index %d refers to long string continuation."), - idx); + sys_warn (r, offset, + _("Weight variable index %d refers to long string " + "continuation. Treating file as unweighted."), idx); + return NULL; + } + + struct variable *weight_var = rec->var; + if (!var_is_numeric (weight_var)) + { + sys_warn (r, offset, _("Ignoring string variable `%s' set " + "as weighting variable."), + var_get_name (weight_var)); return NULL; } - return rec->var; + return weight_var; } /* Parses a set of custom attributes from TEXT into ATTRS. @@ -2328,8 +2379,15 @@ parse_attributes (struct sfm_reader *r, struct text_record *text, if (text_match (text, ')')) break; } - if (attrs != NULL) - attrset_add (attrs, attr); + if (attrs != NULL && attribute_get_n_values (attr) > 0) + { + if (!attrset_try_add (attrs, attr)) + { + text_warn (r, text, _("Duplicate attribute %s."), + attribute_get_name (attr)); + attribute_destroy (attr); + } + } else attribute_destroy (attr); } @@ -2375,7 +2433,7 @@ assign_variable_roles (struct sfm_reader *r, struct dictionary *dict) struct variable *var = dict_get_var (dict, i); struct attrset *attrs = var_get_attributes (var); const struct attribute *attr = attrset_lookup (attrs, "$@Role"); - if (attr != NULL) + if (attr != NULL && attribute_get_n_values (attr) > 0) { int value = atoi (attribute_get_value (attr, 0)); enum var_role role; @@ -2463,7 +2521,8 @@ parse_long_string_value_labels (struct sfm_reader *r, ofs += 4; /* Parse variable name, width, and number of labels. */ - if (!check_overflow (r, record, ofs, var_name_len + 8)) + if (!check_overflow (r, record, ofs, var_name_len) + || !check_overflow (r, record, ofs, var_name_len + 8)) return; var_name = recode_string_pool ("UTF-8", dict_encoding, (const char *) record->data + ofs, @@ -2514,8 +2573,7 @@ parse_long_string_value_labels (struct sfm_reader *r, if (!skip) { if (value_length == width) - memcpy (value_str_rw (&value, width), - (const uint8_t *) record->data + ofs, width); + memcpy (value.s, (const uint8_t *) record->data + ofs, width); else { sys_warn (r, record->pos + ofs, @@ -2547,8 +2605,7 @@ parse_long_string_value_labels (struct sfm_reader *r, if (!var_add_value_label (var, &value, label)) sys_warn (r, record->pos + ofs, _("Duplicate value label for `%.*s' on %s."), - width, value_str (&value, width), - var_get_name (var)); + width, value.s, var_get_name (var)); pool_free (r->pool, label); } ofs += label_length; @@ -2581,7 +2638,8 @@ parse_long_string_missing_values (struct sfm_reader *r, ofs += 4; /* Parse variable name. */ - if (!check_overflow (r, record, ofs, var_name_len + 1)) + if (!check_overflow (r, record, ofs, var_name_len) + || !check_overflow (r, record, ofs, var_name_len + 1)) return; var_name = recode_string_pool ("UTF-8", dict_encoding, (const char *) record->data + ofs, @@ -2681,8 +2739,7 @@ sys_file_casereader_read (struct casereader *reader, void *r_) retval = read_case_number (r, &v->f); else { - uint8_t *s = value_str_rw (v, sv->var_width); - retval = read_case_string (r, s + sv->offset, sv->segment_width); + retval = read_case_string (r, v->s + sv->offset, sv->segment_width); if (retval == 1) { retval = skip_whole_strings (r, ROUND_DOWN (sv->padding, 8)); @@ -2972,7 +3029,7 @@ open_text_record (struct sfm_reader *r, } /* Closes TEXT, frees its storage, and issues a final warning - about suppressed warnings if necesary. */ + about suppressed warnings if necessary. */ static void close_text_record (struct sfm_reader *r, struct text_record *text) { @@ -3069,7 +3126,11 @@ text_get_token (struct text_record *text, struct substring delimiters, char *end; if (!ss_tokenize (text->buffer, delimiters, &text->pos, &token)) - return NULL; + { + if (delimiter != NULL) + *delimiter = ss_data (text->buffer)[text->pos-1]; + return NULL; + } end = &ss_data (token)[ss_length (token)]; if (delimiter != NULL) @@ -3173,7 +3234,6 @@ static void sys_msg (struct sfm_reader *r, off_t offset, int class, const char *format, va_list args) { - struct msg m; struct string text; ds_init_empty (&text); @@ -3184,15 +3244,11 @@ sys_msg (struct sfm_reader *r, off_t offset, ds_put_format (&text, _("`%s': "), fh_get_file_name (r->fh)); ds_put_vformat (&text, format, args); - m.category = msg_class_to_category (class); - m.severity = msg_class_to_severity (class); - m.file_name = NULL; - m.first_line = 0; - m.last_line = 0; - m.first_column = 0; - m.last_column = 0; - m.text = ds_cstr (&text); - + struct msg m = { + .category = msg_class_to_category (class), + .severity = msg_class_to_severity (class), + .text = ds_cstr (&text), + }; msg_emit (&m); } @@ -3489,7 +3545,7 @@ read_ztrailer (struct sfm_reader *r, if (fstat (fileno (r->file), &s)) { - sys_error (ME, 0, _("%s: stat failed (%s)."), + sys_error (r, 0, _("%s: stat failed (%s)."), fh_get_file_name (r->fh), strerror (errno)); return false; }