Revert of Update Zlib to version 1.2.8

third_party/zlib/contrib/minizip/minizip.c

 /*
    minizip.c
    Version 1.1, February 14h, 2010
    sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
          Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 
          Modifications of Unzip for Zip64
          Copyright (C) 2007-2008 Even Rouault
 
          Modifications for Zip64 support on both zip and unzip
          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */
 
 
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+#ifndef _WIN32
         #ifndef __USE_FILE_OFFSET64
                 #define __USE_FILE_OFFSET64
         #endif
         #ifndef __USE_LARGEFILE64
                 #define __USE_LARGEFILE64
         #endif
         #ifndef _LARGEFILE64_SOURCE
                 #define _LARGEFILE64_SOURCE
         #endif
         #ifndef _FILE_OFFSET_BIT
                 #define _FILE_OFFSET_BIT 64
         #endif
 #endif
 
-#ifdef __APPLE__
-// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
-#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#define FTELLO_FUNC(stream) ftello(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-#else
-#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
-#define FTELLO_FUNC(stream) ftello64(stream)
-#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-
-
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
 #include <fcntl.h>
 
-#ifdef _WIN32
-# include <direct.h>
-# include <io.h>
-#else
+#ifdef unix
 # include <unistd.h>
 # include <utime.h>
 # include <sys/types.h>
 # include <sys/stat.h>
+#else
+# include <direct.h>
+# include <io.h>
 #endif
 
 #include "zip.h"
 
 #ifdef _WIN32
         #define USEWIN32IOAPI
         #include "iowin32.h"
 #endif
 
 
@@ skipping 18 matching lines @@
       {
         FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
         FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0);
         FindClose(hFind);
         ret = 1;
       }
   }
   return ret;
 }
 #else
-#ifdef unix || __APPLE__
+#ifdef unix
 uLong filetime(f, tmzip, dt)
     char *f;               /* name of file to get info on */
     tm_zip *tmzip;         /* return value: access, modific. and creation times */
     uLong *dt;             /* dostime */
 {
   int ret=0;
   struct stat s;        /* results of stat() */
   struct tm* filedate;
   time_t tm_t=0;
 
@@ skipping 40 matching lines @@
 #endif
 
 
 
 
 int check_exist_file(filename)
     const char* filename;
 {
     FILE* ftestexist;
     int ret = 1;
-    ftestexist = FOPEN_FUNC(filename,"rb");
+    ftestexist = fopen64(filename,"rb");
     if (ftestexist==NULL)
         ret = 0;
     else
         fclose(ftestexist);
     return ret;
 }
 
 void do_banner()
 {
     printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
@@ skipping 10 matching lines @@
            "  -9  Compress better\n\n" \
            "  -j  exclude path. store only the file name.\n\n");
 }
 
 /* calculate the CRC32 of a file,
    because to encrypt a file, we need known the CRC32 of the file before */
 int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
 {
    unsigned long calculate_crc=0;
    int err=ZIP_OK;
-   FILE * fin = FOPEN_FUNC(filenameinzip,"rb");
-
+   FILE * fin = fopen64(filenameinzip,"rb");
    unsigned long size_read = 0;
    unsigned long total_read = 0;
    if (fin==NULL)
    {
        err = ZIP_ERRNO;
    }
 
     if (err == ZIP_OK)
         do
         {
@@ skipping 17 matching lines @@
 
     *result_crc=calculate_crc;
     printf("file %s crc %lx\n", filenameinzip, calculate_crc);
     return err;
 }
 
 int isLargeFile(const char* filename)
 {
   int largeFile = 0;
   ZPOS64_T pos = 0;
-  FILE* pFile = FOPEN_FUNC(filename, "rb");
+  FILE* pFile = fopen64(filename, "rb");
 
   if(pFile != NULL)
   {
-    int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
-    pos = FTELLO_FUNC(pFile);
+    int n = fseeko64(pFile, 0, SEEK_END);
+
+    pos = ftello64(pFile);
 
                 printf("File : %s is %lld bytes\n", filename, pos);
 
     if(pos >= 0xffffffff)
      largeFile = 1;
 
                 fclose(pFile);
   }
 
  return largeFile;
@@ skipping 209 matching lines @@
                                  (opt_compress_level != 0) ? Z_DEFLATED : 0,
                                  opt_compress_level,0,
                                  /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
                                  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
                                  password,crcFile, zip64);
 
                 if (err != ZIP_OK)
                     printf("error in opening %s in zipfile\n",filenameinzip);
                 else
                 {
-                    fin = FOPEN_FUNC(filenameinzip,"rb");
+                    fin = fopen64(filenameinzip,"rb");
                     if (fin==NULL)
                     {
                         err=ZIP_ERRNO;
                         printf("error in opening %s for reading\n",filenameinzip);
                     }
                 }
 
                 if (err == ZIP_OK)
                     do
                     {
@@ skipping 37 matching lines @@
             printf("error in closing %s\n",filename_try);
     }
     else
     {
        do_help();
     }
 
     free(buf);
     return 0;
 }