#include <xalloc.h>
#include <libpspp/assertion.h>
+#include <byteswap.h>
#include <crc.h>
#include "inflate.h"
/* Read a 32 bit value from F */
static void
-get_u32 (FILE *f, uint32_t *x)
+get_u32 (FILE *f, uint32_t *v)
{
- get_bytes (f, x, sizeof *x);
+ uint32_t x;
+ get_bytes (f, &x, sizeof x);
+#ifdef WORDS_BIGENDIAN
+ *v = bswap_32 (x);
+#else
+ *v = x;
+#endif
+}
+
+/* Read a 16 bit value from F */
+static void
+get_u16 (FILE *f, uint16_t *v)
+{
+ uint16_t x;
+ get_bytes (f, &x, sizeof x);
+#ifdef WORDS_BIGENDIAN
+ *v = bswap_16 (x);
+#else
+ *v = x;
+#endif
}
}
-/* Read a 16 bit value from F */
-static void
-get_u16 (FILE *f, uint16_t *x)
-{
- get_bytes (f, x, sizeof *x);
-}
-
/* Reads upto BYTES bytes from ZM and puts them in BUF.
Returns the number of bytes read, or -1 on error */
int
get_u32 (zr->fr, &eattr);
get_u32 (zr->fr, &zm->offset);
- zm->name = calloc (nlen + 1, 1);
+ zm->name = xzalloc (nlen + 1);
get_bytes (zr->fr, zm->name, nlen);
skip_bytes (zr->fr, extralen);
off_t offset = 0;
uint32_t central_dir_start, central_dir_length;
- struct zip_reader *zr = malloc (sizeof *zr);
+ struct zip_reader *zr = xzalloc (sizeof *zr);
zr->errs = errs;
if ( zr->errs)
ds_init_empty (zr->errs);
return NULL;
}
- zr->members = calloc (zr->n_members, sizeof (*zr->members));
+ zr->members = xcalloc (zr->n_members, sizeof (*zr->members));
+ memset (zr->members, 0, zr->n_members * sizeof (*zr->members));
zr->filename = strdup (filename);
uint32_t ucomp_size, comp_size;
uint32_t crc;
-
+ bool new_member = false;
char *name = NULL;
int i;
if ( zr == NULL)
return NULL;
- for (i = 0 ; i < zr->n_members; ++i)
+ for (i = 0; i < zr->n_members; ++i)
{
- zm = zr->members[i] = zip_header_read_next (zr);
- if (zm && 0 == strcmp (zm->name, member))
+ zm = zr->members[i];
+
+ if (zm == NULL)
{
- break;
+ zm = zr->members[i] = zip_header_read_next (zr);
+ new_member = true;
}
+ if (zm && 0 == strcmp (zm->name, member))
+ break;
else
- {
- zm = NULL;
- }
+ zm = NULL;
}
if ( zm == NULL)
get_u16 (zm->fp, &nlen);
get_u16 (zm->fp, &extra_len);
- name = calloc (nlen + 1, sizeof (char));
+ name = xzalloc (nlen + 1);
get_bytes (zm->fp, name, nlen);
free (name);
zm->bytes_unread = zm->ucomp_size;
+
+ if ( !new_member)
+ decompressors[zm->compression].finish (zm);
- if ( ! decompressors[zm->compression].init (zm) )
+ if (!decompressors[zm->compression].init (zm) )
return NULL;
return zm;