2004-03-03 00:56:51 +01:00
|
|
|
// Zip archiving on top of ZLib.
|
|
|
|
//
|
2004-08-24 19:29:54 +02:00
|
|
|
// Copyright (c) 2003 Jan Wassenberg
|
2004-03-03 00:56:51 +01:00
|
|
|
//
|
|
|
|
// This program is free software; you can redistribute it and/or
|
|
|
|
// modify it under the terms of the GNU General Public License as
|
|
|
|
// published by the Free Software Foundation; either version 2 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
|
|
|
|
// General Public License for more details.
|
|
|
|
//
|
|
|
|
// Contact info:
|
|
|
|
// Jan.Wassenberg@stud.uni-karlsruhe.de
|
|
|
|
// http://www.stud.uni-karlsruhe.de/~urkt/
|
|
|
|
|
2004-08-11 22:21:42 +02:00
|
|
|
// components:
|
|
|
|
// - z_*: Zip-specific code
|
|
|
|
// passes the list of files in an archive to lookup.
|
|
|
|
// - lookup_*: file lookup
|
|
|
|
// per archive: return file info (e.g. offset, size), given filename.
|
|
|
|
// - ZArchive_*: Handle-based container for archive info
|
|
|
|
// owns archive file and its lookup mechanism.
|
|
|
|
// - inf_*: in-memory inflate routines (zlib wrapper)
|
|
|
|
// decompresses blocks from file_io callback.
|
|
|
|
// - zip_*: file from Zip archive
|
|
|
|
// uses lookup to get file information; holds inflate state.
|
|
|
|
// - sync and async I/O
|
|
|
|
// uses file_* and inf_*.
|
|
|
|
// - file mapping
|
|
|
|
|
|
|
|
|
2004-05-08 03:11:51 +02:00
|
|
|
#include "precompiled.h"
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
#include "lib.h"
|
2004-06-04 19:47:12 +02:00
|
|
|
#include "zip.h"
|
2004-05-06 19:14:30 +02:00
|
|
|
#include "res.h"
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-12-07 02:19:10 +01:00
|
|
|
#include <map>
|
|
|
|
|
2004-06-04 14:41:53 +02:00
|
|
|
#include <assert.h>
|
|
|
|
|
2004-05-27 02:29:54 +02:00
|
|
|
// provision for removing all ZLib code (all inflate calls will fail).
|
|
|
|
// used for checking DLL dependency; might also simulate corrupt Zip files.
|
2004-05-26 21:28:42 +02:00
|
|
|
//#define NO_ZLIB
|
|
|
|
|
|
|
|
#ifndef NO_ZLIB
|
2004-11-22 01:17:37 +01:00
|
|
|
# define ZLIB_DLL
|
2004-08-08 20:50:44 +02:00
|
|
|
# include <zlib.h>
|
2004-08-10 17:56:04 +02:00
|
|
|
|
2004-08-08 20:50:44 +02:00
|
|
|
# ifdef _MSC_VER
|
|
|
|
# ifdef NDEBUG
|
|
|
|
# pragma comment(lib, "zlib1.lib")
|
|
|
|
# else
|
|
|
|
# pragma comment(lib, "zlib1d.lib")
|
|
|
|
# endif
|
|
|
|
# endif
|
2004-03-03 00:56:51 +01:00
|
|
|
#endif
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
2004-03-03 00:56:51 +01:00
|
|
|
//
|
2004-08-10 17:56:04 +02:00
|
|
|
// z_*: Zip-specific code
|
|
|
|
// passes the list of files in an archive to lookup.
|
2004-03-03 00:56:51 +01:00
|
|
|
//
|
2004-05-06 19:14:30 +02:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
// convenience container for location / size of file in archive.
|
2004-08-10 17:56:04 +02:00
|
|
|
struct ZLoc
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-06-02 22:41:05 +02:00
|
|
|
off_t ofs;
|
|
|
|
off_t csize; // = 0 if not compressed
|
|
|
|
off_t ucsize;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-11-08 00:00:32 +01:00
|
|
|
time_t mtime;
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
// why csize?
|
|
|
|
// file I/O may be N-buffered, so it's good to know when the raw data
|
2004-08-24 19:29:54 +02:00
|
|
|
// stops, or else we potentially overshoot by N-1 blocks.
|
|
|
|
// if we do read too much though, nothing breaks - inflate would just
|
|
|
|
// ignore it, since Zip files are compressed individually.
|
2004-05-06 19:14:30 +02:00
|
|
|
//
|
2004-08-10 17:56:04 +02:00
|
|
|
// we also need a way to check if a file is compressed (e.g. to fail
|
|
|
|
// mmap requests if the file is compressed). packing a bit in ofs or
|
2004-05-06 19:14:30 +02:00
|
|
|
// ucsize is error prone and ugly (1 bit less won't hurt though).
|
|
|
|
// any other way will mess up the nice 2^n byte size anyway, so
|
|
|
|
// might as well store csize.
|
|
|
|
};
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
// Zip file data structures and signatures
|
|
|
|
static const char cdfh_id[] = "PK\1\2";
|
|
|
|
static const char lfh_id[] = "PK\3\4";
|
|
|
|
static const char ecdr_id[] = "PK\5\6";
|
|
|
|
const size_t CDFH_SIZE = 46;
|
|
|
|
const size_t LFH_SIZE = 30;
|
|
|
|
const size_t ECDR_SIZE = 22;
|
2004-05-13 15:52:48 +02:00
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// return -1 if file is obviously not a valid Zip archive,
|
|
|
|
// otherwise 0. used as early-out test in lookup_init (see call site).
|
2004-12-10 00:12:02 +01:00
|
|
|
static inline int z_validate(const void* file, size_t size)
|
2004-08-10 17:56:04 +02:00
|
|
|
{
|
|
|
|
// make sure it's big enough to check the header and for
|
2004-08-24 19:29:54 +02:00
|
|
|
// z_find_ecdr to succeed (if smaller, it's definitely bogus).
|
|
|
|
if(size < ECDR_SIZE)
|
2004-12-01 22:37:01 +01:00
|
|
|
return ERR_CORRUPTED;
|
2004-05-13 15:52:48 +02:00
|
|
|
|
2004-08-11 22:21:42 +02:00
|
|
|
// check "header" (first LFH) signature
|
|
|
|
return (*(u32*)file == *(u32*)&lfh_id)? 0 : -1;
|
2004-05-13 15:52:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// find "End of Central Dir Record" in file.
|
|
|
|
// z_validate has made sure size >= ECDR_SIZE.
|
|
|
|
// return -1 on failure (output param invalid), otherwise 0.
|
2004-12-10 00:12:02 +01:00
|
|
|
static int z_find_ecdr(const void* file, size_t size, const u8*& ecdr_)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-05-06 19:14:30 +02:00
|
|
|
// early out: check expected case (ECDR at EOF; no file comment)
|
2004-08-24 19:29:54 +02:00
|
|
|
const u8* ecdr = (const u8*)file + size - ECDR_SIZE;
|
2004-05-06 19:14:30 +02:00
|
|
|
if(*(u32*)ecdr == *(u32*)&ecdr_id)
|
|
|
|
goto found_ecdr;
|
|
|
|
|
2004-05-18 02:38:39 +02:00
|
|
|
{
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
// scan the last 66000 bytes of file for ecdr_id signature
|
2004-08-24 19:29:54 +02:00
|
|
|
// (the Zip archive comment field, up to 64k, may follow ECDR).
|
2004-05-06 19:14:30 +02:00
|
|
|
// if the zip file is < 66000 bytes, scan the whole file.
|
|
|
|
|
|
|
|
size_t bytes_left = MIN(66000, size);
|
|
|
|
ecdr = (const u8*)file + size - bytes_left;
|
|
|
|
|
|
|
|
while(bytes_left >= 4)
|
|
|
|
{
|
|
|
|
if(*(u32*)ecdr == *(u32*)&ecdr_id)
|
|
|
|
goto found_ecdr;
|
|
|
|
|
2004-06-02 22:41:05 +02:00
|
|
|
// check next 4 bytes (unaligned!!)
|
2004-05-06 19:14:30 +02:00
|
|
|
ecdr++;
|
|
|
|
bytes_left--;
|
|
|
|
}
|
|
|
|
|
|
|
|
// reached EOF and still haven't found the ECDR identifier.
|
2004-12-01 22:37:01 +01:00
|
|
|
return ERR_CORRUPTED;
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-05-18 02:38:39 +02:00
|
|
|
}
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
found_ecdr:
|
|
|
|
ecdr_ = ecdr;
|
2004-03-03 00:56:51 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-06-11 04:14:18 +02:00
|
|
|
#ifdef PARANOIA
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
// make sure the LFH fields match those passed (from the CDFH).
|
|
|
|
// only used in PARANOIA builds - costs time when opening archives.
|
2004-08-24 19:29:54 +02:00
|
|
|
// return -1 on error or mismatch, otherwise 0.
|
2004-12-10 00:12:02 +01:00
|
|
|
static int z_verify_lfh(const void* file, const off_t lfh_ofs, const off_t file_ofs)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-05-06 19:14:30 +02:00
|
|
|
assert(lfh_ofs < file_ofs); // header comes before file
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
const u8* lfh = (const u8*)file + lfh_ofs;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-12-01 22:37:01 +01:00
|
|
|
// LFH signature doesn't match
|
2004-05-06 19:14:30 +02:00
|
|
|
if(*(u32*)lfh != *(u32*)lfh_id)
|
2004-12-01 22:37:01 +01:00
|
|
|
return ERR_CORRUPTED;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
const u16 lfh_fn_len = read_le16(lfh+26);
|
|
|
|
const u16 lfh_e_len = read_le16(lfh+28);
|
|
|
|
|
2004-06-02 22:41:05 +02:00
|
|
|
const off_t lfh_file_ofs = lfh_ofs + LFH_SIZE + lfh_fn_len + lfh_e_len;
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-12-01 22:37:01 +01:00
|
|
|
// CDFH and LFH are inconsistent =>
|
|
|
|
// normal builds would return incorrect offsets.
|
2004-05-06 19:14:30 +02:00
|
|
|
if(file_ofs != lfh_file_ofs)
|
2004-12-01 22:37:01 +01:00
|
|
|
return ERR_CORRUPTED;
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
return 0;
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
|
|
|
|
2004-06-11 04:14:18 +02:00
|
|
|
#endif // #ifdef PARANOIA
|
|
|
|
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-11-08 00:00:32 +01:00
|
|
|
//
|
|
|
|
// date conversion from DOS to Unix
|
|
|
|
//
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
static uint bits(uint num, uint lo_idx, uint hi_idx)
|
|
|
|
{
|
|
|
|
uint result = num;
|
|
|
|
result >>= lo_idx;
|
|
|
|
const uint count = (hi_idx - lo_idx)+1;
|
|
|
|
// number of bits to return
|
|
|
|
result &= (1u << count)-1;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static time_t convert_dos_date(u16 fatdate, u16 fattime)
|
|
|
|
{
|
2004-12-07 02:19:10 +01:00
|
|
|
struct tm t;
|
|
|
|
t.tm_sec = bits(fattime, 0,4) * 2; // [0,59]
|
|
|
|
t.tm_min = bits(fattime, 5,10); // [0,59]
|
|
|
|
t.tm_hour = bits(fattime, 11,15); // [0,23]
|
|
|
|
t.tm_mday = bits(fatdate, 0,4); // [1,31]
|
|
|
|
t.tm_mon = bits(fatdate, 5,8)-1; // [0,11]
|
|
|
|
t.tm_year = bits(fatdate, 9,15) + 80; // since 1900
|
|
|
|
t.tm_isdst = -1; // unknown - let libc determine
|
|
|
|
|
|
|
|
time_t ret = mktime(&t);
|
|
|
|
if(ret == (time_t)-1)
|
|
|
|
debug_warn("convert_dos_date: mktime failed");
|
|
|
|
return ret;
|
2004-11-08 00:00:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// if cdfh is valid and describes a file, extract its name, offset and size
|
|
|
|
// for use in z_enum_files (passes it to lookup).
|
|
|
|
// return -1 on error (output params invalid), or 0 on success.
|
2004-12-10 00:12:02 +01:00
|
|
|
static int z_extract_cdfh(const u8* cdfh, ssize_t bytes_left, const char*& fn, size_t& fn_len, ZLoc* loc)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-08-24 19:29:54 +02:00
|
|
|
// sanity check: did we even read the CDFH?
|
|
|
|
if(bytes_left < CDFH_SIZE)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-08-24 19:29:54 +02:00
|
|
|
debug_warn("z_extract_cdfh: CDFH not in buffer!");
|
|
|
|
return -1;
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// this is checked when advancing,
|
|
|
|
// but we need this for the first central dir entry.
|
|
|
|
if(*(u32*)cdfh != *(u32*)cdfh_id)
|
2004-05-18 02:38:39 +02:00
|
|
|
{
|
2004-08-24 19:29:54 +02:00
|
|
|
debug_warn("z_extract_cdfh: CDFH signature not found");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-05-18 02:38:39 +02:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// extract fields from CDFH
|
|
|
|
const u8 method = cdfh[10];
|
2004-11-08 00:00:32 +01:00
|
|
|
const u16 fattime = read_le16(cdfh+12);
|
|
|
|
const u16 fatdate = read_le16(cdfh+14);
|
2004-08-24 19:29:54 +02:00
|
|
|
const u32 csize_ = read_le32(cdfh+20);
|
2004-05-06 19:14:30 +02:00
|
|
|
const u32 ucsize_ = read_le32(cdfh+24);
|
|
|
|
const u16 fn_len_ = read_le16(cdfh+28);
|
|
|
|
const u16 e_len = read_le16(cdfh+30);
|
|
|
|
const u16 c_len = read_le16(cdfh+32);
|
|
|
|
const u32 lfh_ofs = read_le32(cdfh+42);
|
2004-08-24 19:29:54 +02:00
|
|
|
const char* fn_ = (const char*)cdfh+CDFH_SIZE;
|
2004-05-06 19:14:30 +02:00
|
|
|
// not 0-terminated!
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
//
|
|
|
|
// check if valid and data should actually be returned
|
|
|
|
//
|
|
|
|
|
|
|
|
// .. compression method is unknown (neither deflated nor stored)
|
2004-05-06 19:14:30 +02:00
|
|
|
if(method & ~8)
|
|
|
|
{
|
2004-08-24 19:29:54 +02:00
|
|
|
debug_warn("z_extract_cdfh: unknown compression method");
|
2004-12-01 22:37:01 +01:00
|
|
|
return ERR_NOT_SUPPORTED;
|
2004-05-06 19:14:30 +02:00
|
|
|
}
|
2004-08-24 19:29:54 +02:00
|
|
|
// .. this is a directory entry; we only want files.
|
|
|
|
if(!csize_ && !ucsize_)
|
2004-12-07 02:19:10 +01:00
|
|
|
return -1;
|
2004-08-24 19:29:54 +02:00
|
|
|
#ifdef PARANOIA
|
|
|
|
// .. CDFH's file ofs doesn't match that reported by LFH.
|
|
|
|
// don't check this in normal builds - seeking between LFHs and
|
|
|
|
// central dir is slow. this happens if the headers differ for some
|
|
|
|
// reason; we'd notice anyway, because inflate will fail
|
|
|
|
// (since file offset is incorrect).
|
|
|
|
if(z_verify_lfh(file, lfh_ofs, file_ofs) != 0)
|
|
|
|
return -1;
|
|
|
|
#endif
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
|
|
|
|
// write out entry data
|
2004-05-06 19:14:30 +02:00
|
|
|
fn = fn_;
|
|
|
|
fn_len = fn_len_;
|
2004-06-02 22:41:05 +02:00
|
|
|
loc->ofs = (off_t)(lfh_ofs + LFH_SIZE + fn_len_ + e_len);
|
2004-08-24 19:29:54 +02:00
|
|
|
loc->csize = (off_t)(method? csize_ : 0);
|
|
|
|
// if not compressed, csize = 0 (see zfile_compressed)
|
2004-06-02 22:41:05 +02:00
|
|
|
loc->ucsize = (off_t)ucsize_;
|
2004-11-08 00:00:32 +01:00
|
|
|
loc->mtime = convert_dos_date(fatdate, fattime);
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-03-03 00:56:51 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// successively call <cb> for each valid file in the archive,
|
|
|
|
// passing the complete path and <user>.
|
|
|
|
// if it returns a nonzero value, abort and return that, otherwise 0.
|
|
|
|
//
|
|
|
|
// HACK: call back with negative index the first time; its abs. value is
|
|
|
|
// the number of entries in the archive. lookup needs to know this so it can
|
|
|
|
// preallocate memory. having lookup_init call z_get_num_files and then
|
|
|
|
// z_enum_files would require passing around a ZipInfo struct, or searching
|
|
|
|
// for the ECDR twice - both ways aren't nice. nor is expanding on demand -
|
|
|
|
// we try to minimize allocations (faster, less fragmentation).
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
// fn (filename) is not necessarily 0-terminated!
|
|
|
|
// loc is only valid during the callback! must be copied or saved.
|
2004-12-10 00:12:02 +01:00
|
|
|
typedef int(*CDFH_CB)(uintptr_t user, i32 idx, const char* fn, size_t fn_len, const ZLoc* loc);
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-12-10 00:12:02 +01:00
|
|
|
static int z_enum_files(const void* file, const size_t size, const CDFH_CB cb, const uintptr_t user)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-08-24 19:29:54 +02:00
|
|
|
// find "End of Central Directory Record"
|
2004-05-06 19:14:30 +02:00
|
|
|
const u8* ecdr;
|
2004-08-10 17:56:04 +02:00
|
|
|
CHECK_ERR(z_find_ecdr(file, size, ecdr));
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// call back with number of entries in archives (an upper bound
|
|
|
|
// for valid files; we're not interested in the directory entries).
|
|
|
|
// we'd have to scan through the central dir to count them out; we'll
|
|
|
|
// just skip them and waste a bit of preallocated memory.
|
|
|
|
const i32 num_entries = read_le16(ecdr+10);
|
|
|
|
// .. callback expects -num_entries < 0.
|
2004-05-06 19:14:30 +02:00
|
|
|
// if it's 0, the callback would treat it as an index => crash.
|
2004-08-24 19:29:54 +02:00
|
|
|
if(!num_entries)
|
2004-05-06 19:14:30 +02:00
|
|
|
return -1;
|
2004-08-24 19:29:54 +02:00
|
|
|
CHECK_ERR(cb(user, -num_entries, 0, 0, 0));
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// iterate through CDFH
|
2004-05-06 19:14:30 +02:00
|
|
|
const u32 cd_ofs = read_le32(ecdr+16);
|
|
|
|
const u8* cdfh = (const u8*)file + cd_ofs;
|
2004-08-24 19:29:54 +02:00
|
|
|
i32 idx = 0;
|
|
|
|
// only incremented when valid, so we don't leave holes
|
|
|
|
// in lookup's arrays (bad locality).
|
|
|
|
i32 entries_left = num_entries;
|
|
|
|
for(;;)
|
2004-05-06 19:14:30 +02:00
|
|
|
{
|
2004-08-24 19:29:54 +02:00
|
|
|
entries_left--;
|
|
|
|
ssize_t bytes_left = (ssize_t)size - ( cdfh - (u8*)file );
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
const char* fn;
|
|
|
|
size_t fn_len;
|
2004-08-10 17:56:04 +02:00
|
|
|
ZLoc loc;
|
2004-08-24 19:29:54 +02:00
|
|
|
// CDFH is valid and of a file
|
|
|
|
if(z_extract_cdfh(cdfh, bytes_left, fn, fn_len, &loc) == 0)
|
|
|
|
{
|
2004-05-06 19:14:30 +02:00
|
|
|
cb(user, idx, fn, fn_len, &loc);
|
2004-08-24 19:29:54 +02:00
|
|
|
idx++; // see rationale above
|
|
|
|
|
|
|
|
// advance to next cdfh (the easy way - we have a valid fn_len
|
|
|
|
// and assume there's no extra data stored after the header).
|
|
|
|
cdfh += CDFH_SIZE + fn_len;
|
|
|
|
if(*(u32*)cdfh == *(u32*)cdfh_id)
|
|
|
|
goto found_next_cdfh;
|
|
|
|
|
|
|
|
// not found; scan for it below (as if the CDFH were invalid).
|
|
|
|
// note: don't restore the previous cdfh pointer - fn_len is
|
|
|
|
// correct and there are additional fields before the next CDFH.
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!entries_left)
|
|
|
|
break;
|
|
|
|
|
|
|
|
// scan for the next CDFH (its signature)
|
|
|
|
for(ssize_t i = 0; i < bytes_left - (ssize_t)CDFH_SIZE; i++)
|
|
|
|
if(*(u32*)(++cdfh) == *(u32*)cdfh_id)
|
|
|
|
goto found_next_cdfh;
|
|
|
|
|
|
|
|
debug_warn("z_enum_files: next CDFH not found");
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
found_next_cdfh:;
|
2004-05-06 19:14:30 +02:00
|
|
|
}
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
2004-03-03 00:56:51 +01:00
|
|
|
//
|
2004-08-10 17:56:04 +02:00
|
|
|
// lookup_*: file lookup
|
2004-08-11 22:21:42 +02:00
|
|
|
// per archive: return file info (e.g. offset, size), given filename.
|
2004-03-03 00:56:51 +01:00
|
|
|
//
|
2004-05-06 19:14:30 +02:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
// current file-lookup implementation:
|
|
|
|
// store each file's ZEnt in an array. check the next entry first; if that's
|
|
|
|
// not what we're looking for, find its index via map<filename_hash, index>.
|
2004-05-06 19:14:30 +02:00
|
|
|
//
|
2004-08-10 17:56:04 +02:00
|
|
|
// rationale:
|
|
|
|
// - we don't export a "key" (currently array index) that would allow faster
|
|
|
|
// file lookup. this would only be useful if higher-level code were to
|
|
|
|
// store the key and use it more than once. also, lookup is currently fast
|
|
|
|
// enough. finally, this would also make our file enumerate callback
|
|
|
|
// incompatible with the others (due to the extra key param).
|
|
|
|
//
|
|
|
|
// - we don't bother with a directory tree to speed up lookup. the above
|
2004-08-24 19:29:54 +02:00
|
|
|
// is fast enough: O(1) if accessed sequentially, otherwise O(log(files)).
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
struct ZEnt
|
|
|
|
{
|
2004-05-06 19:14:30 +02:00
|
|
|
const char* fn; // currently allocated individually
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
ZLoc loc;
|
2004-03-03 00:56:51 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
typedef std::map<FnHash, i32> LookupIdx;
|
|
|
|
typedef LookupIdx::iterator LookupIdxIt;
|
|
|
|
|
|
|
|
// per-archive information for mapping filename -> file info
|
|
|
|
struct LookupInfo
|
|
|
|
{
|
2004-03-03 00:56:51 +01:00
|
|
|
ZEnt* ents;
|
2004-05-06 19:14:30 +02:00
|
|
|
FnHash* fn_hashes;
|
|
|
|
// split out of ZEnt for more efficient search
|
|
|
|
// (=> ZEnt is power-of-2, back-to-back fn_hashes)
|
|
|
|
//
|
|
|
|
// currently both share one memory allocation; only mem_free() ents!
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
i32 num_entries;
|
|
|
|
// .. in above arrays (used to check indices)
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
i32 num_files;
|
2004-08-24 19:29:54 +02:00
|
|
|
// actual number of valid files! (see z_enum_files)
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
i32 next_file;
|
|
|
|
// for last-file-opened optimization.
|
|
|
|
// we store index of next file instead of the last one opened
|
|
|
|
// to avoid trouble on first call (don't want last == -1).
|
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
// don't know size of std::map, and this struct is
|
|
|
|
// included in a control block (ZArchive).
|
|
|
|
// allocate dynamically to be safe.
|
2004-05-06 19:14:30 +02:00
|
|
|
LookupIdx* idx;
|
2004-03-03 00:56:51 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// support for case-insensitive filenames: the hash of each
|
2004-08-11 22:21:42 +02:00
|
|
|
// filename string is saved in lookup_add_file_cb and searched for by
|
|
|
|
// lookup_get_file_info. in both cases, we convert a temporary to
|
|
|
|
// lowercase before hashing it.
|
|
|
|
static void strcpy_lower(char* dst, const char* src)
|
|
|
|
{
|
|
|
|
int c;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
c = *src++;
|
|
|
|
*dst++ = tolower(c);
|
|
|
|
}
|
|
|
|
while(c != '\0');
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
// add file <fn> to the lookup data structure.
|
2004-08-24 19:29:54 +02:00
|
|
|
// called from z_enum_files in order (0 <= idx < num_entries).
|
|
|
|
// the first call notifies us of # entries, so we can allocate memory.
|
2004-05-06 19:14:30 +02:00
|
|
|
//
|
2004-08-10 17:56:04 +02:00
|
|
|
// notes:
|
|
|
|
// - fn (filename) is not necessarily 0-terminated!
|
|
|
|
// - loc is only valid during the callback! must be copied or saved.
|
2004-12-10 00:12:02 +01:00
|
|
|
static int lookup_add_file_cb(uintptr_t user, i32 idx,
|
|
|
|
const char* fn, size_t fn_len, const ZLoc* loc)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-05-06 19:14:30 +02:00
|
|
|
LookupInfo* li = (LookupInfo*)user;
|
|
|
|
|
|
|
|
// HACK: on first call, idx is negative and tells us how many
|
2004-08-24 19:29:54 +02:00
|
|
|
// entries are in the archive (so we can allocate memory).
|
2004-08-10 17:56:04 +02:00
|
|
|
// see z_enum_files for why it's done this way.
|
2004-05-06 19:14:30 +02:00
|
|
|
if(idx < 0)
|
|
|
|
{
|
2004-08-24 19:29:54 +02:00
|
|
|
const i32 num_entries = -idx;
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
// both arrays in one allocation (more efficient)
|
2004-08-24 19:29:54 +02:00
|
|
|
const size_t ents_size = (num_entries * sizeof(ZEnt));
|
|
|
|
const size_t array_size = ents_size + (num_entries * sizeof(FnHash));
|
2004-05-06 19:14:30 +02:00
|
|
|
void* p = mem_alloc(array_size, 4*KB);
|
|
|
|
if(!p)
|
|
|
|
return ERR_NO_MEM;
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
li->num_entries = num_entries;
|
|
|
|
li->num_files = 0;
|
|
|
|
// will count below, since some entries aren't files.
|
2004-05-06 19:14:30 +02:00
|
|
|
li->ents = (ZEnt*)p;
|
|
|
|
li->fn_hashes = (FnHash*)((char*)p + ents_size);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// adding a regular file.
|
|
|
|
|
|
|
|
assert(idx < li->num_entries);
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// hash (lower case!) filename
|
2004-08-11 22:21:42 +02:00
|
|
|
char lc_fn[PATH_MAX];
|
|
|
|
strcpy_lower(lc_fn, fn);
|
|
|
|
FnHash fn_hash = fnv_hash(lc_fn, fn_len);
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// fill ZEnt
|
|
|
|
ZEnt* ent = li->ents + idx;
|
|
|
|
ent->loc = *loc;
|
|
|
|
// .. copy filename (needs to be 0-terminated)
|
2004-12-10 00:12:02 +01:00
|
|
|
// note: Zip paths only have '/' terminators; no need to convert.
|
2004-08-24 19:29:54 +02:00
|
|
|
char* fn_copy = (char*)malloc(fn_len+1);
|
|
|
|
if(!fn_copy)
|
|
|
|
return ERR_NO_MEM;
|
|
|
|
memcpy(fn_copy, fn, fn_len);
|
|
|
|
fn_copy[fn_len] = '\0';
|
|
|
|
ent->fn = fn_copy;
|
|
|
|
|
|
|
|
li->num_files++;
|
2004-05-06 19:14:30 +02:00
|
|
|
li->fn_hashes[idx] = fn_hash;
|
2004-08-24 19:29:54 +02:00
|
|
|
(*li->idx)[fn_hash] = idx;
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
return 0;
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// initialize lookup data structure for the given Zip archive:
|
|
|
|
// adds all files to the index.
|
2004-12-10 00:12:02 +01:00
|
|
|
static int lookup_init(LookupInfo* li, const void* file, const size_t size)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-08-10 17:56:04 +02:00
|
|
|
int err;
|
|
|
|
|
|
|
|
// check if it's even a Zip file.
|
|
|
|
// the VFS blindly opens files when mounting; it needs to open
|
|
|
|
// all archives, but doesn't know their extension (e.g. ".pk3").
|
|
|
|
err = z_validate(file, size);
|
|
|
|
if(err < 0) // don't CHECK_ERR - this can happen often.
|
|
|
|
return err;
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
li->next_file = 0;
|
|
|
|
li->idx = new LookupIdx;
|
2004-08-24 19:29:54 +02:00
|
|
|
// ents, fn_hashes, num_files are initialized in lookup_add_file_cb
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
err = z_enum_files(file, size, lookup_add_file_cb, (uintptr_t)li);
|
2004-05-13 15:52:48 +02:00
|
|
|
if(err < 0)
|
|
|
|
{
|
|
|
|
delete li->idx;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
// free lookup data structure.
|
|
|
|
// (no use-after-free checking - that's handled by the VFS)
|
2004-12-10 00:12:02 +01:00
|
|
|
static int lookup_free(LookupInfo* li)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-08-10 17:56:04 +02:00
|
|
|
// free memory allocated for filenames
|
2004-05-06 19:14:30 +02:00
|
|
|
for(i32 i = 0; i < li->num_files; i++)
|
|
|
|
{
|
|
|
|
free((void*)li->ents[i].fn);
|
|
|
|
li->ents[i].fn = 0;
|
|
|
|
}
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
li->num_files = 0;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
delete li->idx;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
// frees both ents and fn_hashes! (they share an allocation)
|
2004-05-06 19:14:30 +02:00
|
|
|
return mem_free(li->ents);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// look up ZLoc, given filename.
|
2004-12-10 00:12:02 +01:00
|
|
|
static int lookup_get_file_info(LookupInfo* li, const char* fn, ZLoc* loc)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-08-24 19:29:54 +02:00
|
|
|
// hash (lower case!) filename
|
2004-08-11 22:21:42 +02:00
|
|
|
char lc_fn[PATH_MAX];
|
|
|
|
strcpy_lower(lc_fn, fn);
|
|
|
|
const FnHash fn_hash = fnv_hash(lc_fn);
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-11 22:21:42 +02:00
|
|
|
const FnHash* fn_hashes = li->fn_hashes;
|
2004-05-06 19:14:30 +02:00
|
|
|
const i32 num_files = li->num_files;
|
|
|
|
i32 i = li->next_file;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// early-out: check if the next entry is what we want
|
|
|
|
if(i < num_files && fn_hashes[i] == fn_hash)
|
|
|
|
goto have_idx;
|
|
|
|
|
|
|
|
// .. no - consult index
|
2004-05-06 19:14:30 +02:00
|
|
|
{
|
2004-08-24 19:29:54 +02:00
|
|
|
LookupIdxIt it = li->idx->find(fn_hash);
|
|
|
|
// not found: error
|
|
|
|
if(it == li->idx->end())
|
|
|
|
return ERR_FILE_NOT_FOUND;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
i = it->second;
|
|
|
|
assert(0 <= i && i < li->num_files);
|
2004-05-06 19:14:30 +02:00
|
|
|
}
|
2004-08-24 19:29:54 +02:00
|
|
|
|
|
|
|
have_idx:
|
|
|
|
|
|
|
|
// indicate that this is the most recent entry touched
|
2004-05-06 19:14:30 +02:00
|
|
|
li->next_file = i+1;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
*loc = li->ents[i].loc;
|
2004-05-06 19:14:30 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// successively call <cb> for each valid file in the index,
|
|
|
|
// passing the complete path and <user>.
|
|
|
|
// if it returns a nonzero value, abort and return that, otherwise 0.
|
2004-12-10 00:12:02 +01:00
|
|
|
static int lookup_enum_files(LookupInfo* li, FileCB cb, uintptr_t user)
|
2004-05-06 19:14:30 +02:00
|
|
|
{
|
2004-12-07 02:19:10 +01:00
|
|
|
struct stat s;
|
|
|
|
memset(&s, 0, sizeof(s));
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
const ZEnt* ent = li->ents;
|
|
|
|
for(i32 i = 0; i < li->num_files; i++, ent++)
|
|
|
|
{
|
2004-12-07 02:19:10 +01:00
|
|
|
s.st_mode = S_IFREG;
|
|
|
|
s.st_size = (off_t)ent->loc.ucsize;
|
|
|
|
s.st_mtime = ent->loc.mtime;
|
|
|
|
|
|
|
|
int ret = cb(ent->fn, &s, user);
|
2004-08-24 19:29:54 +02:00
|
|
|
if(ret != 0)
|
|
|
|
return ret;
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
return 0;
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
2004-08-11 22:21:42 +02:00
|
|
|
// ZArchive_*: Handle-based container for archive info
|
2004-05-06 19:14:30 +02:00
|
|
|
// owns archive file and its lookup mechanism.
|
|
|
|
//
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
|
|
struct ZArchive
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-05-06 19:14:30 +02:00
|
|
|
File f;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
LookupInfo li;
|
|
|
|
|
2004-08-11 22:21:42 +02:00
|
|
|
// problem:
|
|
|
|
// if ZArchive_reload aborts due to file_open failing, ZArchive_dtor
|
|
|
|
// is called by h_alloc, and file_close complains the File is
|
2004-08-24 19:29:54 +02:00
|
|
|
// invalid (wasn't open). this happens e.g. if vfs_mount blindly
|
2004-08-11 22:21:42 +02:00
|
|
|
// tries to open a directory as an archive.
|
|
|
|
// workaround:
|
|
|
|
// only free the above if ZArchive_reload succeeds, i.e. is_open.
|
|
|
|
// note:
|
|
|
|
// if lookup_init fails after file_open opened the file,
|
|
|
|
// we wouldn't file_close in the dtor,
|
|
|
|
// but it's taken care of by ZArchive_reload.
|
2004-05-06 19:14:30 +02:00
|
|
|
bool is_open;
|
|
|
|
};
|
|
|
|
|
2004-06-11 04:14:18 +02:00
|
|
|
H_TYPE_DEFINE(ZArchive);
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
static void ZArchive_init(ZArchive*, va_list)
|
|
|
|
{}
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
|
|
|
|
static void ZArchive_dtor(ZArchive* za)
|
|
|
|
{
|
|
|
|
if(za->is_open)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-05-06 19:14:30 +02:00
|
|
|
file_close(&za->f);
|
|
|
|
lookup_free(&za->li);
|
|
|
|
|
|
|
|
za->is_open = false;
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
2004-05-06 19:14:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
static int ZArchive_reload(ZArchive* za, const char* fn, Handle)
|
2004-05-06 19:14:30 +02:00
|
|
|
{
|
|
|
|
int err;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// open
|
2004-08-15 23:47:32 +02:00
|
|
|
err = file_open(fn, FILE_CACHE_BLOCK, &za->f);
|
2004-08-11 22:21:42 +02:00
|
|
|
if(err < 0)
|
|
|
|
// don't complain - this happens when vfs_mount blindly
|
|
|
|
// zip_archive_opens a dir.
|
2004-05-06 19:14:30 +02:00
|
|
|
return err;
|
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
// map
|
2004-05-06 19:14:30 +02:00
|
|
|
void* file;
|
|
|
|
size_t size;
|
|
|
|
err = file_map(&za->f, file, size);
|
|
|
|
if(err < 0)
|
|
|
|
goto exit_close;
|
|
|
|
|
|
|
|
err = lookup_init(&za->li, file, size);
|
|
|
|
if(err < 0)
|
|
|
|
goto exit_unmap_close;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-05-13 15:52:48 +02:00
|
|
|
file_unmap(&za->f);
|
2004-08-24 19:29:54 +02:00
|
|
|
// we map the file only for convenience when loading;
|
|
|
|
// extraction is via aio (faster, better mem use).
|
2004-05-13 15:52:48 +02:00
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
za->is_open = true;
|
2004-03-03 00:56:51 +01:00
|
|
|
return 0;
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
exit_unmap_close:
|
|
|
|
file_unmap(&za->f);
|
|
|
|
exit_close:
|
|
|
|
file_close(&za->f);
|
2004-08-11 22:21:42 +02:00
|
|
|
|
|
|
|
// don't complain here either; this happens when vfs_mount
|
|
|
|
// zip_archive_opens an invalid file that's in a mount point dir.
|
2004-05-06 19:14:30 +02:00
|
|
|
return err;
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// open and return a handle to the zip archive indicated by <fn>.
|
|
|
|
// somewhat slow - each file is added to an internal index.
|
2004-12-10 00:12:02 +01:00
|
|
|
Handle zip_archive_open(const char* fn)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
|
|
|
return h_alloc(H_ZArchive, fn);
|
|
|
|
}
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-03-03 00:56:51 +01:00
|
|
|
// close the archive <ha> and set ha to 0
|
2004-08-21 14:54:25 +02:00
|
|
|
int zip_archive_close(Handle& ha)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
|
|
|
return h_free(ha, H_ZArchive);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// successively call <cb> for each valid file in the archive <ha>,
|
|
|
|
// passing the complete path and <user>.
|
|
|
|
// if it returns a nonzero value, abort and return that, otherwise 0.
|
2004-08-11 22:21:42 +02:00
|
|
|
int zip_enum(const Handle ha, const FileCB cb, const uintptr_t user)
|
2004-05-06 19:14:30 +02:00
|
|
|
{
|
|
|
|
H_DEREF(ha, ZArchive, za);
|
|
|
|
|
|
|
|
return lookup_enum_files(&za->li, cb, user);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
2004-03-03 00:56:51 +01:00
|
|
|
//
|
2004-08-11 22:21:42 +02:00
|
|
|
// inf_*: in-memory inflate routines (zlib wrapper)
|
|
|
|
// decompresses blocks from file_io callback.
|
2004-03-03 00:56:51 +01:00
|
|
|
//
|
2004-05-06 19:14:30 +02:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
// must be dynamically allocated - need one for every open ZFile,
|
|
|
|
// and z_stream is large.
|
|
|
|
struct InfCtx
|
|
|
|
{
|
|
|
|
z_stream zs;
|
|
|
|
|
|
|
|
void* in_buf;
|
|
|
|
// 0 until inf_inflate called with free_in_buf = true.
|
|
|
|
// mem_free-d after consumed by inf_inflate, or by inf_free.
|
|
|
|
// note: necessary; can't just use next_in-total_in, because
|
|
|
|
// we may inflate in chunks.
|
|
|
|
//
|
|
|
|
// can't have this owned (i.e. allocated) by inf_, because
|
|
|
|
// there can be several IOs in-flight and therefore buffers of
|
|
|
|
// compressed data. we'd need a list if stored here; having the
|
|
|
|
// IOs store them and pass them to us is more convenient.
|
|
|
|
|
|
|
|
bool compressed;
|
|
|
|
};
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// allocate a new context.
|
2004-09-19 17:49:46 +02:00
|
|
|
static uintptr_t inf_init_ctx(bool compressed)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-05-26 21:28:42 +02:00
|
|
|
#ifdef NO_ZLIB
|
|
|
|
return 0;
|
|
|
|
#else
|
2004-05-06 19:14:30 +02:00
|
|
|
// allocate ZLib stream
|
2004-09-19 17:49:46 +02:00
|
|
|
const size_t size = round_up(sizeof(InfCtx), 32);
|
2004-07-31 13:03:17 +02:00
|
|
|
// be nice to allocator
|
2004-09-19 17:49:46 +02:00
|
|
|
InfCtx* ctx = (InfCtx*)calloc(size, 1);
|
|
|
|
if(inflateInit2(&ctx->zs, -MAX_WBITS) != Z_OK)
|
2004-05-06 19:14:30 +02:00
|
|
|
// -MAX_WBITS indicates no zlib header present
|
|
|
|
return 0;
|
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
ctx->compressed = compressed;
|
|
|
|
|
|
|
|
return (uintptr_t)ctx;
|
2004-05-26 21:28:42 +02:00
|
|
|
#endif
|
2004-05-06 19:14:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
// convenience - both inf_inflate and inf_free use this.
|
|
|
|
static void free_in_buf(InfCtx* ctx)
|
|
|
|
{
|
|
|
|
mem_free(ctx->in_buf);
|
|
|
|
ctx->in_buf = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// subsequent calls to inf_inflate will unzip into <out>.
|
|
|
|
int inf_set_dest(uintptr_t _ctx, void* out, size_t out_size)
|
2004-05-06 19:14:30 +02:00
|
|
|
{
|
2004-05-26 21:28:42 +02:00
|
|
|
#ifdef NO_ZLIB
|
|
|
|
return -1;
|
|
|
|
#else
|
2004-09-19 17:49:46 +02:00
|
|
|
InfCtx* ctx = (InfCtx*)_ctx;
|
|
|
|
z_stream* zs = &ctx->zs;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
if(zs->next_out || zs->avail_out)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-08-16 15:20:53 +02:00
|
|
|
debug_warn("zip_set_dest: ctx already in use!");
|
2004-05-06 19:14:30 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-09-19 17:49:46 +02:00
|
|
|
zs->next_out = (Byte*)out;
|
|
|
|
zs->avail_out = (uInt)out_size;
|
2004-05-06 19:14:30 +02:00
|
|
|
return 0;
|
2004-05-26 21:28:42 +02:00
|
|
|
#endif
|
2004-05-06 19:14:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
// unzip into output buffer. returns bytes written
|
|
|
|
// (may be 0, if not enough data is passed in), or < 0 on error.
|
2004-09-19 17:49:46 +02:00
|
|
|
ssize_t inf_inflate(uintptr_t _ctx, void* in, size_t in_size, bool free_in_buf = false)
|
2004-05-06 19:14:30 +02:00
|
|
|
{
|
2004-05-26 21:28:42 +02:00
|
|
|
#ifdef NO_ZLIB
|
|
|
|
return -1;
|
|
|
|
#else
|
2004-09-19 17:49:46 +02:00
|
|
|
InfCtx* ctx = (InfCtx*)_ctx;
|
|
|
|
z_stream* zs = &ctx->zs;
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
size_t prev_avail_out = zs->avail_out;
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
if(in)
|
|
|
|
{
|
|
|
|
if(zs->avail_in || ctx->in_buf)
|
|
|
|
debug_warn("inf_inflate: previous input buffer not empty");
|
|
|
|
zs->avail_in = (uInt)in_size;
|
|
|
|
zs->next_in = (Byte*)in;
|
|
|
|
|
|
|
|
if(free_in_buf)
|
|
|
|
ctx->in_buf = in;
|
|
|
|
}
|
2004-08-18 04:11:50 +02:00
|
|
|
|
|
|
|
int err = 0;
|
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
if(ctx->compressed)
|
|
|
|
err = inflate(zs, Z_SYNC_FLUSH);
|
2004-08-18 04:11:50 +02:00
|
|
|
else
|
|
|
|
{
|
2004-09-19 17:49:46 +02:00
|
|
|
memcpy(zs->next_out, zs->next_in, zs->avail_in);
|
|
|
|
uInt size = zs->avail_in;
|
|
|
|
zs->avail_out -= size;
|
|
|
|
zs->avail_in -= size; // => = 0
|
|
|
|
zs->next_in += size;
|
|
|
|
zs->next_out += size;
|
|
|
|
zs->total_in += size;
|
|
|
|
zs->total_out += size;
|
2004-08-18 04:11:50 +02:00
|
|
|
}
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
// check+return how much actual data was read
|
2004-08-10 17:56:04 +02:00
|
|
|
//
|
|
|
|
// note: zlib may not always output data, e.g. if passed very little
|
|
|
|
// data in one block (due to misalignment). return 0 ("no data output"),
|
|
|
|
// which doesn't abort the read.
|
2004-09-19 17:49:46 +02:00
|
|
|
size_t avail_out = zs->avail_out;
|
2004-05-06 19:14:30 +02:00
|
|
|
assert(avail_out <= prev_avail_out);
|
|
|
|
// make sure output buffer size didn't magically increase
|
|
|
|
ssize_t nread = (ssize_t)(prev_avail_out - avail_out);
|
|
|
|
if(!nread)
|
|
|
|
return (err < 0)? err : 0;
|
|
|
|
// try to pass along the ZLib error code, but make sure
|
2004-08-10 17:56:04 +02:00
|
|
|
// it isn't treated as 'bytes output', i.e. > 0.
|
2004-05-06 19:14:30 +02:00
|
|
|
|
|
|
|
return nread;
|
2004-05-26 21:28:42 +02:00
|
|
|
#endif
|
2004-05-06 19:14:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// free the given context.
|
2004-09-19 17:49:46 +02:00
|
|
|
int inf_free_ctx(uintptr_t _ctx)
|
2004-05-06 19:14:30 +02:00
|
|
|
{
|
2004-05-26 21:28:42 +02:00
|
|
|
#ifdef NO_ZLIB
|
|
|
|
return -1;
|
|
|
|
#else
|
2004-09-19 17:49:46 +02:00
|
|
|
InfCtx* ctx = (InfCtx*)_ctx;
|
|
|
|
z_stream* zs = &ctx->zs;
|
|
|
|
|
|
|
|
free_in_buf(ctx);
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
// can have both input or output data remaining
|
|
|
|
// (if not all data in uncompressed stream was needed)
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
inflateEnd(zs);
|
|
|
|
free(ctx);
|
2004-03-03 00:56:51 +01:00
|
|
|
return 0;
|
2004-05-26 21:28:42 +02:00
|
|
|
#endif
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
2004-08-11 22:21:42 +02:00
|
|
|
// zip_*: file from Zip archive
|
|
|
|
// uses lookup to get file information; holds inflate state.
|
2004-05-06 19:14:30 +02:00
|
|
|
//
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
2004-06-03 02:17:24 +02:00
|
|
|
enum ZFileFlags
|
|
|
|
{
|
|
|
|
// the ZFile has been successfully zip_map-ped.
|
2004-08-11 22:21:42 +02:00
|
|
|
// used to make sure the archive's mmap refcount remains balanced,
|
|
|
|
// i.e. no one double-frees the mapping.
|
2004-06-03 02:17:24 +02:00
|
|
|
ZF_HAS_MAPPING = 0x4000
|
|
|
|
};
|
|
|
|
|
2004-03-03 00:56:51 +01:00
|
|
|
// marker for ZFile struct, to make sure it's valid
|
2004-06-03 02:17:24 +02:00
|
|
|
#ifdef PARANOIA
|
2004-03-03 00:56:51 +01:00
|
|
|
static const u32 ZFILE_MAGIC = FOURCC('Z','F','I','L');
|
2004-06-03 02:17:24 +02:00
|
|
|
#endif
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// return 0 <==> ZFile seems valid
|
2004-03-03 00:56:51 +01:00
|
|
|
static int zfile_validate(uint line, ZFile* zf)
|
|
|
|
{
|
|
|
|
const char* msg = "";
|
|
|
|
int err = -1;
|
|
|
|
|
|
|
|
if(!zf)
|
|
|
|
{
|
|
|
|
msg = "ZFile* parameter = 0";
|
|
|
|
err = ERR_INVALID_PARAM;
|
|
|
|
}
|
|
|
|
#ifdef PARANOIA
|
2004-03-05 17:23:31 +01:00
|
|
|
else if(zf->magic != ZFILE_MAGIC)
|
2004-03-03 00:56:51 +01:00
|
|
|
msg = "ZFile corrupted (magic field incorrect)";
|
|
|
|
#endif
|
|
|
|
#ifndef NDEBUG
|
2004-09-19 17:49:46 +02:00
|
|
|
// else if(!h_user_data(zf->ha, H_ZArchive))
|
|
|
|
// msg = "invalid archive handle";
|
|
|
|
// disabled: happens at shutdown because handles are freed out-of order;
|
|
|
|
// archive is freed before its files, making its Handle invalid
|
2004-03-03 00:56:51 +01:00
|
|
|
#endif
|
|
|
|
else if(!zf->ucsize)
|
|
|
|
msg = "ucsize = 0";
|
2004-08-11 22:21:42 +02:00
|
|
|
else if(!zf->inf_ctx)
|
2004-03-03 00:56:51 +01:00
|
|
|
msg = "read context invalid";
|
|
|
|
// everything is OK
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
// failed somewhere - err is the error code,
|
|
|
|
// or -1 if not set specifically above.
|
|
|
|
debug_out("zfile_validate at line %d failed: %s\n", line, msg);
|
2004-05-08 03:11:51 +02:00
|
|
|
debug_warn("zfile_validate failed");
|
2004-03-03 00:56:51 +01:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define CHECK_ZFILE(f)\
|
|
|
|
do\
|
|
|
|
{\
|
|
|
|
int err = zfile_validate(__LINE__, f);\
|
|
|
|
if(err < 0)\
|
|
|
|
return err;\
|
|
|
|
}\
|
|
|
|
while(0);
|
|
|
|
|
|
|
|
|
2004-08-11 22:21:42 +02:00
|
|
|
// convenience function, allows implementation change in ZFile.
|
|
|
|
// note that size == ucsize isn't foolproof, and adding a flag to
|
|
|
|
// ofs or size is ugly and error-prone.
|
|
|
|
// no error checking - always called from functions that check zf.
|
|
|
|
static inline bool zfile_compressed(ZFile* zf)
|
|
|
|
{
|
|
|
|
return zf->csize != 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-11-08 00:00:32 +01:00
|
|
|
// get file status (size, mtime). output param is zeroed on error.
|
2004-08-11 22:21:42 +02:00
|
|
|
int zip_stat(Handle ha, const char* fn, struct stat* s)
|
|
|
|
{
|
|
|
|
// zero output param in case we fail below.
|
|
|
|
memset(s, 0, sizeof(struct stat));
|
|
|
|
|
|
|
|
H_DEREF(ha, ZArchive, za);
|
|
|
|
LookupInfo* li = &za->li;
|
|
|
|
|
|
|
|
ZLoc loc;
|
|
|
|
CHECK_ERR(lookup_get_file_info(li, fn, &loc));
|
|
|
|
|
2004-11-08 00:00:32 +01:00
|
|
|
s->st_size = loc.ucsize;
|
|
|
|
s->st_mtime = loc.mtime;
|
2004-08-11 22:21:42 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// open file, and fill *zf with information about it.
|
|
|
|
// return < 0 on error (output param zeroed).
|
2004-08-10 17:56:04 +02:00
|
|
|
int zip_open(const Handle ha, const char* fn, ZFile* zf)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-08-10 17:56:04 +02:00
|
|
|
// zero output param in case we fail below.
|
2004-03-03 00:56:51 +01:00
|
|
|
memset(zf, 0, sizeof(ZFile));
|
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
H_DEREF(ha, ZArchive, za);
|
|
|
|
LookupInfo* li = (LookupInfo*)&za->li;
|
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
ZLoc loc;
|
|
|
|
// don't want ZFile to contain a ZEnt struct -
|
2004-05-06 19:14:30 +02:00
|
|
|
// its ucsize member must be 'loose' for compatibility with File.
|
2004-08-10 17:56:04 +02:00
|
|
|
// => need to copy ZEnt fields into ZFile.
|
|
|
|
CHECK_ERR(lookup_get_file_info(li, fn, &loc));
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
#ifdef PARANOIA
|
2004-05-06 19:14:30 +02:00
|
|
|
zf->magic = ZFILE_MAGIC;
|
2004-03-03 00:56:51 +01:00
|
|
|
#endif
|
|
|
|
|
2004-08-10 17:56:04 +02:00
|
|
|
zf->ucsize = loc.ucsize;
|
|
|
|
zf->ofs = loc.ofs;
|
|
|
|
zf->csize = loc.csize;
|
2004-05-06 19:14:30 +02:00
|
|
|
|
2004-03-03 00:56:51 +01:00
|
|
|
zf->ha = ha;
|
2004-09-19 17:49:46 +02:00
|
|
|
zf->inf_ctx = inf_init_ctx(zfile_compressed(zf));
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-07-31 13:03:17 +02:00
|
|
|
CHECK_ZFILE(zf);
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// close file.
|
2004-03-03 00:56:51 +01:00
|
|
|
int zip_close(ZFile* zf)
|
|
|
|
{
|
2004-07-31 13:03:17 +02:00
|
|
|
CHECK_ZFILE(zf);
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-05-06 19:14:30 +02:00
|
|
|
// remaining ZFile fields don't need to be freed/cleared
|
2004-08-11 22:21:42 +02:00
|
|
|
return inf_free_ctx(zf->inf_ctx);
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-07-31 13:03:17 +02:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
2004-08-11 22:21:42 +02:00
|
|
|
// sync and async I/O
|
|
|
|
// uses file_* and inf_*.
|
2004-07-31 13:03:17 +02:00
|
|
|
//
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// rationale for not supporting aio for compressed files:
|
|
|
|
// would complicate things considerably (could no longer just
|
|
|
|
// return the file I/O context, since we have to decompress in wait_io),
|
|
|
|
// yet it isn't really useful - the main application is streaming music,
|
|
|
|
// which is already compressed.
|
|
|
|
|
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
static const size_t CHUNK_SIZE = 16*KB;
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
// begin transferring <size> bytes, starting at <ofs>. get result
|
|
|
|
// with zip_wait_io; when no longer needed, free via zip_discard_io.
|
2004-12-10 00:12:02 +01:00
|
|
|
int zip_start_io(ZFile* zf, off_t user_ofs, size_t max_output_size, void* user_buf, ZipIO* io)
|
2004-08-24 19:29:54 +02:00
|
|
|
{
|
2004-09-19 17:49:46 +02:00
|
|
|
// not needed, since ZFile tells us the last read offset in the file.
|
|
|
|
UNUSED(user_ofs);
|
|
|
|
|
|
|
|
// zero output param in case we fail below.
|
|
|
|
memset(io, 0, sizeof(ZipIO));
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
CHECK_ZFILE(zf);
|
2004-09-19 17:49:46 +02:00
|
|
|
H_DEREF(zf->ha, ZArchive, za);
|
|
|
|
|
|
|
|
// transfer params that differ if compressed
|
|
|
|
size_t size = max_output_size;
|
|
|
|
void* buf = user_buf;
|
|
|
|
|
|
|
|
const off_t ofs = zf->ofs + zf->last_read_ofs;
|
|
|
|
// needed before align check below
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
if(zfile_compressed(zf))
|
|
|
|
{
|
2004-09-19 17:49:46 +02:00
|
|
|
io->inf_ctx = zf->inf_ctx;
|
|
|
|
io->max_output_size = max_output_size;
|
|
|
|
io->user_buf = user_buf;
|
|
|
|
|
|
|
|
// if there's anything left in the inf_ctx buffer, return that.
|
|
|
|
// required! if data remaining in buffer expands to fill max output,
|
|
|
|
// we must not read more cdata - nowhere to store it.
|
|
|
|
CHECK_ERR(inf_set_dest(io->inf_ctx, io->user_buf, io->max_output_size));
|
|
|
|
ssize_t bytes_inflated = inf_inflate(io->inf_ctx, 0, 0);
|
|
|
|
CHECK_ERR(bytes_inflated);
|
|
|
|
if(bytes_inflated == max_output_size)
|
|
|
|
{
|
|
|
|
io->already_inflated = true;
|
|
|
|
io->max_output_size = bytes_inflated;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// read up to next chunk (so that the next read is aligned -
|
|
|
|
// less work for aio) or up to EOF.
|
|
|
|
const ssize_t left_in_chunk = CHUNK_SIZE - (ofs % CHUNK_SIZE);
|
|
|
|
const ssize_t left_in_file = zf->csize - ofs;
|
|
|
|
size = MIN(left_in_chunk, left_in_file);
|
|
|
|
|
|
|
|
// note: only need to clamp if compressed
|
|
|
|
|
|
|
|
buf = mem_alloc(size, 4*KB);
|
2004-08-24 19:29:54 +02:00
|
|
|
}
|
2004-09-19 17:49:46 +02:00
|
|
|
// else: not compressed; we'll just read directly from the archive file.
|
|
|
|
// no need to clamp to EOF - that's done already by the VFS.
|
2004-08-24 19:29:54 +02:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
zf->last_read_ofs += (off_t)size;
|
|
|
|
|
|
|
|
CHECK_ERR(file_start_io(&za->f, ofs, size, buf, &io->io));
|
|
|
|
|
|
|
|
return 0;
|
2004-08-24 19:29:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// indicates if the IO referenced by <io> has completed.
|
|
|
|
// return value: 0 if pending, 1 if complete, < 0 on error.
|
2004-09-22 17:20:58 +02:00
|
|
|
int zip_io_complete(ZipIO* io)
|
2004-08-24 19:29:54 +02:00
|
|
|
{
|
2004-09-19 17:49:46 +02:00
|
|
|
if(io->already_inflated)
|
|
|
|
return 1;
|
|
|
|
return file_io_complete(&io->io);
|
2004-08-24 19:29:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// wait until the transfer <io> completes, and return its buffer.
|
|
|
|
// output parameters are zeroed on error.
|
2004-09-22 17:20:58 +02:00
|
|
|
int zip_wait_io(ZipIO* io, void*& buf, size_t& size)
|
2004-08-24 19:29:54 +02:00
|
|
|
{
|
2004-09-19 17:49:46 +02:00
|
|
|
buf = io->user_buf;
|
|
|
|
size = io->max_output_size;
|
|
|
|
if(io->already_inflated)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
void* raw_buf;
|
|
|
|
size_t raw_size;
|
|
|
|
CHECK_ERR(file_wait_io(&io->io, raw_buf, raw_size));
|
|
|
|
|
|
|
|
if(io->inf_ctx)
|
|
|
|
{
|
|
|
|
inf_set_dest(io->inf_ctx, buf, size);
|
|
|
|
ssize_t bytes_inflated = inf_inflate(io->inf_ctx, raw_buf, raw_size, true);
|
|
|
|
// true: we allocated the compressed data input buffer, and
|
|
|
|
// want it freed when it's consumed.
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
buf = raw_buf;
|
|
|
|
size = raw_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2004-08-24 19:29:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// finished with transfer <io> - free its buffer (returned by zip_wait_io)
|
2004-09-22 17:20:58 +02:00
|
|
|
int zip_discard_io(ZipIO* io)
|
2004-08-24 19:29:54 +02:00
|
|
|
{
|
2004-09-19 17:49:46 +02:00
|
|
|
if(io->already_inflated)
|
|
|
|
return 0;
|
|
|
|
return file_discard_io(&io->io);
|
2004-08-24 19:29:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// allow user-specified callbacks: "chain" them, because file_io's
|
|
|
|
// callback mechanism is already used to return blocks.
|
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
struct CBParams
|
2004-08-12 17:51:31 +02:00
|
|
|
{
|
|
|
|
uintptr_t inf_ctx;
|
|
|
|
|
|
|
|
FileIOCB user_cb;
|
|
|
|
uintptr_t user_ctx;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
static ssize_t read_cb(uintptr_t ctx, void* buf, size_t size)
|
2004-08-12 17:51:31 +02:00
|
|
|
{
|
2004-09-19 17:49:46 +02:00
|
|
|
CBParams* p = (CBParams*)ctx;
|
2004-08-12 17:51:31 +02:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
ssize_t ucsize = inf_inflate(p->inf_ctx, buf, size);
|
2004-08-12 17:51:31 +02:00
|
|
|
|
|
|
|
if(p->user_cb)
|
2004-08-27 02:33:20 +02:00
|
|
|
{
|
|
|
|
ssize_t user_ret = p->user_cb(p->user_ctx, buf, size);
|
|
|
|
// only pass on error codes - we need to return number of actual
|
|
|
|
// bytes inflated to file_io in the normal case.
|
|
|
|
if(user_ret < 0)
|
|
|
|
return user_ret;
|
|
|
|
}
|
2004-08-12 17:51:31 +02:00
|
|
|
|
2004-08-27 02:33:20 +02:00
|
|
|
return ucsize;
|
2004-08-12 17:51:31 +02:00
|
|
|
}
|
|
|
|
|
2004-08-18 04:11:50 +02:00
|
|
|
#include "timer.h"
|
2004-08-12 17:51:31 +02:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
|
|
|
|
|
2004-08-27 02:33:20 +02:00
|
|
|
// read from the (possibly compressed) file <zf> as if it were a normal file.
|
|
|
|
// starting at the beginning of the logical (decompressed) file,
|
|
|
|
// skip <ofs> bytes of data; read the next <size> bytes into <buf>.
|
|
|
|
//
|
|
|
|
// if non-NULL, <cb> is called for each block read, passing <ctx>.
|
|
|
|
// if it returns a negative error code,
|
|
|
|
// the read is aborted and that value is returned.
|
|
|
|
// the callback mechanism is useful for user progress notification or
|
|
|
|
// processing data while waiting for the next I/O to complete
|
|
|
|
// (quasi-parallel, without the complexity of threads).
|
|
|
|
//
|
|
|
|
// return bytes read, or a negative error code.
|
|
|
|
ssize_t zip_read(ZFile* zf, off_t ofs, size_t size, void* p, FileIOCB cb, uintptr_t ctx)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-07-31 13:03:17 +02:00
|
|
|
CHECK_ZFILE(zf);
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-18 04:11:50 +02:00
|
|
|
const bool compressed = zfile_compressed(zf);
|
|
|
|
|
2004-03-03 00:56:51 +01:00
|
|
|
ZArchive* za = H_USER_DATA(zf->ha, ZArchive);
|
|
|
|
if(!za)
|
|
|
|
return ERR_INVALID_HANDLE;
|
|
|
|
|
2004-08-27 02:33:20 +02:00
|
|
|
ofs += zf->ofs;
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
// pump all previous cdata out of inflate context
|
|
|
|
// if that satisfied the request, we're done
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-03-03 00:56:51 +01:00
|
|
|
// not compressed - just pass it on to file_io
|
|
|
|
// (avoid the Zip inflate start/finish stuff below)
|
2004-08-18 04:11:50 +02:00
|
|
|
// if(!compressed)
|
2004-08-27 02:33:20 +02:00
|
|
|
// return file_io(&za->f, ofs, csize, p);
|
2004-08-24 19:29:54 +02:00
|
|
|
// no need to set last_raw_ofs - only checked if compressed.
|
2004-03-03 00:56:51 +01:00
|
|
|
|
|
|
|
// compressed
|
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
CHECK_ERR(inf_set_dest(zf->inf_ctx, p, size));
|
2004-08-10 17:56:04 +02:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
/*
|
|
|
|
static bool once = false;
|
|
|
|
if(!once)
|
2004-05-06 19:14:30 +02:00
|
|
|
{
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-24 19:29:54 +02:00
|
|
|
once=true;
|
|
|
|
uintptr_t xctx = inf_init_ctx();
|
|
|
|
size_t xsize = za->f.size;
|
|
|
|
void* xbuf=mem_alloc(xsize, 65536);
|
|
|
|
inf_set_dest(xctx, xbuf, xsize);
|
|
|
|
const IOCBParams xparams = { xctx, false, 0, 0 };
|
|
|
|
double t1 = get_time();
|
|
|
|
file_io(&za->f,0, xsize, 0, io_cb, (uintptr_t)&xparams);
|
|
|
|
double t2 = get_time();
|
|
|
|
debug_out("\n\ntime to load whole archive %f\nthroughput %f MB/s\n", t2-t1, xsize / (t2-t1) / 1e6);
|
|
|
|
mem_free(xbuf);
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
2004-08-24 19:29:54 +02:00
|
|
|
*/
|
2004-08-18 04:11:50 +02:00
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
const CBParams params = { zf->inf_ctx, cb, ctx };
|
2004-08-12 17:51:31 +02:00
|
|
|
|
2004-08-27 02:33:20 +02:00
|
|
|
// HACK: shouldn't read the whole thing into mem
|
|
|
|
size_t csize = zf->csize;
|
|
|
|
if(!csize)
|
|
|
|
csize = zf->ucsize; // HACK on HACK: csize = 0 if file not compressed
|
2004-08-18 04:11:50 +02:00
|
|
|
|
|
|
|
|
2004-09-19 17:49:46 +02:00
|
|
|
ssize_t uc_transferred = file_io(&za->f, ofs, csize, (void**)0, read_cb, (uintptr_t)¶ms);
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-08-27 02:33:20 +02:00
|
|
|
zf->last_read_ofs += (off_t)csize;
|
2004-06-03 15:57:36 +02:00
|
|
|
|
2004-08-27 02:33:20 +02:00
|
|
|
return uc_transferred;
|
2004-08-11 22:21:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-07-31 13:03:17 +02:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
|
|
|
// file mapping
|
|
|
|
//
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
2004-06-03 02:17:24 +02:00
|
|
|
// map the entire file <zf> into memory. mapping compressed files
|
|
|
|
// isn't allowed, since the compression algorithm is unspecified.
|
|
|
|
// output parameters are zeroed on failure.
|
|
|
|
//
|
|
|
|
// the mapping will be removed (if still open) when its file is closed.
|
|
|
|
// however, map/unmap calls should still be paired so that the mapping
|
|
|
|
// may be removed when no longer needed.
|
2004-12-10 00:12:02 +01:00
|
|
|
int zip_map(ZFile* zf, void*& p, size_t& size)
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-06-03 02:17:24 +02:00
|
|
|
p = 0;
|
|
|
|
size = 0;
|
|
|
|
|
2004-07-31 13:03:17 +02:00
|
|
|
CHECK_ZFILE(zf);
|
2004-03-03 00:56:51 +01:00
|
|
|
|
2004-06-03 02:17:24 +02:00
|
|
|
// mapping compressed files doesn't make sense because the
|
|
|
|
// compression algorithm is unspecified - disallow it.
|
2004-08-11 22:21:42 +02:00
|
|
|
if(zfile_compressed(zf))
|
2004-03-03 00:56:51 +01:00
|
|
|
{
|
2004-06-03 02:17:24 +02:00
|
|
|
debug_warn("zip_map: file is compressed");
|
2004-03-03 00:56:51 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-08-11 22:21:42 +02:00
|
|
|
// note: we mapped the archive in zip_archive_open, but unmapped it
|
|
|
|
// in the meantime to save memory in case it wasn't going to be mapped.
|
|
|
|
// now we do so again; it's unmapped in zip_unmap (refcounted).
|
|
|
|
H_DEREF(zf->ha, ZArchive, za);
|
|
|
|
void* archive_p;
|
|
|
|
size_t archive_size;
|
|
|
|
CHECK_ERR(file_map(&za->f, archive_p, archive_size));
|
|
|
|
|
|
|
|
p = (char*)archive_p + zf->ofs;
|
|
|
|
size = zf->ucsize;
|
2004-06-02 22:41:05 +02:00
|
|
|
|
2004-06-03 02:17:24 +02:00
|
|
|
zf->flags |= ZF_HAS_MAPPING;
|
|
|
|
return 0;
|
2004-03-03 00:56:51 +01:00
|
|
|
}
|
2004-06-02 22:41:05 +02:00
|
|
|
|
|
|
|
|
2004-06-03 02:17:24 +02:00
|
|
|
// remove the mapping of file <zf>; fail if not mapped.
|
|
|
|
//
|
|
|
|
// the mapping will be removed (if still open) when its archive is closed.
|
|
|
|
// however, map/unmap calls should be paired so that the archive mapping
|
|
|
|
// may be removed when no longer needed.
|
2004-12-10 00:12:02 +01:00
|
|
|
int zip_unmap(ZFile* zf)
|
2004-06-02 22:41:05 +02:00
|
|
|
{
|
2004-07-31 13:03:17 +02:00
|
|
|
CHECK_ZFILE(zf);
|
2004-06-03 02:17:24 +02:00
|
|
|
|
|
|
|
// make sure archive mapping refcount remains balanced:
|
2004-08-24 19:29:54 +02:00
|
|
|
// don't allow multiple|"false" unmaps.
|
2004-06-03 02:17:24 +02:00
|
|
|
if(!(zf->flags & ZF_HAS_MAPPING))
|
|
|
|
return -1;
|
|
|
|
zf->flags &= ~ZF_HAS_MAPPING;
|
|
|
|
|
2004-07-31 13:03:17 +02:00
|
|
|
H_DEREF(zf->ha, ZArchive, za);
|
2004-08-11 22:21:42 +02:00
|
|
|
return file_unmap(&za->f);
|
2004-06-03 15:57:36 +02:00
|
|
|
}
|