libmspack 0.0.5 → 0.10.1.2

data/ext/libmspack/mspack/crc32.c

@@ -40,56 +40,56 @@
 #include "crc32.h"
 
 const unsigned int crc32_table[256] = {
-	0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
-	0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
-	0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
-	0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
-	0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
-	0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
-	0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
-	0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
-	0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
-	0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
-	0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
-	0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
-	0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
-	0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
-	0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
-	0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
-	0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
-	0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
-	0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
-	0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
-	0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
-	0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
-	0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
-	0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
-	0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
-	0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
-	0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
-	0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
-	0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
-	0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
-	0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
-	0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
-	0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
-	0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
-	0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
-	0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
-	0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
-	0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
-	0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
-	0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
-	0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
-	0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
-	0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
-	0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
-	0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
-	0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
-	0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
-	0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
-	0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
-	0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
-	0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
-	0x2d02ef8dL
+        0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+        0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+        0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+        0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+        0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+        0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+        0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+        0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+        0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+        0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+        0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+        0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+        0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+        0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+        0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+        0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+        0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+        0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+        0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+        0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+        0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+        0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+        0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+        0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+        0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+        0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+        0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+        0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+        0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+        0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+        0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+        0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+        0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+        0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+        0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+        0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+        0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+        0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+        0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+        0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+        0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+        0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+        0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+        0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+        0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+        0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+        0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+        0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+        0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+        0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+        0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+        0x2d02ef8dL
 };

data/ext/libmspack/mspack/crc32.h

@@ -8,7 +8,7 @@ extern const unsigned int crc32_table[256];
 static inline unsigned int
 crc32(unsigned int val, const void *ss, int len)
 {
-	const unsigned char *s = ss;
+        const unsigned char *s = ss;
         while (--len >= 0)
                 val = crc32_table[(val ^ *s++) & 0xff] ^ (val >> 8);
         return val;

data/ext/libmspack/mspack/kwajd.c

@@ -80,8 +80,8 @@ void mspack_destroy_kwaj_decompressor(struct mskwaj_decompressor *base)
 {
     struct mskwaj_decompressor_p *self = (struct mskwaj_decompressor_p *) base;
     if (self) {
-	struct mspack_system *sys = self->system;
-	sys->free(self);
+        struct mspack_system *sys = self->system;
+        sys->free(self);
     }
 }
 
@@ -91,7 +91,7 @@ void mspack_destroy_kwaj_decompressor(struct mskwaj_decompressor *base)
  * opens a KWAJ file without decompressing, reads header
  */
 static struct mskwajd_header *kwajd_open(struct mskwaj_decompressor *base,
-					 const char *filename)
+                                         const char *filename)
 {
     struct mskwaj_decompressor_p *self = (struct mskwaj_decompressor_p *) base;
     struct mskwajd_header *hdr;
@@ -104,18 +104,18 @@ static struct mskwajd_header *kwajd_open(struct mskwaj_decompressor *base,
     fh  = sys->open(sys, filename, MSPACK_SYS_OPEN_READ);
     hdr = (struct mskwajd_header *) sys->alloc(sys, sizeof(struct mskwajd_header_p));
     if (fh && hdr) {
-	((struct mskwajd_header_p *) hdr)->fh = fh;
-	self->error = kwajd_read_headers(sys, fh, hdr);
+        ((struct mskwajd_header_p *) hdr)->fh = fh;
+        self->error = kwajd_read_headers(sys, fh, hdr);
     }
     else {
-	if (!fh)  self->error = MSPACK_ERR_OPEN;
-	if (!hdr) self->error = MSPACK_ERR_NOMEMORY;
+        if (!fh)  self->error = MSPACK_ERR_OPEN;
+        if (!hdr) self->error = MSPACK_ERR_NOMEMORY;
     }
     
     if (self->error) {
-	if (fh)  sys->close(fh);
-	if (hdr) sys->free(hdr);
-	hdr = NULL;
+        if (fh) sys->close(fh);
+        sys->free(hdr);
+        hdr = NULL;
     }
 
     return hdr;
@@ -127,7 +127,7 @@ static struct mskwajd_header *kwajd_open(struct mskwaj_decompressor *base,
  * closes a KWAJ file
  */
 static void kwajd_close(struct mskwaj_decompressor *base,
-			struct mskwajd_header *hdr)
+                        struct mskwajd_header *hdr)
 {
     struct mskwaj_decompressor_p *self = (struct mskwaj_decompressor_p *) base;
     struct mskwajd_header_p *hdr_p = (struct mskwajd_header_p *) hdr;
@@ -149,22 +149,22 @@ static void kwajd_close(struct mskwaj_decompressor *base,
  * reads the headers of a KWAJ format file
  */
 static int kwajd_read_headers(struct mspack_system *sys,
-			      struct mspack_file *fh,
-			      struct mskwajd_header *hdr)
+                              struct mspack_file *fh,
+                              struct mskwajd_header *hdr)
 {
     unsigned char buf[16];
     int i;
 
     /* read in the header */
     if (sys->read(fh, &buf[0], kwajh_SIZEOF) != kwajh_SIZEOF) {
-	return MSPACK_ERR_READ;
+        return MSPACK_ERR_READ;
     }
 
     /* check for "KWAJ" signature */
     if (((unsigned int) EndGetI32(&buf[kwajh_Signature1]) != 0x4A41574B) ||
-	((unsigned int) EndGetI32(&buf[kwajh_Signature2]) != 0xD127F088))
+        ((unsigned int) EndGetI32(&buf[kwajh_Signature2]) != 0xD127F088))
     {
-	return MSPACK_ERR_SIGNATURE;
+        return MSPACK_ERR_SIGNATURE;
     }
 
     /* basic header fields */
@@ -180,61 +180,67 @@ static int kwajd_read_headers(struct mspack_system *sys,
 
     /* 4 bytes: length of unpacked file */
     if (hdr->headers & MSKWAJ_HDR_HASLENGTH) {
-	if (sys->read(fh, &buf[0], 4) != 4) return MSPACK_ERR_READ;
-	hdr->length = EndGetI32(&buf[0]);
+        if (sys->read(fh, &buf[0], 4) != 4) return MSPACK_ERR_READ;
+        hdr->length = EndGetI32(&buf[0]);
     }
 
     /* 2 bytes: unknown purpose */
     if (hdr->headers & MSKWAJ_HDR_HASUNKNOWN1) {
-	if (sys->read(fh, &buf[0], 2) != 2) return MSPACK_ERR_READ;
+        if (sys->read(fh, &buf[0], 2) != 2) return MSPACK_ERR_READ;
     }
 
     /* 2 bytes: length of section, then [length] bytes: unknown purpose */
     if (hdr->headers & MSKWAJ_HDR_HASUNKNOWN2) {
-	if (sys->read(fh, &buf[0], 2) != 2) return MSPACK_ERR_READ;
-	i = EndGetI16(&buf[0]);
-	if (sys->seek(fh, (off_t)i, MSPACK_SYS_SEEK_CUR)) return MSPACK_ERR_SEEK;
+        if (sys->read(fh, &buf[0], 2) != 2) return MSPACK_ERR_READ;
+        i = EndGetI16(&buf[0]);
+        if (sys->seek(fh, (off_t)i, MSPACK_SYS_SEEK_CUR)) return MSPACK_ERR_SEEK;
     }
 
     /* filename and extension */
     if (hdr->headers & (MSKWAJ_HDR_HASFILENAME | MSKWAJ_HDR_HASFILEEXT)) {
-	off_t pos = sys->tell(fh);
-	char *fn = (char *) sys->alloc(sys, (size_t) 13);
-
-	/* allocate memory for maximum length filename */
-	if (! fn) return MSPACK_ERR_NOMEMORY;
-	hdr->filename = fn;
-
-	/* copy filename if present */
-	if (hdr->headers & MSKWAJ_HDR_HASFILENAME) {
-	    if (sys->read(fh, &buf[0], 9) != 9) return MSPACK_ERR_READ;
-	    for (i = 0; i < 9; i++, fn++) if (!(*fn = buf[i])) break;
-	    pos += (i < 9) ? i+1 : 9;
-	    if (sys->seek(fh, pos, MSPACK_SYS_SEEK_START))
-		return MSPACK_ERR_SEEK;
-	}
-
-	/* copy extension if present */
-	if (hdr->headers & MSKWAJ_HDR_HASFILEEXT) {
-	    *fn++ = '.';
-	    if (sys->read(fh, &buf[0], 4) != 4) return MSPACK_ERR_READ;
-	    for (i = 0; i < 4; i++, fn++) if (!(*fn = buf[i])) break;
-	    pos += (i < 4) ? i+1 : 4;
-	    if (sys->seek(fh, pos, MSPACK_SYS_SEEK_START))
-		return MSPACK_ERR_SEEK;
-	}
-	*fn = '\0';
+        int len;
+        /* allocate memory for maximum length filename */
+        char *fn = (char *) sys->alloc(sys, (size_t) 13);
+        if (!(hdr->filename = fn)) return MSPACK_ERR_NOMEMORY;
+
+        /* copy filename if present */
+        if (hdr->headers & MSKWAJ_HDR_HASFILENAME) {
+            /* read and copy up to 9 bytes of a null terminated string */
+            if ((len = sys->read(fh, &buf[0], 9)) < 2) return MSPACK_ERR_READ;
+            for (i = 0; i < len; i++) if (!(*fn++ = buf[i])) break;
+            /* if string was 9 bytes with no null terminator, reject it */
+            if (i == 9 && buf[8] != '\0') return MSPACK_ERR_DATAFORMAT;
+            /* seek to byte after string ended in file */
+            if (sys->seek(fh, (off_t)(i + 1 - len), MSPACK_SYS_SEEK_CUR))
+                return MSPACK_ERR_SEEK;
+            fn--; /* remove the null terminator */
+        }
+
+        /* copy extension if present */
+        if (hdr->headers & MSKWAJ_HDR_HASFILEEXT) {
+            *fn++ = '.';
+            /* read and copy up to 4 bytes of a null terminated string */
+            if ((len = sys->read(fh, &buf[0], 4)) < 2) return MSPACK_ERR_READ;
+            for (i = 0; i < len; i++) if (!(*fn++ = buf[i])) break;
+            /* if string was 4 bytes with no null terminator, reject it */
+            if (i == 4 && buf[3] != '\0') return MSPACK_ERR_DATAFORMAT;
+            /* seek to byte after string ended in file */
+            if (sys->seek(fh, (off_t)(i + 1 - len), MSPACK_SYS_SEEK_CUR))
+                return MSPACK_ERR_SEEK;
+            fn--; /* remove the null terminator */
+        }
+        *fn = '\0';
     }
 
     /* 2 bytes: extra text length then [length] bytes of extra text data */
     if (hdr->headers & MSKWAJ_HDR_HASEXTRATEXT) {
-	if (sys->read(fh, &buf[0], 2) != 2) return MSPACK_ERR_READ;
-	i = EndGetI16(&buf[0]);
-	hdr->extra = (char *) sys->alloc(sys, (size_t)i+1);
-	if (! hdr->extra) return MSPACK_ERR_NOMEMORY;
-	if (sys->read(fh, hdr->extra, i) != i) return MSPACK_ERR_READ;
-	hdr->extra[i] = '\0';
-	hdr->extra_length = i;
+        if (sys->read(fh, &buf[0], 2) != 2) return MSPACK_ERR_READ;
+        i = EndGetI16(&buf[0]);
+        hdr->extra = (char *) sys->alloc(sys, (size_t)i+1);
+        if (! hdr->extra) return MSPACK_ERR_NOMEMORY;
+        if (sys->read(fh, hdr->extra, i) != i) return MSPACK_ERR_READ;
+        hdr->extra[i] = '\0';
+        hdr->extra_length = i;
     }
     return MSPACK_ERR_OK;
 }
@@ -245,7 +251,7 @@ static int kwajd_read_headers(struct mspack_system *sys,
  * decompresses a KWAJ file
  */
 static int kwajd_extract(struct mskwaj_decompressor *base,
-			 struct mskwajd_header *hdr, const char *filename)
+                         struct mskwajd_header *hdr, const char *filename)
 {
     struct mskwaj_decompressor_p *self = (struct mskwaj_decompressor_p *) base;
     struct mspack_system *sys;
@@ -259,48 +265,48 @@ static int kwajd_extract(struct mskwaj_decompressor *base,
 
     /* seek to the compressed data */
     if (sys->seek(fh, hdr->data_offset, MSPACK_SYS_SEEK_START)) {
-	return self->error = MSPACK_ERR_SEEK;
+        return self->error = MSPACK_ERR_SEEK;
     }
 
     /* open file for output */
     if (!(outfh = sys->open(sys, filename, MSPACK_SYS_OPEN_WRITE))) {
-	return self->error = MSPACK_ERR_OPEN;
+        return self->error = MSPACK_ERR_OPEN;
     }
 
     self->error = MSPACK_ERR_OK;
 
     /* decompress based on format */
     if (hdr->comp_type == MSKWAJ_COMP_NONE ||
-	hdr->comp_type == MSKWAJ_COMP_XOR)
+        hdr->comp_type == MSKWAJ_COMP_XOR)
     {
-	/* NONE is a straight copy. XOR is a copy xored with 0xFF */
-	unsigned char *buf = (unsigned char *) sys->alloc(sys, (size_t) KWAJ_INPUT_SIZE);
-	if (buf) {
-	    int read, i;
-	    while ((read = sys->read(fh, buf, KWAJ_INPUT_SIZE)) > 0) {
-		if (hdr->comp_type == MSKWAJ_COMP_XOR) {
-		    for (i = 0; i < read; i++) buf[i] ^= 0xFF;
-		}
-		if (sys->write(outfh, buf, read) != read) {
-		    self->error = MSPACK_ERR_WRITE;
-		    break;
-		}
-	    }
-	    if (read < 0) self->error = MSPACK_ERR_READ;
-	    sys->free(buf);
-	}
-	else {
-	    self->error = MSPACK_ERR_NOMEMORY;
-	}
+        /* NONE is a straight copy. XOR is a copy xored with 0xFF */
+        unsigned char *buf = (unsigned char *) sys->alloc(sys, (size_t) KWAJ_INPUT_SIZE);
+        if (buf) {
+            int read, i;
+            while ((read = sys->read(fh, buf, KWAJ_INPUT_SIZE)) > 0) {
+                if (hdr->comp_type == MSKWAJ_COMP_XOR) {
+                    for (i = 0; i < read; i++) buf[i] ^= 0xFF;
+                }
+                if (sys->write(outfh, buf, read) != read) {
+                    self->error = MSPACK_ERR_WRITE;
+                    break;
+                }
+            }
+            if (read < 0) self->error = MSPACK_ERR_READ;
+            sys->free(buf);
+        }
+        else {
+            self->error = MSPACK_ERR_NOMEMORY;
+        }
     }
     else if (hdr->comp_type == MSKWAJ_COMP_SZDD) {
-	self->error = lzss_decompress(sys, fh, outfh, KWAJ_INPUT_SIZE,
-				      LZSS_MODE_EXPAND);
+        self->error = lzss_decompress(sys, fh, outfh, KWAJ_INPUT_SIZE,
+                                      LZSS_MODE_EXPAND);
     }
     else if (hdr->comp_type == MSKWAJ_COMP_LZH) {
-	struct kwajd_stream *lzh = lzh_init(sys, fh, outfh);
-	self->error = (lzh) ? lzh_decompress(lzh) : MSPACK_ERR_NOMEMORY;
-	lzh_free(lzh);
+        struct kwajd_stream *lzh = lzh_init(sys, fh, outfh);
+        self->error = (lzh) ? lzh_decompress(lzh) : MSPACK_ERR_NOMEMORY;
+        lzh_free(lzh);
     }
     else if (hdr->comp_type == MSKWAJ_COMP_MSZIP) {
         struct mszipd_stream *zip = mszipd_init(sys,fh,outfh,KWAJ_INPUT_SIZE,0);
@@ -308,7 +314,7 @@ static int kwajd_extract(struct mskwaj_decompressor *base,
         mszipd_free(zip);
     }
     else {
-	self->error = MSPACK_ERR_DATAFORMAT;
+        self->error = MSPACK_ERR_DATAFORMAT;
     }
 
     /* close output file */
@@ -323,7 +329,7 @@ static int kwajd_extract(struct mskwaj_decompressor *base,
  * unpacks directly from input to output
  */
 static int kwajd_decompress(struct mskwaj_decompressor *base,
-			    const char *input, const char *output)
+                            const char *input, const char *output)
 {
     struct mskwaj_decompressor_p *self = (struct mskwaj_decompressor_p *) base;
     struct mskwajd_header *hdr;
@@ -359,13 +365,13 @@ static int kwajd_error(struct mskwaj_decompressor *base)
 #define BITS_VAR lzh
 #define BITS_ORDER_MSB
 #define BITS_NO_READ_INPUT
-#define READ_BYTES do {					\
-    if (i_ptr >= i_end) {				\
-	if ((err = lzh_read_input(lzh))) return err;	\
-	i_ptr = lzh->i_ptr;				\
-	i_end = lzh->i_end;				\
-    }							\
-    INJECT_BITS(*i_ptr++, 8);				\
+#define READ_BYTES do {                                 \
+    if (i_ptr >= i_end) {                               \
+        if ((err = lzh_read_input(lzh))) return err;    \
+        i_ptr = lzh->i_ptr;                             \
+        i_end = lzh->i_end;                             \
+    }                                                   \
+    INJECT_BITS(*i_ptr++, 8);                           \
 } while (0)
 #include <readbits.h>
 
@@ -387,30 +393,30 @@ static int kwajd_error(struct mskwaj_decompressor *base)
  * isn't how the default readbits.h read_input() works (it simply lets
  * 2 fake bytes in then stops), so we implement our own.
  */
-#define READ_BITS_SAFE(val, n) do {			\
-    READ_BITS(val, n);					\
-    if (lzh->input_end && bits_left < lzh->input_end)	\
-	return MSPACK_ERR_OK;				\
+#define READ_BITS_SAFE(val, n) do {                     \
+    READ_BITS(val, n);                                  \
+    if (lzh->input_end && bits_left < lzh->input_end)   \
+        return MSPACK_ERR_OK;                           \
 } while (0)
 
-#define READ_HUFFSYM_SAFE(tbl, val) do {		\
-    READ_HUFFSYM(tbl, val);				\
-    if (lzh->input_end && bits_left < lzh->input_end)	\
-	return MSPACK_ERR_OK;				\
+#define READ_HUFFSYM_SAFE(tbl, val) do {                \
+    READ_HUFFSYM(tbl, val);                             \
+    if (lzh->input_end && bits_left < lzh->input_end)   \
+        return MSPACK_ERR_OK;                           \
 } while (0)
 
-#define BUILD_TREE(tbl, type)						\
-    STORE_BITS;								\
-    err = lzh_read_lens(lzh, type, MAXSYMBOLS(tbl), &HUFF_LEN(tbl,0));	\
-    if (err) return err;						\
-    RESTORE_BITS;							\
-    if (make_decode_table(MAXSYMBOLS(tbl), TABLEBITS(tbl),		\
-	&HUFF_LEN(tbl,0), &HUFF_TABLE(tbl,0)))				\
-	return MSPACK_ERR_DATAFORMAT;
-
-#define WRITE_BYTE do {							\
-    if (lzh->sys->write(lzh->output, &lzh->window[pos], 1) != 1)	\
-        return MSPACK_ERR_WRITE;					\
+#define BUILD_TREE(tbl, type)                                           \
+    STORE_BITS;                                                         \
+    err = lzh_read_lens(lzh, type, MAXSYMBOLS(tbl), &HUFF_LEN(tbl,0));  \
+    if (err) return err;                                                \
+    RESTORE_BITS;                                                       \
+    if (make_decode_table(MAXSYMBOLS(tbl), TABLEBITS(tbl),              \
+        &HUFF_LEN(tbl,0), &HUFF_TABLE(tbl,0)))                          \
+        return MSPACK_ERR_DATAFORMAT;
+
+#define WRITE_BYTE do {                                                 \
+    if (lzh->sys->write(lzh->output, &lzh->window[pos], 1) != 1)        \
+        return MSPACK_ERR_WRITE;                                        \
 } while (0)
 
 static struct kwajd_stream *lzh_init(struct mspack_system *sys,
@@ -452,33 +458,33 @@ static int lzh_decompress(struct kwajd_stream *lzh)
     BUILD_TREE(LITERAL,   types[4]);
 
     while (!lzh->input_end) {
-	if (lit_run) READ_HUFFSYM_SAFE(MATCHLEN2, len);
-	else         READ_HUFFSYM_SAFE(MATCHLEN1, len);
-
-	if (len > 0) {
-	    len += 2;
-	    lit_run = 0; /* not the end of a literal run */
-	    READ_HUFFSYM_SAFE(OFFSET, j); offset = j << 6;
-	    READ_BITS_SAFE(j, 6);         offset |= j;
-
-	    /* copy match as output and into the ring buffer */
-	    while (len-- > 0) {
-		lzh->window[pos] = lzh->window[(pos+4096-offset) & 4095];
-		WRITE_BYTE;
-		pos++; pos &= 4095;
-	    }
-	}
-	else {
-	    READ_HUFFSYM_SAFE(LITLEN, len); len++;
-	    lit_run = (len == 32) ? 0 : 1; /* end of a literal run? */
-	    while (len-- > 0) {
-		READ_HUFFSYM_SAFE(LITERAL, j);
-		/* copy as output and into the ring buffer */
-		lzh->window[pos] = j;
-		WRITE_BYTE;
-		pos++; pos &= 4095;
-	    }
-	}
+        if (lit_run) READ_HUFFSYM_SAFE(MATCHLEN2, len);
+        else         READ_HUFFSYM_SAFE(MATCHLEN1, len);
+
+        if (len > 0) {
+            len += 2;
+            lit_run = 0; /* not the end of a literal run */
+            READ_HUFFSYM_SAFE(OFFSET, j); offset = j << 6;
+            READ_BITS_SAFE(j, 6);         offset |= j;
+
+            /* copy match as output and into the ring buffer */
+            while (len-- > 0) {
+                lzh->window[pos] = lzh->window[(pos+4096-offset) & 4095];
+                WRITE_BYTE;
+                pos++; pos &= 4095;
+            }
+        }
+        else {
+            READ_HUFFSYM_SAFE(LITLEN, len); len++;
+            lit_run = (len == 32) ? 0 : 1; /* end of a literal run? */
+            while (len-- > 0) {
+                READ_HUFFSYM_SAFE(LITERAL, j);
+                /* copy as output and into the ring buffer */
+                lzh->window[pos] = j;
+                WRITE_BYTE;
+                pos++; pos &= 4095;
+            }
+        }
     }
     return MSPACK_ERR_OK;
 }
@@ -492,8 +498,8 @@ static void lzh_free(struct kwajd_stream *lzh)
 }
 
 static int lzh_read_lens(struct kwajd_stream *lzh,
-			 unsigned int type, unsigned int numsyms,
-			 unsigned char *lens)
+                         unsigned int type, unsigned int numsyms,
+                         unsigned char *lens)
 {
     register unsigned int bit_buffer;
     register int bits_left;
@@ -504,33 +510,33 @@ static int lzh_read_lens(struct kwajd_stream *lzh,
     RESTORE_BITS;
     switch (type) {
     case 0:
-	i = numsyms; c = (i==16)?4: (i==32)?5: (i==64)?6: (i==256)?8 :0;
-	for (i = 0; i < numsyms; i++) lens[i] = c;
-	break;
+        i = numsyms; c = (i==16)?4: (i==32)?5: (i==64)?6: (i==256)?8 :0;
+        for (i = 0; i < numsyms; i++) lens[i] = c;
+        break;
 
     case 1:
-	READ_BITS_SAFE(c, 4); lens[0] = c;
-	for (i = 1; i < numsyms; i++) {
-    	           READ_BITS_SAFE(sel, 1); if (sel == 0)  lens[i] = c;
-	    else { READ_BITS_SAFE(sel, 1); if (sel == 0)  lens[i] = ++c;
-	    else { READ_BITS_SAFE(c, 4);                  lens[i] = c; }}
-	}
-	break;
+        READ_BITS_SAFE(c, 4); lens[0] = c;
+        for (i = 1; i < numsyms; i++) {
+                   READ_BITS_SAFE(sel, 1); if (sel == 0)  lens[i] = c;
+            else { READ_BITS_SAFE(sel, 1); if (sel == 0)  lens[i] = ++c;
+            else { READ_BITS_SAFE(c, 4);                  lens[i] = c; }}
+        }
+        break;
 
     case 2:
-	READ_BITS_SAFE(c, 4); lens[0] = c;
-	for (i = 1; i < numsyms; i++) {
-	    READ_BITS_SAFE(sel, 2);
-	    if (sel == 3) READ_BITS_SAFE(c, 4); else c += (char) sel-1;
-	    lens[i] = c;
-	}
-	break;
+        READ_BITS_SAFE(c, 4); lens[0] = c;
+        for (i = 1; i < numsyms; i++) {
+            READ_BITS_SAFE(sel, 2);
+            if (sel == 3) READ_BITS_SAFE(c, 4); else c += (char) sel-1;
+            lens[i] = c;
+        }
+        break;
 
     case 3:
-	for (i = 0; i < numsyms; i++) {
-	    READ_BITS_SAFE(c, 4); lens[i] = c;
-	}
-	break;
+        for (i = 0; i < numsyms; i++) {
+            READ_BITS_SAFE(c, 4); lens[i] = c;
+        }
+        break;
     }
     STORE_BITS;
     return MSPACK_ERR_OK;
@@ -539,18 +545,18 @@ static int lzh_read_lens(struct kwajd_stream *lzh,
 static int lzh_read_input(struct kwajd_stream *lzh) {
     int read;
     if (lzh->input_end) {
-	lzh->input_end += 8;
-	lzh->inbuf[0] = 0;
-	read = 1;
+        lzh->input_end += 8;
+        lzh->inbuf[0] = 0;
+        read = 1;
     }
     else {
-	read = lzh->sys->read(lzh->input, &lzh->inbuf[0], KWAJ_INPUT_SIZE);
-	if (read < 0) return MSPACK_ERR_READ;
-	if (read == 0) {
-	    lzh->input_end = 8;
-	    lzh->inbuf[0] = 0;
-	    read = 1;
-	}
+        read = lzh->sys->read(lzh->input, &lzh->inbuf[0], KWAJ_INPUT_SIZE);
+        if (read < 0) return MSPACK_ERR_READ;
+        if (read == 0) {
+            lzh->input_end = 8;
+            lzh->inbuf[0] = 0;
+            read = 1;
+        }
     }
 
     /* update i_ptr and i_end */

data/ext/libmspack/mspack/lzss.h

@@ -54,10 +54,10 @@ extern "C" {
  * @return an error code, or MSPACK_ERR_OK if successful
  */
 extern int lzss_decompress(struct mspack_system *system,
-			   struct mspack_file *input,
-			   struct mspack_file *output,
-			   int input_buffer_size,
-			   int mode);
+                           struct mspack_file *input,
+                           struct mspack_file *output,
+                           int input_buffer_size,
+                           int mode);
 
 #ifdef __cplusplus
 }