X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fsys-file-writer.c;h=34f59d332d1544abf2bdd67497d228ab6f88ee45;hb=f641982c71972cbf57eb9469d14af8629bf79d7b;hp=823d0c47e29138950421e7103b964f8ba52b48a4;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c index 823d0c47e2..34f59d332d 100644 --- a/src/data/sys-file-writer.c +++ b/src/data/sys-file-writer.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . + Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -18,37 +17,93 @@ 02110-1301, USA. */ #include + #include "sys-file-writer.h" -#include "sfm-private.h" -#include -#include +#include "sys-file-private.h" + #include #include #include +#include #include #include -#if HAVE_UNISTD_H -#include /* Required by SunOS4. */ -#endif +#include + #include -#include "case.h" -#include "dictionary.h" -#include -#include "file-handle-def.h" #include #include +#include #include -#include "settings.h" -#include "stat-macros.h" #include +#include + +#include "case.h" +#include "dictionary.h" +#include "file-handle-def.h" +#include "format.h" +#include "missing-values.h" +#include "settings.h" #include "value-labels.h" #include "variable.h" -#include + +#include "minmax.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include +/* Find 64-bit floating-point type. */ +#if SIZEOF_FLOAT == 8 + #define flt64 float + #define FLT64_MAX FLT_MAX +#elif SIZEOF_DOUBLE == 8 + #define flt64 double + #define FLT64_MAX DBL_MAX +#elif SIZEOF_LONG_DOUBLE == 8 + #define flt64 long double + #define FLT64_MAX LDBL_MAX +#else + #error Which one of your basic types is 64-bit floating point? +#endif + +/* Figure out SYSMIS value for flt64. */ +#include +#if SIZEOF_DOUBLE == 8 +#define second_lowest_flt64 second_lowest_value +#else +#error Must define second_lowest_flt64 for your architecture. +#endif + +/* Record Type 1: General Information. */ +struct sysfile_header + { + char rec_type[4] ; /* 00: Record-type code, "$FL2". */ + char prod_name[60] ; /* 04: Product identification. */ + int32_t layout_code ; /* 40: 2. */ + int32_t nominal_case_size ; /* 44: Number of `value's per case. + Note: some systems set this to -1 */ + int32_t compress ; /* 48: 1=compressed, 0=not compressed. */ + int32_t weight_idx ; /* 4c: 1-based index of weighting var, or 0. */ + int32_t case_cnt ; /* 50: Number of cases, -1 if unknown. */ + flt64 bias ; /* 54: Compression bias (100.0). */ + char creation_date[9] ; /* 5c: `dd mmm yy' creation date of file. */ + char creation_time[8] ; /* 65: `hh:mm:ss' 24-hour creation time. */ + char file_label[64] ; /* 6d: File label. */ + char padding[3] ; /* ad: Ignored padding. */ + } ATTRIBUTE((packed)) ; + +/* Record Type 2: Variable. */ +struct sysfile_variable + { + int32_t rec_type ; /* 2. */ + int32_t type ; /* 0=numeric, 1-255=string width, + -1=continued string. */ + int32_t has_var_label ; /* 1=has a variable label, 0=doesn't. */ + int32_t n_missing_values ; /* Missing value code of -3,-2,0,1,2, or 3. */ + int32_t print ; /* Print format. */ + int32_t write ; /* Write format. */ + char name[SHORT_NAME_LEN] ; /* Variable name. */ + /* The rest of the structure varies. */ + } ATTRIBUTE((packed)) ; /* Compression bias used by PSPP. Values between (1 - COMPRESSION_BIAS) and (251 - COMPRESSION_BIAS) inclusive can be @@ -65,6 +120,7 @@ struct sfm_writer int compress; /* 1=compressed, 0=not compressed. */ int case_cnt; /* Number of cases written so far. */ size_t flt64_cnt; /* Number of flt64 elements in case. */ + bool has_vls; /* Does the dict have very long strings? */ /* Compression buffering. */ flt64 *buf; /* Buffered data. */ @@ -76,6 +132,8 @@ struct sfm_writer /* Variables. */ struct sfm_var *vars; /* Variables. */ size_t var_cnt; /* Number of variables. */ + size_t var_cnt_vls; /* Number of variables including + very long string components. */ }; /* A variable in a system file. */ @@ -89,7 +147,7 @@ struct sfm_var static char *append_string_max (char *, const char *, const char *); static void write_header (struct sfm_writer *, const struct dictionary *); static void buf_write (struct sfm_writer *, const void *, size_t); -static void write_variable (struct sfm_writer *, struct variable *); +static void write_variable (struct sfm_writer *, const struct variable *); static void write_value_labels (struct sfm_writer *, struct variable *, int idx); static void write_rec_7_34 (struct sfm_writer *); @@ -97,18 +155,30 @@ static void write_rec_7_34 (struct sfm_writer *); static void write_longvar_table (struct sfm_writer *w, const struct dictionary *dict); +static void write_vls_length_table (struct sfm_writer *w, + const struct dictionary *dict); + + static void write_variable_display_parameters (struct sfm_writer *w, const struct dictionary *dict); static void write_documents (struct sfm_writer *, const struct dictionary *); -static int does_dict_need_translation (const struct dictionary *); static inline int var_flt64_cnt (const struct variable *v) { - return v->type == NUMERIC ? 1 : DIV_RND_UP (v->width, sizeof (flt64)); + assert(sizeof(flt64) == MAX_SHORT_STRING); + return sfm_width_to_bytes(var_get_width (v)) / MAX_SHORT_STRING ; +} + +static inline int +var_flt64_cnt_nom (const struct variable *v) +{ + return (var_is_numeric (v) + ? 1 : DIV_RND_UP (var_get_width (v), sizeof (flt64))); } + /* Returns default options for writing a system file. */ struct sfm_write_options sfm_writer_default_options (void) @@ -120,6 +190,28 @@ sfm_writer_default_options (void) return opts; } + +/* Return a short variable name to be used as the continuation of the + variable with the short name SN. + + FIXME: Need to resolve clashes somehow. + + */ +static const char * +cont_var_name(const char *sn, int idx) +{ + static char s[SHORT_NAME_LEN + 1]; + + char abb[SHORT_NAME_LEN + 1 - 3]= {0}; + + strncpy(abb, sn, SHORT_NAME_LEN - 3); + + snprintf(s, SHORT_NAME_LEN + 1, "%s%03d", abb, idx); + + return s; +} + + /* Opens the system file designated by file handle FH for writing cases from dictionary D according to the given OPTS. If COMPRESS is nonzero, the system file will be compressed. @@ -149,7 +241,7 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d, mode = S_IRUSR | S_IRGRP | S_IROTH; if (opts.create_writeable) mode |= S_IWUSR | S_IWGRP | S_IWOTH; - fd = open (fh_get_filename (fh), O_WRONLY | O_CREAT | O_TRUNC, mode); + fd = open (fh_get_file_name (fh), O_WRONLY | O_CREAT | O_TRUNC, mode); if (fd < 0) goto open_error; @@ -162,22 +254,28 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d, w->fh = fh; w->file = fdopen (fd, "w"); - w->needs_translation = does_dict_need_translation (d); + w->needs_translation = dict_compacting_would_change (d); w->compress = opts.compress; w->case_cnt = 0; w->flt64_cnt = 0; + w->has_vls = false; w->buf = w->end = w->ptr = NULL; w->x = w->y = NULL; w->var_cnt = dict_get_var_cnt (d); + w->var_cnt_vls = w->var_cnt; w->vars = xnmalloc (w->var_cnt, sizeof *w->vars); for (i = 0; i < w->var_cnt; i++) { const struct variable *dv = dict_get_var (d, i); struct sfm_var *sv = &w->vars[i]; - sv->width = dv->width; - sv->fv = dv->fv; + sv->width = var_get_width (dv); + /* spss compatibility nonsense */ + if ( var_get_width (dv) >= MIN_VERY_LONG_STRING ) + w->has_vls = true; + + sv->fv = var_get_case_index (dv); sv->flt64_cnt = var_flt64_cnt (dv); } @@ -194,7 +292,42 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d, /* Write basic variable info. */ dict_assign_short_names (d); for (i = 0; i < dict_get_var_cnt (d); i++) - write_variable (w, dict_get_var (d, i)); + { + int count = 0; + const struct variable *v = dict_get_var(d, i); + int wcount = var_get_width (v); + + do { + struct variable *var_cont = var_clone (v); + var_set_short_name (var_cont, var_get_short_name (v)); + if ( var_is_alpha (v)) + { + if ( 0 != count ) + { + var_clear_missing_values (var_cont); + var_set_short_name (var_cont, + cont_var_name (var_get_short_name (v), + count)); + var_clear_label (var_cont); + w->var_cnt_vls++; + } + count++; + if ( wcount >= MIN_VERY_LONG_STRING ) + { + var_set_width (var_cont, MIN_VERY_LONG_STRING - 1); + wcount -= EFFECTIVE_LONG_STRING_LENGTH; + } + else + { + var_set_width (var_cont, wcount); + wcount -= var_get_width (var_cont); + } + } + + write_variable (w, var_cont); + var_destroy (var_cont); + } while(wcount > 0); + } /* Write out value labels. */ for (idx = i = 0; i < dict_get_var_cnt (d); i++) @@ -215,13 +348,15 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d, if (opts.version >= 3) write_longvar_table (w, d); + write_vls_length_table(w, d); + /* Write end-of-headers record. */ { struct { - int32 rec_type P; - int32 filler P; - } + int32_t rec_type ; + int32_t filler ; + } ATTRIBUTE((packed)) rec_999; rec_999.rec_type = 999; @@ -250,27 +385,10 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d, open_error: msg (ME, _("Error opening \"%s\" for writing as a system file: %s."), - fh_get_filename (fh), strerror (errno)); + fh_get_file_name (fh), strerror (errno)); goto error; } -static int -does_dict_need_translation (const struct dictionary *d) -{ - size_t case_idx; - size_t i; - - case_idx = 0; - for (i = 0; i < dict_get_var_cnt (d); i++) - { - struct variable *v = dict_get_var (d, i); - if (v->fv != case_idx) - return 0; - case_idx += v->nv; - } - return 1; -} - /* Returns value of X truncated to two least-significant digits. */ static int rerange (int x) @@ -304,14 +422,16 @@ write_header (struct sfm_writer *w, const struct dictionary *d) w->flt64_cnt = 0; for (i = 0; i < dict_get_var_cnt (d); i++) - w->flt64_cnt += var_flt64_cnt (dict_get_var (d, i)); - hdr.case_size = w->flt64_cnt; + { + w->flt64_cnt += var_flt64_cnt (dict_get_var (d, i)); + } + hdr.nominal_case_size = w->flt64_cnt; hdr.compress = w->compress; if (dict_get_weight (d) != NULL) { - struct variable *weight_var; + const struct variable *weight_var; int recalc_weight_idx = 1; int i; @@ -374,15 +494,16 @@ write_header (struct sfm_writer *w, const struct dictionary *d) /* Translates format spec from internal form in SRC to system file format in DEST. */ static inline void -write_format_spec (struct fmt_spec *src, int32 *dest) +write_format_spec (const struct fmt_spec *src, int32_t *dest) { - *dest = (formats[src->type].spss << 16) | (src->w << 8) | src->d; + assert (fmt_check_output (src)); + *dest = (fmt_to_io (src->type) << 16) | (src->w << 8) | src->d; } /* Write the variable record(s) for primary variable P and secondary variable S to system file W. */ static void -write_variable (struct sfm_writer *w, struct variable *v) +write_variable (struct sfm_writer *w, const struct variable *v) { struct sysfile_variable sv; @@ -390,12 +511,13 @@ write_variable (struct sfm_writer *w, struct variable *v) struct missing_values mv; flt64 m[3]; /* Missing value values. */ int nm; /* Number of missing values, possibly negative. */ + const char *label = var_get_label (v); sv.rec_type = 2; - sv.type = v->width; - sv.has_var_label = (v->label != NULL); + sv.type = MIN (var_get_width (v), MIN_VERY_LONG_STRING - 1); + sv.has_var_label = label != NULL; - mv_copy (&mv, &v->miss); + mv_copy (&mv, var_get_missing_values (v)); nm = 0; if (mv_has_range (&mv)) { @@ -408,35 +530,36 @@ write_variable (struct sfm_writer *w, struct variable *v) { union value value; mv_pop_value (&mv, &value); - if (v->type == NUMERIC) + if (var_is_numeric (v)) m[nm] = value.f; else - buf_copy_rpad ((char *) &m[nm], sizeof m[nm], value.s, v->width); + buf_copy_rpad ((char *) &m[nm], sizeof m[nm], value.s, + var_get_width (v)); nm++; } - if (mv_has_range (&v->miss)) + if (mv_has_range (var_get_missing_values (v))) nm = -nm; sv.n_missing_values = nm; - write_format_spec (&v->print, &sv.print); - write_format_spec (&v->write, &sv.write); - buf_copy_str_rpad (sv.name, sizeof sv.name, v->short_name); + write_format_spec (var_get_print_format (v), &sv.print); + write_format_spec (var_get_write_format (v), &sv.write); + buf_copy_str_rpad (sv.name, sizeof sv.name, var_get_short_name (v)); buf_write (w, &sv, sizeof sv); - if (v->label) + if (label != NULL) { struct label { - int32 label_len P; - char label[255] P; - } + int32_t label_len ; + char label[255] ; + } ATTRIBUTE((packed)) l; int ext_len; - l.label_len = min (strlen (v->label), 255); + l.label_len = MIN (strlen (label), 255); ext_len = ROUND_UP (l.label_len, sizeof l.label_len); - memcpy (l.label, v->label, l.label_len); + memcpy (l.label, label, l.label_len); memset (&l.label[l.label_len], ' ', ext_len - l.label_len); buf_write (w, &l, offsetof (struct label, label) + ext_len); @@ -445,7 +568,7 @@ write_variable (struct sfm_writer *w, struct variable *v) if (nm) buf_write (w, m, sizeof *m * abs (nm)); - if (v->type == ALPHA && v->width > (int) sizeof (flt64)) + if (var_is_alpha (v) && var_get_width (v) > (int) sizeof (flt64)) { int i; int pad_count; @@ -457,7 +580,8 @@ write_variable (struct sfm_writer *w, struct variable *v) memset (&sv.write, 0, sizeof sv.write); memset (&sv.name, 0, sizeof sv.name); - pad_count = DIV_RND_UP (v->width, (int) sizeof (flt64)) - 1; + pad_count = DIV_RND_UP (MIN(var_get_width (v), MIN_VERY_LONG_STRING - 1), + (int) sizeof (flt64)) - 1; for (i = 0; i < pad_count; i++) buf_write (w, &sv, sizeof sv); } @@ -470,18 +594,19 @@ write_value_labels (struct sfm_writer *w, struct variable *v, int idx) { struct value_label_rec { - int32 rec_type P; - int32 n_labels P; - flt64 labels[1] P; - }; + int32_t rec_type ; + int32_t n_labels ; + flt64 labels[1] ; + } ATTRIBUTE((packed)); struct var_idx_rec { - int32 rec_type P; - int32 n_vars P; - int32 vars[1] P; - }; + int32_t rec_type ; + int32_t n_vars ; + int32_t vars[1] ; + } ATTRIBUTE((packed)); + const struct val_labs *val_labs; struct val_labs_iterator *i; struct value_label_rec *vlr; struct var_idx_rec vir; @@ -489,23 +614,24 @@ write_value_labels (struct sfm_writer *w, struct variable *v, int idx) size_t vlr_size; flt64 *loc; - if (!val_labs_count (v->val_labs)) + val_labs = var_get_value_labels (v); + if (val_labs == NULL) return; /* Pass 1: Count bytes. */ vlr_size = (sizeof (struct value_label_rec) - + sizeof (flt64) * (val_labs_count (v->val_labs) - 1)); - for (vl = val_labs_first (v->val_labs, &i); vl != NULL; - vl = val_labs_next (v->val_labs, &i)) + + sizeof (flt64) * (val_labs_count (val_labs) - 1)); + for (vl = val_labs_first (val_labs, &i); vl != NULL; + vl = val_labs_next (val_labs, &i)) vlr_size += ROUND_UP (strlen (vl->label) + 1, sizeof (flt64)); /* Pass 2: Copy bytes. */ vlr = xmalloc (vlr_size); vlr->rec_type = 3; - vlr->n_labels = val_labs_count (v->val_labs); + vlr->n_labels = val_labs_count (val_labs); loc = vlr->labels; - for (vl = val_labs_first_sorted (v->val_labs, &i); vl != NULL; - vl = val_labs_next (v->val_labs, &i)) + for (vl = val_labs_first_sorted (val_labs, &i); vl != NULL; + vl = val_labs_next (val_labs, &i)) { size_t len = strlen (vl->label); @@ -531,11 +657,10 @@ static void write_documents (struct sfm_writer *w, const struct dictionary *d) { struct - { - int32 rec_type P; /* Always 6. */ - int32 n_lines P; /* Number of lines of documents. */ - } - rec_6; + { + int32_t rec_type ; /* Always 6. */ + int32_t n_lines ; /* Number of lines of documents. */ + } ATTRIBUTE((packed)) rec_6; const char *documents; size_t n_lines; @@ -558,16 +683,16 @@ write_variable_display_parameters (struct sfm_writer *w, struct { - int32 rec_type P; - int32 subtype P; - int32 elem_size P; - int32 n_elem P; - } vdp_hdr; + int32_t rec_type ; + int32_t subtype ; + int32_t elem_size ; + int32_t n_elem ; + } ATTRIBUTE((packed)) vdp_hdr; vdp_hdr.rec_type = 7; vdp_hdr.subtype = 11; vdp_hdr.elem_size = 4; - vdp_hdr.n_elem = w->var_cnt * 3; + vdp_hdr.n_elem = w->var_cnt_vls * 3; buf_write (w, &vdp_hdr, sizeof vdp_hdr); @@ -576,46 +701,110 @@ write_variable_display_parameters (struct sfm_writer *w, struct variable *v; struct { - int32 measure P; - int32 width P; - int32 align P; - } - params; + int32_t measure ; + int32_t width ; + int32_t align ; + } ATTRIBUTE((packed)) params; v = dict_get_var(dict, i); - params.measure = v->measure; - params.width = v->display_width; - params.align = v->alignment; + params.measure = (var_get_measure (v) == MEASURE_NOMINAL ? 1 + : var_get_measure (v) == MEASURE_ORDINAL ? 2 + : 3); + params.width = var_get_display_width (v); + params.align = (var_get_alignment (v) == ALIGN_LEFT ? 0 + : var_get_alignment (v) == ALIGN_RIGHT ? 1 + : 2); buf_write (w, ¶ms, sizeof(params)); + + if (var_is_long_string (v)) + { + int wcount = var_get_width (v) - EFFECTIVE_LONG_STRING_LENGTH ; + + while (wcount > 0) + { + params.width = wcount >= MIN_VERY_LONG_STRING ? 32 : wcount; + + buf_write (w, ¶ms, sizeof(params)); + + wcount -= EFFECTIVE_LONG_STRING_LENGTH ; + } + } } } +/* Writes the table of lengths for Very Long String Variables */ +static void +write_vls_length_table (struct sfm_writer *w, + const struct dictionary *dict) +{ + int i; + struct + { + int32_t rec_type ; + int32_t subtype ; + int32_t elem_size ; + int32_t n_elem ; + } ATTRIBUTE((packed)) vls_hdr; + + struct string vls_length_map; + + ds_init_empty (&vls_length_map); + + vls_hdr.rec_type = 7; + vls_hdr.subtype = 14; + vls_hdr.elem_size = 1; + + + for (i = 0; i < dict_get_var_cnt (dict); ++i) + { + const struct variable *v = dict_get_var (dict, i); + + if ( var_get_width (v) < MIN_VERY_LONG_STRING ) + continue; + + ds_put_format (&vls_length_map, "%s=%05d", + var_get_short_name (v), var_get_width (v)); + ds_put_char (&vls_length_map, '\0'); + ds_put_char (&vls_length_map, '\t'); + } + + vls_hdr.n_elem = ds_length (&vls_length_map); + + if ( vls_hdr.n_elem > 0 ) + { + buf_write (w, &vls_hdr, sizeof vls_hdr); + buf_write (w, ds_data (&vls_length_map), ds_length (&vls_length_map)); + } + + ds_destroy (&vls_length_map); +} + /* Writes the long variable name table */ static void write_longvar_table (struct sfm_writer *w, const struct dictionary *dict) { struct { - int32 rec_type P; - int32 subtype P; - int32 elem_size P; - int32 n_elem P; - } - lv_hdr; + int32_t rec_type ; + int32_t subtype ; + int32_t elem_size ; + int32_t n_elem ; + } ATTRIBUTE((packed)) lv_hdr; struct string long_name_map; size_t i; - ds_init (&long_name_map, 10 * dict_get_var_cnt (dict)); + ds_init_empty (&long_name_map); for (i = 0; i < dict_get_var_cnt (dict); i++) { struct variable *v = dict_get_var (dict, i); if (i) - ds_putc (&long_name_map, '\t'); - ds_printf (&long_name_map, "%s=%s", v->short_name, v->name); + ds_put_char (&long_name_map, '\t'); + ds_put_format (&long_name_map, "%s=%s", + var_get_short_name (v), var_get_name (v)); } lv_hdr.rec_type = 7; @@ -635,18 +824,17 @@ write_rec_7_34 (struct sfm_writer *w) { struct { - int32 rec_type_3 P; - int32 subtype_3 P; - int32 data_type_3 P; - int32 n_elem_3 P; - int32 elem_3[8] P; - int32 rec_type_4 P; - int32 subtype_4 P; - int32 data_type_4 P; - int32 n_elem_4 P; - flt64 elem_4[3] P; - } - rec_7; + int32_t rec_type_3 ; + int32_t subtype_3 ; + int32_t data_type_3 ; + int32_t n_elem_3 ; + int32_t elem_3[8] ; + int32_t rec_type_4 ; + int32_t subtype_4 ; + int32_t data_type_4 ; + int32_t n_elem_4 ; + flt64 elem_4[3] ; + } ATTRIBUTE((packed)) rec_7; /* Components of the version number, from major to minor. */ int version_component[3]; @@ -666,7 +854,7 @@ write_rec_7_34 (struct sfm_writer *w) rec_7.rec_type_3 = 7; rec_7.subtype_3 = 3; - rec_7.data_type_3 = sizeof (int32); + rec_7.data_type_3 = sizeof (int32_t); rec_7.n_elem_3 = 8; rec_7.elem_3[0] = version_component[0]; rec_7.elem_3[1] = version_component[1]; @@ -716,7 +904,7 @@ buf_write (struct sfm_writer *w, const void *buf, size_t nbytes) static char * append_string_max (char *dest, const char *src, const char *end) { - int nbytes = min (end - dest, (int) strlen (src)); + int nbytes = MIN (end - dest, (int) strlen (src)); memcpy (dest, src, nbytes); return dest + nbytes; } @@ -749,7 +937,7 @@ sfm_write_case (struct sfm_writer *w, const struct ccase *c) w->case_cnt++; if (!w->needs_translation && !w->compress - && sizeof (flt64) == sizeof (union value)) + && sizeof (flt64) == sizeof (union value) && ! w->has_vls ) { /* Fast path: external and internal representations are the same and the dictionary is properly ordered. Write @@ -762,21 +950,38 @@ sfm_write_case (struct sfm_writer *w, const struct ccase *c) Write into a bounce buffer, then write to W. */ flt64 *bounce; flt64 *bounce_cur; + flt64 *bounce_end; size_t bounce_size; size_t i; bounce_size = sizeof *bounce * w->flt64_cnt; bounce = bounce_cur = local_alloc (bounce_size); + bounce_end = bounce + bounce_size; for (i = 0; i < w->var_cnt; i++) { struct sfm_var *v = &w->vars[i]; + memset(bounce_cur, ' ', v->flt64_cnt * sizeof (flt64)); + if (v->width == 0) - *bounce_cur = case_num (c, v->fv); + { + *bounce_cur = case_num_idx (c, v->fv); + bounce_cur += v->flt64_cnt; + } else - memcpy (bounce_cur, case_data (c, v->fv)->s, v->width); - bounce_cur += v->flt64_cnt; + { int ofs = 0; + while (ofs < v->width) + { + int chunk = MIN (MIN_VERY_LONG_STRING - 1, v->width - ofs); + int nv = DIV_RND_UP (chunk, sizeof (flt64)); + buf_copy_rpad ((char *) bounce_cur, nv * sizeof (flt64), + case_data_idx (c, v->fv)->s + ofs, chunk); + bounce_cur += nv; + ofs += chunk; + } + } + } if (!w->compress) @@ -887,7 +1092,7 @@ sfm_close_writer (struct sfm_writer *w) if (ok && !fseek (w->file, offsetof (struct sysfile_header, case_cnt), SEEK_SET)) { - int32 case_cnt = w->case_cnt; + int32_t case_cnt = w->case_cnt; fwrite (&case_cnt, sizeof case_cnt, 1, w->file); clearerr (w->file); } @@ -897,7 +1102,7 @@ sfm_close_writer (struct sfm_writer *w) if (!ok) msg (ME, _("An I/O error occurred writing system file \"%s\"."), - fh_get_filename (w->fh)); + fh_get_file_name (w->fh)); } fh_close (w->fh, "system file", "we");