some conflicts resolved

[wxWidgets.git] / src / common / unzip.c

diff --git a/src/common/unzip.c b/src/common/unzip.c
index ce2260231ceec58a4c67c8837aeb907b6a136e50..54ced0c33b4b20dd1e3adc318d540eb8b7686b58 100644 (file)
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -1,9 +1,12 @@
-/* unzip.c -- IO on .zip files using zlib 
+/* unzip.c -- IO on .zip files using zlib

    Version 0.15 beta, Mar 19th, 1998,
 
    Read unzip.h for more info
 */
 
    Version 0.15 beta, Mar 19th, 1998,
 
    Read unzip.h for more info
 */
 

+#if !defined(__VISAGECPP__)
+#   pragma warning(disable:4001)    /* non standard extension used: single line comment */
+#endif

 #include "wx/setup.h"
 
 #if wxUSE_ZLIB && wxUSE_ZIPSTREAM
 #include "wx/setup.h"
 
 #if wxUSE_ZLIB && wxUSE_ZIPSTREAM


@@ -12,7 +15,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include "zlib.h"
 #include <stdlib.h>
 #include <string.h>
 #include "zlib.h"

+
+/* Not the right solution (paths in makefiles) but... */
+#ifdef __BORLANDC__
+#include "../common/unzip.h"
+#else

 #include "unzip.h"
 #include "unzip.h"

+#endif

 
 #ifdef STDC
 #  include <stddef.h>
 
 #ifdef STDC
 #  include <stddef.h>


@@ -128,6 +137,10 @@ typedef struct
                                            file if we are decompressing it */
 } unz_s;
 
                                            file if we are decompressing it */
 } unz_s;
 

+#if defined (__VISAGECPP__)
+/* VA always requires prototypes */
+int unzlocal_CheckCurrentFileCoherencyHeader (unz_s*, uInt*, uLong*, uInt*);
+#endif

 
 /* ===========================================================================
      Read a byte from a gz_stream; update next_in and avail_in. Return EOF
 
 /* ===========================================================================
      Read a byte from a gz_stream; update next_in and avail_in. Return EOF


@@ -149,7 +162,7 @@ local int unzlocal_getByte(fin,pi)
     }
     else
     {
     }
     else
     {

-        if (ferror(fin)) 
+        if (ferror(fin))

             return UNZ_ERRNO;
         else
             return UNZ_EOF;
             return UNZ_ERRNO;
         else
             return UNZ_EOF;


@@ -158,7 +171,7 @@ local int unzlocal_getByte(fin,pi)
 
 
 /* ===========================================================================
 
 
 /* ===========================================================================

-   Reads a long in LSB order from the given gz_stream. Sets 
+   Reads a long in LSB order from the given gz_stream. Sets

 */
 local int unzlocal_getShort (fin,pX)
        FILE* fin;
 */
 local int unzlocal_getShort (fin,pX)
        FILE* fin;


@@ -170,11 +183,11 @@ local int unzlocal_getShort (fin,pX)
 
     err = unzlocal_getByte(fin,&i);
     x = (uLong)i;
 
     err = unzlocal_getByte(fin,&i);
     x = (uLong)i;

-    
+

     if (err==UNZ_OK)
         err = unzlocal_getByte(fin,&i);
     x += ((uLong)i)<<8;
     if (err==UNZ_OK)
         err = unzlocal_getByte(fin,&i);
     x += ((uLong)i)<<8;

-   
+

     if (err==UNZ_OK)
         *pX = x;
     else
     if (err==UNZ_OK)
         *pX = x;
     else


@@ -192,7 +205,7 @@ local int unzlocal_getLong (fin,pX)
 
     err = unzlocal_getByte(fin,&i);
     x = (uLong)i;
 
     err = unzlocal_getByte(fin,&i);
     x = (uLong)i;

-    
+

     if (err==UNZ_OK)
         err = unzlocal_getByte(fin,&i);
     x += ((uLong)i)<<8;
     if (err==UNZ_OK)
         err = unzlocal_getByte(fin,&i);
     x += ((uLong)i)<<8;


@@ -204,7 +217,7 @@ local int unzlocal_getLong (fin,pX)
     if (err==UNZ_OK)
         err = unzlocal_getByte(fin,&i);
     x += ((uLong)i)<<24;
     if (err==UNZ_OK)
         err = unzlocal_getByte(fin,&i);
     x += ((uLong)i)<<24;

-   
+

     if (err==UNZ_OK)
         *pX = x;
     else
     if (err==UNZ_OK)
         *pX = x;
     else


@@ -248,7 +261,7 @@ local int strcmpcasenosensitive_internal (fileName1,fileName2)
 #define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
 #endif
 
 #define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
 #endif
 

-/* 
+/*

    Compare two filename (fileName1,fileName2).
    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
    If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
    Compare two filename (fileName1,fileName2).
    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
    If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi


@@ -269,7 +282,7 @@ extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivit
                return strcmp(fileName1,fileName2);
 
        return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
                return strcmp(fileName1,fileName2);
 
        return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);

-} 
+}

 
 #define BUFREADCOMMENT (0x400)
 
 
 #define BUFREADCOMMENT (0x400)
 


@@ -304,13 +317,13 @@ local uLong unzlocal_SearchCentralDir(fin)
        {
                uLong uReadSize,uReadPos ;
                int i;
        {
                uLong uReadSize,uReadPos ;
                int i;

-               if (uBackRead+BUFREADCOMMENT>uMaxBack) 
+               if (uBackRead+BUFREADCOMMENT>uMaxBack)

                        uBackRead = uMaxBack;
                else
                        uBackRead+=BUFREADCOMMENT;
                uReadPos = uSizeFile-uBackRead ;
                
                        uBackRead = uMaxBack;
                else
                        uBackRead+=BUFREADCOMMENT;
                uReadPos = uSizeFile-uBackRead ;
                

-               uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? 
+               uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?

                      (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
                if (fseek(fin,uReadPos,SEEK_SET)!=0)
                        break;
                      (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
                if (fseek(fin,uReadPos,SEEK_SET)!=0)
                        break;


@@ -319,7 +332,7 @@ local uLong unzlocal_SearchCentralDir(fin)
                        break;
 
                 for (i=(int)uReadSize-3; (i--)>0;)
                        break;
 
                 for (i=(int)uReadSize-3; (i--)>0;)

-                       if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && 
+                       if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&

                                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
                        {
                                uPosFound = uReadPos+i;
                                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
                        {
                                uPosFound = uReadPos+i;


@@ -350,12 +363,12 @@ extern unzFile ZEXPORT unzOpen (path)
        uLong central_pos,uL;
        FILE * fin ;
 
        uLong central_pos,uL;
        FILE * fin ;
 

-       uLong number_disk;          /* number of the current dist, used for 
+       uLong number_disk;          /* number of the current dist, used for

                                                                   spaning ZIP, unsupported, always 0*/
        uLong number_disk_with_CD;  /* number the the disk with central dir, used
                                                                   for spaning ZIP, unsupported, always 0*/
        uLong number_entry_CD;      /* total number of entries in
                                                                   spaning ZIP, unsupported, always 0*/
        uLong number_disk_with_CD;  /* number the the disk with central dir, used
                                                                   for spaning ZIP, unsupported, always 0*/
        uLong number_entry_CD;      /* total number of entries in

-                                      the central dir 
+                                      the central dir

                                       (same than number_entry on nospan) */
 
        int err=UNZ_OK;
                                       (same than number_entry on nospan) */
 
        int err=UNZ_OK;


@@ -403,7 +416,7 @@ extern unzFile ZEXPORT unzOpen (path)
        if (unzlocal_getLong(fin,&us.size_central_dir)!=UNZ_OK)
                err=UNZ_ERRNO;
 
        if (unzlocal_getLong(fin,&us.size_central_dir)!=UNZ_OK)
                err=UNZ_ERRNO;
 

-       /* offset of start of central directory with respect to the 
+       /* offset of start of central directory with respect to the

              starting disk number */
        if (unzlocal_getLong(fin,&us.offset_central_dir)!=UNZ_OK)
                err=UNZ_ERRNO;
              starting disk number */
        if (unzlocal_getLong(fin,&us.offset_central_dir)!=UNZ_OK)
                err=UNZ_ERRNO;


@@ -412,7 +425,7 @@ extern unzFile ZEXPORT unzOpen (path)
        if (unzlocal_getShort(fin,&us.gi.size_comment)!=UNZ_OK)
                err=UNZ_ERRNO;
 
        if (unzlocal_getShort(fin,&us.gi.size_comment)!=UNZ_OK)
                err=UNZ_ERRNO;
 

-       if ((central_pos<us.offset_central_dir+us.size_central_dir) && 
+       if ((central_pos<us.offset_central_dir+us.size_central_dir) &&

                (err==UNZ_OK))
                err=UNZ_BADZIPFILE;
 
                (err==UNZ_OK))
                err=UNZ_BADZIPFILE;
 


@@ -421,7 +434,6 @@ extern unzFile ZEXPORT unzOpen (path)
                fclose(fin);
                return NULL;
        }
                fclose(fin);
                return NULL;
        }

-

        us.file=fin;
        us.byte_before_the_zipfile = central_pos -
                                    (us.offset_central_dir+us.size_central_dir);
        us.file=fin;
        us.byte_before_the_zipfile = central_pos -
                                    (us.offset_central_dir+us.size_central_dir);


@@ -498,7 +510,7 @@ local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
 */
 local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
                                                   unz_file_info *pfile_info,
 */
 local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
                                                   unz_file_info *pfile_info,

-                                                  unz_file_info_internal 
+                                                  unz_file_info_internal

                                                   *pfile_info_internal,
                                                   char *szFileName,
                                                                                                  uLong fileNameBufferSize,
                                                   *pfile_info_internal,
                                                   char *szFileName,
                                                                                                  uLong fileNameBufferSize,


@@ -629,7 +641,7 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
                lSeek += file_info.size_file_extra - uSizeRead;
        }
        else
                lSeek += file_info.size_file_extra - uSizeRead;
        }
        else

-               lSeek+=file_info.size_file_extra; 
+               lSeek+=file_info.size_file_extra;

 
        
        if ((err==UNZ_OK) && (szComment!=NULL))
 
        
        if ((err==UNZ_OK) && (szComment!=NULL))


@@ -868,7 +880,7 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
 
        if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size uncompr */
                err=UNZ_ERRNO;
 
        if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size uncompr */
                err=UNZ_ERRNO;

-       else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && 
+       else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&

                                                          ((uFlags & 8)==0))
                err=UNZ_BADZIPFILE;
 
                                                          ((uFlags & 8)==0))
                err=UNZ_BADZIPFILE;
 


@@ -955,27 +967,27 @@ extern int ZEXPORT unzOpenCurrentFile (file)
        {
          pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
          pfile_in_zip_read_info->stream.zfree = (free_func)0;
        {
          pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
          pfile_in_zip_read_info->stream.zfree = (free_func)0;

-         pfile_in_zip_read_info->stream.opaque = (voidpf)0; 
-      
+         pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+

          err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
          if (err == Z_OK)
            pfile_in_zip_read_info->stream_initialised=1;
         /* windowBits is passed < 0 to tell that there is no zlib header.
          * Note that in this case inflate *requires* an extra "dummy" byte
          * after the compressed stream in order to complete decompression and
          err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
          if (err == Z_OK)
            pfile_in_zip_read_info->stream_initialised=1;
         /* windowBits is passed < 0 to tell that there is no zlib header.
          * Note that in this case inflate *requires* an extra "dummy" byte
          * after the compressed stream in order to complete decompression and

-         * return Z_STREAM_END. 
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the 
+         * return Z_STREAM_END.
+         * In unzip, i don't wait absolutely Z_STREAM_END because I known the

          * size of both compressed and uncompressed data
          */
        }
          * size of both compressed and uncompressed data
          */
        }

-       pfile_in_zip_read_info->rest_read_compressed = 
+       pfile_in_zip_read_info->rest_read_compressed =

             s->cur_file_info.compressed_size ;
             s->cur_file_info.compressed_size ;

-       pfile_in_zip_read_info->rest_read_uncompressed = 
+       pfile_in_zip_read_info->rest_read_uncompressed =

             s->cur_file_info.uncompressed_size ;
 
        
             s->cur_file_info.uncompressed_size ;
 
        

-       pfile_in_zip_read_info->pos_in_zipfile = 
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + 
+       pfile_in_zip_read_info->pos_in_zipfile =
+            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +

                          iSizeVar;
        
        pfile_in_zip_read_info->stream.avail_in = (uInt)0;
                          iSizeVar;
        
        pfile_in_zip_read_info->stream.avail_in = (uInt)0;


@@ -1024,7 +1036,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
        pfile_in_zip_read_info->stream.avail_out = (uInt)len;
        
        if (len>pfile_in_zip_read_info->rest_read_uncompressed)
        pfile_in_zip_read_info->stream.avail_out = (uInt)len;
        
        if (len>pfile_in_zip_read_info->rest_read_uncompressed)

-               pfile_in_zip_read_info->stream.avail_out = 
+               pfile_in_zip_read_info->stream.avail_out =

                  (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
 
        while (pfile_in_zip_read_info->stream.avail_out>0)
                  (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
 
        while (pfile_in_zip_read_info->stream.avail_out>0)


@@ -1038,7 +1050,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
                        if (uReadThis == 0)
                                return UNZ_EOF;
                        if (fseek(pfile_in_zip_read_info->file,
                        if (uReadThis == 0)
                                return UNZ_EOF;
                        if (fseek(pfile_in_zip_read_info->file,

-                      pfile_in_zip_read_info->pos_in_zipfile + 
+                      pfile_in_zip_read_info->pos_in_zipfile +

                          pfile_in_zip_read_info->byte_before_the_zipfile,SEEK_SET)!=0)
                                return UNZ_ERRNO;
                        if (fread(pfile_in_zip_read_info->read_buffer,uReadThis,1,
                          pfile_in_zip_read_info->byte_before_the_zipfile,SEEK_SET)!=0)
                                return UNZ_ERRNO;
                        if (fread(pfile_in_zip_read_info->read_buffer,uReadThis,1,


@@ -1048,7 +1060,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
 
                        pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
                        
 
                        pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
                        

-                       pfile_in_zip_read_info->stream.next_in = 
+                       pfile_in_zip_read_info->stream.next_in =

                 (Bytef*)pfile_in_zip_read_info->read_buffer;
                        pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
                }
                 (Bytef*)pfile_in_zip_read_info->read_buffer;
                        pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
                }


@@ -1056,7 +1068,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
                if (pfile_in_zip_read_info->compression_method==0)
                {
                        uInt uDoCopy,i ;
                if (pfile_in_zip_read_info->compression_method==0)
                {
                        uInt uDoCopy,i ;

-                       if (pfile_in_zip_read_info->stream.avail_out < 
+                       if (pfile_in_zip_read_info->stream.avail_out <

                             pfile_in_zip_read_info->stream.avail_in)
                                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
                        else
                             pfile_in_zip_read_info->stream.avail_in)
                                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
                        else


@@ -1098,7 +1110,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
                        uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
                        uOutThis = uTotalOutAfter-uTotalOutBefore;
                        
                        uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
                        uOutThis = uTotalOutAfter-uTotalOutBefore;
                        

-                       pfile_in_zip_read_info->crc32 = 
+                       pfile_in_zip_read_info->crc32 =

                 crc32(pfile_in_zip_read_info->crc32,bufBefore,
                         (uInt)(uOutThis));
 
                 crc32(pfile_in_zip_read_info->crc32,bufBefore,
                         (uInt)(uOutThis));
 


@@ -1106,10 +1118,10 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
                 uOutThis;
 
                        iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
                 uOutThis;
 
                        iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);

-            
+

                        if (err==Z_STREAM_END)
                                return (iRead==0) ? UNZ_EOF : iRead;
                        if (err==Z_STREAM_END)
                                return (iRead==0) ? UNZ_EOF : iRead;

-                       if (err!=Z_OK) 
+                       if (err!=Z_OK)

                                break;
                }
        }
                                break;
                }
        }


@@ -1141,7 +1153,7 @@ extern z_off_t ZEXPORT unztell (file)
 
 
 /*
 
 
 /*

-  return 1 if the end of file was reached, 0 elsewhere 
+  return 1 if the end of file was reached, 0 elsewhere

 */
 extern int ZEXPORT unzeof (file)
        unzFile file;
 */
 extern int ZEXPORT unzeof (file)
        unzFile file;


@@ -1173,7 +1185,7 @@ extern int ZEXPORT unzeof (file)
 
   if buf!=NULL, len is the size of the buffer, the extra header is copied in
        buf.
 
   if buf!=NULL, len is the size of the buffer, the extra header is copied in
        buf.

-  the return value is the number of bytes copied in buf, or (if <0) 
+  the return value is the number of bytes copied in buf, or (if <0)

        the error code
 */
 extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
        the error code
 */
 extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)


@@ -1194,7 +1206,7 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
        if (pfile_in_zip_read_info==NULL)
                return UNZ_PARAMERROR;
 
        if (pfile_in_zip_read_info==NULL)
                return UNZ_PARAMERROR;
 

-       size_to_read = (pfile_in_zip_read_info->size_local_extrafield - 
+       size_to_read = (pfile_in_zip_read_info->size_local_extrafield -

                                pfile_in_zip_read_info->pos_local_extrafield);
 
        if (buf==NULL)
                                pfile_in_zip_read_info->pos_local_extrafield);
 
        if (buf==NULL)


@@ -1209,7 +1221,7 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
                return 0;
        
        if (fseek(pfile_in_zip_read_info->file,
                return 0;
        
        if (fseek(pfile_in_zip_read_info->file,

-              pfile_in_zip_read_info->offset_local_extrafield + 
+              pfile_in_zip_read_info->offset_local_extrafield +

                          pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0)
                return UNZ_ERRNO;
 
                          pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0)
                return UNZ_ERRNO;
 


@@ -1296,4 +1308,9 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
        return (int)uReadThis;
 }
 
        return (int)uReadThis;
 }
 

-#endif
+#else
+
+/* the file shouldn't be empty, som compilers don't like it */
+static const int dummyVariableInUnzip = 17;
+
+#endif /* wxUSE_ZLIB && wxUSE_ZIPSTREAM */