X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fpor-file-writer.c;h=7b1b25512a89358b966d44416467dfd5e4bf2b10;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=5f91c7e684b21b56d93cbc02e4a1eae06e3a6a2b;hpb=6999c6d125665923b52ae15cbad83d06c92a8875;p=pspp-builds.git diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c index 5f91c7e6..7b1b2551 100644 --- a/src/data/por-file-writer.c +++ b/src/data/por-file-writer.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009 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 published by @@ -19,42 +19,49 @@ #include #include -#include #include #include #include #include #include #include -#include #include #include #include #include #include +#include #include +#include #include #include #include #include -#include #include -#include #include #include #include #include +#include "minmax.h" +#include "xalloc.h" + #include "gettext.h" #define _(msgid) gettext (msgid) +#define N_(msgid) (msgid) + +/* Maximum width of a variable in a portable file. */ +#define MAX_POR_WIDTH 255 /* Portable file writer. */ struct pfm_writer { struct file_handle *fh; /* File handle. */ + struct fh_lock *lock; /* Lock on file handle. */ FILE *file; /* File stream. */ + struct replace_file *rf; /* Ticket for replacing output file. */ int lc; /* Number of characters on this line so far. */ @@ -71,7 +78,7 @@ struct pfm_var int fv; /* Starting case index. */ }; -static struct casewriter_class por_file_casewriter_class; +static const struct casewriter_class por_file_casewriter_class; static bool close_writer (struct pfm_writer *); static void buf_write (struct pfm_writer *, const void *, size_t); @@ -80,6 +87,8 @@ static void write_version_data (struct pfm_writer *); static void write_variables (struct pfm_writer *, struct dictionary *); static void write_value_labels (struct pfm_writer *, const struct dictionary *); +static void write_documents (struct pfm_writer *, + const struct dictionary *); static void format_trig_double (long double, int base_10_precision, char[]); static char *format_trig_int (int, bool force_sign, char[]); @@ -104,31 +113,14 @@ pfm_open_writer (struct file_handle *fh, struct dictionary *dict, { struct pfm_writer *w = NULL; mode_t mode; - int fd; size_t i; - /* Create file. */ - mode = S_IRUSR | S_IRGRP | S_IROTH; - if (opts.create_writeable) - mode |= S_IWUSR | S_IWGRP | S_IWOTH; - fd = open (fh_get_file_name (fh), O_WRONLY | O_CREAT | O_TRUNC, mode); - if (fd < 0) - goto open_error; - - /* Open file handle. */ - if (!fh_open (fh, FH_REF_FILE, "portable file", "we")) - goto error; - /* Initialize data structures. */ w = xmalloc (sizeof *w); - w->fh = fh; - w->file = fdopen (fd, "w"); - if (w->file == NULL) - { - close (fd); - goto open_error; - } - + w->fh = fh_ref (fh); + w->lock = NULL; + w->file = NULL; + w->rf = NULL; w->lc = 0; w->var_cnt = 0; w->vars = NULL; @@ -139,7 +131,7 @@ pfm_open_writer (struct file_handle *fh, struct dictionary *dict, { const struct variable *dv = dict_get_var (dict, i); struct pfm_var *pv = &w->vars[i]; - pv->width = var_get_width (dv); + pv->width = MIN (var_get_width (dv), MAX_POR_WIDTH); pv->fv = var_get_case_index (dv); } @@ -151,25 +143,42 @@ pfm_open_writer (struct file_handle *fh, struct dictionary *dict, w->digits = DBL_DIG; } + /* Lock file. */ + /* TRANSLATORS: this fragment will be interpolated into + messages in fh_lock() that identify types of files. */ + w->lock = fh_lock (fh, FH_REF_FILE, N_("portable file"), FH_ACC_WRITE, true); + if (w->lock == NULL) + goto error; + + /* Create file. */ + mode = S_IRUSR | S_IRGRP | S_IROTH; + if (opts.create_writeable) + mode |= S_IWUSR | S_IWGRP | S_IWOTH; + w->rf = replace_file_start (fh_get_file_name (fh), "w", mode, + &w->file, NULL); + if (w->rf == NULL) + { + msg (ME, _("Error opening \"%s\" for writing as a portable file: %s."), + fh_get_file_name (fh), strerror (errno)); + goto error; + } + /* Write file header. */ write_header (w); write_version_data (w); write_variables (w, dict); write_value_labels (w, dict); + if (dict_get_document_line_cnt (dict) > 0) + write_documents (w, dict); buf_write (w, "F", 1); if (ferror (w->file)) goto error; - return casewriter_create (&por_file_casewriter_class, w); + return casewriter_create (dict_get_proto (dict), + &por_file_casewriter_class, w); - error: +error: close_writer (w); return NULL; - - open_error: - msg (ME, _("An error occurred while opening \"%s\" for writing " - "as a portable file: %s."), - fh_get_file_name (fh), strerror (errno)); - goto error; } /* Write NBYTES starting at BUF to the portable file represented by @@ -207,7 +216,8 @@ write_float (struct pfm_writer *w, double d) char buffer[64]; format_trig_double (d, floor (d) == d ? DBL_DIG : w->digits, buffer); buf_write (w, buffer, strlen (buffer)); - buf_write (w, "/", 1); + if (d != SYSMIS) + buf_write (w, "/", 1); } /* Write N to the portable file as an integer field. */ @@ -284,25 +294,30 @@ write_version_data (struct pfm_writer *w) write_string (w, host_system); } -/* Write format F to file H. */ +/* Write format F to file H. The format is first resized to fit + a value of the given WIDTH, which is handy in case F + represents a string longer than 255 bytes and thus WIDTH is + truncated to 255 bytes. */ static void -write_format (struct pfm_writer *w, const struct fmt_spec *f) +write_format (struct pfm_writer *w, struct fmt_spec f, int width) { - write_int (w, fmt_to_io (f->type)); - write_int (w, f->w); - write_int (w, f->d); + fmt_resize (&f, width); + write_int (w, fmt_to_io (f.type)); + write_int (w, f.w); + write_int (w, f.d); } -/* Write value V for variable VV to file H. */ +/* Write value V with width WIDTH to file H. */ static void -write_value (struct pfm_writer *w, union value *v, struct variable *vv) +write_value (struct pfm_writer *w, const union value *v, int width) { - if (var_is_numeric (vv)) + if (width == 0) write_float (w, v->f); else { - write_int (w, var_get_width (vv)); - buf_write (w, v->s, var_get_width (vv)); + width = MIN (width, MAX_POR_WIDTH); + write_int (w, width); + buf_write (w, value_str (v, width), width); } } @@ -314,6 +329,12 @@ write_variables (struct pfm_writer *w, struct dictionary *dict) short_names_assign (dict); + if (dict_get_weight (dict) != NULL) + { + buf_write (w, "6", 1); + write_string (w, var_get_short_name (dict_get_weight (dict), 0)); + } + buf_write (w, "4", 1); write_int (w, dict_get_var_cnt (dict)); write_int (w, 161); @@ -322,19 +343,23 @@ write_variables (struct pfm_writer *w, struct dictionary *dict) { struct variable *v = dict_get_var (dict, i); struct missing_values mv; + int width = MIN (var_get_width (v), MAX_POR_WIDTH); + int j; buf_write (w, "7", 1); - write_int (w, var_get_width (v)); + write_int (w, width); write_string (w, var_get_short_name (v, 0)); - write_format (w, var_get_print_format (v)); - write_format (w, var_get_write_format (v)); + write_format (w, *var_get_print_format (v), width); + write_format (w, *var_get_write_format (v), width); /* Write missing values. */ mv_copy (&mv, var_get_missing_values (v)); - while (mv_has_range (&mv)) + if (var_get_width (v) > 8) + mv_resize (&mv, 8); + if (mv_has_range (&mv)) { double x, y; - mv_pop_range (&mv, &x, &y); + mv_get_range (&mv, &x, &y); if (x == LOWEST) { buf_write (w, "9", 1); @@ -352,13 +377,12 @@ write_variables (struct pfm_writer *w, struct dictionary *dict) write_float (w, y); } } - while (mv_has_value (&mv)) + for (j = 0; j < mv_n_values (&mv); j++) { - union value value; - mv_pop_value (&mv, &value); buf_write (w, "8", 1); - write_value (w, &value, v); + write_value (w, mv_get_value (&mv, j), mv_get_width (&mv)); } + mv_destroy (&mv); /* Write variable label. */ if (var_get_label (v) != NULL) @@ -377,12 +401,12 @@ write_value_labels (struct pfm_writer *w, const struct dictionary *dict) for (i = 0; i < dict_get_var_cnt (dict); i++) { - struct val_labs_iterator *j; struct variable *v = dict_get_var (dict, i); const struct val_labs *val_labs = var_get_value_labels (v); - struct val_lab *vl; + size_t n_labels = val_labs_count (val_labs); + const struct val_lab **labels; - if (val_labs == NULL) + if (n_labels == 0) continue; buf_write (w, "D", 1); @@ -390,16 +414,37 @@ write_value_labels (struct pfm_writer *w, const struct dictionary *dict) write_string (w, var_get_short_name (v, 0)); write_int (w, val_labs_count (val_labs)); - for (vl = val_labs_first_sorted (val_labs, &j); vl != NULL; - vl = val_labs_next (val_labs, &j)) + n_labels = val_labs_count (val_labs); + labels = val_labs_sorted (val_labs); + for (i = 0; i < n_labels; i++) { - write_value (w, &vl->value, v); - write_string (w, vl->label); + const struct val_lab *vl = labels[i]; + write_value (w, val_lab_get_value (vl), var_get_width (v)); + write_string (w, val_lab_get_label (vl)); } + free (labels); } } -/* Writes case C to the portable file represented by H. */ +/* Write documents in DICT to portable file W. */ +static void +write_documents (struct pfm_writer *w, const struct dictionary *dict) +{ + size_t line_cnt = dict_get_document_line_cnt (dict); + struct string line = DS_EMPTY_INITIALIZER; + int i; + + buf_write (w, "E", 1); + write_int (w, line_cnt); + for (i = 0; i < line_cnt; i++) + { + dict_get_document_line (dict, i, &line); + write_string (w, ds_cstr (&line)); + } + ds_destroy (&line); +} + +/* Writes case C to the portable file represented by WRITER. */ static void por_file_casewriter_write (struct casewriter *writer, void *w_, struct ccase *c) @@ -425,7 +470,7 @@ por_file_casewriter_write (struct casewriter *writer, void *w_, else casewriter_force_error (writer); - case_destroy (c); + case_unref (c); } static void @@ -460,9 +505,13 @@ close_writer (struct pfm_writer *w) if (!ok) msg (ME, _("An I/O error occurred writing portable file \"%s\"."), fh_get_file_name (w->fh)); + + if (ok ? !replace_file_commit (w->rf) : !replace_file_abort (w->rf)) + ok = false; } - fh_close (w->fh, "portable file", "we"); + fh_unlock (w->lock); + fh_unref (w->fh); free (w->vars); free (w); @@ -735,7 +784,7 @@ format_trig_double (long double value, int base_10_precision, char output[]) 0...30**6, an invariant of the loop below. */ errno = 0; base_2_sig = frexp (value, &base_2_exp); - if (errno != 0 || !finite (base_2_sig)) + if (errno != 0 || !isfinite (base_2_sig)) goto missing_value; if (base_2_exp == 0 && base_2_sig == 0.) goto zero; @@ -856,7 +905,7 @@ format_trig_double (long double value, int base_10_precision, char output[]) return; } -static struct casewriter_class por_file_casewriter_class = +static const struct casewriter_class por_file_casewriter_class = { por_file_casewriter_write, por_file_casewriter_destroy,