[vlc-devel] [PATCH 8/8] access: remove legacy zip accessor/stream
Filip Roséen
filip at atch.se
Thu Feb 16 22:44:18 CET 2017
---
modules/access/Makefile.am | 16 -
modules/access/zip/unzip/crypt.h | 133 ----
modules/access/zip/unzip/ioapi.c | 181 -----
modules/access/zip/unzip/ioapi.h | 75 --
modules/access/zip/unzip/unzip.c | 1602 --------------------------------------
modules/access/zip/unzip/unzip.h | 354 ---------
modules/access/zip/zip.h | 75 --
modules/access/zip/zipaccess.c | 408 ----------
modules/access/zip/zipstream.c | 844 --------------------
9 files changed, 3688 deletions(-)
delete mode 100644 modules/access/zip/unzip/crypt.h
delete mode 100644 modules/access/zip/unzip/ioapi.c
delete mode 100644 modules/access/zip/unzip/ioapi.h
delete mode 100644 modules/access/zip/unzip/unzip.c
delete mode 100644 modules/access/zip/unzip/unzip.h
delete mode 100644 modules/access/zip/zip.h
delete mode 100644 modules/access/zip/zipaccess.c
delete mode 100644 modules/access/zip/zipstream.c
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 616aa12f92..dd485a2767 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -45,22 +45,6 @@ access_LTLIBRARIES += libtimecode_plugin.la
libvdr_plugin_la_SOURCES = access/vdr.c
access_LTLIBRARIES += libvdr_plugin.la
-libzip_plugin_la_SOURCES = access/zip/zip.h access/zip/zipstream.c access/zip/zipaccess.c
-libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS)
-libzip_plugin_la_LIBADD = $(MINIZIP_LIBS)
-libunzip_la_SOURCES = access/zip/unzip/unzip.c access/zip/unzip/unzip.h access/zip/unzip/crypt.h \
- access/zip/unzip/ioapi.c access/zip/unzip/ioapi.h
-libunzip_la_LIBADD = -lz
-libunzip_la_LDFLAGS = -static
-if HAVE_ZLIB
-access_LTLIBRARIES += libzip_plugin.la
-if !HAVE_MINIZIP
-noinst_LTLIBRARIES += libunzip.la
-libzip_plugin_la_CFLAGS += -I$(srcdir)/access/zip/unzip
-libzip_plugin_la_LIBADD += libunzip.la
-endif
-endif
-
### Audio capture ###
libaccess_alsa_plugin_la_SOURCES = access/alsa.c
diff --git a/modules/access/zip/unzip/crypt.h b/modules/access/zip/unzip/crypt.h
deleted file mode 100644
index c7f16a5dcd..0000000000
--- a/modules/access/zip/unzip/crypt.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile
-
-
- Version 1.01e, February 12th, 2005
-
- Copyright (C) 1998-2005 Gilles Vollant
-
- This code is a modified version of crypting code in Infozip distribution
-
- The encryption/decryption parts of this source code (as opposed to the
- non-echoing password parts) were originally written in Europe. The
- whole source package can be freely distributed, including from the USA.
- (Prior to January 2000, re-export from the US was a violation of US law.)
-
- This encryption code is a direct transcription of the algorithm from
- Roger Schlafly, described by Phil Katz in the file appnote.txt. This
- file (appnote.txt) is distributed with the PKZIP program (even in the
- version without encryption capabilities).
-
- If you don't need crypting in your application, just define symbols
- NOCRYPT and NOUNCRYPT.
-
- This code support the "Traditional PKWARE Encryption".
-
- The new AES encryption added on Zip format by Winzip (see the page
- http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
- Encryption is not supported.
-*/
-
-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
-
-/***********************************************************************
- * Return the next byte in the pseudo-random sequence
- */
-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
-{
- (void) pcrc_32_tab;
- unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
- * unpredictable manner on 16-bit systems; not a problem
- * with any known compiler so far, though */
-
- temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
- return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
-
-/***********************************************************************
- * Update the encryption keys with the next byte of plain text
- */
-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
-{
- (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
- (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
- (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
- {
- register int keyshift = (int)((*(pkeys+1)) >> 24);
- (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
- }
- return c;
-}
-
-
-/***********************************************************************
- * Initialize the encryption keys and the random header according to
- * the given password.
- */
-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
-{
- *(pkeys+0) = 305419896L;
- *(pkeys+1) = 591751049L;
- *(pkeys+2) = 878082192L;
- while (*passwd != '\0') {
- update_keys(pkeys,pcrc_32_tab,(int)*passwd);
- passwd++;
- }
-}
-
-#define zdecode(pkeys,pcrc_32_tab,c) \
- (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
-
-#define zencode(pkeys,pcrc_32_tab,c,t) \
- (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
-
-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-
-#define RAND_HEAD_LEN 12
- /* "last resort" source for second part of crypt seed pattern */
-# ifndef ZCR_SEED2
-# define ZCR_SEED2 3141592654UL /* use PI as default pattern */
-# endif
-
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
- const char *passwd; /* password string */
- unsigned char *buf; /* where to write header */
- int bufSize;
- unsigned long* pkeys;
- const unsigned long* pcrc_32_tab;
- unsigned long crcForCrypting;
-{
- int n; /* index in random header */
- int t; /* temporary */
- int c; /* random byte */
- unsigned char header[RAND_HEAD_LEN-2]; /* random header */
- static unsigned calls = 0; /* ensure different random header each time */
-
- if (bufSize<RAND_HEAD_LEN)
- return 0;
-
- /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
- * output of rand() to get less predictability, since rand() is
- * often poorly implemented.
- */
- if (++calls == 1)
- {
- srand((unsigned)(time(NULL) ^ ZCR_SEED2));
- }
- init_keys(passwd, pkeys, pcrc_32_tab);
- for (n = 0; n < RAND_HEAD_LEN-2; n++)
- {
- c = (rand() >> 7) & 0xff;
- header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
- }
- /* Encrypt random header (last two bytes is high word of crc) */
- init_keys(passwd, pkeys, pcrc_32_tab);
- for (n = 0; n < RAND_HEAD_LEN-2; n++)
- {
- buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
- }
- buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
- buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
- return n;
-}
-
-#endif
diff --git a/modules/access/zip/unzip/ioapi.c b/modules/access/zip/unzip/ioapi.c
deleted file mode 100644
index 2e7d87198d..0000000000
--- a/modules/access/zip/unzip/ioapi.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/* ioapi.c -- IO base function header for compress/uncompress .zip
- files using zlib + zip or unzip API
-
- Version 1.01e, February 12th, 2005
-
- Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "zlib.h"
-#include "ioapi.h"
-
-
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END 2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-
-voidpf ZCALLBACK fopen_file_func (
- voidpf opaque,
- const char* filename,
- int mode);
-
-uLong ZCALLBACK fread_file_func (
- voidpf opaque,
- voidpf stream,
- void* buf,
- uLong size);
-
-uLong ZCALLBACK fwrite_file_func (
- voidpf opaque,
- voidpf stream,
- const void* buf,
- uLong size);
-
-long ZCALLBACK ftell_file_func (
- voidpf opaque,
- voidpf stream);
-
-long ZCALLBACK fseek_file_func (
- voidpf opaque,
- voidpf stream,
- uLong offset,
- int origin);
-
-int ZCALLBACK fclose_file_func (
- voidpf opaque,
- voidpf stream);
-
-int ZCALLBACK ferror_file_func (
- voidpf opaque,
- voidpf stream);
-
-
-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
- voidpf opaque;
- const char* filename;
- int mode;
-{
- (void) opaque;
- FILE* file = NULL;
- const char* mode_fopen = NULL;
- if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
- mode_fopen = "rb";
- else
- if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
- mode_fopen = "r+b";
- else
- if (mode & ZLIB_FILEFUNC_MODE_CREATE)
- mode_fopen = "wb";
-
- if ((filename!=NULL) && (mode_fopen != NULL))
- file = fopen(filename, mode_fopen);
- return file;
-}
-
-
-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
- voidpf opaque;
- voidpf stream;
- void* buf;
- uLong size;
-{
- (void) opaque;
- uLong ret;
- ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
- return ret;
-}
-
-
-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
- voidpf opaque;
- voidpf stream;
- const void* buf;
- uLong size;
-{
- (void) opaque;
- uLong ret;
- ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
- return ret;
-}
-
-long ZCALLBACK ftell_file_func (opaque, stream)
- voidpf opaque;
- voidpf stream;
-{
- (void) opaque;
- long ret;
- ret = ftell((FILE *)stream);
- return ret;
-}
-
-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
- voidpf opaque;
- voidpf stream;
- uLong offset;
- int origin;
-{
- (void) opaque;
- int fseek_origin=0;
- switch (origin)
- {
- case ZLIB_FILEFUNC_SEEK_CUR :
- fseek_origin = SEEK_CUR;
- break;
- case ZLIB_FILEFUNC_SEEK_END :
- fseek_origin = SEEK_END;
- break;
- case ZLIB_FILEFUNC_SEEK_SET :
- fseek_origin = SEEK_SET;
- break;
- default: return -1;
- }
- return fseek((FILE *)stream, offset, fseek_origin) ? -1 : 0;
-}
-
-int ZCALLBACK fclose_file_func (opaque, stream)
- voidpf opaque;
- voidpf stream;
-{
- (void) opaque;
- int ret;
- ret = fclose((FILE *)stream);
- return ret;
-}
-
-int ZCALLBACK ferror_file_func (opaque, stream)
- voidpf opaque;
- voidpf stream;
-{
- (void) opaque;
- int ret;
- ret = ferror((FILE *)stream);
- return ret;
-}
-
-void fill_fopen_filefunc (pzlib_filefunc_def)
- zlib_filefunc_def* pzlib_filefunc_def;
-{
- pzlib_filefunc_def->zopen_file = fopen_file_func;
- pzlib_filefunc_def->zread_file = fread_file_func;
- pzlib_filefunc_def->zwrite_file = fwrite_file_func;
- pzlib_filefunc_def->ztell_file = ftell_file_func;
- pzlib_filefunc_def->zseek_file = fseek_file_func;
- pzlib_filefunc_def->zclose_file = fclose_file_func;
- pzlib_filefunc_def->zerror_file = ferror_file_func;
- pzlib_filefunc_def->opaque = NULL;
-}
diff --git a/modules/access/zip/unzip/ioapi.h b/modules/access/zip/unzip/ioapi.h
deleted file mode 100644
index 0dca45a4ae..0000000000
--- a/modules/access/zip/unzip/ioapi.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
- files using zlib + zip or unzip API
-
- Version 1.01e, February 12th, 2005
-
- Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#ifndef _ZLIBIOAPI_H
-#define _ZLIBIOAPI_H
-
-
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ (1)
-#define ZLIB_FILEFUNC_MODE_WRITE (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE (8)
-
-
-#ifndef ZCALLBACK
-
-#if (defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#define ZCALLBACK CALLBACK
-#else
-#define ZCALLBACK
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef voidpf (ZCALLBACK *open_file_func) (voidpf opaque, const char* filename, int mode);
-typedef uLong (ZCALLBACK *read_file_func) (voidpf opaque, voidpf stream, void* buf, uLong size);
-typedef uLong (ZCALLBACK *write_file_func) (voidpf opaque, voidpf stream, const void* buf, uLong size);
-typedef long (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream);
-typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
-typedef int (ZCALLBACK *close_file_func) (voidpf opaque, voidpf stream);
-typedef int (ZCALLBACK *testerror_file_func) (voidpf opaque, voidpf stream);
-
-typedef struct zlib_filefunc_def_s
-{
- open_file_func zopen_file;
- read_file_func zread_file;
- write_file_func zwrite_file;
- tell_file_func ztell_file;
- seek_file_func zseek_file;
- close_file_func zclose_file;
- testerror_file_func zerror_file;
- voidpf opaque;
-} zlib_filefunc_def;
-
-
-
-void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def);
-
-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/modules/access/zip/unzip/unzip.c b/modules/access/zip/unzip/unzip.c
deleted file mode 100644
index 3712f779a1..0000000000
--- a/modules/access/zip/unzip/unzip.c
+++ /dev/null
@@ -1,1602 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib
- Version 1.01e, February 12th, 2005
-
- Copyright (C) 1998-2005 Gilles Vollant
-
- Read unzip.h for more info
-*/
-
-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-compatibility with older software. The following is from the original crypt.c. Code
-woven in by Terry Thorsen 1/2003.
-*/
-/*
- Copyright (c) 1990-2000 Info-ZIP. All rights reserved.
-
- See the accompanying file LICENSE, version 2000-Apr-09 or later
- (the contents of which are also included in zip.h) for terms of use.
- If, for some reason, all these files are missing, the Info-ZIP license
- also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
-*/
-/*
- crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h]
-
- The encryption/decryption parts of this source code (as opposed to the
- non-echoing password parts) were originally written in Europe. The
- whole source package can be freely distributed, including from the USA.
- (Prior to January 2000, re-export from the US was a violation of US law.)
- */
-
-/*
- This encryption code is a direct transcription of the algorithm from
- Roger Schlafly, described by Phil Katz in the file appnote.txt. This
- file (appnote.txt) is distributed with the PKZIP program (even in the
- version without encryption capabilities).
- */
-
-
-#include "zlib.h"
-#include "unzip.h"
-
-#ifdef STDC
-# include <stddef.h>
-# include <string.h>
-# include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
- extern int errno;
-#else
-# include <errno.h>
-#endif
-
-#include <assert.h>
-
-#ifndef local
-# define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-#ifndef CASESENSITIVITYDEFAULT_NO
-# if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
-# define CASESENSITIVITYDEFAULT_NO
-# endif
-#endif
-
-
-#ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
-#endif
-
-#ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {free(p);}
-#endif
-
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
-
-
-const char unz_copyright[] =
- " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info_internal_s
-{
- uLong offset_curfile;/* relative offset of local header 4 bytes */
-} unz_file_info_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
- when reading and decompress it */
-typedef struct
-{
- char *read_buffer; /* internal buffer for compressed data */
- z_stream stream; /* zLib stream structure for inflate */
-
- uLong pos_in_zipfile; /* position in byte on the zipfile, for fseek*/
- uLong stream_initialised; /* flag set if stream structure is initialised*/
-
- uLong offset_local_extrafield;/* offset of the local extra field */
- uInt size_local_extrafield;/* size of the local extra field */
- uLong pos_local_extrafield; /* position in the local extra field in read*/
-
- uLong crc32; /* crc32 of all data uncompressed */
- uLong crc32_wait; /* crc32 we must obtain after decompress all */
- uLong rest_read_compressed; /* number of byte to be decompressed */
- uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
- zlib_filefunc_def z_filefunc;
- voidpf filestream; /* io structore of the zipfile */
- uLong compression_method; /* compression method (0==store) */
- uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
- int raw;
-} file_in_zip_read_info_s;
-
-
-/* unz_s contain internal information about the zipfile
-*/
-typedef struct
-{
- zlib_filefunc_def z_filefunc;
- voidpf filestream; /* io structore of the zipfile */
- unz_global_info gi; /* public global information */
- uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
- uLong num_file; /* number of the current file in the zipfile*/
- uLong pos_in_central_dir; /* pos of the current file in the central dir*/
- uLong current_file_ok; /* flag about the usability of the current file*/
- uLong central_pos; /* position of the beginning of the central dir*/
-
- uLong size_central_dir; /* size of the central directory */
- uLong offset_central_dir; /* offset of start of central directory with
- respect to the starting disk number */
-
- unz_file_info cur_file_info; /* public info about the current file in zip*/
- unz_file_info_internal cur_file_info_internal; /* private info about it*/
- file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
- file if we are decompressing it */
- int encrypted;
-# ifndef NOUNCRYPT
- unsigned long keys[3]; /* keys defining the pseudo-random sequence */
- const unsigned long* pcrc_32_tab;
-# endif
-} unz_s;
-
-
-#ifndef NOUNCRYPT
-#include "crypt.h"
-#endif
-
-/* ===========================================================================
- Read a byte from a gz_stream; update next_in and avail_in. Return EOF
- for end of file.
- IN assertion: the stream s has been sucessfully opened for reading.
-*/
-
-
-local int unzlocal_getByte (
- const zlib_filefunc_def* pzlib_filefunc_def,
- voidpf filestream,
- int *pi);
-
-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
- const zlib_filefunc_def* pzlib_filefunc_def;
- voidpf filestream;
- int *pi;
-{
- unsigned char c;
- int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
- if (err==1)
- {
- *pi = (int)c;
- return UNZ_OK;
- }
- else
- {
- if (ZERROR(*pzlib_filefunc_def,filestream))
- return UNZ_ERRNO;
- else
- return UNZ_EOF;
- }
-}
-
-
-/* ===========================================================================
- Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int unzlocal_getShort (
- const zlib_filefunc_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX);
-
-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
- const zlib_filefunc_def* pzlib_filefunc_def;
- voidpf filestream;
- uLong *pX;
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==UNZ_OK)
- err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<8;
-
- if (err==UNZ_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-local int unzlocal_getLong (
- const zlib_filefunc_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX);
-
-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
- const zlib_filefunc_def* pzlib_filefunc_def;
- voidpf filestream;
- uLong *pX;
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==UNZ_OK)
- err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<8;
-
- if (err==UNZ_OK)
- err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<16;
-
- if (err==UNZ_OK)
- err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<24;
-
- if (err==UNZ_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (fileName1,fileName2)
- const char* fileName1;
- const char* fileName2;
-{
- for (;;)
- {
- char c1=*(fileName1++);
- char c2=*(fileName2++);
- if ((c1>='a') && (c1<='z'))
- c1 -= 0x20;
- if ((c2>='a') && (c2<='z'))
- c2 -= 0x20;
- if (c1=='\0')
- return ((c2=='\0') ? 0 : -1);
- if (c2=='\0')
- return 1;
- if (c1<c2)
- return -1;
- if (c1>c2)
- return 1;
- }
-}
-
-
-#ifdef CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#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
- or strcasecmp)
- If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
- (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
- const char* fileName1;
- const char* fileName2;
- int iCaseSensitivity;
-{
- if (iCaseSensitivity==0)
- iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
-
- if (iCaseSensitivity==1)
- return strcmp(fileName1,fileName2);
-
- return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-
-/*
- Locate the Central directory of a zipfile (at the end, just before
- the global comment)
-*/
-local uLong unzlocal_SearchCentralDir (
- const zlib_filefunc_def* pzlib_filefunc_def,
- voidpf filestream);
-
-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
- const zlib_filefunc_def* pzlib_filefunc_def;
- voidpf filestream;
-{
- unsigned char* buf;
- uLong uSizeFile;
- uLong uBackRead;
- uLong uMaxBack=0xffff; /* maximum size of global comment */
- uLong uPosFound=0;
-
- if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
- return 0;
-
-
- uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
-
- if (uMaxBack>uSizeFile)
- uMaxBack = uSizeFile;
-
- buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
- if (buf==NULL)
- return 0;
-
- uBackRead = 4;
- while (uBackRead<uMaxBack)
- {
- uLong uReadSize,uReadPos ;
- int i;
- if (uBackRead+BUFREADCOMMENT>uMaxBack)
- uBackRead = uMaxBack;
- else
- uBackRead+=BUFREADCOMMENT;
- uReadPos = uSizeFile-uBackRead ;
-
- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
- if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- break;
-
- if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
- break;
-
- for (i=(int)uReadSize-3; (i--)>0;)
- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
- ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
- {
- uPosFound = uReadPos+i;
- break;
- }
-
- if (uPosFound!=0)
- break;
- }
- TRYFREE(buf);
- return uPosFound;
-}
-
-/*
- Open a Zip file. path contain the full pathname (by example,
- on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
- "zlib/zlib114.zip".
- If the zipfile cannot be opened (file doesn't exist or in not valid), the
- return value is NULL.
- Else, the return value is a unzFile Handle, usable with other function
- of this unzip package.
-*/
-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
- const char *path;
- zlib_filefunc_def* pzlib_filefunc_def;
-{
- unz_s us;
- unz_s *s;
- uLong central_pos,uL;
-
- 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
- the central dir
- (same than number_entry on nospan) */
-
- int err=UNZ_OK;
-
- if (unz_copyright[0]!=' ')
- return NULL;
-
- if (pzlib_filefunc_def==NULL)
- fill_fopen_filefunc(&us.z_filefunc);
- else
- us.z_filefunc = *pzlib_filefunc_def;
-
- us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
- path,
- ZLIB_FILEFUNC_MODE_READ |
- ZLIB_FILEFUNC_MODE_EXISTING);
- if (us.filestream==NULL)
- return NULL;
-
- central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
- if (central_pos==0)
- err=UNZ_ERRNO;
-
- if (ZSEEK(us.z_filefunc, us.filestream,
- central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err=UNZ_ERRNO;
-
- /* the signature, already checked */
- if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* number of this disk */
- if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* number of the disk with the start of the central directory */
- if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* total number of entries in the central dir on this disk */
- if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* total number of entries in the central dir */
- if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- if ((number_entry_CD!=us.gi.number_entry) ||
- (number_disk_with_CD!=0) ||
- (number_disk!=0))
- err=UNZ_BADZIPFILE;
-
- /* size of the central directory */
- if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* offset of start of central directory with respect to the
- starting disk number */
- if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* zipfile comment length */
- if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
- (err==UNZ_OK))
- err=UNZ_BADZIPFILE;
-
- if (err!=UNZ_OK)
- {
- ZCLOSE(us.z_filefunc, us.filestream);
- return NULL;
- }
-
- us.byte_before_the_zipfile = central_pos -
- (us.offset_central_dir+us.size_central_dir);
- us.central_pos = central_pos;
- us.pfile_in_zip_read = NULL;
- us.encrypted = 0;
-
-
- s=(unz_s*)ALLOC(sizeof(unz_s));
- *s=us;
- unzGoToFirstFile((unzFile)s);
- return (unzFile)s;
-}
-
-
-extern unzFile ZEXPORT unzOpen (path)
- const char *path;
-{
- return unzOpen2(path, NULL);
-}
-
-/*
- Close a ZipFile opened with unzipOpen.
- If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
- these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
- return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (file)
- unzFile file;
-{
- unz_s* s;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
-
- if (s->pfile_in_zip_read!=NULL)
- unzCloseCurrentFile(file);
-
- ZCLOSE(s->z_filefunc, s->filestream);
- TRYFREE(s);
- return UNZ_OK;
-}
-
-
-/*
- Write info about the ZipFile in the *pglobal_info structure.
- No preparation of the structure is needed
- return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
- unzFile file;
- unz_global_info *pglobal_info;
-{
- unz_s* s;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- *pglobal_info=s->gi;
- return UNZ_OK;
-}
-
-
-/*
- Translate date/time from Dos format to tm_unz (readable more easilty)
-*/
-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
- uLong ulDosDate;
- tm_unz* ptm;
-{
- uLong uDate;
- uDate = (uLong)(ulDosDate>>16);
- ptm->tm_mday = (uInt)(uDate&0x1f) ;
- ptm->tm_mon = (uInt)((((uDate)&0x1E0)/0x20)-1) ;
- ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
-
- ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
- ptm->tm_min = (uInt) ((ulDosDate&0x7E0)/0x20) ;
- ptm->tm_sec = (uInt) (2*(ulDosDate&0x1f)) ;
-}
-
-/*
- Get Info about the current file in the zipfile, with internal only info
-*/
-local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
- unz_file_info *pfile_info,
- unz_file_info_internal
- *pfile_info_internal,
- char *szFileName,
- uLong fileNameBufferSize,
- void *extraField,
- uLong extraFieldBufferSize,
- char *szComment,
- uLong commentBufferSize);
-
-local int unzlocal_GetCurrentFileInfoInternal (file,
- pfile_info,
- pfile_info_internal,
- szFileName, fileNameBufferSize,
- extraField, extraFieldBufferSize,
- szComment, commentBufferSize)
- unzFile file;
- unz_file_info *pfile_info;
- unz_file_info_internal *pfile_info_internal;
- char *szFileName;
- uLong fileNameBufferSize;
- void *extraField;
- uLong extraFieldBufferSize;
- char *szComment;
- uLong commentBufferSize;
-{
- unz_s* s;
- unz_file_info file_info;
- unz_file_info_internal file_info_internal;
- int err=UNZ_OK;
- uLong uMagic;
- long lSeek=0;
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- if (ZSEEK(s->z_filefunc, s->filestream,
- s->pos_in_central_dir+s->byte_before_the_zipfile,
- ZLIB_FILEFUNC_SEEK_SET)!=0)
- err=UNZ_ERRNO;
-
-
- /* we check the magic */
- if (err==UNZ_OK)
- {
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
- err=UNZ_ERRNO;
- else if (uMagic!=0x02014b50)
- err=UNZ_BADZIPFILE;
- }
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
- err=UNZ_ERRNO;
-
- unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
- err=UNZ_ERRNO;
-
- lSeek+=file_info.size_filename;
- if ((err==UNZ_OK) && (szFileName!=NULL))
- {
- uLong uSizeRead ;
- if (file_info.size_filename<fileNameBufferSize)
- {
- *(szFileName+file_info.size_filename)='\0';
- uSizeRead = file_info.size_filename;
- }
- else
- uSizeRead = fileNameBufferSize;
-
- if ((file_info.size_filename>0) && (fileNameBufferSize>0))
- if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
- err=UNZ_ERRNO;
- lSeek -= uSizeRead;
- }
-
-
- if ((err==UNZ_OK) && (extraField!=NULL))
- {
- uLong uSizeRead ;
- if (file_info.size_file_extra<extraFieldBufferSize)
- uSizeRead = file_info.size_file_extra;
- else
- uSizeRead = extraFieldBufferSize;
-
- if (lSeek!=0)
- {
- if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
- lSeek=0;
- else
- err=UNZ_ERRNO;
- }
- if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
- if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
- err=UNZ_ERRNO;
- lSeek += file_info.size_file_extra - uSizeRead;
- }
- else
- lSeek+=file_info.size_file_extra;
-
-
- if ((err==UNZ_OK) && (szComment!=NULL))
- {
- uLong uSizeRead ;
- if (file_info.size_file_comment<commentBufferSize)
- {
- *(szComment+file_info.size_file_comment)='\0';
- uSizeRead = file_info.size_file_comment;
- }
- else
- uSizeRead = commentBufferSize;
-
- if (lSeek!=0)
- {
- if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
- lSeek=0;
- else
- err=UNZ_ERRNO;
- }
- if ((file_info.size_file_comment>0) && (commentBufferSize>0))
- if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
- err=UNZ_ERRNO;
- lSeek+=file_info.size_file_comment - uSizeRead;
- }
- else
- lSeek+=file_info.size_file_comment;
-
- if ((err==UNZ_OK) && (pfile_info!=NULL))
- *pfile_info=file_info;
-
- if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
- *pfile_info_internal=file_info_internal;
-
- return err;
-}
-
-
-
-/*
- Write info about the ZipFile in the *pglobal_info structure.
- No preparation of the structure is needed
- return UNZ_OK if there is no problem.
-*/
-extern int ZEXPORT unzGetCurrentFileInfo (file,
- pfile_info,
- szFileName, fileNameBufferSize,
- extraField, extraFieldBufferSize,
- szComment, commentBufferSize)
- unzFile file;
- unz_file_info *pfile_info;
- char *szFileName;
- uLong fileNameBufferSize;
- void *extraField;
- uLong extraFieldBufferSize;
- char *szComment;
- uLong commentBufferSize;
-{
- return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
- szFileName,fileNameBufferSize,
- extraField,extraFieldBufferSize,
- szComment,commentBufferSize);
-}
-
-/*
- Set the current file of the zipfile to the first file.
- return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile (file)
- unzFile file;
-{
- int err=UNZ_OK;
- unz_s* s;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- s->pos_in_central_dir=s->offset_central_dir;
- s->num_file=0;
- err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
- &s->cur_file_info_internal,
- NULL,0,NULL,0,NULL,0);
- s->current_file_ok = (err == UNZ_OK);
- return err;
-}
-
-/*
- Set the current file of the zipfile to the next file.
- return UNZ_OK if there is no problem
- return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-extern int ZEXPORT unzGoToNextFile (file)
- unzFile file;
-{
- unz_s* s;
- int err;
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- if (!s->current_file_ok)
- return UNZ_END_OF_LIST_OF_FILE;
- if (s->gi.number_entry != 0xffff) /* 2^16 files overflow hack */
- if (s->num_file+1==s->gi.number_entry)
- return UNZ_END_OF_LIST_OF_FILE;
-
- s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
- s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
- s->num_file++;
- err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
- &s->cur_file_info_internal,
- NULL,0,NULL,0,NULL,0);
- s->current_file_ok = (err == UNZ_OK);
- return err;
-}
-
-
-/*
- Try locate the file szFileName in the zipfile.
- For the iCaseSensitivity signification, see unzipStringFileNameCompare
-
- return value :
- UNZ_OK if the file is found. It becomes the current file.
- UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
- unzFile file;
- const char *szFileName;
- int iCaseSensitivity;
-{
- unz_s* s;
- int err;
-
- /* We remember the 'current' position in the file so that we can jump
- * back there if we fail.
- */
- unz_file_info cur_file_infoSaved;
- unz_file_info_internal cur_file_info_internalSaved;
- uLong num_fileSaved;
- uLong pos_in_central_dirSaved;
-
-
- if (file==NULL)
- return UNZ_PARAMERROR;
-
- if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
- return UNZ_PARAMERROR;
-
- s=(unz_s*)file;
- if (!s->current_file_ok)
- return UNZ_END_OF_LIST_OF_FILE;
-
- /* Save the current state */
- num_fileSaved = s->num_file;
- pos_in_central_dirSaved = s->pos_in_central_dir;
- cur_file_infoSaved = s->cur_file_info;
- cur_file_info_internalSaved = s->cur_file_info_internal;
-
- err = unzGoToFirstFile(file);
-
- while (err == UNZ_OK)
- {
- char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
- err = unzGetCurrentFileInfo(file,NULL,
- szCurrentFileName,sizeof(szCurrentFileName)-1,
- NULL,0,NULL,0);
- if (err == UNZ_OK)
- {
- if (unzStringFileNameCompare(szCurrentFileName,
- szFileName,iCaseSensitivity)==0)
- return UNZ_OK;
- err = unzGoToNextFile(file);
- }
- }
-
- /* We failed, so restore the state of the 'current file' to where we
- * were.
- */
- s->num_file = num_fileSaved ;
- s->pos_in_central_dir = pos_in_central_dirSaved ;
- s->cur_file_info = cur_file_infoSaved;
- s->cur_file_info_internal = cur_file_info_internalSaved;
- return err;
-}
-
-
-/*
-///////////////////////////////////////////
-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
-// I need random access
-//
-// Further optimization could be realized by adding an ability
-// to cache the directory in memory. The goal being a single
-// comprehensive file read to put the file I need in a memory.
-*/
-
-/*
-typedef struct unz_file_pos_s
-{
- uLong pos_in_zip_directory; // offset in file
- uLong num_of_file; // # of file
-} unz_file_pos;
-*/
-
-extern int ZEXPORT unzGetFilePos(file, file_pos)
- unzFile file;
- unz_file_pos* file_pos;
-{
- unz_s* s;
-
- if (file==NULL || file_pos==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- if (!s->current_file_ok)
- return UNZ_END_OF_LIST_OF_FILE;
-
- file_pos->pos_in_zip_directory = s->pos_in_central_dir;
- file_pos->num_of_file = s->num_file;
-
- return UNZ_OK;
-}
-
-extern int ZEXPORT unzGoToFilePos(file, file_pos)
- unzFile file;
- unz_file_pos* file_pos;
-{
- unz_s* s;
- int err;
-
- if (file==NULL || file_pos==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
-
- /* jump to the right spot */
- s->pos_in_central_dir = file_pos->pos_in_zip_directory;
- s->num_file = file_pos->num_of_file;
-
- /* set the current file */
- err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
- &s->cur_file_info_internal,
- NULL,0,NULL,0,NULL,0);
- /* return results */
- s->current_file_ok = (err == UNZ_OK);
- return err;
-}
-
-/*
-// Unzip Helper Functions - should be here?
-///////////////////////////////////////////
-*/
-
-/*
- Read the local header of the current zipfile
- Check the coherency of the local header and info in the end of central
- directory about this file
- store in *piSizeVar the size of extra info in local header
- (filename and size of extra field data)
-*/
-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
- poffset_local_extrafield,
- psize_local_extrafield)
- unz_s* s;
- uInt* piSizeVar;
- uLong *poffset_local_extrafield;
- uInt *psize_local_extrafield;
-{
- uLong uMagic,uData,uFlags;
- uLong size_filename;
- uLong size_extra_field;
- int err=UNZ_OK;
-
- *piSizeVar = 0;
- *poffset_local_extrafield = 0;
- *psize_local_extrafield = 0;
-
- if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
- s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
- return UNZ_ERRNO;
-
-
- if (err==UNZ_OK)
- {
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
- err=UNZ_ERRNO;
- else if (uMagic!=0x04034b50)
- err=UNZ_BADZIPFILE;
- }
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
- err=UNZ_ERRNO;
-/*
- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
- err=UNZ_BADZIPFILE;
-*/
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
- err=UNZ_ERRNO;
- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
- err=UNZ_BADZIPFILE;
-
- if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
- (s->cur_file_info.compression_method!=Z_DEFLATED))
- err=UNZ_BADZIPFILE;
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
- err=UNZ_ERRNO;
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
- err=UNZ_ERRNO;
- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
- ((uFlags & 8)==0))
- err=UNZ_BADZIPFILE;
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
- err=UNZ_ERRNO;
- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
- ((uFlags & 8)==0))
- err=UNZ_BADZIPFILE;
-
- if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
- err=UNZ_ERRNO;
- else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
- ((uFlags & 8)==0))
- err=UNZ_BADZIPFILE;
-
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
- err=UNZ_ERRNO;
- else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
- err=UNZ_BADZIPFILE;
-
- *piSizeVar += (uInt)size_filename;
-
- if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
- err=UNZ_ERRNO;
- *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
- SIZEZIPLOCALHEADER + size_filename;
- *psize_local_extrafield = (uInt)size_extra_field;
-
- *piSizeVar += (uInt)size_extra_field;
-
- return err;
-}
-
-/*
- Open for reading data the current file in the zipfile.
- If there is no error and the file is opened, the return value is UNZ_OK.
-*/
-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
- unzFile file;
- int* method;
- int* level;
- int raw;
- const char* password;
-{
- int err=UNZ_OK;
- uInt iSizeVar;
- unz_s* s;
- file_in_zip_read_info_s* pfile_in_zip_read_info;
- uLong offset_local_extrafield; /* offset of the local extra field */
- uInt size_local_extrafield; /* size of the local extra field */
-# ifndef NOUNCRYPT
- char source[12];
-# else
- if (password != NULL)
- return UNZ_PARAMERROR;
-# endif
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- if (!s->current_file_ok)
- return UNZ_PARAMERROR;
-
- if (s->pfile_in_zip_read != NULL)
- unzCloseCurrentFile(file);
-
- if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
- &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
- return UNZ_BADZIPFILE;
-
- pfile_in_zip_read_info = (file_in_zip_read_info_s*)
- ALLOC(sizeof(file_in_zip_read_info_s));
- if (pfile_in_zip_read_info==NULL)
- return UNZ_INTERNALERROR;
-
- pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
- pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
- pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
- pfile_in_zip_read_info->pos_local_extrafield=0;
- pfile_in_zip_read_info->raw=raw;
-
- if (pfile_in_zip_read_info->read_buffer==NULL)
- {
- TRYFREE(pfile_in_zip_read_info);
- return UNZ_INTERNALERROR;
- }
-
- pfile_in_zip_read_info->stream_initialised=0;
-
- if (method!=NULL)
- *method = (int)s->cur_file_info.compression_method;
-
- if (level!=NULL)
- {
- *level = 6;
- switch (s->cur_file_info.flag & 0x06)
- {
- case 6 : *level = 1; break;
- case 4 : *level = 2; break;
- case 2 : *level = 9; break;
- }
- }
-
- if ((s->cur_file_info.compression_method!=0) &&
- (s->cur_file_info.compression_method!=Z_DEFLATED))
- err=UNZ_BADZIPFILE;
-
- pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
- pfile_in_zip_read_info->crc32=0;
- pfile_in_zip_read_info->compression_method =
- s->cur_file_info.compression_method;
- pfile_in_zip_read_info->filestream=s->filestream;
- pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
- pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
- pfile_in_zip_read_info->stream.total_out = 0;
-
- if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
- (!raw))
- {
- 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.next_in = (voidpf)0;
- pfile_in_zip_read_info->stream.avail_in = 0;
-
- err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
- if (err == Z_OK)
- pfile_in_zip_read_info->stream_initialised=1;
- else
- {
- TRYFREE(pfile_in_zip_read_info);
- return err;
- }
- /* 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
- * size of both compressed and uncompressed data
- */
- }
- pfile_in_zip_read_info->rest_read_compressed =
- s->cur_file_info.compressed_size ;
- pfile_in_zip_read_info->rest_read_uncompressed =
- s->cur_file_info.uncompressed_size ;
-
-
- 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;
-
- s->pfile_in_zip_read = pfile_in_zip_read_info;
-
-# ifndef NOUNCRYPT
- if (password != NULL)
- {
- int i;
- s->pcrc_32_tab = (unsigned long*)get_crc_table();
- init_keys(password,s->keys,s->pcrc_32_tab);
- if (ZSEEK(s->z_filefunc, s->filestream,
- s->pfile_in_zip_read->pos_in_zipfile +
- s->pfile_in_zip_read->byte_before_the_zipfile,
- SEEK_SET)!=0)
- return UNZ_INTERNALERROR;
- if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
- return UNZ_INTERNALERROR;
-
- for (i = 0; i<12; i++)
- zdecode(s->keys,s->pcrc_32_tab,source[i]);
-
- s->pfile_in_zip_read->pos_in_zipfile+=12;
- s->encrypted=1;
- }
-# endif
-
-
- return UNZ_OK;
-}
-
-extern int ZEXPORT unzOpenCurrentFile (file)
- unzFile file;
-{
- return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
-}
-
-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
- unzFile file;
- const char* password;
-{
- return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
-}
-
-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
- unzFile file;
- int* method;
- int* level;
- int raw;
-{
- return unzOpenCurrentFile3(file, method, level, raw, NULL);
-}
-
-/*
- Read bytes from the current file.
- buf contain buffer where data must be copied
- len the size of buf.
-
- return the number of byte copied if somes bytes are copied
- return 0 if the end of file was reached
- return <0 with error code if there is an error
- (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-extern int ZEXPORT unzReadCurrentFile (file, buf, len)
- unzFile file;
- voidp buf;
- unsigned len;
-{
- int err=UNZ_OK;
- uInt iRead = 0;
- unz_s* s;
- file_in_zip_read_info_s* pfile_in_zip_read_info;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- pfile_in_zip_read_info=s->pfile_in_zip_read;
-
- if (pfile_in_zip_read_info==NULL)
- return UNZ_PARAMERROR;
-
-
- if (pfile_in_zip_read_info->read_buffer == NULL)
- return UNZ_END_OF_LIST_OF_FILE;
- if (len==0)
- return 0;
-
- pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
-
- 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->raw)))
- pfile_in_zip_read_info->stream.avail_out =
- (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
- if ((len>pfile_in_zip_read_info->rest_read_compressed+
- pfile_in_zip_read_info->stream.avail_in) &&
- (pfile_in_zip_read_info->raw))
- pfile_in_zip_read_info->stream.avail_out =
- (uInt)pfile_in_zip_read_info->rest_read_compressed+
- pfile_in_zip_read_info->stream.avail_in;
-
- while (pfile_in_zip_read_info->stream.avail_out>0)
- {
- if ((pfile_in_zip_read_info->stream.avail_in==0) &&
- (pfile_in_zip_read_info->rest_read_compressed>0))
- {
- uInt uReadThis = UNZ_BUFSIZE;
- if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
- uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
- if (uReadThis == 0)
- return UNZ_EOF;
- if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
- pfile_in_zip_read_info->filestream,
- pfile_in_zip_read_info->pos_in_zipfile +
- pfile_in_zip_read_info->byte_before_the_zipfile,
- ZLIB_FILEFUNC_SEEK_SET)!=0)
- return UNZ_ERRNO;
- if (ZREAD(pfile_in_zip_read_info->z_filefunc,
- pfile_in_zip_read_info->filestream,
- pfile_in_zip_read_info->read_buffer,
- uReadThis)!=uReadThis)
- return UNZ_ERRNO;
-
-
-# ifndef NOUNCRYPT
- if(s->encrypted)
- {
- uInt i;
- for(i=0;i<uReadThis;i++)
- pfile_in_zip_read_info->read_buffer[i] =
- zdecode(s->keys,s->pcrc_32_tab,
- pfile_in_zip_read_info->read_buffer[i]);
- }
-# endif
-
-
- pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
-
- pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-
- 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;
- }
-
- if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
- {
- uInt uDoCopy,i ;
-
- if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
- (pfile_in_zip_read_info->rest_read_compressed == 0))
- return (iRead==0) ? UNZ_EOF : iRead;
-
- 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
- uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-
- for (i=0;i<uDoCopy;i++)
- *(pfile_in_zip_read_info->stream.next_out+i) =
- *(pfile_in_zip_read_info->stream.next_in+i);
-
- pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
- pfile_in_zip_read_info->stream.next_out,
- uDoCopy);
- pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
- pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
- pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
- pfile_in_zip_read_info->stream.next_out += uDoCopy;
- pfile_in_zip_read_info->stream.next_in += uDoCopy;
- pfile_in_zip_read_info->stream.total_out += uDoCopy;
- iRead += uDoCopy;
- }
- else
- {
- uLong uTotalOutBefore,uTotalOutAfter;
- const Bytef *bufBefore;
- uLong uOutThis;
- int flush=Z_SYNC_FLUSH;
-
- uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
- bufBefore = pfile_in_zip_read_info->stream.next_out;
-
- /*
- if ((pfile_in_zip_read_info->rest_read_uncompressed ==
- pfile_in_zip_read_info->stream.avail_out) &&
- (pfile_in_zip_read_info->rest_read_compressed == 0))
- flush = Z_FINISH;
- */
- err=inflate(&pfile_in_zip_read_info->stream,flush);
-
- if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
- err = Z_DATA_ERROR;
-
- uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
- uOutThis = uTotalOutAfter-uTotalOutBefore;
-
- pfile_in_zip_read_info->crc32 =
- crc32(pfile_in_zip_read_info->crc32,bufBefore,
- (uInt)(uOutThis));
-
- pfile_in_zip_read_info->rest_read_uncompressed -=
- uOutThis;
-
- iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
- if (err==Z_STREAM_END)
- return (iRead==0) ? UNZ_EOF : iRead;
- if (err!=Z_OK)
- break;
- }
- }
-
- if (err==Z_OK)
- return iRead;
- return err;
-}
-
-
-/*
- Give the current position in uncompressed data
-*/
-extern z_off_t ZEXPORT unztell (file)
- unzFile file;
-{
- unz_s* s;
- file_in_zip_read_info_s* pfile_in_zip_read_info;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- pfile_in_zip_read_info=s->pfile_in_zip_read;
-
- if (pfile_in_zip_read_info==NULL)
- return UNZ_PARAMERROR;
-
- return (z_off_t)pfile_in_zip_read_info->stream.total_out;
-}
-
-
-/*
- return 1 if the end of file was reached, 0 elsewhere
-*/
-extern int ZEXPORT unzeof (file)
- unzFile file;
-{
- unz_s* s;
- file_in_zip_read_info_s* pfile_in_zip_read_info;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- pfile_in_zip_read_info=s->pfile_in_zip_read;
-
- if (pfile_in_zip_read_info==NULL)
- return UNZ_PARAMERROR;
-
- if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
- return 1;
- else
- return 0;
-}
-
-
-
-/*
- Read extra field from the current file (opened by unzOpenCurrentFile)
- This is the local-header version of the extra field (sometimes, there is
- more info in the local-header version than in the central-header)
-
- if buf==NULL, it return the size of the local extra field that can be read
-
- 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 error code
-*/
-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
- unzFile file;
- voidp buf;
- unsigned len;
-{
- unz_s* s;
- file_in_zip_read_info_s* pfile_in_zip_read_info;
- uInt read_now;
- uLong size_to_read;
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- pfile_in_zip_read_info=s->pfile_in_zip_read;
-
- if (pfile_in_zip_read_info==NULL)
- return UNZ_PARAMERROR;
-
- size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
- pfile_in_zip_read_info->pos_local_extrafield);
-
- if (buf==NULL)
- return (int)size_to_read;
-
- if (len>size_to_read)
- read_now = (uInt)size_to_read;
- else
- read_now = (uInt)len ;
-
- if (read_now==0)
- return 0;
-
- if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
- pfile_in_zip_read_info->filestream,
- pfile_in_zip_read_info->offset_local_extrafield +
- pfile_in_zip_read_info->pos_local_extrafield,
- ZLIB_FILEFUNC_SEEK_SET)!=0)
- return UNZ_ERRNO;
-
- if (ZREAD(pfile_in_zip_read_info->z_filefunc,
- pfile_in_zip_read_info->filestream,
- buf,read_now)!=read_now)
- return UNZ_ERRNO;
-
- return (int)read_now;
-}
-
-/*
- Close the file in zip opened with unzipOpenCurrentFile
- Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-extern int ZEXPORT unzCloseCurrentFile (file)
- unzFile file;
-{
- int err=UNZ_OK;
-
- unz_s* s;
- file_in_zip_read_info_s* pfile_in_zip_read_info;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- pfile_in_zip_read_info=s->pfile_in_zip_read;
-
- if (pfile_in_zip_read_info==NULL)
- return UNZ_PARAMERROR;
-
-
- if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
- (!pfile_in_zip_read_info->raw))
- {
- if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
- err=UNZ_CRCERROR;
- }
-
-
- TRYFREE(pfile_in_zip_read_info->read_buffer);
- pfile_in_zip_read_info->read_buffer = NULL;
- if (pfile_in_zip_read_info->stream_initialised)
- inflateEnd(&pfile_in_zip_read_info->stream);
-
- pfile_in_zip_read_info->stream_initialised = 0;
- TRYFREE(pfile_in_zip_read_info);
-
- s->pfile_in_zip_read=NULL;
-
- return err;
-}
-
-
-/*
- Get the global comment string of the ZipFile, in the szComment buffer.
- uSizeBuf is the size of the szComment buffer.
- return the number of byte copied or an error code <0
-*/
-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
- unzFile file;
- char *szComment;
- uLong uSizeBuf;
-{
- unz_s* s;
- uLong uReadThis ;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
-
- uReadThis = uSizeBuf;
- if (uReadThis>s->gi.size_comment)
- uReadThis = s->gi.size_comment;
-
- if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
- return UNZ_ERRNO;
-
- if (uReadThis>0)
- {
- *szComment='\0';
- if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
- return UNZ_ERRNO;
- }
-
- if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
- *(szComment+s->gi.size_comment)='\0';
- return (int)uReadThis;
-}
-
-/* Additions by RX '2004 */
-extern uLong ZEXPORT unzGetOffset (file)
- unzFile file;
-{
- unz_s* s;
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
- if (!s->current_file_ok)
- return 0;
- if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
- if (s->num_file==s->gi.number_entry)
- return 0;
- return s->pos_in_central_dir;
-}
-
-extern int ZEXPORT unzSetOffset (file, pos)
- unzFile file;
- uLong pos;
-{
- unz_s* s;
- int err;
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz_s*)file;
-
- s->pos_in_central_dir = pos;
- s->num_file = s->gi.number_entry; /* hack */
- err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
- &s->cur_file_info_internal,
- NULL,0,NULL,0,NULL,0);
- s->current_file_ok = (err == UNZ_OK);
- return err;
-}
diff --git a/modules/access/zip/unzip/unzip.h b/modules/access/zip/unzip/unzip.h
deleted file mode 100644
index 4a52f0f427..0000000000
--- a/modules/access/zip/unzip/unzip.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
- Version 1.01e, February 12th, 2005
-
- Copyright (C) 1998-2005 Gilles Vollant
-
- This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
- WinZip, InfoZip tools and compatible.
-
- Multi volume ZipFile (span) are not supported.
- Encryption compatible with pkzip 2.04g only supported
- Old compressions used by old PKZip 1.x are not supported
-
-
- I WAIT FEEDBACK at mail info at winimage.com
- Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
- Condition of use and distribution are the same than zlib :
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-
-/* for more info about .ZIP format, see
- http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
- http://www.info-zip.org/pub/infozip/doc/
- PkWare has also a specification at :
- ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _unz_H
-#define _unz_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of _WIN32, we define a pointer that cannot be converted
- from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK (0)
-#define UNZ_END_OF_LIST_OF_FILE (-100)
-#define UNZ_ERRNO (Z_ERRNO)
-#define UNZ_EOF (0)
-#define UNZ_PARAMERROR (-102)
-#define UNZ_BADZIPFILE (-103)
-#define UNZ_INTERNALERROR (-104)
-#define UNZ_CRCERROR (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
- uInt tm_sec; /* seconds after the minute - [0,59] */
- uInt tm_min; /* minutes after the hour - [0,59] */
- uInt tm_hour; /* hours since midnight - [0,23] */
- uInt tm_mday; /* day of the month - [1,31] */
- uInt tm_mon; /* months since January - [0,11] */
- uInt tm_year; /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
- These data comes from the end of central dir */
-typedef struct unz_global_info_s
-{
- uLong number_entry; /* total number of entries in
- the central dir on this disk */
- uLong size_comment; /* size of the global comment of the zipfile */
-} unz_global_info;
-
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info_s
-{
- uLong version; /* version made by 2 bytes */
- uLong version_needed; /* version needed to extract 2 bytes */
- uLong flag; /* general purpose bit flag 2 bytes */
- uLong compression_method; /* compression method 2 bytes */
- uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
- uLong crc; /* crc-32 4 bytes */
- uLong compressed_size; /* compressed size 4 bytes */
- uLong uncompressed_size; /* uncompressed size 4 bytes */
- uLong size_filename; /* filename length 2 bytes */
- uLong size_file_extra; /* extra field length 2 bytes */
- uLong size_file_comment; /* file comment length 2 bytes */
-
- uLong disk_num_start; /* disk number start 2 bytes */
- uLong internal_fa; /* internal file attributes 2 bytes */
- uLong external_fa; /* external file attributes 4 bytes */
-
- tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,
- const char* fileName2,
- int iCaseSensitivity);
-/*
- Compare two filename (fileName1,fileName2).
- If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
- If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
- or strcasecmp)
- If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
- (like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen (const char *path);
-/*
- Open a Zip file. path contain the full pathname (by example,
- on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
- "zlib/zlib113.zip".
- If the zipfile cannot be opened (file don't exist or in not valid), the
- return value is NULL.
- Else, the return value is a unzFile Handle, usable with other function
- of this unzip package.
-*/
-
-extern unzFile ZEXPORT unzOpen2 (const char *path,
- zlib_filefunc_def* pzlib_filefunc_def);
-/*
- Open a Zip file, like unzOpen, but provide a set of file low level API
- for read/write the zip file (see ioapi.h)
-*/
-
-extern int ZEXPORT unzClose (unzFile file);
-/*
- Close a ZipFile opened with unzipOpen.
- If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
- these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
- return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo (unzFile file,
- unz_global_info *pglobal_info);
-/*
- Write info about the ZipFile in the *pglobal_info structure.
- No preparation of the structure is needed
- return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment (unzFile file,
- char *szComment,
- uLong uSizeBuf);
-/*
- Get the global comment string of the ZipFile, in the szComment buffer.
- uSizeBuf is the size of the szComment buffer.
- return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile (unzFile file);
-/*
- Set the current file of the zipfile to the first file.
- return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile (unzFile file);
-/*
- Set the current file of the zipfile to the next file.
- return UNZ_OK if there is no problem
- return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile (unzFile file,
- const char *szFileName,
- int iCaseSensitivity);
-/*
- Try locate the file szFileName in the zipfile.
- For the iCaseSensitivity signification, see unzStringFileNameCompare
-
- return value :
- UNZ_OK if the file is found. It becomes the current file.
- UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-/* ****************************************** */
-/* Ryan supplied functions */
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_pos_s
-{
- uLong pos_in_zip_directory; /* offset in zip file directory */
- uLong num_of_file; /* # of file */
-} unz_file_pos;
-
-extern int ZEXPORT unzGetFilePos(
- unzFile file,
- unz_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos(
- unzFile file,
- unz_file_pos* file_pos);
-
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
- unz_file_info *pfile_info,
- char *szFileName,
- uLong fileNameBufferSize,
- void *extraField,
- uLong extraFieldBufferSize,
- char *szComment,
- uLong commentBufferSize);
-/*
- Get Info about the current file
- if pfile_info!=NULL, the *pfile_info structure will contain somes info about
- the current file
- if szFileName!=NULL, the filemane string will be copied in szFileName
- (fileNameBufferSize is the size of the buffer)
- if extraField!=NULL, the extra field information will be copied in extraField
- (extraFieldBufferSize is the size of the buffer).
- This is the Central-header version of the extra field
- if szComment!=NULL, the comment string of the file will be copied in szComment
- (commentBufferSize is the size of the buffer)
-*/
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
- from it, and close it (you can close it before reading all the file)
- */
-
-extern int ZEXPORT unzOpenCurrentFile (unzFile file);
-/*
- Open for reading data the current file in the zipfile.
- If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file,
- const char* password);
-/*
- Open for reading data the current file in the zipfile.
- password is a crypting password
- If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFile2 (unzFile file,
- int* method,
- int* level,
- int raw);
-/*
- Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
- if raw==1
- *method will receive method of compression, *level will receive level of
- compression
- note : you can set level parameter as NULL (if you did not want known level,
- but you CANNOT set method parameter as NULL
-*/
-
-extern int ZEXPORT unzOpenCurrentFile3 (unzFile file,
- int* method,
- int* level,
- int raw,
- const char* password);
-/*
- Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
- if raw==1
- *method will receive method of compression, *level will receive level of
- compression
- note : you can set level parameter as NULL (if you did not want known level,
- but you CANNOT set method parameter as NULL
-*/
-
-
-extern int ZEXPORT unzCloseCurrentFile (unzFile file);
-/*
- Close the file in zip opened with unzOpenCurrentFile
- Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-extern int ZEXPORT unzReadCurrentFile (unzFile file,
- voidp buf,
- unsigned len);
-/*
- Read bytes from the current file (opened by unzOpenCurrentFile)
- buf contain buffer where data must be copied
- len the size of buf.
-
- return the number of byte copied if somes bytes are copied
- return 0 if the end of file was reached
- return <0 with error code if there is an error
- (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell (unzFile file);
-/*
- Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof (unzFile file);
-/*
- return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield (unzFile file,
- voidp buf,
- unsigned len);
-/*
- Read extra field from the current file (opened by unzOpenCurrentFile)
- This is the local-header version of the extra field (sometimes, there is
- more info in the local-header version than in the central-header)
-
- if buf==NULL, it return the size of the local extra field
-
- 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 error code
-*/
-
-/***************************************************************************/
-
-/* Get the current file offset */
-extern uLong ZEXPORT unzGetOffset (unzFile file);
-
-/* Set the current file offset */
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz_H */
diff --git a/modules/access/zip/zip.h b/modules/access/zip/zip.h
deleted file mode 100644
index 7ef1460dba..0000000000
--- a/modules/access/zip/zip.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * zip.h: Module (access+filter) to extract different archives, based on zlib
- *****************************************************************************
- * Copyright (C) 2009 VLC authors and VideoLAN
- * $Id$
- *
- * Authors: Jean-Philippe André <jpeg at videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/** **************************************************************************
- * Common includes and shared headers
- *****************************************************************************/
-
-#ifndef ZIP_ACCESSDEMUX_H
-#define ZIP_ACCESSDEMUX_H
-
-#include <vlc_common.h>
-#include <vlc_url.h>
-#include <vlc_strings.h>
-#include <vlc_arrays.h>
-#include <vlc_plugin.h>
-#include <vlc_stream.h>
-#include "unzip.h"
-#include "ioapi.h"
-
-#include <assert.h>
-
-#define ZIP_FILENAME_LEN 512
-#define ZIP_BUFFER_LEN 32768
-#define ZIP_SEP "!/"
-#define ZIP_SEP_LEN 2
-
-
-/** **************************************************************************
- * Module access points: stream_filter
- *****************************************************************************/
-int StreamOpen( vlc_object_t* );
-void StreamClose( vlc_object_t* );
-
-/** **************************************************************************
- * Module access points: access
- *****************************************************************************/
-int AccessOpen( vlc_object_t *p_this );
-void AccessClose( vlc_object_t *p_this );
-
-/** Common function */
-bool isAllowedChar( char c );
-
-/** **************************************************************************
- * zipIO function headers : how to use vlc_stream to read the zip
- * Note: static because the implementations differ
- *****************************************************************************/
-static void* ZCALLBACK ZipIO_Open( void* opaque, const char* filename, int m );
-static uLong ZCALLBACK ZipIO_Read( void*, void* stream, void* buf, uLong sz );
-static uLong ZCALLBACK ZipIO_Write( void*, void* stream, const void*, uLong );
-static long ZCALLBACK ZipIO_Tell( void*, void* stream );
-static long ZCALLBACK ZipIO_Seek( void*, void* stream, uLong offset, int ori );
-static int ZCALLBACK ZipIO_Close( void*, void* stream );
-static int ZCALLBACK ZipIO_Error( void*, void* stream );
-
-#endif /* ZIP_ACCESSDEMUX_H */
diff --git a/modules/access/zip/zipaccess.c b/modules/access/zip/zipaccess.c
deleted file mode 100644
index e8157f7d69..0000000000
--- a/modules/access/zip/zipaccess.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*****************************************************************************
- * zipaccess.c: Module (access) to extract different archives, based on zlib
- *****************************************************************************
- * Copyright (C) 2009 VLC authors and VideoLAN
- * $Id$
- *
- * Authors: Jean-Philippe André <jpeg at videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/** @todo:
- * - implement crypto (using url zip://user:password@path-to-archive!/file)
- * - read files in zip with long name (use unz_file_info.size_filename)
- * - multi-volume archive support ?
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <limits.h>
-#include "zip.h"
-#include <vlc_access.h>
-
-/** **************************************************************************
- * This is our own access_sys_t for zip files
- *****************************************************************************/
-struct access_sys_t
-{
- /* zlib / unzip members */
- unzFile zipFile;
-};
-
-static int AccessControl( access_t *p_access, int i_query, va_list args );
-static ssize_t AccessRead( access_t *, void *, size_t );
-static int AccessSeek( access_t *, uint64_t );
-static char *unescapeXml( const char *psz_text );
-
-/** **************************************************************************
- * \brief Unescape valid XML string
- * The exact reverse of escapeToXml (zipstream.c)
- *****************************************************************************/
-static char *unescapeXml( const char *psz_text )
-{
- char *psz_ret = malloc( strlen( psz_text ) + 1 );
- if( unlikely( !psz_ret ) ) return NULL;
-
- char *psz_tmp = psz_ret;
- for( char *psz_iter = (char*) psz_text; *psz_iter; ++psz_iter, ++psz_tmp )
- {
- if( *psz_iter == '?' )
- {
- int i_value;
- if( !sscanf( ++psz_iter, "%02x", &i_value ) )
- {
- /* Invalid number: URL incorrectly encoded */
- free( psz_ret );
- return NULL;
- }
- *psz_tmp = (char) i_value;
- psz_iter++;
- }
- else if( isAllowedChar( *psz_iter ) )
- {
- *psz_tmp = *psz_iter;
- }
- else
- {
- /* Invalid character encoding for the URL */
- free( psz_ret );
- return NULL;
- }
- }
- *psz_tmp = '\0';
-
- return psz_ret;
-}
-
-/** **************************************************************************
- * \brief Open access
- *****************************************************************************/
-int AccessOpen( vlc_object_t *p_this )
-{
- access_t *p_access = (access_t*)p_this;
- access_sys_t *p_sys;
- int i_ret = VLC_EGENERIC;
-
- char *psz_pathToZip = NULL, *psz_path = NULL, *psz_sep = NULL;
- char *psz_fileInzip = NULL;
-
- if( !strstr( p_access->psz_location, ZIP_SEP ) )
- {
- msg_Dbg( p_access, "location does not contain separator " ZIP_SEP );
- return VLC_EGENERIC;
- }
-
- p_access->p_sys = p_sys = (access_sys_t*)
- calloc( 1, sizeof( access_sys_t ) );
- if( unlikely( !p_sys ) )
- return VLC_ENOMEM;
-
- /* Split the MRL */
- psz_path = xstrdup( p_access->psz_location );
- psz_sep = strstr( psz_path, ZIP_SEP );
-
- *psz_sep = '\0';
- psz_pathToZip = unescapeXml( psz_path );
- if( !psz_pathToZip )
- {
- /* Maybe this was not an encoded string */
- msg_Dbg( p_access, "not an encoded URL Trying file '%s'",
- psz_path );
- psz_pathToZip = strdup( psz_path );
- if( unlikely( !psz_pathToZip ) )
- {
- i_ret = VLC_ENOMEM;
- goto exit;
- }
- }
-
- psz_fileInzip = unescapeXml( psz_sep + ZIP_SEP_LEN );
- if( unlikely( psz_fileInzip == NULL ) )
- {
- psz_fileInzip = strdup( psz_sep + ZIP_SEP_LEN );
- if( unlikely( psz_fileInzip == NULL ) )
- {
- i_ret = VLC_ENOMEM;
- goto exit;
- }
- }
-
- /* Define IO functions */
- zlib_filefunc_def func;
- func.zopen_file = ZipIO_Open;
- func.zread_file = ZipIO_Read;
- func.zwrite_file = ZipIO_Write; // see comment
- func.ztell_file = ZipIO_Tell;
- func.zseek_file = ZipIO_Seek;
- func.zclose_file = ZipIO_Close;
- func.zerror_file = ZipIO_Error;
- func.opaque = p_access;
-
- /* Open zip archive */
- p_sys->zipFile = unzOpen2( psz_pathToZip, &func );
- if( !p_sys->zipFile )
- {
- msg_Err( p_access, "not a valid zip archive: '%s'", psz_pathToZip );
- goto exit;
- }
-
- /* Open file in zip */
- if( unzLocateFile( p_sys->zipFile, psz_fileInzip, 0 ) != UNZ_OK )
- {
- msg_Err( p_access, "could not [re]locate file in zip: '%s'",
- psz_fileInzip );
- goto exit;
- }
-
- if( unzOpenCurrentFile( p_sys->zipFile ) != UNZ_OK )
- {
- msg_Err( p_access, "could not [re]open file in zip: '%s'",
- psz_fileInzip );
- goto exit;
- }
-
- /* Set callback */
- ACCESS_SET_CALLBACKS( AccessRead, NULL, AccessControl, AccessSeek );
-
- i_ret = VLC_SUCCESS;
-
-exit:
- if( i_ret != VLC_SUCCESS )
- {
- if( p_sys->zipFile )
- {
- unzCloseCurrentFile( p_sys->zipFile );
- unzClose( p_sys->zipFile );
- }
- free( p_sys );
- }
-
- free( psz_fileInzip );
- free( psz_pathToZip );
- free( psz_path );
- return i_ret;
-}
-
-/** **************************************************************************
- * \brief Close access: free structures
- *****************************************************************************/
-void AccessClose( vlc_object_t *p_this )
-{
- access_t *p_access = (access_t*)p_this;
- access_sys_t *p_sys = p_access->p_sys;
- unzFile file = p_sys->zipFile;
-
- unzCloseCurrentFile( file );
- unzClose( file );
- free( p_sys );
-}
-
-/** **************************************************************************
- * \brief Control access
- *****************************************************************************/
-static int AccessControl( access_t *p_access, int i_query, va_list args )
-{
- access_sys_t *sys = p_access->p_sys;
- bool *pb_bool;
- int64_t *pi_64;
-
- switch( i_query )
- {
- case STREAM_CAN_SEEK:
- case STREAM_CAN_PAUSE:
- case STREAM_CAN_CONTROL_PACE:
- pb_bool = (bool*)va_arg( args, bool* );
- *pb_bool = true;
- break;
-
- case STREAM_CAN_FASTSEEK:
- pb_bool = (bool*)va_arg( args, bool* );
- *pb_bool = false;
- break;
-
- case STREAM_GET_SIZE:
- {
- unz_file_info z_info;
-
- unzGetCurrentFileInfo( sys->zipFile, &z_info,
- NULL, 0, NULL, 0, NULL, 0 );
- *va_arg( args, uint64_t * ) = z_info.uncompressed_size;
- break;
- }
-
- case STREAM_GET_PTS_DELAY:
- pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = DEFAULT_PTS_DELAY;
- break;
-
- case STREAM_SET_PAUSE_STATE:
- /* Nothing to do */
- break;
-
- default:
- return VLC_EGENERIC;
- }
- return VLC_SUCCESS;
-}
-
-/** **************************************************************************
- * \brief Read access
- * Reads current opened file in zip. This does not open the file in zip.
- * Return -1 if no data yet, 0 if no more data, else real data read
- *****************************************************************************/
-static ssize_t AccessRead( access_t *p_access, void *p_buffer, size_t sz )
-{
- access_sys_t *p_sys = p_access->p_sys;
- unzFile file = p_sys->zipFile;
-
- int i_read = unzReadCurrentFile( file, p_buffer, sz );
-
- return ( i_read >= 0 ? i_read : VLC_EGENERIC );
-}
-
-/** **************************************************************************
- * \brief Seek inside zip file
- *****************************************************************************/
-static int AccessSeek( access_t *p_access, uint64_t seek_len )
-{
- access_sys_t *p_sys = p_access->p_sys;
- unzFile file = p_sys->zipFile;
-
- if( seek_len > ULONG_MAX )
- return VLC_EGENERIC; /* TODO: update minizip to LFS */
-
- if( unzSetOffset( file, seek_len ) < 0 )
- return VLC_EGENERIC;
-
- return VLC_SUCCESS;
-}
-
-/** **************************************************************************
- * \brief I/O functions for the ioapi: open (read only)
- *****************************************************************************/
-static void* ZCALLBACK ZipIO_Open( void* opaque, const char* file, int mode )
-{
- assert(opaque != NULL);
- assert(mode == (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_EXISTING));
-
- access_t *p_access = (access_t*) opaque;
-
- char *fileUri = malloc( strlen(file) + 8 );
- if( unlikely( !fileUri ) )
- return NULL;
- if( !strstr( file, "://" ) )
- {
- strcpy( fileUri, "file://" );
- strcat( fileUri, file );
- }
- else
- {
- strcpy( fileUri, file );
- }
-
- stream_t *s = vlc_stream_NewURL( p_access, fileUri );
- free( fileUri );
- return s;
-}
-
-/** **************************************************************************
- * \brief I/O functions for the ioapi: read
- *****************************************************************************/
-static uLong ZCALLBACK ZipIO_Read( void* opaque, void* stream,
- void* buf, uLong size )
-{
- (void)opaque;
- //access_t *p_access = (access_t*) opaque;
- //msg_Dbg(p_access, "read %d", size);
- return vlc_stream_Read( (stream_t*) stream, buf, size );
-}
-
-/** **************************************************************************
- * \brief I/O functions for the ioapi: write (assert insteadof segfault)
- *****************************************************************************/
-static uLong ZCALLBACK ZipIO_Write( void* opaque, void* stream,
- const void* buf, uLong size )
-{
- (void)opaque; (void)stream; (void)buf; (void)size;
- int zip_access_cannot_write_this_should_not_happen = 0;
- assert(zip_access_cannot_write_this_should_not_happen);
- return 0;
-}
-
-/** **************************************************************************
- * \brief I/O functions for the ioapi: tell
- *****************************************************************************/
-static long ZCALLBACK ZipIO_Tell( void* opaque, void* stream )
-{
- (void)opaque;
- int64_t i64_tell = vlc_stream_Tell( (stream_t*) stream );
- //access_t *p_access = (access_t*) opaque;
- //msg_Dbg(p_access, "tell %" PRIu64, i64_tell);
- return (long)i64_tell;
-}
-
-/** **************************************************************************
- * \brief I/O functions for the ioapi: seek
- *****************************************************************************/
-static long ZCALLBACK ZipIO_Seek( void* opaque, void* stream,
- uLong offset, int origin )
-{
- (void)opaque;
- int64_t pos = offset;
- switch( origin )
- {
- case SEEK_CUR:
- pos += vlc_stream_Tell( (stream_t*) stream );
- break;
- case SEEK_SET:
- break;
- case SEEK_END:
- pos += stream_Size( (stream_t*) stream );
- break;
- default:
- return -1;
- }
- if( pos < 0 )
- return -1;
- vlc_stream_Seek( (stream_t*) stream, pos );
- /* Note: in unzip.c, unzlocal_SearchCentralDir seeks to the end of
- the stream, which is doable but returns an error in VLC.
- That's why we always assume this was OK. FIXME */
- return 0;
-}
-
-/** **************************************************************************
- * \brief I/O functions for the ioapi: close
- *****************************************************************************/
-static int ZCALLBACK ZipIO_Close( void* opaque, void* stream )
-{
- (void)opaque;
- vlc_stream_Delete( (stream_t*) stream );
- return 0;
-}
-
-/** **************************************************************************
- * \brief I/O functions for the ioapi: test error (man 3 ferror)
- *****************************************************************************/
-static int ZCALLBACK ZipIO_Error( void* opaque, void* stream )
-{
- (void)opaque;
- (void)stream;
- //msg_Dbg( p_access, "error" );
- return 0;
-}
diff --git a/modules/access/zip/zipstream.c b/modules/access/zip/zipstream.c
deleted file mode 100644
index 4eff9f56f7..0000000000
--- a/modules/access/zip/zipstream.c
+++ /dev/null
@@ -1,844 +0,0 @@
-/*****************************************************************************
- * zipstream.c: stream_filter that creates a XSPF playlist from a Zip archive
- *****************************************************************************
- * Copyright (C) 2009 VLC authors and VideoLAN
- * $Id$
- *
- * Authors: Jean-Philippe André <jpeg at videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/** **************************************************************************
- * Preamble
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "zip.h"
-#include <stddef.h>
-
-/** **************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin()
- set_shortname( "Zip" )
- set_category( CAT_INPUT )
- set_subcategory( SUBCAT_INPUT_STREAM_FILTER )
- set_description( N_( "Zip files filter" ) )
- set_capability( "stream_filter", 15 )
- set_callbacks( StreamOpen, StreamClose )
- add_submodule()
- set_subcategory( SUBCAT_INPUT_ACCESS )
- set_description( N_( "Zip access" ) )
- set_capability( "access", 0 )
- add_shortcut( "unzip", "zip" )
- set_callbacks( AccessOpen, AccessClose )
-vlc_module_end()
-
-/** *************************************************************************
- * Local prototypes
- ****************************************************************************/
-static ssize_t Read( stream_t *, void *p_read, size_t i_read );
-static int Seek( stream_t *s, uint64_t );
-static int Control( stream_t *, int i_query, va_list );
-
-typedef struct node node;
-typedef struct item item;
-
-static int Fill( stream_t * );
-static int CreatePlaylist( stream_t *s, char **pp_buffer );
-static int GetFilesInZip( stream_t*, unzFile, vlc_array_t*, vlc_array_t* );
-static node* findOrCreateParentNode( node *root, const char *fullpath );
-static int WriteXSPF( char **pp_buffer, vlc_array_t *p_filenames,
- const char *psz_zippath );
-static int nodeToXSPF( char **pp_buffer, node *n, bool b_root );
-static node* findOrCreateParentNode( node *root, const char *fullpath );
-
-/** **************************************************************************
- * Struct definitions
- *****************************************************************************/
-struct stream_sys_t
-{
- /* zlib / unzip members */
- unzFile zipFile;
- zlib_filefunc_def *fileFunctions;
- char *psz_path;
-
- /* xspf data */
- char *psz_xspf;
- size_t i_len;
- size_t i_pos;
-};
-
-struct item {
- int id;
- item *next;
-};
-
-struct node {
- char *name;
- item *media;
- node *child;
- node *next;
-};
-
-/** **************************************************************************
- * Some helpers
- *****************************************************************************/
-
-inline static node* new_node( char *name )
-{
- node *n = (node*) calloc( 1, sizeof(node) );
- n->name = vlc_xml_encode( name );
- return n;
-}
-
-inline static item* new_item( int id )
-{
- item *media = (item*) calloc( 1, sizeof(item) );
- media->id = id;
- return media;
-}
-
-inline static void free_all_node( node *root )
-{
- while( root )
- {
- free_all_node( root->child );
- free( root->name );
- item *media = root->media;
- while( media )
- {
- item *next_media = media->next;
- free( media );
- media = next_media;
- }
- node *tmp = root->next;
- free( root );
- root = tmp;
- }
-}
-
-/* Allocate strcat and format */
-static int astrcatf( char **ppsz_dest, const char *psz_fmt_src, ... )
-{
- char *psz_tmp;
- va_list args;
-
- va_start( args, psz_fmt_src );
- int i_ret = vasprintf( &psz_tmp, psz_fmt_src, args );
- va_end( args );
-
- if( i_ret == -1 ) return -1;
-
- int i_len = strlen( *ppsz_dest ) + strlen( psz_tmp ) + 1;
- char *psz_out = realloc( *ppsz_dest, i_len );
- if( !psz_out ) return -1;
-
- strcat( psz_out, psz_tmp );
- free( psz_tmp );
-
- *ppsz_dest = psz_out;
- return i_len;
-}
-
-/** **************************************************************************
- * Zip file identifier
- *****************************************************************************/
-static const uint8_t p_zip_marker[] = { 0x50, 0x4b, 0x03, 0x04 }; // "PK^C^D"
-static const int i_zip_marker = 4;
-
-
-/** **************************************************************************
- * Open
- *****************************************************************************/
-int StreamOpen( vlc_object_t *p_this )
-{
- stream_t *s = (stream_t*) p_this;
- stream_sys_t *p_sys;
-
- /* Verify file format */
- const uint8_t *p_peek;
- if( vlc_stream_Peek( s->p_source, &p_peek, i_zip_marker ) < i_zip_marker )
- return VLC_EGENERIC;
- if( memcmp( p_peek, p_zip_marker, i_zip_marker ) )
- return VLC_EGENERIC;
- if( s->psz_url == NULL )
- return VLC_EGENERIC;
-
- s->p_sys = p_sys = calloc( 1, sizeof( *p_sys ) );
- if( !p_sys )
- return VLC_ENOMEM;
-
- p_sys->fileFunctions = ( zlib_filefunc_def * )
- calloc( 1, sizeof( zlib_filefunc_def ) );
- if( !p_sys->fileFunctions )
- goto error;
- p_sys->fileFunctions->zopen_file = ZipIO_Open;
- p_sys->fileFunctions->zread_file = ZipIO_Read;
- p_sys->fileFunctions->zwrite_file = ZipIO_Write;
- p_sys->fileFunctions->ztell_file = ZipIO_Tell;
- p_sys->fileFunctions->zseek_file = ZipIO_Seek;
- p_sys->fileFunctions->zclose_file = ZipIO_Close;
- p_sys->fileFunctions->zerror_file = ZipIO_Error;
- p_sys->fileFunctions->opaque = ( void * ) s;
- p_sys->zipFile = unzOpen2( NULL /* path */, p_sys->fileFunctions );
- if( !p_sys->zipFile )
- {
- msg_Warn( s, "unable to open file" );
- free( p_sys->fileFunctions );
- goto error;
- }
-
- /* Find the stream uri */
- const char *p = strstr(s->psz_url, "://");
- p_sys->psz_path = strdup(p ? p + 3 : "");
-
- char *psz_tmp;
- if( asprintf( &psz_tmp, "%s.xspf", s->psz_url ) == -1 )
- psz_tmp = NULL;
-
- if( p_sys->psz_path == NULL || psz_tmp == NULL )
- {
- free( psz_tmp );
- free( p_sys->psz_path );
- free( p_sys->fileFunctions );
- }
- free(s->psz_url);
- s->psz_url = psz_tmp;
- s->pf_read = Read;
- s->pf_seek = Seek;
- s->pf_control = Control;
- return VLC_SUCCESS;
-error:
- free( p_sys );
- return VLC_ENOMEM;
-}
-
-/** *************************************************************************
- * Close
- ****************************************************************************/
-void StreamClose( vlc_object_t *p_this )
-{
- stream_t *s = (stream_t*)p_this;
- stream_sys_t *p_sys = s->p_sys;
-
- if( p_sys->zipFile )
- unzClose( p_sys->zipFile );
-
- free( p_sys->fileFunctions );
- free( p_sys->psz_xspf );
- free( p_sys->psz_path );
- free( p_sys );
-}
-
-/** *************************************************************************
- * Stream filters functions
- ****************************************************************************/
-
-/** *************************************************************************
- * Read
- ****************************************************************************/
-static ssize_t Read( stream_t *s, void *p_read, size_t i_read )
-{
- stream_sys_t *p_sys = s->p_sys;
-
- /* Fill the buffer */
- if( Fill( s ) )
- return -1;
-
- /* Read the buffer */
- size_t i_len = __MIN( i_read, p_sys->i_len - p_sys->i_pos );
- memcpy( p_read, p_sys->psz_xspf + p_sys->i_pos, i_len );
- p_sys->i_pos += i_len;
-
- return i_len;
-}
-
-static int Seek( stream_t *s, uint64_t i_position )
-{
- stream_sys_t *p_sys = s->p_sys;
-
- if( i_position > p_sys->i_len )
- i_position = p_sys->i_len;
-
- p_sys->i_pos = i_position;
- return VLC_SUCCESS;
-}
-
-/** *************************************************************************
- * Control
- ****************************************************************************/
-static int Control( stream_t *s, int i_query, va_list args )
-{
- stream_sys_t *p_sys = s->p_sys;
-
- switch( i_query )
- {
- case STREAM_GET_SIZE:
- {
- uint64_t *pi_size = va_arg( args, uint64_t* );
- *pi_size = p_sys->i_len;
- return VLC_SUCCESS;
- }
-
- case STREAM_GET_CONTENT_TYPE:
- return VLC_EGENERIC;
-
- case STREAM_CAN_SEEK:
- case STREAM_CAN_FASTSEEK:
- case STREAM_SET_RECORD_STATE:
- return vlc_stream_vaControl( s->p_source, i_query, args );
-
- default:
- return VLC_EGENERIC;
- }
-}
-
-static int Fill( stream_t *s )
-{
- stream_sys_t *p_sys = s->p_sys;
-
- if( p_sys->psz_xspf )
- return VLC_SUCCESS;
-
- if( CreatePlaylist( s, &p_sys->psz_xspf ) < 0 )
- return VLC_EGENERIC;
-
- p_sys->i_len = strlen( p_sys->psz_xspf );
- p_sys->i_pos = 0;
- return VLC_SUCCESS;
-}
-
-static int CreatePlaylist( stream_t *s, char **pp_buffer )
-{
- stream_sys_t *p_sys = s->p_sys;
-
- unzFile file = p_sys->zipFile;
- if( !file )
- return -1;
-
- /* Get some infos about zip archive */
- int i_ret = 0;
- vlc_array_t *p_filenames = vlc_array_new(); /* Will contain char* */
-
- /* List all file names in Zip archive */
- i_ret = GetFilesInZip( s, file, p_filenames, NULL );
- if( i_ret < 0 )
- {
- i_ret = -1;
- goto exit;
- }
-
- /* Construct the xspf playlist */
- i_ret = WriteXSPF( pp_buffer, p_filenames, p_sys->psz_path );
- if( i_ret > 0 )
- i_ret = 1;
- else if( i_ret < 0 )
- i_ret = -1;
-
-exit:
- /* Close archive */
- unzClose( file );
- p_sys->zipFile = NULL;
-
- for( int i = 0; i < vlc_array_count( p_filenames ); i++ )
- {
- free( vlc_array_item_at_index( p_filenames, i ) );
- }
- vlc_array_destroy( p_filenames );
- return i_ret;
-}
-
-
-/** **************************************************************************
- * Zip utility functions
- *****************************************************************************/
-
-/** **************************************************************************
- * \brief List files in zip and append their names to p_array
- * \param p_this
- * \param file Opened zip file
- * \param p_array vlc_array_t which will receive all filenames
- *
- * In case of error, returns VLC_EGENERIC.
- * In case of success, returns number of files found, and goes back to first file.
- *****************************************************************************/
-static int GetFilesInZip( stream_t *p_this, unzFile file,
- vlc_array_t *p_filenames, vlc_array_t *p_fileinfos )
-{
- if( !p_filenames || !p_this )
- return VLC_EGENERIC;
-
- int i_ret = 0;
-
- /* Get global info */
- unz_global_info info;
-
- if( unzGetGlobalInfo( file, &info ) != UNZ_OK )
- {
- msg_Warn( p_this, "this is not a valid zip archive" );
- return VLC_EGENERIC;
- }
-
- /* Go to first file in archive */
- unzGoToFirstFile( file );
-
- /* Get info about each file */
- for( unsigned long i = 0; i < info.number_entry; i++ )
- {
- char *psz_fileName = calloc( ZIP_FILENAME_LEN, 1 );
- unz_file_info *p_fileInfo = calloc( 1, sizeof( unz_file_info ) );
-
- if( !p_fileInfo || !psz_fileName )
- {
- free( psz_fileName );
- free( p_fileInfo );
- return VLC_ENOMEM;
- }
-
- if( unzGetCurrentFileInfo( file, p_fileInfo, psz_fileName,
- ZIP_FILENAME_LEN, NULL, 0, NULL, 0 )
- != UNZ_OK )
- {
- msg_Warn( p_this, "can't get info about file in zip" );
- free( psz_fileName );
- free( p_fileInfo );
- return VLC_EGENERIC;
- }
-
- if( p_filenames )
- vlc_array_append( p_filenames, strdup( psz_fileName ) );
- free( psz_fileName );
-
- if( p_fileinfos )
- vlc_array_append( p_fileinfos, p_fileInfo );
- else
- free( p_fileInfo );
-
- if( i < ( info.number_entry - 1 ) )
- {
- /* Go the next file in the archive */
- if( unzGoToNextFile( file ) != UNZ_OK )
- {
- msg_Warn( p_this, "can't go to next file in zip" );
- return VLC_EGENERIC;
- }
- }
-
- i_ret++;
- }
-
- /* i_ret should be equal to info.number_entry */
- unzGoToFirstFile( file );
- return i_ret;
-}
-
-
-/** **************************************************************************
- * XSPF generation functions
- *****************************************************************************/
-
-/** **************************************************************************
- * \brief Check a character for allowance in the Xml.
- * Allowed chars are: a-z, A-Z, 0-9, \, /, ., ' ', _ and :
- *****************************************************************************/
-bool isAllowedChar( char c )
-{
- return ( c >= 'a' && c <= 'z' )
- || ( c >= 'A' && c <= 'Z' )
- || ( c >= '0' && c <= '9' )
- || ( c == ':' ) || ( c == '/' )
- || ( c == '\\' ) || ( c == '.' )
- || ( c == ' ' ) || ( c == '_' );
-}
-
-/** **************************************************************************
- * \brief Escape string to be XML valid
- * Allowed chars are defined by the above function isAllowedChar()
- * Invalid chars are escaped using non standard '?XX' notation.
- * NOTE: We cannot trust VLC internal Web encoding functions
- * because they are not able to encode and decode some rare utf-8
- * characters properly. Also, we don't control exactly when they are
- * called (from this module).
- *****************************************************************************/
-static int escapeToXml( char **ppsz_encoded, const char *psz_url )
-{
- char *psz_iter, *psz_tmp;
-
- /* Count number of unallowed characters in psz_url */
- size_t i_num = 0, i_len = 0;
- for( psz_iter = (char*) psz_url; *psz_iter; ++psz_iter )
- {
- if( isAllowedChar( *psz_iter ) )
- {
- i_len++;
- }
- else
- {
- i_len++;
- i_num++;
- }
- }
-
- /* Special case */
- if( i_num == 0 )
- {
- *ppsz_encoded = malloc( i_len + 1 );
- memcpy( *ppsz_encoded, psz_url, i_len + 1 );
- return VLC_SUCCESS;
- }
-
- /* Copy string, replacing invalid characters */
- char *psz_ret = malloc( i_len + 3*i_num + 2 );
- if( !psz_ret ) return VLC_ENOMEM;
-
- for( psz_iter = (char*) psz_url, psz_tmp = psz_ret;
- *psz_iter; ++psz_iter, ++psz_tmp )
- {
- if( isAllowedChar( *psz_iter ) )
- {
- *psz_tmp = *psz_iter;
- }
- else
- {
- *(psz_tmp++) = '?';
- snprintf( psz_tmp, 3, "%02x", ( *psz_iter & 0x000000FF ) );
- psz_tmp++;
- }
- }
- *psz_tmp = '\0';
-
- /* Return success */
- *ppsz_encoded = psz_ret;
- return VLC_SUCCESS;
-}
-
-/** **************************************************************************
- * \brief Write the XSPF playlist given the list of files
- *****************************************************************************/
-static int WriteXSPF( char **pp_buffer, vlc_array_t *p_filenames,
- const char *psz_zippath )
-{
- char *psz_zip = strrchr( psz_zippath, DIR_SEP_CHAR );
- psz_zip = vlc_xml_encode( psz_zip ? (psz_zip+1) : psz_zippath );
-
- if( asprintf( pp_buffer, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\" "
- "xmlns:vlc=\"http://www.videolan.org/vlc/playlist/ns/0/\">\n"
- " <title>%s</title>\n"
- " <trackList>\n", psz_zip ) == -1)
- return -1;
-
- /* Root node */
- node *playlist = new_node( psz_zip );
- free( psz_zip );
-
- /* Encode the URI and append ZIP_SEP */
- char *psz_pathtozip;
- escapeToXml( &psz_pathtozip, psz_zippath );
- if( astrcatf( &psz_pathtozip, "%s", ZIP_SEP ) < 0 ) {
- free_all_node( playlist );
- return -1;
- }
-
- int i_track = 0;
- for( int i = 0; i < vlc_array_count( p_filenames ); ++i )
- {
- char *psz_name = (char*) vlc_array_item_at_index( p_filenames, i );
- int i_len = strlen( psz_name );
-
- if( !i_len ) continue;
-
- /* Is it a folder ? */
- if( psz_name[i_len-1] == '/' )
- {
- /* Do nothing */
- }
- else /* File */
- {
- /* Extract file name */
- char *psz_file = strrchr( psz_name, '/' );
- psz_file = vlc_xml_encode( psz_file ? (psz_file+1) : psz_name );
-
- /* Build full MRL */
- char *psz_path = strdup( psz_pathtozip );
- char *psz_escapedName;
- escapeToXml( &psz_escapedName, psz_name );
- if( astrcatf( &psz_path, "%s", psz_escapedName ) < 0 )
- {
- free( psz_escapedName );
- return -1;
- }
- free( psz_escapedName );
-
- /* Track information */
- if( astrcatf( pp_buffer,
- " <track>\n"
- " <location>zip://%s</location>\n"
- " <title>%s</title>\n"
- " <extension application=\"http://www.videolan.org/vlc/playlist/0\">\n"
- " <vlc:id>%d</vlc:id>\n"
- " </extension>\n"
- " </track>\n",
- psz_path, psz_file, i_track ) < 0 ) return -1;
-
- free( psz_file );
- free( psz_path );
-
- /* Find the parent node */
- node *parent = findOrCreateParentNode( playlist, psz_name );
- assert( parent );
-
- /* Add the item to this node */
- item *tmp = parent->media;
- if( !tmp )
- {
- parent->media = new_item( i_track );
- }
- else
- {
- while( tmp->next )
- {
- tmp = tmp->next;
- }
- tmp->next = new_item( i_track );
- }
-
- ++i_track;
- }
- }
-
- free( psz_pathtozip );
-
- /* Close tracklist, open the extension */
- if( astrcatf( pp_buffer,
- " </trackList>\n"
- " <extension application=\"http://www.videolan.org/vlc/playlist/0\">\n"
- ) < 0 ) return -1;
-
- /* Write the tree */
- if( nodeToXSPF( pp_buffer, playlist, true ) < 0 ) return -1;
-
- /* Close extension and playlist */
- if( astrcatf( pp_buffer, " </extension>\n</playlist>\n" ) < 0 ) return -1;
-
- /* printf( "%s", *pp_buffer ); */
-
- free_all_node( playlist );
-
- return VLC_SUCCESS;
-}
-
-/** **************************************************************************
- * \brief Recursively convert a node to its XSPF representation
- *****************************************************************************/
-static int nodeToXSPF( char **pp_buffer, node *n, bool b_root )
-{
- if( !b_root )
- {
- if( astrcatf( pp_buffer, " <vlc:node title=\"%s\">\n", n->name ) < 0 )
- return -1;
- }
- if( n->child )
- nodeToXSPF( pp_buffer, n->child, false );
- item *i = n->media;
- while( i )
- {
- if( astrcatf( pp_buffer, " <vlc:item tid=\"%d\" />\n", i->id ) < 0 )
- return -1;
- i = i->next;
- }
- if( !b_root )
- {
- if( astrcatf( pp_buffer, " </vlc:node>\n" ) < 0 )
- return -1;
- }
- return VLC_SUCCESS;
-}
-
-/** **************************************************************************
- * \brief Either create or find the parent node of the item
- *****************************************************************************/
-static node* findOrCreateParentNode( node *root, const char *fullpath )
-{
- char *folder;
- char *path = strdup( fullpath );
- folder = path;
-
- assert( root );
-
- char *sep = strchr( folder, '/' );
- if( !sep )
- {
- free( path );
- return root;
- }
-
- *sep = '\0';
- ++sep;
-
- node *current = root->child;
-
- while( current )
- {
- if( current->name && !strcmp( current->name, folder ) )
- {
- /* We found the folder, go recursively deeper */
- node *parentNode = findOrCreateParentNode( current, sep );
- free( path );
- return parentNode;
- }
- current = current->next;
- }
-
- /* If we are here, then it means that we did not find the parent */
- node *ret = new_node( folder );
- if( !root->child )
- root->child = ret;
- else
- {
- current = root->child;
- while( current->next )
- {
- current = current->next;
- }
- current->next = ret;
- }
-
- /* And now, create the subfolders */
- ret = findOrCreateParentNode( ret, sep );
-
- free( path );
- return ret;
-}
-
-
-/** **************************************************************************
- * ZipIO function definitions : how to use vlc_stream to read the zip
- *****************************************************************************/
-
-/** **************************************************************************
- * \brief interface for unzip module to open a file using a vlc_stream
- * \param opaque
- * \param filename
- * \param mode how to open the file (read/write ?). We support only read
- * \return opaque
- *****************************************************************************/
-static void ZCALLBACK *ZipIO_Open( void *opaque, const char *file, int mode )
-{
- (void) file;
- stream_t *s = (stream_t*) opaque;
- if( mode & ( ZLIB_FILEFUNC_MODE_CREATE | ZLIB_FILEFUNC_MODE_WRITE ) )
- {
- msg_Dbg( s, "ZipIO_Open: we cannot write into zip files" );
- return NULL;
- }
- return s;
-}
-
-/** **************************************************************************
- * \brief read something from stream into buffer
- * \param opaque should be the stream
- * \param stream stream created by ZipIO_Open
- * \param buf buffer to read the file
- * \param size length of this buffer
- * \return return the number of bytes read (<= size)
- *****************************************************************************/
-static unsigned long ZCALLBACK ZipIO_Read( void *opaque, void *stream,
- void *buf, unsigned long size )
-{
- (void) stream;
- stream_t *s = (stream_t*) opaque;
- return (unsigned long) vlc_stream_Read( s->p_source, buf, (int) size );
-}
-
-/** **************************************************************************
- * \brief tell size of stream
- * \param opaque should be the stream
- * \param stream stream created by ZipIO_Open
- * \return size of the file / stream
- * ATTENTION: this is not vlc_stream_Tell, but stream_Size !
- *****************************************************************************/
-static long ZCALLBACK ZipIO_Tell( void *opaque, void *stream )
-{
- (void) stream;
- stream_t *s = (stream_t*) opaque;
- return (long) stream_Size( s->p_source ); /* /!\ not vlc_stream_Tell /!\ */
-}
-
-/** **************************************************************************
- * \brief seek in the stream
- * \param opaque should be the stream
- * \param stream stream created by ZipIO_Open
- * \param offset positive offset to seek
- * \param origin current position in stream
- * \return ¿ VLC_SUCCESS or an error code ?
- *****************************************************************************/
-static long ZCALLBACK ZipIO_Seek ( void *opaque, void *stream,
- unsigned long offset, int origin )
-{
- (void) stream;
- stream_t *s = (stream_t*) opaque;
- long l_ret;
-
- uint64_t pos = offset + origin;
- l_ret = (long) vlc_stream_Seek( s->p_source, pos );
- return l_ret;
-}
-
-/** **************************************************************************
- * \brief close the stream
- * \param opaque should be the stream
- * \param stream stream created by ZipIO_Open
- * \return always VLC_SUCCESS
- * This closes zip archive
- *****************************************************************************/
-static int ZCALLBACK ZipIO_Close ( void *opaque, void *stream )
-{
- (void) stream;
- (void) opaque;
-// stream_t *s = (stream_t*) opaque;
-// if( p_demux->p_sys && p_demux->p_sys->zipFile )
-// p_demux->p_sys->zipFile = NULL;
-// vlc_stream_Seek( s->p_source, 0 );
- return VLC_SUCCESS;
-}
-
-/** **************************************************************************
- * \brief I/O functions for the ioapi: write (assert insteadof segfault)
- *****************************************************************************/
-static uLong ZCALLBACK ZipIO_Write( void* opaque, void* stream,
- const void* buf, uLong size )
-{
- (void)opaque; (void)stream; (void)buf; (void)size;
- int ERROR_zip_cannot_write_this_should_not_happen = 0;
- assert( ERROR_zip_cannot_write_this_should_not_happen );
- return 0;
-}
-
-/** **************************************************************************
- * \brief I/O functions for the ioapi: test error (man 3 ferror)
- *****************************************************************************/
-static int ZCALLBACK ZipIO_Error( void* opaque, void* stream )
-{
- (void)opaque;
- (void)stream;
- return 0;
-}
-
--
2.11.1
More information about the vlc-devel
mailing list