Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / libpspp / zip-reader.c

diff --git a/src/libpspp/zip-reader.c b/src/libpspp/zip-reader.c
index 00758c5faae19bf957343af185466b89c000a1dd..4810ae53378c4dda4b98426f809002c4f1c3ad1e 100644 (file)
--- a/src/libpspp/zip-reader.c
+++ b/src/libpspp/zip-reader.c
@@ -63,7 +63,7 @@ stored_finish (struct zip_member *zm UNUSED)
 }
 
 
-static struct decompressor decompressors[n_COMPRESSION] = 
+static struct decompressor decompressors[n_COMPRESSION] =
   {
     {stored_init, stored_read, stored_finish},
     {inflate_init, inflate_read, inflate_finish}
@@ -73,6 +73,7 @@ static enum compression
 comp_code (struct zip_member *zm, uint16_t c)
 {
   enum compression which;
+  assert (zm->errmsgs);
   switch (c)
     {
     case 0:
@@ -82,7 +83,7 @@ comp_code (struct zip_member *zm, uint16_t c)
       which = COMPRESSION_INFLATE;
       break;
     default:
-      ds_put_format (zm->errs, _("Unsupported compression type (%d)"), c);
+      ds_put_format (zm->errmsgs, _("Unsupported compression type (%d)"), c);
       which = n_COMPRESSION;
       break;
     }
@@ -103,7 +104,7 @@ struct zip_reader
 void
 zip_member_finish (struct zip_member *zm)
 {
-  ds_clear (zm->errs);
+  ds_clear (zm->errmsgs);
   /*  Probably not useful, because we would have to read right to the end of the member
   if (zm->expected_crc != zm->crc)
     {
@@ -120,7 +121,7 @@ void
 zip_reader_destroy (struct zip_reader *zr)
 {
   int i;
-  if (zr == NULL) 
+  if (zr == NULL)
     return;
 
   fclose (zr->fr);
@@ -154,7 +155,7 @@ static bool get_bytes (FILE *f, void *x, size_t n) WARN_UNUSED_RESULT;
 
 /* Read N bytes from F, storing the result in X */
 static bool
-get_bytes (FILE *f, void *x, size_t n) 
+get_bytes (FILE *f, void *x, size_t n)
 {
   return (n == fread (x, 1, n, f));
 }
@@ -208,7 +209,7 @@ check_magic (FILE *f, uint32_t expected, struct string *err)
   if ((expected != magic))
     {
       ds_put_format (err,
-                    _("Corrupt file at 0x%llx: Expected %"PRIx32"; got %"PRIx32), 
+                    _("Corrupt file at 0x%llx: Expected %"PRIx32"; got %"PRIx32),
                     (long long int) ftello (f) - sizeof (uint32_t), expected, magic);
 
       return false;
@@ -224,7 +225,7 @@ zip_member_read (struct zip_member *zm, void *buf, size_t bytes)
 {
   int bytes_read = 0;
 
-  ds_clear (zm->errs);
+  ds_clear (zm->errmsgs);
 
   if ( bytes > zm->bytes_unread)
     bytes = zm->bytes_unread;
@@ -244,7 +245,7 @@ zip_member_read (struct zip_member *zm, void *buf, size_t bytes)
 /*
   Read a local file header from ZR and add it to ZR's internal array.
   Returns a pointer to the member read.  This pointer belongs to ZR.
-  If the caller wishes to control it, she should ref it with 
+  If the caller wishes to control it, she should ref it with
   zip_member_ref.
 */
 static struct zip_member *
@@ -254,12 +255,13 @@ zip_header_read_next (struct zip_reader *zr)
 
   uint16_t v, nlen, extralen;
   uint16_t gp, time, date;
-  
+
   uint16_t clen, diskstart, iattr;
   uint32_t eattr;
   uint16_t comp_type;
 
   ds_clear (zr->errs);
+  zm->errmsgs = zr->errs;
 
   if ( ! check_magic (zr->fr, MAGIC_SOCD, zr->errs))
     return NULL;
@@ -289,12 +291,12 @@ zip_header_read_next (struct zip_reader *zr)
   if (! get_bytes (zr->fr, zm->name, nlen)) return NULL;
 
   skip_bytes (zr->fr, extralen);
-  
+
   zr->members[zr->nm++] = zm;
 
   zm->fp = fopen (zr->filename, "rb");
   zm->ref_cnt = 1;
-  zm->errs = zr->errs;
+
 
   return zm;
 }
@@ -354,7 +356,7 @@ zip_reader_create (const char *filename, struct string *errs)
       free (zr);
       return NULL;
     }
-  
+
   if (! get_u16 (zr->fr, &disknum)) return NULL;
   if (! get_u16 (zr->fr, &disknum)) return NULL;
 
@@ -376,7 +378,7 @@ zip_reader_create (const char *filename, struct string *errs)
   zr->members = xcalloc (zr->n_members, sizeof (*zr->members));
   memset (zr->members, 0, zr->n_members * sizeof (*zr->members));
 
-  zr->filename = strdup (filename);
+  zr->filename = xstrdup (filename);
 
   return zr;
 }
@@ -390,7 +392,7 @@ zip_member_open (struct zip_reader *zr, const char *member)
   uint16_t v, nlen, extra_len;
   uint16_t gp, comp_type, time, date;
   uint32_t ucomp_size, comp_size;
-  
+
   uint32_t crc;
   bool new_member = false;
   char *name = NULL;
@@ -415,14 +417,14 @@ zip_member_open (struct zip_reader *zr, const char *member)
     else
       zm = NULL;
   }
-  
+
   if ( zm == NULL)
     return NULL;
 
   if ( 0 != fseeko (zm->fp, zm->offset, SEEK_SET))
     {
       const char *mm = strerror (errno);
-      ds_put_format (zm->errs, _("Failed to seek to start of member `%s': %s"), zm->name, mm);
+      ds_put_format (zm->errmsgs, _("Failed to seek to start of member `%s': %s"), zm->name, mm);
       return NULL;
     }
 
@@ -452,7 +454,7 @@ zip_member_open (struct zip_reader *zr, const char *member)
 
   if (strcmp (name, zm->name) != 0)
     {
-      ds_put_format (zm->errs,
+      ds_put_format (zm->errmsgs,
                     _("Name mismatch in zip archive. Central directory says `%s'; local file header says `%s'"),
                     zm->name, name);
       free (name);
@@ -463,7 +465,7 @@ zip_member_open (struct zip_reader *zr, const char *member)
   free (name);
 
   zm->bytes_unread = zm->ucomp_size;
-  
+
   if ( !new_member)
     decompressors[zm->compression].finish (zm);
 
@@ -515,7 +517,7 @@ find_eocd (FILE *fp, off_t *off)
   const uint32_t magic = MAGIC_EOCD;
   bool found = false;
 
-  /* The magic cannot be more than 22 bytes from the end of the file, 
+  /* The magic cannot be more than 22 bytes from the end of the file,
      because that is the minimum length of the EndOfCentralDirectory
      record.
    */
@@ -525,7 +527,7 @@ find_eocd (FILE *fp, off_t *off)
     }
   start = ftello (fp);
   stop = start + sizeof (magic);
-  do 
+  do
     {
       found = probe_magic (fp, magic, start, stop, off);
       /* FIXME: For extra confidence lookup the directory start record here*/
@@ -572,7 +574,7 @@ probe_magic (FILE *fp, uint32_t magic, off_t start, off_t stop, off_t *off)
        state++;
       else
        state = 0;
-      
+
       if ( state == 4)
        {
          *off = ftello (fp) - 4;