[opengtoolkit-cvs] lvzip/c_source ChangeLogUnzip,1.2,1.3 Makefile,1.4,1.5 zip.c,1.4,1.5 zlibvc.def,1.6,1.7

[Rolf K. <lab...@us...>]

Update of /cvsroot/opengtoolkit/lvzip/c_source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28263/c_source

Modified Files:
	ChangeLogUnzip Makefile zip.c zlibvc.def 
Log Message:
Added global comment handling to zipOpen2

Index: Makefile
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	8 Dec 2004 20:29:15 -0000	1.4
--- Makefile	28 Dec 2004 17:32:33 -0000	1.5
***************
*** 1,4 ****
! # Makefile for zlib
  # Copyright (C) 1995-2003 Jean-loup Gailly.
  # For conditions of distribution and use, see copyright notice in zlib.h
  
--- 1,5 ----
! # Makefile for lvzlib
  # Copyright (C) 1995-2003 Jean-loup Gailly.
+ # Copyright (C) 2003-2004 Rolf Kalbermatter.
  # For conditions of distribution and use, see copyright notice in zlib.h
  
***************
*** 30,36 ****
  
  LIBS=libz.a
! SHAREDLIB=libz.so
! SHAREDLIBV=libz.so.1.2.2
! SHAREDLIBM=libz.so.1
  
  AR=ar rc
--- 31,37 ----
  
  LIBS=libz.a
! SHAREDLIB=lvzlib.so
! SHAREDLIBV=lvzlib.so.1.2.2
! SHAREDLIBM=lvzlib.so.1
  
  AR=ar rc

Index: zip.c
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zip.c	8 Dec 2004 20:29:15 -0000	1.4
--- zip.c	28 Dec 2004 17:32:33 -0000	1.5
***************
*** 2,5 ****
--- 2,8 ----
     Version 1.01, May 8th, 2004
  
+    27 Dec 2004 Rolf Kalbermatter
+    Modification to zipOpen2 to support globalComment retrieval.
+ 
     Copyright (C) 1998-2004 Gilles Vollant
  
***************
*** 144,147 ****
--- 147,153 ----
      uLong add_position_when_writting_offset;
      uLong number_entry;
+ #ifndef NO_ADDFILEINEXISTINGZIP
+     char *globalcomment;
+ #endif
  } zip_internal;
  
***************
*** 593,597 ****
              err=ZIP_ERRNO;
  
!         /* zipfile comment length */
          if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)
              err=ZIP_ERRNO;
--- 599,603 ----
              err=ZIP_ERRNO;
  
!         /* zipfile global comment length */
          if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)
              err=ZIP_ERRNO;
***************
*** 607,613 ****
          }
  
          byte_before_the_zipfile = central_pos -
                                  (offset_central_dir+size_central_dir);
!         ziinit.add_position_when_writting_offset = byte_before_the_zipfile ;
  
          {
--- 613,630 ----
          }
  
+         ziinit.globalcomment = NULL;
+         if (size_comment>0)
+         {
+             ziinit.globalcomment = ALLOC(size_comment+1);
+             if (ziinit.globalcomment)
+             {
+                size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);
+                ziinit.globalcomment[size_comment]=0;
+             }
+         }
+ 
          byte_before_the_zipfile = central_pos -
                                  (offset_central_dir+size_central_dir);
!         ziinit.add_position_when_writting_offset = byte_before_the_zipfile;
  
          {
***************
*** 642,649 ****
--- 659,674 ----
              err=ZIP_ERRNO;
      }
+ 
+     if (globalcomment)
+     {
+       *globalcomment = ziinit.globalcomment;
+     }
  #    endif /* !NO_ADDFILEINEXISTINGZIP*/
  
      if (err != ZIP_OK)
      {
+ #    ifndef NO_ADDFILEINEXISTINGZIP
+         TRYFREE(ziinit.globalcomment);
+ #    endif /* !NO_ADDFILEINEXISTINGZIP*/
          TRYFREE(zi);
          return NULL;
***************
*** 1124,1127 ****
--- 1149,1156 ----
      }
  
+ #ifndef NO_ADDFILEINEXISTINGZIP
+     if (global_comment==NULL)
+         global_comment = zi->globalcomment;
+ #endif
      if (global_comment==NULL)
          size_global_comment = 0;
***************
*** 1129,1133 ****
          size_global_comment = (uInt)strlen(global_comment);
  
- 
      centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
      if (err==ZIP_OK)
--- 1158,1161 ----
***************
*** 1183,1186 ****
--- 1211,1217 ----
              err = ZIP_ERRNO;
  
+ #ifndef NO_ADDFILEINEXISTINGZIP
+     TRYFREE(zi->globalcomment);
+ #endif
      TRYFREE(zi);
  

Index: ChangeLogUnzip
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/ChangeLogUnzip,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLogUnzip	8 Dec 2004 20:23:39 -0000	1.2
--- ChangeLogUnzip	28 Dec 2004 17:32:33 -0000	1.3
***************
*** 1,2 ****
--- 1,5 ----
+ Change in 1.01d LabVIEW (27 dec 04)
+ - Add global comment handling to zipOpen2 for append mode.
+ 
  Change in 1.01b (20 may 04)
  - Integrate patch from Debian package (submited by Mark Brown)

Index: zlibvc.def
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlibvc.def,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** zlibvc.def	25 Dec 2004 16:32:41 -0000	1.6
--- zlibvc.def	28 Dec 2004 17:32:33 -0000	1.7
***************
*** 1,5 ****
  LIBRARY		"lvzlib"
  
! DESCRIPTION	'"""zlib data compression library"""'
  
  
--- 1,5 ----
  LIBRARY		"lvzlib"
  
! DESCRIPTION	'"""LabVIEW zlib data compression library"""'