X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpfm-read.c;h=ab33e700f724ab2c5c6562593be0351a673a3e17;hb=bc2466a1677cc97a837a75439b3d4c3b49a8125a;hp=514e7bda6bbee7905d65c42029f618bb8bab54cf;hpb=2bfc3a138f308ffb38634a92b23bdc7b62592324;p=pspp-builds.git diff --git a/src/pfm-read.c b/src/pfm-read.c index 514e7bda..ab33e700 100644 --- a/src/pfm-read.c +++ b/src/pfm-read.c @@ -17,25 +17,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* AIX requires this to be the first thing in the file. */ #include -#if __GNUC__ -#define alloca __builtin_alloca -#else -#if HAVE_ALLOCA_H -#include -#else -#ifdef _AIX -#pragma alloca -#else -#ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -#endif -#endif -#endif -#endif - -#include +#include "pfm.h" +#include "error.h" #include #include #include @@ -49,7 +33,6 @@ char *alloca (); #include "hash.h" #include "magic.h" #include "misc.h" -#include "pfm.h" #include "str.h" #include "value-labels.h" #include "var.h" @@ -79,7 +62,7 @@ static struct fh_ext_class pfm_r_class; static int corrupt_msg (struct file_handle *h, const char *format,...) - __attribute__ ((format (printf, 2, 3))); + PRINTF_FORMAT (2, 3); /* Displays a corruption error. */ static int @@ -99,12 +82,14 @@ corrupt_msg (struct file_handle *h, const char *format, ...) { char *title; struct error e; + const char *filename; e.class = ME; getl_location (&e.where.filename, &e.where.line_number); - e.title = title = local_alloc (strlen (h->fn) + 80); + filename = handle_get_filename (h); + e.title = title = local_alloc (strlen (filename) + 80); sprintf (title, _("portable file %s corrupt at offset %ld: "), - h->fn, ftell (ext->file) - (82 - (long) (ext->bp - ext->buf))); + filename, ftell (ext->file) - (82 - (long) (ext->bp - ext->buf))); e.text = buf; err_vmsg (&e); @@ -117,12 +102,13 @@ corrupt_msg (struct file_handle *h, const char *format, ...) /* Closes a portable file after we're done with it. */ static void -pfm_close (struct file_handle * h) +pfm_close (struct file_handle *h) { struct pfm_fhuser_ext *ext = h->ext; if (EOF == fclose (ext->file)) - msg (ME, _("%s: Closing portable file: %s."), h->fn, strerror (errno)); + msg (ME, _("%s: Closing portable file: %s."), + handle_get_filename (h), strerror (errno)); free (ext->vars); free (ext->trans); free (h->ext); @@ -237,20 +223,21 @@ pfm_read_dictionary (struct file_handle *h, struct pfm_read_info *inf) { msg (ME, _("Cannot read file %s as portable file: already opened " "for %s."), - fh_handle_name (h), h->class->name); + handle_get_name (h), h->class->name); return NULL; } msg (VM (1), _("%s: Opening portable-file handle %s for reading."), - fh_handle_filename (h), fh_handle_name (h)); + handle_get_filename (h), handle_get_name (h)); /* Open the physical disk file. */ ext = xmalloc (sizeof (struct pfm_fhuser_ext)); - ext->file = fopen (h->norm_fn, "rb"); + ext->file = fopen (handle_get_filename (h), "rb"); if (ext->file == NULL) { msg (ME, _("An error occurred while opening \"%s\" for reading " - "as a portable file: %s."), h->fn, strerror (errno)); + "as a portable file: %s."), + handle_get_filename (h), strerror (errno)); err_cond_fail (); free (ext); return NULL; @@ -298,7 +285,7 @@ pfm_read_dictionary (struct file_handle *h, struct pfm_read_info *inf) fclose (ext->file); if (ext && ext->dict) - free_dictionary (ext->dict); + dict_destroy (ext->dict); free (ext); h->class = NULL; h->ext = NULL; @@ -421,7 +408,7 @@ read_float (struct file_handle *h) } /* Read an integer and return its value, or NOT_INT on failure. */ -int +static int read_int (struct file_handle *h) { double f = read_float (h); @@ -634,11 +621,9 @@ static int convert_format (struct file_handle *h, int fmt[3], struct fmt_spec *v, struct variable *vv) { - if (fmt[0] < 0 - || (size_t) fmt[0] >= sizeof translate_fmt / sizeof *translate_fmt) - lose ((h, _("%s: Bad format specifier byte %d."), vv->name, fmt[0])); - - v->type = translate_fmt[fmt[0]]; + v->type = translate_fmt (fmt[0]); + if (v->type == -1) + lose ((h, _("%s: Bad format specifier byte (%d)."), vv->name, fmt[0])); v->w = fmt[1]; v->d = fmt[2]; @@ -683,6 +668,7 @@ static int read_variables (struct file_handle *h) { struct pfm_fhuser_ext *ext = h->ext; + char *weight_name = NULL; int i; if (!match (68 /* 4 */)) @@ -703,16 +689,21 @@ read_variables (struct file_handle *h) corrupt_msg (h, _("Unexpected flag value %d."), x); } - ext->dict = new_dictionary (0); + ext->dict = dict_create (); if (match (70 /* 6 */)) { - char *name = read_string (h); - if (!name) + weight_name = read_string (h); + if (!weight_name) goto lossage; - strcpy (ext->dict->weight_var, name); - asciify (ext->dict->weight_var); + asciify (weight_name); + if (strlen (weight_name) > 8) + { + corrupt_msg (h, _("Weight variable name (%s) truncated."), + weight_name); + weight_name[8] = '\0'; + } } for (i = 0; i < ext->nvars; i++) @@ -787,7 +778,7 @@ read_variables (struct file_handle *h) if (width < 0 || width > 255) lose ((h, "Bad width %d for variable %s.", width, name)); - v = create_variable (ext->dict, name, width ? ALPHA : NUMERIC, width); + v = dict_create_var (ext->dict, name, width); v->get.fv = v->fv; if (v == NULL) lose ((h, _("Duplicate variable name %s."), name)); @@ -852,16 +843,22 @@ read_variables (struct file_handle *h) asciify (v->label); } } - ext->case_size = ext->dict->nval; - if (ext->dict->weight_var[0] != 0 - && !find_dict_variable (ext->dict, ext->dict->weight_var)) - lose ((h, _("Weighting variable %s not present in dictionary."), - ext->dict->weight_var)); + if (weight_name != NULL) + { + struct variable *weight_var = dict_lookup_var (ext->dict, weight_name); + if (weight_var == NULL) + lose ((h, _("Weighting variable %s not present in dictionary."), + weight_name)); + free (weight_name); + + dict_set_weight (ext->dict, weight_var); + } return 1; lossage: + free (weight_name); return 0; } @@ -922,7 +919,7 @@ read_value_label (struct file_handle *h) goto lossage; asciify (name); - v[i] = find_dict_variable (ext->dict, name); + v[i] = dict_lookup_var (ext->dict, name); if (v[i] == NULL) lose ((h, _("Unknown variable %s while parsing value labels."), name)); @@ -1016,9 +1013,9 @@ pfm_read_case (struct file_handle *h, union value *perm, struct dictionary *dict /* Translate a case in data file format to a case in active file format. */ - for (i = 0; i < dict->nvar; i++) + for (i = 0; i < dict_get_var_cnt (dict); i++) { - struct variable *v = dict->var[i]; + struct variable *v = dict_get_var (dict, i); if (v->get.fv == -1) continue;