summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2016-02-10 23:19:30 +0100
committerAndrew Branson <andrew.branson@cern.ch>2016-02-10 23:19:30 +0100
commit800bcd232186a71c90782ee002d6072aab257f28 (patch)
tree423b819c0aead40b4e08cc2c229cd612a375c487
parentb3f9fcecdcf5f73ac902d76b95739b76e6bfcba1 (diff)
Remove static Quazip
-rw-r--r--daemon/daemon.pro6
-rw-r--r--daemon/quazip/CMakeLists.txt23
-rw-r--r--daemon/quazip/JlCompress.cpp522
-rw-r--r--daemon/quazip/JlCompress.h139
-rw-r--r--daemon/quazip/crypt.h135
-rw-r--r--daemon/quazip/debian/libquazip0.symbols163
-rw-r--r--daemon/quazip/doc/faq.dox45
-rw-r--r--daemon/quazip/doc/index.dox177
-rw-r--r--daemon/quazip/doc/usage.dox77
-rw-r--r--daemon/quazip/ioapi.h207
-rw-r--r--daemon/quazip/qioapi.cpp361
-rw-r--r--daemon/quazip/quaadler32.cpp53
-rw-r--r--daemon/quazip/quaadler32.h54
-rw-r--r--daemon/quazip/quachecksum32.h78
-rw-r--r--daemon/quazip/quacrc32.cpp52
-rw-r--r--daemon/quazip/quacrc32.h50
-rw-r--r--daemon/quazip/quagzipfile.cpp172
-rw-r--r--daemon/quazip/quagzipfile.h108
-rw-r--r--daemon/quazip/quaziodevice.cpp320
-rw-r--r--daemon/quazip/quaziodevice.h98
-rw-r--r--daemon/quazip/quazip.cpp788
-rw-r--r--daemon/quazip/quazip.h571
-rw-r--r--daemon/quazip/quazip.pri33
-rw-r--r--daemon/quazip/quazip.pro81
-rw-r--r--daemon/quazip/quazip.sln20
-rw-r--r--daemon/quazip/quazip.vcproj314
-rw-r--r--daemon/quazip/quazip.vcxproj121
-rw-r--r--daemon/quazip/quazip.vcxproj.filters117
-rw-r--r--daemon/quazip/quazip_global.h59
-rw-r--r--daemon/quazip/quazipdir.cpp567
-rw-r--r--daemon/quazip/quazipdir.h223
-rw-r--r--daemon/quazip/quazipfile.cpp502
-rw-r--r--daemon/quazip/quazipfile.h456
-rw-r--r--daemon/quazip/quazipfileinfo.cpp176
-rw-r--r--daemon/quazip/quazipfileinfo.h172
-rw-r--r--daemon/quazip/quazipnewinfo.cpp277
-rw-r--r--daemon/quazip/quazipnewinfo.h207
-rw-r--r--daemon/quazip/run_moc.bat3
-rw-r--r--daemon/quazip/unzip.c2155
-rw-r--r--daemon/quazip/unzip.h458
-rw-r--r--daemon/quazip/zip.c2103
-rw-r--r--daemon/quazip/zip.h390
-rw-r--r--rpm/pebble.spec1
-rw-r--r--rpm/pebble.yaml79
44 files changed, 43 insertions, 12670 deletions
diff --git a/daemon/daemon.pro b/daemon/daemon.pro
index 9bdc643..47be329 100644
--- a/daemon/daemon.pro
+++ b/daemon/daemon.pro
@@ -5,6 +5,7 @@ CONFIG += link_pkgconfig
QT += core gui qml bluetooth dbus contacts positioning
PKGCONFIG += mlite5 icu-i18n zlib
+LIBS += -lquazip
CONFIG += c++11
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
@@ -55,9 +56,6 @@ DBUS_ADAPTORS += ../org.pebbled.Watch.xml
OTHER_FILES += js/typedarray.js
-DEFINES += QUAZIP_STATIC
-include(quazip/quazip.pri)
-
INSTALLS += target systemd js
target.path = /usr/bin
@@ -69,4 +67,4 @@ js.files = js/*
js.path = /usr/share/pebble/js
# unnecesary includes, just so QtCreator could find headers... :-(
-INCLUDEPATH += $$[QT_HOST_PREFIX]/include/mlite5
+INCLUDEPATH += $$[QT_HOST_PREFIX]/include/mlite5 $$[QT_HOST_PREFIX]/include/quazip
diff --git a/daemon/quazip/CMakeLists.txt b/daemon/quazip/CMakeLists.txt
deleted file mode 100644
index dcb1cde..0000000
--- a/daemon/quazip/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# set all include directories for in and out of source builds
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${ZLIB_INCLUDE_DIRS}
-)
-
-file(GLOB SRCS "*.c" "*.cpp")
-file(GLOB PUBLIC_HEADERS "*.h")
-
-# Must be added to enable export macro
-ADD_DEFINITIONS(-DQUAZIP_BUILD)
-
-qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
-set(SRCS ${SRCS} ${MOC_SRCS})
-
-add_library(quazip SHARED ${SRCS})
-set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1)
-# Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
-target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES})
-
-install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip)
-install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
diff --git a/daemon/quazip/JlCompress.cpp b/daemon/quazip/JlCompress.cpp
deleted file mode 100644
index 4be77b6..0000000
--- a/daemon/quazip/JlCompress.cpp
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
-Copyright (C) 2010 Roberto Pompermaier
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include "JlCompress.h"
-#include <QDebug>
-
-static bool copyData(QIODevice &inFile, QIODevice &outFile)
-{
- while (!inFile.atEnd()) {
- char buf[4096];
- qint64 readLen = inFile.read(buf, 4096);
- if (readLen <= 0)
- return false;
- if (outFile.write(buf, readLen) != readLen)
- return false;
- }
- return true;
-}
-
-/**OK
- * Comprime il file fileName, nell'oggetto zip, con il nome fileDest.
- *
- * La funzione fallisce se:
- * * zip==NULL;
- * * l'oggetto zip e stato aperto in una modalita non compatibile con l'aggiunta di file;
- * * non e possibile aprire il file d'origine;
- * * non e possibile creare il file all'interno dell'oggetto zip;
- * * si e rilevato un errore nella copia dei dati;
- * * non e stato possibile chiudere il file all'interno dell'oggetto zip;
- */
-bool JlCompress::compressFile(QuaZip* zip, QString fileName, QString fileDest) {
- // zip: oggetto dove aggiungere il file
- // fileName: nome del file reale
- // fileDest: nome del file all'interno del file compresso
-
- // Controllo l'apertura dello zip
- if (!zip) return false;
- if (zip->getMode()!=QuaZip::mdCreate &&
- zip->getMode()!=QuaZip::mdAppend &&
- zip->getMode()!=QuaZip::mdAdd) return false;
-
- // Apro il file originale
- QFile inFile;
- inFile.setFileName(fileName);
- if(!inFile.open(QIODevice::ReadOnly)) return false;
-
- // Apro il file risulato
- QuaZipFile outFile(zip);
- if(!outFile.open(QIODevice::WriteOnly, QuaZipNewInfo(fileDest, inFile.fileName()))) return false;
-
- // Copio i dati
- if (!copyData(inFile, outFile) || outFile.getZipError()!=UNZ_OK) {
- return false;
- }
-
- // Chiudo i file
- outFile.close();
- if (outFile.getZipError()!=UNZ_OK) return false;
- inFile.close();
-
- return true;
-}
-
-/**OK
- * Comprime la cartella dir nel file fileCompressed, se recursive e true allora
- * comprime anche le sotto cartelle. I nomi dei file preceduti dal path creato
- * togliendo il pat della cartella origDir al path della cartella dir.
- * Se la funzione fallisce restituisce false e cancella il file che si e tentato
- * di creare.
- *
- * La funzione fallisce se:
- * * zip==NULL;
- * * l'oggetto zip e stato aperto in una modalita non compatibile con l'aggiunta di file;
- * * la cartella dir non esiste;
- * * la compressione di una sotto cartella fallisce (1);
- * * la compressione di un file fallisce;
- * (1) La funzione si richiama in maniera ricorsiva per comprimere le sotto cartelle
- * dunque gli errori di compressione di una sotto cartella sono gli stessi di questa
- * funzione.
- */
-bool JlCompress::compressSubDir(QuaZip* zip, QString dir, QString origDir, bool recursive) {
- // zip: oggetto dove aggiungere il file
- // dir: cartella reale corrente
- // origDir: cartella reale originale
- // (path(dir)-path(origDir)) = path interno all'oggetto zip
-
- // Controllo l'apertura dello zip
- if (!zip) return false;
- if (zip->getMode()!=QuaZip::mdCreate &&
- zip->getMode()!=QuaZip::mdAppend &&
- zip->getMode()!=QuaZip::mdAdd) return false;
-
- // Controllo la cartella
- QDir directory(dir);
- if (!directory.exists()) return false;
-
- QDir origDirectory(origDir);
- if (dir != origDir) {
- QuaZipFile dirZipFile(zip);
- if (!dirZipFile.open(QIODevice::WriteOnly,
- QuaZipNewInfo(origDirectory.relativeFilePath(dir) + "/", dir), 0, 0, 0)) {
- return false;
- }
- dirZipFile.close();
- }
-
-
- // Se comprimo anche le sotto cartelle
- if (recursive) {
- // Per ogni sotto cartella
- QFileInfoList files = directory.entryInfoList(QDir::AllDirs|QDir::NoDotAndDotDot);
- Q_FOREACH (QFileInfo file, files) {
- // Comprimo la sotto cartella
- if(!compressSubDir(zip,file.absoluteFilePath(),origDir,recursive)) return false;
- }
- }
-
- // Per ogni file nella cartella
- QFileInfoList files = directory.entryInfoList(QDir::Files);
- Q_FOREACH (QFileInfo file, files) {
- // Se non e un file o e il file compresso che sto creando
- if(!file.isFile()||file.absoluteFilePath()==zip->getZipName()) continue;
-
- // Creo il nome relativo da usare all'interno del file compresso
- QString filename = origDirectory.relativeFilePath(file.absoluteFilePath());
-
- // Comprimo il file
- if (!compressFile(zip,file.absoluteFilePath(),filename)) return false;
- }
-
- return true;
-}
-
-/**OK
- * Estrae il file fileName, contenuto nell'oggetto zip, con il nome fileDest.
- * Se la funzione fallisce restituisce false e cancella il file che si e tentato di estrarre.
- *
- * La funzione fallisce se:
- * * zip==NULL;
- * * l'oggetto zip e stato aperto in una modalita non compatibile con l'estrazione di file;
- * * non e possibile aprire il file all'interno dell'oggetto zip;
- * * non e possibile creare il file estratto;
- * * si e rilevato un errore nella copia dei dati (1);
- * * non e stato possibile chiudere il file all'interno dell'oggetto zip (1);
- *
- * (1): prima di uscire dalla funzione cancella il file estratto.
- */
-bool JlCompress::extractFile(QuaZip* zip, QString fileName, QString fileDest) {
- // zip: oggetto dove aggiungere il file
- // filename: nome del file reale
- // fileincompress: nome del file all'interno del file compresso
-
- // Controllo l'apertura dello zip
- if (!zip) return false;
- if (zip->getMode()!=QuaZip::mdUnzip) return false;
-
- // Apro il file compresso
- if (!fileName.isEmpty())
- zip->setCurrentFile(fileName);
- QuaZipFile inFile(zip);
- if(!inFile.open(QIODevice::ReadOnly) || inFile.getZipError()!=UNZ_OK) return false;
-
- // Controllo esistenza cartella file risultato
- QDir curDir;
- if (fileDest.endsWith('/')) {
- if (!curDir.mkpath(fileDest)) {
- return false;
- }
- } else {
- if (!curDir.mkpath(QFileInfo(fileDest).absolutePath())) {
- return false;
- }
- }
-
- QuaZipFileInfo64 info;
- if (!zip->getCurrentFileInfo(&info))
- return false;
-
- QFile::Permissions srcPerm = info.getPermissions();
- if (fileDest.endsWith('/') && QFileInfo(fileDest).isDir()) {
- if (srcPerm != 0) {
- QFile(fileDest).setPermissions(srcPerm);
- }
- return true;
- }
-
- // Apro il file risultato
- QFile outFile;
- outFile.setFileName(fileDest);
- if(!outFile.open(QIODevice::WriteOnly)) return false;
-
- // Copio i dati
- if (!copyData(inFile, outFile) || inFile.getZipError()!=UNZ_OK) {
- outFile.close();
- removeFile(QStringList(fileDest));
- return false;
- }
- outFile.close();
-
- // Chiudo i file
- inFile.close();
- if (inFile.getZipError()!=UNZ_OK) {
- removeFile(QStringList(fileDest));
- return false;
- }
-
- if (srcPerm != 0) {
- outFile.setPermissions(srcPerm);
- }
- return true;
-}
-
-/**
- * Rimuove i file il cui nome e specificato all'interno di listFile.
- * Restituisce true se tutti i file sono stati cancellati correttamente, attenzione
- * perche puo restituire false anche se alcuni file non esistevano e si e tentato
- * di cancellarli.
- */
-bool JlCompress::removeFile(QStringList listFile) {
- bool ret = true;
- // Per ogni file
- for (int i=0; i<listFile.count(); i++) {
- // Lo elimino
- ret = ret && QFile::remove(listFile.at(i));
- }
- return ret;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-/**OK
- * Comprime il file fileName nel file fileCompressed.
- * Se la funzione fallisce restituisce false e cancella il file che si e tentato
- * di creare.
- *
- * La funzione fallisce se:
- * * non si riesce ad aprire l'oggetto zip;
- * * la compressione del file fallisce;
- * * non si riesce a chiudere l'oggetto zip;
- */
-bool JlCompress::compressFile(QString fileCompressed, QString file) {
- // Creo lo zip
- QuaZip zip(fileCompressed);
- QDir().mkpath(QFileInfo(fileCompressed).absolutePath());
- if(!zip.open(QuaZip::mdCreate)) {
- QFile::remove(fileCompressed);
- return false;
- }
-
- // Aggiungo il file
- if (!compressFile(&zip,file,QFileInfo(file).fileName())) {
- QFile::remove(fileCompressed);
- return false;
- }
-
- // Chiudo il file zip
- zip.close();
- if(zip.getZipError()!=0) {
- QFile::remove(fileCompressed);
- return false;
- }
-
- return true;
-}
-
-/**OK
- * Comprime i file specificati in files nel file fileCompressed.
- * Se la funzione fallisce restituisce false e cancella il file che si e tentato
- * di creare.
- *
- * La funzione fallisce se:
- * * non si riesce ad aprire l'oggetto zip;
- * * la compressione di un file fallisce;
- * * non si riesce a chiudere l'oggetto zip;
- */
-bool JlCompress::compressFiles(QString fileCompressed, QStringList files) {
- // Creo lo zip
- QuaZip zip(fileCompressed);
- QDir().mkpath(QFileInfo(fileCompressed).absolutePath());
- if(!zip.open(QuaZip::mdCreate)) {
- QFile::remove(fileCompressed);
- return false;
- }
-
- // Comprimo i file
- QFileInfo info;
- Q_FOREACH (QString file, files) {
- info.setFile(file);
- if (!info.exists() || !compressFile(&zip,file,info.fileName())) {
- QFile::remove(fileCompressed);
- return false;
- }
- }
-
- // Chiudo il file zip
- zip.close();
- if(zip.getZipError()!=0) {
- QFile::remove(fileCompressed);
- return false;
- }
-
- return true;
-}
-
-/**OK
- * Comprime la cartella dir nel file fileCompressed, se recursive e true allora
- * comprime anche le sotto cartelle.
- * Se la funzione fallisce restituisce false e cancella il file che si e tentato
- * di creare.
- *
- * La funzione fallisce se:
- * * non si riesce ad aprire l'oggetto zip;
- * * la compressione di un file fallisce;
- * * non si riesce a chiudere l'oggetto zip;
- */
-bool JlCompress::compressDir(QString fileCompressed, QString dir, bool recursive) {
- // Creo lo zip
- QuaZip zip(fileCompressed);
- QDir().mkpath(QFileInfo(fileCompressed).absolutePath());
- if(!zip.open(QuaZip::mdCreate)) {
- QFile::remove(fileCompressed);
- return false;
- }
-
- // Aggiungo i file e le sotto cartelle
- if (!compressSubDir(&zip,dir,dir,recursive)) {
- QFile::remove(fileCompressed);
- return false;
- }
-
- // Chiudo il file zip
- zip.close();
- if(zip.getZipError()!=0) {
- QFile::remove(fileCompressed);
- return false;
- }
-
- return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-/**OK
- * Estrae il file fileName, contenuto nel file fileCompressed, con il nome fileDest.
- * Se fileDest = "" allora il file viene estratto con lo stesso nome con cui e
- * stato compresso.
- * Se la funzione fallisce cancella il file che si e tentato di estrarre.
- * Restituisce il nome assoluto del file estratto.
- *
- * La funzione fallisce se:
- * * non si riesce ad aprire l'oggetto zip;
- * * l'estrazione del file fallisce;
- * * non si riesce a chiudere l'oggetto zip;
- */
-QString JlCompress::extractFile(QString fileCompressed, QString fileName, QString fileDest) {
- // Apro lo zip
- QuaZip zip(fileCompressed);
- if(!zip.open(QuaZip::mdUnzip)) {
- return QString();
- }
-
- // Estraggo il file
- if (fileDest.isEmpty())
- fileDest = fileName;
- if (!extractFile(&zip,fileName,fileDest)) {
- return QString();
- }
-
- // Chiudo il file zip
- zip.close();
- if(zip.getZipError()!=0) {
- removeFile(QStringList(fileDest));
- return QString();
- }
- return QFileInfo(fileDest).absoluteFilePath();
-}
-
-/**OK
- * Estrae i file specificati in files, contenuti nel file fileCompressed, nella
- * cartella dir. La struttura a cartelle del file compresso viene rispettata.
- * Se dir = "" allora il file viene estratto nella cartella corrente.
- * Se la funzione fallisce cancella i file che si e tentato di estrarre.
- * Restituisce i nomi assoluti dei file estratti.
- *
- * La funzione fallisce se:
- * * non si riesce ad aprire l'oggetto zip;
- * * l'estrazione di un file fallisce;
- * * non si riesce a chiudere l'oggetto zip;
- */
-QStringList JlCompress::extractFiles(QString fileCompressed, QStringList files, QString dir) {
- // Creo lo zip
- QuaZip zip(fileCompressed);
- if(!zip.open(QuaZip::mdUnzip)) {
- return QStringList();
- }
-
- // Estraggo i file
- QStringList extracted;
- for (int i=0; i<files.count(); i++) {
- QString absPath = QDir(dir).absoluteFilePath(files.at(i));
- if (!extractFile(&zip, files.at(i), absPath)) {
- removeFile(extracted);
- return QStringList();
- }
- extracted.append(absPath);
- }
-
- // Chiudo il file zip
- zip.close();
- if(zip.getZipError()!=0) {
- removeFile(extracted);
- return QStringList();
- }
-
- return extracted;
-}
-
-/**OK
- * Estrae il file fileCompressed nella cartella dir.
- * Se dir = "" allora il file viene estratto nella cartella corrente.
- * Se la funzione fallisce cancella i file che si e tentato di estrarre.
- * Restituisce i nomi assoluti dei file estratti.
- *
- * La funzione fallisce se:
- * * non si riesce ad aprire l'oggetto zip;
- * * la compressione di un file fallisce;
- * * non si riesce a chiudere l'oggetto zip;
- */
-QStringList JlCompress::extractDir(QString fileCompressed, QString dir) {
- // Apro lo zip
- QuaZip zip(fileCompressed);
- if(!zip.open(QuaZip::mdUnzip)) {
- return QStringList();
- }
-
- QDir directory(dir);
- QStringList extracted;
- if (!zip.goToFirstFile()) {
- return QStringList();
- }
- do {
- QString name = zip.getCurrentFileName();
- QString absFilePath = directory.absoluteFilePath(name);
- if (!extractFile(&zip, "", absFilePath)) {
- removeFile(extracted);
- return QStringList();
- }
- extracted.append(absFilePath);
- } while (zip.goToNextFile());
-
- // Chiudo il file zip
- zip.close();
- if(zip.getZipError()!=0) {
- removeFile(extracted);
- return QStringList();
- }
-
- return extracted;
-}
-
-/**OK
- * Restituisce la lista dei file resenti nel file compresso fileCompressed.
- * Se la funzione fallisce, restituisce un elenco vuoto.
- *
- * La funzione fallisce se:
- * * non si riesce ad aprire l'oggetto zip;
- * * la richiesta di informazioni di un file fallisce;
- * * non si riesce a chiudere l'oggetto zip;
- */
-QStringList JlCompress::getFileList(QString fileCompressed) {
- // Apro lo zip
- QuaZip* zip = new QuaZip(QFileInfo(fileCompressed).absoluteFilePath());
- if(!zip->open(QuaZip::mdUnzip)) {
- delete zip;
- return QStringList();
- }
-
- // Estraggo i nomi dei file
- QStringList lst;
- QuaZipFileInfo64 info;
- for(bool more=zip->goToFirstFile(); more; more=zip->goToNextFile()) {
- if(!zip->getCurrentFileInfo(&info)) {
- delete zip;
- return QStringList();
- }
- lst << info.name;
- //info.name.toLocal8Bit().constData()
- }
-
- // Chiudo il file zip
- zip->close();
- if(zip->getZipError()!=0) {
- delete zip;
- return QStringList();
- }
- delete zip;
-
- return lst;
-}
-
diff --git a/daemon/quazip/JlCompress.h b/daemon/quazip/JlCompress.h
deleted file mode 100644
index 62543f7..0000000
--- a/daemon/quazip/JlCompress.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef JLCOMPRESSFOLDER_H_
-#define JLCOMPRESSFOLDER_H_
-
-/*
-Copyright (C) 2010 Roberto Pompermaier
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include "quazip.h"
-#include "quazipfile.h"
-#include "quazipfileinfo.h"
-#include <QString>
-#include <QDir>
-#include <QFileInfo>
-#include <QFile>
-
-/// Utility class for typical operations.
-/**
- This class contains a number of useful static functions to perform
- simple operations, such as mass ZIP packing or extraction.
- */
-class QUAZIP_EXPORT JlCompress {
-private:
- /// Compress a single file.
- /**
- \param zip Opened zip to compress the file to.
- \param fileName The full path to the source file.
- \param fileDest The full name of the file inside the archive.
- \return true if success, false otherwise.
- */
- static bool compressFile(QuaZip* zip, QString fileName, QString fileDest);
- /// Compress a subdirectory.
- /**
- \param parentZip Opened zip containing the parent directory.
- \param dir The full path to the directory to pack.
- \param parentDir The full path to the directory corresponding to
- the root of the ZIP.
- \param recursive Whether to pack sub-directories as well or only
- files.
- \return true if success, false otherwise.
- */
- static bool compressSubDir(QuaZip* parentZip, QString dir, QString parentDir, bool recursive = true);
- /// Extract a single file.
- /**
- \param zip The opened zip archive to extract from.
- \param fileName The full name of the file to extract.
- \param fileDest The full path to the destination file.
- \return true if success, false otherwise.
- */
- static bool extractFile(QuaZip* zip, QString fileName, QString fileDest);
- /// Remove some files.
- /**
- \param listFile The list of files to remove.
- \return true if success, false otherwise.
- */
- static bool removeFile(QStringList listFile);
-
-public:
- /// Compress a single file.
- /**
- \param fileCompressed The name of the archive.
- \param file The file to compress.
- \return true if success, false otherwise.
- */
- static bool compressFile(QString fileCompressed, QString file);
- /// Compress a list of files.
- /**
- \param fileCompressed The name of the archive.
- \param files The file list to compress.
- \return true if success, false otherwise.
- */
- static bool compressFiles(QString fileCompressed, QStringList files);
- /// Compress a whole directory.
- /**
- \param fileCompressed The name of the archive.
- \param dir The directory to compress.
- \param recursive Whether to pack the subdirectories as well, or
- just regular files.
- \return true if success, false otherwise.
- */
- static bool compressDir(QString fileCompressed, QString dir = QString(), bool recursive = true);
-
-public:
- /// Extract a single file.
- /**
- \param fileCompressed The name of the archive.
- \param fileName The file to extract.
- \param fileDest The destination file, assumed to be identical to
- \a file if left empty.
- \return The list of the full paths of the files extracted, empty on failure.
- */
- static QString extractFile(QString fileCompressed, QString fileName, QString fileDest = QString());
- /// Extract a list of files.
- /**
- \param fileCompressed The name of the archive.
- \param files The file list to extract.
- \param dir The directory to put the files to, the current
- directory if left empty.
- \return The list of the full paths of the files extracted, empty on failure.
- */
- static QStringList extractFiles(QString fileCompressed, QStringList files, QString dir = QString());
- /// Extract a whole archive.
- /**
- \param fileCompressed The name of the archive.
- \param dir The directory to extract to, the current directory if
- left empty.
- \return The list of the full paths of the files extracted, empty on failure.
- */
- static QStringList extractDir(QString fileCompressed, QString dir = QString());
- /// Get the file list.
- /**
- \return The list of the files in the archive, or, more precisely, the
- list of the entries, including both files and directories if they
- are present separately.
- */
- static QStringList getFileList(QString fileCompressed);
-};
-
-#endif /* JLCOMPRESSFOLDER_H_ */
diff --git a/daemon/quazip/crypt.h b/daemon/quazip/crypt.h
deleted file mode 100644
index ddee28e..0000000
--- a/daemon/quazip/crypt.h
+++ /dev/null
@@ -1,135 +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.
-*/
-
-#include "quazip_global.h"
-
-#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 z_crc_t FAR * pcrc_32_tab UNUSED)
-{
- //(void) pcrc_32_tab; /* avoid "unused parameter" warning */
- 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 z_crc_t FAR * 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 z_crc_t FAR * 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 z_crc_t FAR * 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/daemon/quazip/debian/libquazip0.symbols b/daemon/quazip/debian/libquazip0.symbols
deleted file mode 100644
index ed3c09b..0000000
--- a/daemon/quazip/debian/libquazip0.symbols
+++ /dev/null
@@ -1,163 +0,0 @@
-libquazip.so.0 libquazip0 #MINVER#
- _Z24qiodevice_open_file_funcPvS_i@Base 0.4.4
- _Z24qiodevice_read_file_funcPvS_S_m@Base 0.4.4
- _Z24qiodevice_seek_file_funcPvS_mi@Base 0.4.4
- _Z24qiodevice_tell_file_funcPvS_@Base 0.4.4
- _Z25qiodevice_close_file_funcPvS_@Base 0.4.4
- _Z25qiodevice_error_file_funcPvS_@Base 0.4.4
- _Z25qiodevice_write_file_funcPvS_PKvm@Base 0.4.4
- _ZN10JlCompress10extractDirE7QStringS0_@Base 0.4.4
- _ZN10JlCompress11compressDirE7QStringS0_b@Base 0.4.4
- _ZN10JlCompress11extractFileE7QStringS0_S0_@Base 0.4.4
- _ZN10JlCompress11getFileListE7QString@Base 0.4.4
- _ZN10JlCompress12compressFileE7QStringS0_@Base 0.4.4
- _ZN10JlCompress12extractFilesE7QString11QStringListS0_@Base 0.4.4
- _ZN10JlCompress13compressFilesE7QString11QStringList@Base 0.4.4
- _ZN10QuaAdler325resetEv@Base 0.4.4
- _ZN10QuaAdler325valueEv@Base 0.4.4
- _ZN10QuaAdler326updateERK10QByteArray@Base 0.4.4
- _ZN10QuaAdler329calculateERK10QByteArray@Base 0.4.4
- _ZN10QuaAdler32C1Ev@Base 0.4.4
- _ZN10QuaAdler32C2Ev@Base 0.4.4
- _ZN10QuaZipFile10setZipNameERK7QString@Base 0.4.4
- _ZN10QuaZipFile11getFileInfoEP14QuaZipFileInfo@Base 0.4.4
- _ZN10QuaZipFile11setFileNameERK7QStringN6QuaZip15CaseSensitivityE@Base 0.4.4
- _ZN10QuaZipFile4openE6QFlagsIN9QIODevice12OpenModeFlagEE@Base 0.4.4
- _ZN10QuaZipFile4openE6QFlagsIN9QIODevice12OpenModeFlagEEPiS4_bPKc@Base 0.4.4
- _ZN10QuaZipFile4openE6QFlagsIN9QIODevice12OpenModeFlagEERK13QuaZipNewInfoPKcjiibiii@Base 0.4.4
- _ZN10QuaZipFile5closeEv@Base 0.4.4
- _ZN10QuaZipFile6setZipEP6QuaZip@Base 0.4.4
- _ZN10QuaZipFile8readDataEPcx@Base 0.4.4
- _ZN10QuaZipFile9writeDataEPKcx@Base 0.4.4
- _ZN10QuaZipFileC1EP6QuaZipP7QObject@Base 0.4.4
- _ZN10QuaZipFileC1EP7QObject@Base 0.4.4
- _ZN10QuaZipFileC1ERK7QStringP7QObject@Base 0.4.4
- _ZN10QuaZipFileC1ERK7QStringS2_N6QuaZip15CaseSensitivityEP7QObject@Base 0.4.4
- _ZN10QuaZipFileC1Ev@Base 0.4.4
- _ZN10QuaZipFileC2EP6QuaZipP7QObject@Base 0.4.4
- _ZN10QuaZipFileC2EP7QObject@Base 0.4.4
- _ZN10QuaZipFileC2ERK7QStringP7QObject@Base 0.4.4
- _ZN10QuaZipFileC2ERK7QStringS2_N6QuaZip15CaseSensitivityEP7QObject@Base 0.4.4
- _ZN10QuaZipFileC2Ev@Base 0.4.4
- _ZN10QuaZipFileD0Ev@Base 0.4.4
- _ZN10QuaZipFileD1Ev@Base 0.4.4
- _ZN10QuaZipFileD2Ev@Base 0.4.4
- _ZN13QuaZipNewInfo15setFileDateTimeERK7QString@Base 0.4.4
- _ZN13QuaZipNewInfoC1ERK7QString@Base 0.4.4
- _ZN13QuaZipNewInfoC1ERK7QStringS2_@Base 0.4.4
- _ZN13QuaZipNewInfoC2ERK7QString@Base 0.4.4
- _ZN13QuaZipNewInfoC2ERK7QStringS2_@Base 0.4.4
- _ZN13QuaZipNewInfoD1Ev@Base 0.4.4
- _ZN13QuaZipNewInfoD2Ev@Base 0.4.4
- _ZN14QuaZipFileInfoD1Ev@Base 0.4.4
- _ZN14QuaZipFileInfoD2Ev@Base 0.4.4
- _ZN6QuaZip10getUnzFileEv@Base 0.4.4
- _ZN6QuaZip10getZipFileEv@Base 0.4.4
- _ZN6QuaZip10setCommentERK7QString@Base 0.4.4
- _ZN6QuaZip10setZipNameERK7QString@Base 0.4.4
- _ZN6QuaZip11setIoDeviceEP9QIODevice@Base 0.4.4
- _ZN6QuaZip12goToNextFileEv@Base 0.4.4
- _ZN6QuaZip13goToFirstFileEv@Base 0.4.4
- _ZN6QuaZip14setCurrentFileERK7QStringNS_15CaseSensitivityE@Base 0.4.4
- _ZN6QuaZip15setCommentCodecEP10QTextCodec@Base 0.4.4
- _ZN6QuaZip15setCommentCodecEPKc@Base 0.4.4
- _ZN6QuaZip16setFileNameCodecEP10QTextCodec@Base 0.4.4
- _ZN6QuaZip16setFileNameCodecEPKc@Base 0.4.4
- _ZN6QuaZip31setDataDescriptorWritingEnabledEb@Base 0.4.4
- _ZN6QuaZip4openENS_4ModeEP19zlib_filefunc_def_s@Base 0.4.4
- _ZN6QuaZip5closeEv@Base 0.4.4
- _ZN6QuaZipC1EP9QIODevice@Base 0.4.4
- _ZN6QuaZipC1ERK7QString@Base 0.4.4
- _ZN6QuaZipC1Ev@Base 0.4.4
- _ZN6QuaZipC2EP9QIODevice@Base 0.4.4
- _ZN6QuaZipC2ERK7QString@Base 0.4.4
- _ZN6QuaZipC2Ev@Base 0.4.4
- _ZN6QuaZipD1Ev@Base 0.4.4
- _ZN6QuaZipD2Ev@Base 0.4.4
- _ZN7QStringD1Ev@Base 0.4.4
- _ZN7QStringD2Ev@Base 0.4.4
- _ZN8QuaCrc325resetEv@Base 0.4.4
- _ZN8QuaCrc325valueEv@Base 0.4.4
- _ZN8QuaCrc326updateERK10QByteArray@Base 0.4.4
- _ZN8QuaCrc329calculateERK10QByteArray@Base 0.4.4
- _ZN8QuaCrc32C1Ev@Base 0.4.4
- _ZN8QuaCrc32C2Ev@Base 0.4.4
- _ZNK10QuaZipFile10getZipNameEv@Base 0.4.4
- _ZNK10QuaZipFile10metaObjectEv@Base 0.4.4
- _ZNK10QuaZipFile11getFileNameEv@Base 0.4.4
- _ZNK10QuaZipFile11getZipErrorEv@Base 0.4.4
- _ZNK10QuaZipFile12isSequentialEv@Base 0.4.4
- _ZNK10QuaZipFile14bytesAvailableEv@Base 0.4.4
- _ZNK10QuaZipFile17getActualFileNameEv@Base 0.4.4
- _ZNK10QuaZipFile18getCaseSensitivityEv@Base 0.4.4
- _ZNK10QuaZipFile3posEv@Base 0.4.4
- _ZNK10QuaZipFile4sizeEv@Base 0.4.4
- _ZNK10QuaZipFile5atEndEv@Base 0.4.4
- _ZNK10QuaZipFile5csizeEv@Base 0.4.4
- _ZNK10QuaZipFile5isRawEv@Base 0.4.4
- _ZNK10QuaZipFile5usizeEv@Base 0.4.4
- _ZNK10QuaZipFile6getZipEv@Base 0.4.4
- _ZNK6QuaZip10getCommentEv@Base 0.4.4
- _ZNK6QuaZip10getZipNameEv@Base 0.4.4
- _ZNK6QuaZip11getIoDeviceEv@Base 0.4.4
- _ZNK6QuaZip11getZipErrorEv@Base 0.4.4
- _ZNK6QuaZip14hasCurrentFileEv@Base 0.4.4
- _ZNK6QuaZip15getCommentCodecEv@Base 0.4.4
- _ZNK6QuaZip15getEntriesCountEv@Base 0.4.4
- _ZNK6QuaZip15getFileInfoListEv@Base 0.4.4
- _ZNK6QuaZip15getFileNameListEv@Base 0.4.4
- _ZNK6QuaZip16getFileNameCodecEv@Base 0.4.4
- _ZNK6QuaZip18getCurrentFileInfoEP14QuaZipFileInfo@Base 0.4.4
- _ZNK6QuaZip18getCurrentFileNameEv@Base 0.4.4
- _ZNK6QuaZip30isDataDescriptorWritingEnabledEv@Base 0.4.4
- _ZNK6QuaZip6isOpenEv@Base 0.4.4
- _ZNK6QuaZip7getModeEv@Base 0.4.4
- _ZTI10QuaAdler32@Base 0.4.4
- _ZTI10QuaZipFile@Base 0.4.4
- _ZTI13QuaChecksum32@Base 0.4.4
- _ZTI8QuaCrc32@Base 0.4.4
- _ZTS10QuaAdler32@Base 0.4.4
- _ZTS10QuaZipFile@Base 0.4.4
- _ZTS13QuaChecksum32@Base 0.4.4
- _ZTS8QuaCrc32@Base 0.4.4
- _ZTV10QuaAdler32@Base 0.4.4
- _ZTV10QuaZipFile@Base 0.4.4
- _ZTV13QuaChecksum32@Base 0.4.4
- _ZTV8QuaCrc32@Base 0.4.4
- fill_qiodevice_filefunc@Base 0.4.4
- unzClose@Base 0.4.4
- unzCloseCurrentFile@Base 0.4.4
- unzGetCurrentFileInfo@Base 0.4.4
- unzGetFilePos@Base 0.4.4
- unzGetGlobalComment@Base 0.4.4
- unzGetGlobalInfo@Base 0.4.4
- unzGetLocalExtrafield@Base 0.4.4
- unzGetOffset@Base 0.4.4
- unzGoToFilePos@Base 0.4.4
- unzGoToFirstFile@Base 0.4.4
- unzGoToNextFile@Base 0.4.4
- unzLocateFile@Base 0.4.4
- unzOpen2@Base 0.4.4
- unzOpen@Base 0.4.4
- unzOpenCurrentFile2@Base 0.4.4
- unzOpenCurrentFile3@Base 0.4.4
- unzOpenCurrentFile@Base 0.4.4
- unzOpenCurrentFilePassword@Base 0.4.4
- unzReadCurrentFile@Base 0.4.4
- unzSetOffset@Base 0.4.4
- unzStringFileNameCompare@Base 0.4.4
- unz_copyright@Base 0.4.4
- unzeof@Base 0.4.4
- unztell@Base 0.4.4
- zipClearFlags@Base 0.4.4
- zipClose@Base 0.4.4
- zipCloseFileInZip@Base 0.4.4
- zipCloseFileInZipRaw@Base 0.4.4
- zipOpen2@Base 0.4.4
- zipOpen@Base 0.4.4
- zipOpenNewFileInZip2@Base 0.4.4
- zipOpenNewFileInZip3@Base 0.4.4
- zipOpenNewFileInZip@Base 0.4.4
- zipSetFlags@Base 0.4.4
- zipWriteInFileInZip@Base 0.4.4
- zip_copyright@Base 0.4.4
diff --git a/daemon/quazip/doc/faq.dox b/daemon/quazip/doc/faq.dox
deleted file mode 100644
index 68fc52b..0000000
--- a/daemon/quazip/doc/faq.dox
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * \page faq QuaZip FAQ
- *
- * <!--
- *
- * \ref faq-non-QIODevice "Q. Is there any way to use QuaZipFile in Qt where you are supposed to use normal (non-zipped) file, but not through QIODevice API?"
- * \ref faq-zip64 "Q. Can QuaZIP handle files larger than 4GB? What about zip64 standard?"
- *
- * \ref faq-seekable "Q. Can QuaZIP write archives to a sequential QIODevice like QTcpSocket?"
- *
- * -->
- *
- * \anchor faq-non-QIODevice Q. Is there any way to use QuaZipFile in Qt
- * where you are supposed to use normal (non-zipped) file, but not
- * through QIODevice API?
- *
- * A. Usually not. For example, if you are passing file name to some
- * database driver (like SQLite), Qt usually just passes this name down
- * to the 3rd-party library, which is usually does not know anything
- * about QIODevice and therefore there is no way to pass QuaZipFile as
- * normal file. However, if we are talking about some place where you
- * pass file name, and then indirectly use QFile to open it, then it is
- * a good idea to make overloaded method, which accepts a QIODevice
- * pointer. Then you would be able to pass QuaZipFile as well as many
- * other nice things such as QBuffer or QProcess.
- *
- * \anchor faq-zip64 Q. Can QuaZIP handle files larger than 4GB? What
- * about zip64 standard?
- *
- * A. Starting with version 0.6, QuaZIP uses Minizip 1.1 with zip64
- * support which should handle large files perfectly. The zip64 support
- * in Minizip looks like it's not 100% conforming to the standard, but
- * 3rd party tools seem to have no problem with the resulting archives.
- *
- * \anchor faq-seekable Q. Can QuaZIP write archives to a sequential QIODevice like QTcpSocket?
- *
- * A. Not yet. It is not supported by vanilla Minizip (the back-end
- * QuaZIP uses), although theoretically possible according to the ZIP
- * standard. It would require some Minizip modifications that would
- * allow it to detect non-seekable I/O and produce necessary output
- * structures. QuaZIP already writes data descriptor which is necessary
- * for non-seekable I/O. The only thing that is apparently left is to
- * make Minizip fill local headers with correct values and forget about
- * seeking after closing the file.
- **/
diff --git a/daemon/quazip/doc/index.dox b/daemon/quazip/doc/index.dox
deleted file mode 100644
index ae45c5c..0000000
--- a/daemon/quazip/doc/index.dox
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * \mainpage QuaZIP - Qt/C++ wrapper for ZIP/UNZIP package
- *
-\htmlonly
-<a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=142688&amp;type=7" style="width:210; height:62; border:none; float:right;" alt="Powered by SourceForge.net" /></a>
-\endhtmlonly
- * \section overview Overview
- *
- * QuaZIP is a simple C++ wrapper over <a
- * href="http://www.winimage.com/zLibDll/minizip.html">Gilles Vollant's ZIP/UNZIP
- * package</a> that can be used to access ZIP archives. It uses <a
- * href="http://qt.digia.com/">the Qt toolkit</a>.
- *
- * If you do not know what Qt is, you have two options:
- * - Just forget about QuaZIP.
- * - Learn more about Qt by downloading it and/or reading the excellent <a
- * href="http://qt-project.org/doc/">official Qt documentation</a>
- *
- * The choice is yours, but if you are really interested in
- * cross-platform (Windows/Linux/BSD/UNIX/Mac/Others) software
- * development, I would definitely recommend you the latter ^_^
- *
- * QuaZIP allows you to access files inside ZIP archives using QIODevice
- * API, and - yes! - that means that you can also use QTextStream,
- * QDataStream or whatever you would like to use on your zipped files.
- *
- * QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both
- * reading from and writing to ZIP archives.
- *
- * \section download Download QuaZIP
- *
- * Downloads are available from <a
- * href="http://sourceforge.net/projects/quazip/">QuaZIP project's page
- * at SourceForge.net</a>.
- *
- * \section platforms Platforms supported
- *
- * QuaZIP has been currently tested on the following platforms:
- * - linux-g++ (Ubuntu 11.10, Qt 4.7.4)
- * - freebsd-g++ (Qt 4.0.0
- * - hpux-acc (HP-UX 11.11)
- * - hpux-g++ (HP-UX 11.11)
- * - win32-g++ (MinGW)
- * - win32-msvc2010 (MS VS 2010 Express, Qt 4.8.4)
- * - win32-msvc2010 (Qt Creator, Qt 5.0.1)
- * - win32-msvc2012 (Qt Creator, Qt 5.2.0)
- * - some Symbian version, reportedly
- *
- * No testing has been officially done on other systems. Of course, patches to
- * make it work on any platform that it currently does not work on are
- * always welcome!
- *
- * \section whats-new What is new in this version of QuaZIP?
- *
- * See the NEWS.txt file supplied with the distribution.
- *
- * \section Requirements
- *
- * Just <a href="http://www.zlib.org/">zlib</a> and Qt 4/5. Well, Qt 4
- * depends on zlib anyway, but you will need zlib headers to compile
- * QuaZIP. With Qt5 sometimes you need the zlib library as well (on
- * Windows, for example).
- *
- * \section building Building, testing and installing
- *
- * \note Instructions given in this section assume that you are
- * using some UNIX dialect, but the build process should be very similar
- * on win32-g++ platform too. On other platforms it's essentially the
- * same process, maybe with some qmake adjustments not specific to
- * QuaZIP itself.
- *
- * To build the library, run:
-\verbatim
-$ cd /wherever/quazip/source/is/quazip-x.y.z/quazip
-$ qmake [PREFIX=where-to-install]
-$ make
-\endverbatim
- *
- * Make sure that you have Qt 4/5 installed with all required headers and
- * utilities (that is, including the 'dev' or 'devel' package on Linux)
- * and that you run qmake utility of the Qt 4, not some other version
- * you may have already installed (you may need to type full path to
- * qmake like /usr/local/qt4/bin/qmake).
- *
- * To reconfigure (with another PREFIX, for example), just run qmake
- * with appropriate arguments again.
- *
- * If you need to specify additional include path or libraries, use
- * qmake features (see qmake reference in the Qt documentation). For
- * example:
- *
-\verbatim
-$ qmake LIBS+=-L/usr/local/zlib/lib INCLUDEPATH+=/usr/local/zlib/include
-\endverbatim
- * (note abscence of "-I" before the include path and the presence of "-L"
- * before the lib path)
- *
- * Also note that you may or may not need to define ZLIB_WINAPI (qmake
- * DEFINES+=ZLIB_WINAPI) when linking to zlib on Windows, depending on
- * how zlib was built (generally, if using zlibwapi.dll, this define is
- * needed).
- *
- * To install compiled library:
-\verbatim
-$ make install
-\endverbatim
- *
- * By default, QuaZIP compiles as a DLL/SO, but you have other
- * options:
- * - Just copy appropriate source files to your project and use them,
- * but you need to define QUAZIP_STATIC before including any QuaZIP
- * headers (best done as a compiler option). This will save you from
- * possible side effects of importing/exporting QuaZIP symbols.
- * - Compile it as a static library using CONFIG += staticlib qmake
- * option. QUAZIP_STATIC is defined automatically by qmake in this case.
- *
- * Binary compatibility is guaranteed between minor releases starting
- * with version 0.5, thanks to the Pimpl idiom. That is, the next binary
- * incompatible version will be 1.x.
- *
- * \section test Testing
- *
- * To check if QuaZIP's basic features work OK on your platform, you may
- * wish to compile the test suite provided in test directory:
-\verbatim
-$ cd /wherever/quazip/source/is/quazip-x.y.z/qztest
-$ qmake
-$ make
-$ ./qztest
-\endverbatim
- *
- * Note that the test suite looks for the quazip library in the "quazip"
- * folder of the project ("../quazip"), but you may wish to use LIBS
- * for some systems (Windows often puts the library in the separate
- * "debug" or "release" directory). If you wish to use the quazip
- * version that's already installed, provide the appropriate path.
- *
- * On some systems you may need to set PATH, LD_LIBRARY_PATH or
- * SHLIB_PATH to get "qztest" to actually run.
- *
- * If everything went fine, the test suite should report a lot of PASS
- * messages. If something goes wrong, it will provide details and a
- * warning that some tests failed.
- *
- * \section using Using
- *
- * See \ref usage "usage page".
- *
- * \section contacts Authors and contacts
- *
- * This wrapper has been written by Sergey A. Tachenov, AKA Alqualos.
- * This is my first open source project, so it may suck, but I did not
- * find anything like that, so I just had no other choice but to write
- * it.
- *
- * If you have anything to say to me about QuaZIP library, feel free to
- * do so (read the \ref faq first, though). I can not promise,
- * though, that I fix all the bugs you report in, add any features you
- * want, or respond to your critics, or respond to your feedback at all.
- * I may be busy, I may be tired of working on QuaZIP, I may be even
- * dead already (you never know...).
- *
- * To report bugs or to post ideas about what should be done, use
- * SourceForge.net's <a
- * href="http://sourceforge.net/tracker/?group_id=142688">trackers</a>.
- * If you want to send me a private message, use my e-mail address
- * stachenov@gmail.com.
- *
- * Do not use e-mail to report bugs, please. Reporting bugs and problems
- * with the SourceForge.net's bug report system has that advantage that
- * it is visible to public, and I can always search for open tickets
- * that were created long ago. It is highly unlikely that I will search
- * my mail for that kind of stuff, so if a bug reported by mail isn't
- * fixed immediately, it will likely be forgotten forever.
- *
- * Copyright (C) 2005-2014 Sergey A. Tachenov and contributors
- **/
diff --git a/daemon/quazip/doc/usage.dox b/daemon/quazip/doc/usage.dox
deleted file mode 100644
index 108f6cb..0000000
--- a/daemon/quazip/doc/usage.dox
+++ /dev/null
@@ -1,77 +0,0 @@
-/** \page usage Usage
- *
- * This page provides general information on QuaZIP usage. See classes
- * QuaZip and QuaZipFile for the detailed documentation on what can
- * QuaZIP do and what it can not. Also, reading comments in the zip.h and
- * unzip.h files (taken from the original ZIP/UNZIP package) is always a
- * good idea too. After all, QuaZIP is just a wrapper with a few
- * convenience extensions and reimplementations.
- *
- * QuaZip is a class representing ZIP archive, QuaZipFile represents a
- * file inside archive and subclasses QIODevice as well. One limitation
- * is that there can be only one instance of QuaZipFile per QuaZip
- * instance, which kind of makes it confusing why there are two classes
- * instead of one. This is actually no more than an API design mistake.
- *
- * \section terminology Terminology
- *
- * "QuaZIP" means whole this library, while "QuaZip" (note the
- * lower case) is just one class in it.
- *
- * "ZIP/UNZIP API" or "minizip" means the original API of the Gilles
- * Vollant's ZIP/UNZIP package. It was slightly modified to better
- * integrate with Qt. These modifications are not source or binary
- * compatible with the official minizip release, which means you can't
- * just drop the newer minizip version into QuaZIP sources and make it
- * work.
- *
- * "ZIP", "ZIP archive" or "ZIP file" means any ZIP archive. Typically
- * this is a plain file with ".zip" (or ".ZIP") file name suffix, but it
- * can also be any seekable QIODevice (say, QBuffer, but not
- * QTcpSocket).
- *
- * "A file inside archive", "a file inside ZIP" or something like that
- * means file either being read or written from/to some ZIP archive.
- *
- * \section error-handling Error handling
- *
- * Almost any call to ZIP/UNZIP API return some error code. Most of the
- * original API's error checking could be done in this wrapper as well,
- * but it would cause unnecessary code bloating without any benefit. So,
- * QuaZIP only checks for situations that ZIP/UNZIP API can not check
- * for. For example, ZIP/UNZIP API has no "ZIP open mode" concept
- * because read and write modes are completely separated. On the other
- * hand, to avoid creating classes like "QuaZipReader", "QuaZipWriter"
- * or something like that, QuaZIP introduces "ZIP open mode" concept
- * instead, thus making it possible to use one class (QuaZip) for both
- * reading and writing. But this leads to additional open mode checks
- * which are not done in ZIP/UNZIP package.
- *
- * Therefore, error checking is two-level (QuaZIP's level and ZIP/UNZIP
- * API level), which sometimes can be confusing, so here are some
- * advices on how the error checking should be properly done:
- *
- * - Both QuaZip and QuaZipFile have getZipError() function, which return
- * error code of the last ZIP/UNZIP API call. Most function calls
- * reset error code to UNZ_OK on success and set error code on
- * failure. Some functions do not reset error code. Most of them are
- * \c const and do not access ZIP archive in any way. Some, on the
- * other hand, \em do access ZIP archive, but do not reset or set
- * error code. For example, QuaZipFile::pos() function. Such functions
- * are explicitly marked in the documentation.
- * - Most functions have their own way to report errors, by returning a
- * null string, negative value or \c false. If such a function returns
- * error value, call getZipError() to get more information about
- * error. See "zip.h" and "unzip.h" of the ZIP/UNZIP package for error
- * codes.
- * - If the function returns error-stating value (like \c false), but
- * getZipError() returns UNZ_OK, it means that you did something
- * obviously wrong. For example, tried to write in the archive open
- * for reading or not open at all. You better just not do that!
- * Most functions also issue a warning using qWarning() function in
- * such cases. See documentation for a specific function for details
- * on when it should not be called.
- *
- * I know that this is somewhat messy, but I could not find a better way
- * to do all the error handling.
- **/
diff --git a/daemon/quazip/ioapi.h b/daemon/quazip/ioapi.h
deleted file mode 100644
index bbb94c8..0000000
--- a/daemon/quazip/ioapi.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
- part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
- Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
- Modifications for Zip64 support
- Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
- Modified by Sergey A. Tachenov to allow QIODevice API usage.
-
- For more info read MiniZip_info.txt
-
- Changes
-
- Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
- Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
- More if/def section may be needed to support other platforms
- Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
- (but you should use iowin32.c for windows instead)
-
-*/
-
-#ifndef _ZLIBIOAPI64_H
-#define _ZLIBIOAPI64_H
-
-#if (!defined(_WIN32)) && (!defined(WIN32))
-
- // Linux needs this to support file operation on files larger then 4+GB
- // But might need better if/def to select just the platforms that needs them.
-
- #ifndef __USE_FILE_OFFSET64
- #define __USE_FILE_OFFSET64
- #endif
- #ifndef __USE_LARGEFILE64
- #define __USE_LARGEFILE64
- #endif
- #ifndef _LARGEFILE64_SOURCE
- #define _LARGEFILE64_SOURCE
- #endif
- #ifndef _FILE_OFFSET_BIT
- #define _FILE_OFFSET_BIT 64
- #endif
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "zlib.h"
-
-#if defined(USE_FILE32API)
-#define fopen64 fopen
-#define ftello64 ftell
-#define fseeko64 fseek
-#else
-#ifdef _MSC_VER
- #define fopen64 fopen
- #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
- #define ftello64 _ftelli64
- #define fseeko64 _fseeki64
- #else // old MSC
- #define ftello64 ftell
- #define fseeko64 fseek
- #endif
-#endif
-#endif
-
-/*
-#ifndef ZPOS64_T
- #ifdef _WIN32
- #define ZPOS64_T fpos_t
- #else
- #include <stdint.h>
- #define ZPOS64_T uint64_t
- #endif
-#endif
-*/
-
-#ifdef HAVE_MINIZIP64_CONF_H
-#include "mz64conf.h"
-#endif
-
-/* a type choosen by DEFINE */
-#ifdef HAVE_64BIT_INT_CUSTOM
-typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T;
-#else
-#ifdef HAS_STDINT_H
-#include "stdint.h"
-typedef uint64_t ZPOS64_T;
-#else
-
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef unsigned __int64 ZPOS64_T;
-#else
-typedef unsigned long long int ZPOS64_T;
-#endif
-#endif
-#endif
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef OF
-#define OF _Z_OF
-#endif
-
-#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(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
- #define ZCALLBACK CALLBACK
- #else
- #define ZCALLBACK
- #endif
-#endif
-
-
-
-
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, voidpf file, int mode));
-typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
-
-typedef uLong (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef int (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-
-
-/* here is the "old" 32 bits structure structure */
-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;
-
-typedef ZPOS64_T (ZCALLBACK *tell64_file_func) OF((voidpf opaque, voidpf stream));
-typedef int (ZCALLBACK *seek64_file_func) OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-typedef voidpf (ZCALLBACK *open64_file_func) OF((voidpf opaque, voidpf file, int mode));
-
-typedef struct zlib_filefunc64_def_s
-{
- open64_file_func zopen64_file;
- read_file_func zread_file;
- write_file_func zwrite_file;
- tell64_file_func ztell64_file;
- seek64_file_func zseek64_file;
- close_file_func zclose_file;
- testerror_file_func zerror_file;
- voidpf opaque;
- close_file_func zfakeclose_file; // for no-auto-close flag
-} zlib_filefunc64_def;
-
-void fill_qiodevice64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
-void fill_qiodevice_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-
-/* now internal definition, only for zip.c and unzip.h */
-typedef struct zlib_filefunc64_32_def_s
-{
- zlib_filefunc64_def zfile_func64;
- open_file_func zopen32_file;
- tell_file_func ztell32_file;
- seek_file_func zseek32_file;
-} zlib_filefunc64_32_def;
-
-
-#define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
-#define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
-//#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
-//#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream))
-#define ZFAKECLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zfakeclose_file)) ((filefunc).zfile_func64.opaque,filestream))
-#define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream))
-
-voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf file,int mode));
-int call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
-ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
-
-void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
-
-#define ZOPEN64(filefunc,filename,mode) (call_zopen64((&(filefunc)),(filename),(mode)))
-#define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)),(filestream)))
-#define ZSEEK64(filefunc,filestream,pos,mode) (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/daemon/quazip/qioapi.cpp b/daemon/quazip/qioapi.cpp
deleted file mode 100644
index 534dbdf..0000000
--- a/daemon/quazip/qioapi.cpp
+++ /dev/null
@@ -1,361 +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
-
- Modified by Sergey A. Tachenov to integrate with Qt.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "zlib.h"
-#include "ioapi.h"
-#include "quazip_global.h"
-#include <QIODevice>
-#if (QT_VERSION >= 0x050100)
-#define QUAZIP_QSAVEFILE_BUG_WORKAROUND
-#endif
-#ifdef QUAZIP_QSAVEFILE_BUG_WORKAROUND
-#include <QSaveFile>
-#endif
-
-/* 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 call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,voidpf file,int mode)
-{
- if (pfilefunc->zfile_func64.zopen64_file != NULL)
- return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,file,mode);
- else
- {
- return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,file,mode);
- }
-}
-
-int call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
-{
- if (pfilefunc->zfile_func64.zseek64_file != NULL)
- return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
- else
- {
- uLong offsetTruncated = (uLong)offset;
- if (offsetTruncated != offset)
- return -1;
- else
- return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
- }
-}
-
-ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
-{
- if (pfilefunc->zfile_func64.zseek64_file != NULL)
- return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
- else
- {
- uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
- if ((tell_uLong) == ((uLong)-1))
- return (ZPOS64_T)-1;
- else
- return tell_uLong;
- }
-}
-
-struct QIODevice_descriptor {
- // Position only used for writing to sequential devices.
- qint64 pos;
- inline QIODevice_descriptor():
- pos(0)
- {}
-};
-
-voidpf ZCALLBACK qiodevice_open_file_func (
- voidpf opaque,
- voidpf file,
- int mode)
-{
- QIODevice_descriptor *d = reinterpret_cast<QIODevice_descriptor*>(opaque);
- QIODevice *iodevice = reinterpret_cast<QIODevice*>(file);
- QIODevice::OpenMode desiredMode;
- if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
- desiredMode = QIODevice::ReadOnly;
- else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
- desiredMode = QIODevice::ReadWrite;
- else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
- desiredMode = QIODevice::WriteOnly;
- if (iodevice->isOpen()) {
- if ((iodevice->openMode() & desiredMode) == desiredMode) {
- if (desiredMode != QIODevice::WriteOnly
- && iodevice->isSequential()) {
- // We can use sequential devices only for writing.
- delete d;
- return NULL;
- } else {
- if ((desiredMode & QIODevice::WriteOnly) != 0) {
- // open for writing, need to seek existing device
- if (!iodevice->isSequential()) {
- iodevice->seek(0);
- } else {
- d->pos = iodevice->pos();
- }
- }
- }
- return iodevice;
- } else {
- delete d;
- return NULL;
- }
- }
- iodevice->open(desiredMode);
- if (iodevice->isOpen()) {
- if (desiredMode != QIODevice::WriteOnly && iodevice->isSequential()) {
- // We can use sequential devices only for writing.
- iodevice->close();
- delete d;
- return NULL;
- } else {
- return iodevice;
- }
- } else {
- delete d;
- return NULL;
- }
-}
-
-
-uLong ZCALLBACK qiodevice_read_file_func (
- voidpf opaque,
- voidpf stream,
- void* buf,
- uLong size)
-{
- QIODevice_descriptor *d = reinterpret_cast<QIODevice_descriptor*>(opaque);
- QIODevice *iodevice = reinterpret_cast<QIODevice*>(stream);
- qint64 ret64 = iodevice->read((char*)buf,size);
- uLong ret;
- ret = (uLong) ret64;
- if (ret64 != -1) {
- d->pos += ret64;
- }
- return ret;
-}
-
-
-uLong ZCALLBACK qiodevice_write_file_func (
- voidpf opaque,
- voidpf stream,
- const void* buf,
- uLong size)
-{
- QIODevice_descriptor *d = reinterpret_cast<QIODevice_descriptor*>(opaque);
- QIODevice *iodevice = reinterpret_cast<QIODevice*>(stream);
- uLong ret;
- qint64 ret64 = iodevice->write((char*)buf,size);
- if (ret64 != -1) {
- d->pos += ret64;
- }
- ret = (uLong) ret64;
- return ret;
-}
-
-uLong ZCALLBACK qiodevice_tell_file_func (
- voidpf opaque,
- voidpf stream)
-{
- QIODevice_descriptor *d = reinterpret_cast<QIODevice_descriptor*>(opaque);
- QIODevice *iodevice = reinterpret_cast<QIODevice*>(stream);
- uLong ret;
- qint64 ret64;
- if (iodevice->isSequential()) {
- ret64 = d->pos;
- } else {
- ret64 = iodevice->pos();
- }
- ret = static_cast<uLong>(ret64);
- return ret;
-}
-
-ZPOS64_T ZCALLBACK qiodevice64_tell_file_func (
- voidpf opaque,
- voidpf stream)
-{
- QIODevice_descriptor *d = reinterpret_cast<QIODevice_descriptor*>(opaque);
- QIODevice *iodevice = reinterpret_cast<QIODevice*>(stream);
- qint64 ret;
- if (iodevice->isSequential()) {
- ret = d->pos;
- } else {
- ret = iodevice->pos();
- }
- return static_cast<ZPOS64_T>(ret);
-}
-
-int ZCALLBACK qiodevice_seek_file_func (
- voidpf /*opaque UNUSED*/,
- voidpf stream,
- uLong offset,
- int origin)
-{
- QIODevice *iodevice = reinterpret_cast<QIODevice*>(stream);
- if (iodevice->isSequential()) {
- if (origin == ZLIB_FILEFUNC_SEEK_END
- && offset == 0) {
- // sequential devices are always at end (needed in mdAppend)
- return 0;
- } else {
- qWarning("qiodevice_seek_file_func() called for sequential device");
- return -1;
- }
- }
- uLong qiodevice_seek_result=0;
- int ret;
- switch (origin)
- {
- case ZLIB_FILEFUNC_SEEK_CUR :
- qiodevice_seek_result = ((QIODevice*)stream)->pos() + offset;
- break;
- case ZLIB_FILEFUNC_SEEK_END :
- qiodevice_seek_result = ((QIODevice*)stream)->size() - offset;
- break;
- case ZLIB_FILEFUNC_SEEK_SET :
- qiodevice_seek_result = offset;
- break;
- default:
- return -1;
- }
- ret = !iodevice->seek(qiodevice_seek_result);
- return ret;
-}
-
-int ZCALLBACK qiodevice64_seek_file_func (
- voidpf /*opaque UNUSED*/,
- voidpf stream,
- ZPOS64_T offset,
- int origin)
-{
- QIODevice *iodevice = reinterpret_cast<QIODevice*>(stream);
- if (iodevice->isSequential()) {
- if (origin == ZLIB_FILEFUNC_SEEK_END
- && offset == 0) {
- // sequential devices are always at end (needed in mdAppend)
- return 0;
- } else {
- qWarning("qiodevice_seek_file_func() called for sequential device");
- return -1;
- }
- }
- qint64 qiodevice_seek_result=0;
- int ret;
- switch (origin)
- {
- case ZLIB_FILEFUNC_SEEK_CUR :
- qiodevice_seek_result = ((QIODevice*)stream)->pos() + offset;
- break;
- case ZLIB_FILEFUNC_SEEK_END :
- qiodevice_seek_result = ((QIODevice*)stream)->size() - offset;
- break;
- case ZLIB_FILEFUNC_SEEK_SET :
- qiodevice_seek_result = offset;
- break;
- default:
- return -1;
- }
- ret = !iodevice->seek(qiodevice_seek_result);
- return ret;
-}
-
-int ZCALLBACK qiodevice_close_file_func (
- voidpf opaque,
- voidpf stream)
-{
- QIODevice_descriptor *d = reinterpret_cast<QIODevice_descriptor*>(opaque);
- delete d;
- QIODevice *device = reinterpret_cast<QIODevice*>(stream);
-#ifdef QUAZIP_QSAVEFILE_BUG_WORKAROUND
- // QSaveFile terribly breaks the is-a idiom:
- // it IS a QIODevice, but it is NOT compatible with it: close() is private
- QSaveFile *file = qobject_cast<QSaveFile*>(device);
- if (file != NULL) {
- // We have to call the ugly commit() instead:
- return file->commit() ? 0 : -1;
- }
-#endif
- device->close();
- return 0;
-}
-
-int ZCALLBACK qiodevice_fakeclose_file_func (
- voidpf opaque,
- voidpf /*stream*/)
-{
- QIODevice_descriptor *d = reinterpret_cast<QIODevice_descriptor*>(opaque);
- delete d;
- return 0;
-}
-
-int ZCALLBACK qiodevice_error_file_func (
- voidpf /*opaque UNUSED*/,
- voidpf /*stream UNUSED*/)
-{
- // can't check for error due to the QIODevice API limitation
- return 0;
-}
-
-void fill_qiodevice_filefunc (
- zlib_filefunc_def* pzlib_filefunc_def)
-{
- pzlib_filefunc_def->zopen_file = qiodevice_open_file_func;
- pzlib_filefunc_def->zread_file = qiodevice_read_file_func;
- pzlib_filefunc_def->zwrite_file = qiodevice_write_file_func;
- pzlib_filefunc_def->ztell_file = qiodevice_tell_file_func;
- pzlib_filefunc_def->zseek_file = qiodevice_seek_file_func;
- pzlib_filefunc_def->zclose_file = qiodevice_close_file_func;
- pzlib_filefunc_def->zerror_file = qiodevice_error_file_func;
- pzlib_filefunc_def->opaque = new QIODevice_descriptor;
-}
-
-void fill_qiodevice64_filefunc (
- zlib_filefunc64_def* pzlib_filefunc_def)
-{
- // Open functions are the same for Qt.
- pzlib_filefunc_def->zopen64_file = qiodevice_open_file_func;
- pzlib_filefunc_def->zread_file = qiodevice_read_file_func;
- pzlib_filefunc_def->zwrite_file = qiodevice_write_file_func;
- pzlib_filefunc_def->ztell64_file = qiodevice64_tell_file_func;
- pzlib_filefunc_def->zseek64_file = qiodevice64_seek_file_func;
- pzlib_filefunc_def->zclose_file = qiodevice_close_file_func;
- pzlib_filefunc_def->zerror_file = qiodevice_error_file_func;
- pzlib_filefunc_def->opaque = new QIODevice_descriptor;
- pzlib_filefunc_def->zfakeclose_file = qiodevice_fakeclose_file_func;
-}
-
-void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
-{
- p_filefunc64_32->zfile_func64.zopen64_file = NULL;
- p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
- p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
- p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
- p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
- p_filefunc64_32->zfile_func64.ztell64_file = NULL;
- p_filefunc64_32->zfile_func64.zseek64_file = NULL;
- p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
- p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
- p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
- p_filefunc64_32->zfile_func64.zfakeclose_file = NULL;
- p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
- p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
-}
diff --git a/daemon/quazip/quaadler32.cpp b/daemon/quazip/quaadler32.cpp
deleted file mode 100644
index 8393ce1..0000000
--- a/daemon/quazip/quaadler32.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright (C) 2010 Adam Walczak
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include "quaadler32.h"
-
-#include "zlib.h"
-
-QuaAdler32::QuaAdler32()
-{
- reset();
-}
-
-quint32 QuaAdler32::calculate(const QByteArray &data)
-{
- return adler32( adler32(0L, Z_NULL, 0), (const Bytef*)data.data(), data.size() );
-}
-
-void QuaAdler32::reset()
-{
- checksum = adler32(0L, Z_NULL, 0);
-}
-
-void QuaAdler32::update(const QByteArray &buf)
-{
- checksum = adler32( checksum, (const Bytef*)buf.data(), buf.size() );
-}
-
-quint32 QuaAdler32::value()
-{
- return checksum;
-}
diff --git a/daemon/quazip/quaadler32.h b/daemon/quazip/quaadler32.h
deleted file mode 100644
index 4e117e7..0000000
--- a/daemon/quazip/quaadler32.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef QUAADLER32_H
-#define QUAADLER32_H
-
-/*
-Copyright (C) 2010 Adam Walczak
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include <QByteArray>
-
-#include "quachecksum32.h"
-
-/// Adler32 checksum
-/** \class QuaAdler32 quaadler32.h <quazip/quaadler32.h>
- * This class wrappers the adler32 function with the QuaChecksum32 interface.
- * See QuaChecksum32 for more info.
- */
-class QUAZIP_EXPORT QuaAdler32 : public QuaChecksum32
-{
-
-public:
- QuaAdler32();
-
- quint32 calculate(const QByteArray &data);
-
- void reset();
- void update(const QByteArray &buf);
- quint32 value();
-
-private:
- quint32 checksum;
-};
-
-#endif //QUAADLER32_H
diff --git a/daemon/quazip/quachecksum32.h b/daemon/quazip/quachecksum32.h
deleted file mode 100644
index b99ef69..0000000
--- a/daemon/quazip/quachecksum32.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef QUACHECKSUM32_H
-#define QUACHECKSUM32_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include <QByteArray>
-#include "quazip_global.h"
-
-/// Checksum interface.
-/** \class QuaChecksum32 quachecksum32.h <quazip/quachecksum32.h>
- * This is an interface for 32 bit checksums.
- * Classes implementing this interface can calcunate a certin
- * checksum in a single step:
- * \code
- * QChecksum32 *crc32 = new QuaCrc32();
- * rasoult = crc32->calculate(data);
- * \endcode
- * or by streaming the data:
- * \code
- * QChecksum32 *crc32 = new QuaCrc32();
- * while(!fileA.atEnd())
- * crc32->update(fileA.read(bufSize));
- * resoultA = crc32->value();
- * crc32->reset();
- * while(!fileB.atEnd())
- * crc32->update(fileB.read(bufSize));
- * resoultB = crc32->value();
- * \endcode
- */
-class QUAZIP_EXPORT QuaChecksum32
-{
-
-public:
- ///Calculates the checksum for data.
- /** \a data source data
- * \return data checksum
- *
- * This function has no efect on the value returned by value().
- */
- virtual quint32 calculate(const QByteArray &data) = 0;
-
- ///Resets the calculation on a checksun for a stream.
- virtual void reset() = 0;
-
- ///Updates the calculated checksum for the stream
- /** \a buf next portion of data from the stream
- */
- virtual void update(const QByteArray &buf) = 0;
-
- ///Value of the checksum calculated for the stream passed throw update().
- /** \return checksum
- */
- virtual quint32 value() = 0;
-};
-
-#endif //QUACHECKSUM32_H
diff --git a/daemon/quazip/quacrc32.cpp b/daemon/quazip/quacrc32.cpp
deleted file mode 100644
index 7e1c57d..0000000
--- a/daemon/quazip/quacrc32.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include "quacrc32.h"
-
-#include "zlib.h"
-
-QuaCrc32::QuaCrc32()
-{
- reset();
-}
-
-quint32 QuaCrc32::calculate(const QByteArray &data)
-{
- return crc32( crc32(0L, Z_NULL, 0), (const Bytef*)data.data(), data.size() );
-}
-
-void QuaCrc32::reset()
-{
- checksum = crc32(0L, Z_NULL, 0);
-}
-
-void QuaCrc32::update(const QByteArray &buf)
-{
- checksum = crc32( checksum, (const Bytef*)buf.data(), buf.size() );
-}
-
-quint32 QuaCrc32::value()
-{
- return checksum;
-}
diff --git a/daemon/quazip/quacrc32.h b/daemon/quazip/quacrc32.h
deleted file mode 100644
index 2582de8..0000000
--- a/daemon/quazip/quacrc32.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef QUACRC32_H
-#define QUACRC32_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include "quachecksum32.h"
-
-///CRC32 checksum
-/** \class QuaCrc32 quacrc32.h <quazip/quacrc32.h>
-* This class wrappers the crc32 function with the QuaChecksum32 interface.
-* See QuaChecksum32 for more info.
-*/
-class QUAZIP_EXPORT QuaCrc32 : public QuaChecksum32 {
-
-public:
- QuaCrc32();
-
- quint32 calculate(const QByteArray &data);
-
- void reset();
- void update(const QByteArray &buf);
- quint32 value();
-
-private:
- quint32 checksum;
-};
-
-#endif //QUACRC32_H
diff --git a/daemon/quazip/quagzipfile.cpp b/daemon/quazip/quagzipfile.cpp
deleted file mode 100644
index 26bf667..0000000
--- a/daemon/quazip/quagzipfile.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include <QFile>
-
-#include "quagzipfile.h"
-
-/// \cond internal
-class QuaGzipFilePrivate {
- friend class QuaGzipFile;
- QString fileName;
- gzFile gzd;
- inline QuaGzipFilePrivate(): gzd(NULL) {}
- inline QuaGzipFilePrivate(const QString &fileName):
- fileName(fileName), gzd(NULL) {}
- template<typename FileId> bool open(FileId id,
- QIODevice::OpenMode mode, QString &error);
- gzFile open(int fd, const char *modeString);
- gzFile open(const QString &name, const char *modeString);
-};
-
-gzFile QuaGzipFilePrivate::open(const QString &name, const char *modeString)
-{
- return gzopen(QFile::encodeName(name).constData(), modeString);
-}
-
-gzFile QuaGzipFilePrivate::open(int fd, const char *modeString)
-{
- return gzdopen(fd, modeString);
-}
-
-template<typename FileId>
-bool QuaGzipFilePrivate::open(FileId id, QIODevice::OpenMode mode,
- QString &error)
-{
- char modeString[2];
- modeString[0] = modeString[1] = '\0';
- if ((mode & QIODevice::Append) != 0) {
- error = QuaGzipFile::trUtf8("QIODevice::Append is not "
- "supported for GZIP");
- return false;
- }
- if ((mode & QIODevice::ReadOnly) != 0
- && (mode & QIODevice::WriteOnly) != 0) {
- error = QuaGzipFile::trUtf8("Opening gzip for both reading"
- " and writing is not supported");
- return false;
- } else if ((mode & QIODevice::ReadOnly) != 0) {
- modeString[0] = 'r';
- } else if ((mode & QIODevice::WriteOnly) != 0) {
- modeString[0] = 'w';
- } else {
- error = QuaGzipFile::trUtf8("You can open a gzip either for reading"
- " or for writing. Which is it?");
- return false;
- }
- gzd = open(id, modeString);
- if (gzd == NULL) {
- error = QuaGzipFile::trUtf8("Could not gzopen() file");
- return false;
- }
- return true;
-}
-/// \endcond
-
-QuaGzipFile::QuaGzipFile():
-d(new QuaGzipFilePrivate())
-{
-}
-
-QuaGzipFile::QuaGzipFile(QObject *parent):
-QIODevice(parent),
-d(new QuaGzipFilePrivate())
-{
-}
-
-QuaGzipFile::QuaGzipFile(const QString &fileName, QObject *parent):
- QIODevice(parent),
-d(new QuaGzipFilePrivate(fileName))
-{
-}
-
-QuaGzipFile::~QuaGzipFile()
-{
- if (isOpen()) {
- close();
- }
- delete d;
-}
-
-void QuaGzipFile::setFileName(const QString& fileName)
-{
- d->fileName = fileName;
-}
-
-QString QuaGzipFile::getFileName() const
-{
- return d->fileName;
-}
-
-bool QuaGzipFile::isSequential() const
-{
- return true;
-}
-
-bool QuaGzipFile::open(QIODevice::OpenMode mode)
-{
- QString error;
- if (!d->open(d->fileName, mode, error)) {
- setErrorString(error);
- return false;
- }
- return QIODevice::open(mode);
-}
-
-bool QuaGzipFile::open(int fd, QIODevice::OpenMode mode)
-{
- QString error;
- if (!d->open(fd, mode, error)) {
- setErrorString(error);
- return false;
- }
- return QIODevice::open(mode);
-}
-
-bool QuaGzipFile::flush()
-{
- return gzflush(d->gzd, Z_SYNC_FLUSH) == Z_OK;
-}
-
-void QuaGzipFile::close()
-{
- QIODevice::close();
- gzclose(d->gzd);
-}
-
-qint64 QuaGzipFile::readData(char *data, qint64 maxSize)
-{
- return gzread(d->gzd, (voidp)data, (unsigned)maxSize);
-}
-
-qint64 QuaGzipFile::writeData(const char *data, qint64 maxSize)
-{
- if (maxSize == 0)
- return 0;
- int written = gzwrite(d->gzd, (voidp)data, (unsigned)maxSize);
- if (written == 0)
- return -1;
- else
- return written;
-}
diff --git a/daemon/quazip/quagzipfile.h b/daemon/quazip/quagzipfile.h
deleted file mode 100644
index 32bc565..0000000
--- a/daemon/quazip/quagzipfile.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef QUAZIP_QUAGZIPFILE_H
-#define QUAZIP_QUAGZIPFILE_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include <QIODevice>
-#include "quazip_global.h"
-
-#include <zlib.h>
-
-class QuaGzipFilePrivate;
-
-/// GZIP file
-/**
- This class is a wrapper around GZIP file access functions in zlib. Unlike QuaZip classes, it doesn't allow reading from a GZIP file opened as QIODevice, for example, if your GZIP file is in QBuffer. It only provides QIODevice access to a GZIP file contents, but the GZIP file itself must be identified by its name on disk or by descriptor id.
- */
-class QUAZIP_EXPORT QuaGzipFile: public QIODevice {
- Q_OBJECT
-public:
- /// Empty constructor.
- /**
- Must call setFileName() before trying to open.
- */
- QuaGzipFile();
- /// Empty constructor with a parent.
- /**
- Must call setFileName() before trying to open.
- \param parent The parent object, as per QObject logic.
- */
- QuaGzipFile(QObject *parent);
- /// Constructor.
- /**
- \param fileName The name of the GZIP file.
- \param parent The parent object, as per QObject logic.
- */
- QuaGzipFile(const QString &fileName, QObject *parent = NULL);
- /// Destructor.
- virtual ~QuaGzipFile();
- /// Sets the name of the GZIP file to be opened.
- void setFileName(const QString& fileName);
- /// Returns the name of the GZIP file.
- QString getFileName() const;
- /// Returns true.
- /**
- Strictly speaking, zlib supports seeking for GZIP files, but it is
- poorly implemented, because there is no way to implement it
- properly. For reading, seeking backwards is very slow, and for
- writing, it is downright impossible. Therefore, QuaGzipFile does not
- support seeking at all.
- */
- virtual bool isSequential() const;
- /// Opens the file.
- /**
- \param mode Can be either QIODevice::Write or QIODevice::Read.
- ReadWrite and Append aren't supported.
- */
- virtual bool open(QIODevice::OpenMode mode);
- /// Opens the file.
- /**
- \overload
- \param fd The file descriptor to read/write the GZIP file from/to.
- \param mode Can be either QIODevice::Write or QIODevice::Read.
- ReadWrite and Append aren't supported.
- */
- virtual bool open(int fd, QIODevice::OpenMode mode);
- /// Flushes data to file.
- /**
- The data is written using Z_SYNC_FLUSH mode. Doesn't make any sense
- when reading.
- */
- virtual bool flush();
- /// Closes the file.
- virtual void close();
-protected:
- /// Implementation of QIODevice::readData().
- virtual qint64 readData(char *data, qint64 maxSize);
- /// Implementation of QIODevice::writeData().
- virtual qint64 writeData(const char *data, qint64 maxSize);
-private:
- // not implemented by design to disable copy
- QuaGzipFile(const QuaGzipFile &that);
- QuaGzipFile& operator=(const QuaGzipFile &that);
- QuaGzipFilePrivate *d;
-};
-
-#endif // QUAZIP_QUAGZIPFILE_H
diff --git a/daemon/quazip/quaziodevice.cpp b/daemon/quazip/quaziodevice.cpp
deleted file mode 100644
index 0d12028..0000000
--- a/daemon/quazip/quaziodevice.cpp
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include "quaziodevice.h"
-
-#define QUAZIO_INBUFSIZE 4096
-#define QUAZIO_OUTBUFSIZE 4096
-
-/// \cond internal
-class QuaZIODevicePrivate {
- friend class QuaZIODevice;
- QuaZIODevicePrivate(QIODevice *io);
- ~QuaZIODevicePrivate();
- QIODevice *io;
- z_stream zins;
- z_stream zouts;
- char *inBuf;
- int inBufPos;
- int inBufSize;
- char *outBuf;
- int outBufPos;
- int outBufSize;
- bool zBufError;
- int doFlush(QString &error);
-};
-
-QuaZIODevicePrivate::QuaZIODevicePrivate(QIODevice *io):
- io(io),
- inBuf(NULL),
- inBufPos(0),
- inBufSize(0),
- outBuf(NULL),
- outBufPos(0),
- outBufSize(0),
- zBufError(false)
-{
- zins.zalloc = (alloc_func) NULL;
- zins.zfree = (free_func) NULL;
- zins.opaque = NULL;
- zouts.zalloc = (alloc_func) NULL;
- zouts.zfree = (free_func) NULL;
- zouts.opaque = NULL;
- inBuf = new char[QUAZIO_INBUFSIZE];
- outBuf = new char[QUAZIO_OUTBUFSIZE];
-#ifdef QUAZIP_ZIODEVICE_DEBUG_OUTPUT
- debug.setFileName("debug.out");
- debug.open(QIODevice::WriteOnly);
-#endif
-#ifdef QUAZIP_ZIODEVICE_DEBUG_INPUT
- indebug.setFileName("debug.in");
- indebug.open(QIODevice::WriteOnly);
-#endif
-}
-
-QuaZIODevicePrivate::~QuaZIODevicePrivate()
-{
-#ifdef QUAZIP_ZIODEVICE_DEBUG_OUTPUT
- debug.close();
-#endif
-#ifdef QUAZIP_ZIODEVICE_DEBUG_INPUT
- indebug.close();
-#endif
- if (inBuf != NULL)
- delete[] inBuf;
- if (outBuf != NULL)
- delete[] outBuf;
-}
-
-int QuaZIODevicePrivate::doFlush(QString &error)
-{
- int flushed = 0;
- while (outBufPos < outBufSize) {
- int more = io->write(outBuf + outBufPos, outBufSize - outBufPos);
- if (more == -1) {
- error = io->errorString();
- return -1;
- }
- if (more == 0)
- break;
- outBufPos += more;
- flushed += more;
- }
- if (outBufPos == outBufSize) {
- outBufPos = outBufSize = 0;
- }
- return flushed;
-}
-
-/// \endcond
-
-// #define QUAZIP_ZIODEVICE_DEBUG_OUTPUT
-// #define QUAZIP_ZIODEVICE_DEBUG_INPUT
-#ifdef QUAZIP_ZIODEVICE_DEBUG_OUTPUT
-#include <QFile>
-static QFile debug;
-#endif
-#ifdef QUAZIP_ZIODEVICE_DEBUG_INPUT
-#include <QFile>
-static QFile indebug;
-#endif
-
-QuaZIODevice::QuaZIODevice(QIODevice *io, QObject *parent):
- QIODevice(parent),
- d(new QuaZIODevicePrivate(io))
-{
- connect(io, SIGNAL(readyRead()), SIGNAL(readyRead()));
-}
-
-QuaZIODevice::~QuaZIODevice()
-{
- if (isOpen())
- close();
- delete d;
-}
-
-QIODevice *QuaZIODevice::getIoDevice() const
-{
- return d->io;
-}
-
-bool QuaZIODevice::open(QIODevice::OpenMode mode)
-{
- if ((mode & QIODevice::Append) != 0) {
- setErrorString(trUtf8("QIODevice::Append is not supported for"
- " QuaZIODevice"));
- return false;
- }
- if ((mode & QIODevice::ReadWrite) == QIODevice::ReadWrite) {
- setErrorString(trUtf8("QIODevice::ReadWrite is not supported for"
- " QuaZIODevice"));
- return false;
- }
- if ((mode & QIODevice::ReadOnly) != 0) {
- if (inflateInit(&d->zins) != Z_OK) {
- setErrorString(d->zins.msg);
- return false;
- }
- }
- if ((mode & QIODevice::WriteOnly) != 0) {
- if (deflateInit(&d->zouts, Z_DEFAULT_COMPRESSION) != Z_OK) {
- setErrorString(d->zouts.msg);
- return false;
- }
- }
- return QIODevice::open(mode);
-}
-
-void QuaZIODevice::close()
-{
- if ((openMode() & QIODevice::ReadOnly) != 0) {
- if (inflateEnd(&d->zins) != Z_OK) {
- setErrorString(d->zins.msg);
- }
- }
- if ((openMode() & QIODevice::WriteOnly) != 0) {
- flush();
- if (deflateEnd(&d->zouts) != Z_OK) {
- setErrorString(d->zouts.msg);
- }
- }
- QIODevice::close();
-}
-
-qint64 QuaZIODevice::readData(char *data, qint64 maxSize)
-{
- int read = 0;
- while (read < maxSize) {
- if (d->inBufPos == d->inBufSize) {
- d->inBufPos = 0;
- d->inBufSize = d->io->read(d->inBuf, QUAZIO_INBUFSIZE);
- if (d->inBufSize == -1) {
- d->inBufSize = 0;
- setErrorString(d->io->errorString());
- return -1;
- }
- if (d->inBufSize == 0)
- break;
- }
- while (read < maxSize && d->inBufPos < d->inBufSize) {
- d->zins.next_in = (Bytef *) (d->inBuf + d->inBufPos);
- d->zins.avail_in = d->inBufSize - d->inBufPos;
- d->zins.next_out = (Bytef *) (data + read);
- d->zins.avail_out = (uInt) (maxSize - read); // hope it's less than 2GB
- int more = 0;
- switch (inflate(&d->zins, Z_SYNC_FLUSH)) {
- case Z_OK:
- read = (char *) d->zins.next_out - data;
- d->inBufPos = (char *) d->zins.next_in - d->inBuf;
- break;
- case Z_STREAM_END:
- read = (char *) d->zins.next_out - data;
- d->inBufPos = (char *) d->zins.next_in - d->inBuf;
- return read;
- case Z_BUF_ERROR: // this should never happen, but just in case
- if (!d->zBufError) {
- qWarning("Z_BUF_ERROR detected with %d/%d in/out, weird",
- d->zins.avail_in, d->zins.avail_out);
- d->zBufError = true;
- }
- memmove(d->inBuf, d->inBuf + d->inBufPos, d->inBufSize - d->inBufPos);
- d->inBufSize -= d->inBufPos;
- d->inBufPos = 0;
- more = d->io->read(d->inBuf + d->inBufSize, QUAZIO_INBUFSIZE - d->inBufSize);
- if (more == -1) {
- setErrorString(d->io->errorString());
- return -1;
- }
- if (more == 0)
- return read;
- d->inBufSize += more;
- break;
- default:
- setErrorString(QString::fromLocal8Bit(d->zins.msg));
- return -1;
- }
- }
- }
-#ifdef QUAZIP_ZIODEVICE_DEBUG_INPUT
- indebug.write(data, read);
-#endif
- return read;
-}
-
-qint64 QuaZIODevice::writeData(const char *data, qint64 maxSize)
-{
- int written = 0;
- QString error;
- if (d->doFlush(error) == -1) {
- setErrorString(error);
- return -1;
- }
- while (written < maxSize) {
- // there is some data waiting in the output buffer
- if (d->outBufPos < d->outBufSize)
- return written;
- d->zouts.next_in = (Bytef *) (data + written);
- d->zouts.avail_in = (uInt) (maxSize - written); // hope it's less than 2GB
- d->zouts.next_out = (Bytef *) d->outBuf;
- d->zouts.avail_out = QUAZIO_OUTBUFSIZE;
- switch (deflate(&d->zouts, Z_NO_FLUSH)) {
- case Z_OK:
- written = (char *) d->zouts.next_in - data;
- d->outBufSize = (char *) d->zouts.next_out - d->outBuf;
- break;
- default:
- setErrorString(QString::fromLocal8Bit(d->zouts.msg));
- return -1;
- }
- if (d->doFlush(error) == -1) {
- setErrorString(error);
- return -1;
- }
- }
-#ifdef QUAZIP_ZIODEVICE_DEBUG_OUTPUT
- debug.write(data, written);
-#endif
- return written;
-}
-
-bool QuaZIODevice::flush()
-{
- QString error;
- if (d->doFlush(error) < 0) {
- setErrorString(error);
- return false;
- }
- // can't flush buffer, some data is still waiting
- if (d->outBufPos < d->outBufSize)
- return true;
- Bytef c = 0;
- d->zouts.next_in = &c; // fake input buffer
- d->zouts.avail_in = 0; // of zero size
- do {
- d->zouts.next_out = (Bytef *) d->outBuf;
- d->zouts.avail_out = QUAZIO_OUTBUFSIZE;
- switch (deflate(&d->zouts, Z_SYNC_FLUSH)) {
- case Z_OK:
- d->outBufSize = (char *) d->zouts.next_out - d->outBuf;
- if (d->doFlush(error) < 0) {
- setErrorString(error);
- return false;
- }
- if (d->outBufPos < d->outBufSize)
- return true;
- break;
- case Z_BUF_ERROR: // nothing to write?
- return true;
- default:
- setErrorString(QString::fromLocal8Bit(d->zouts.msg));
- return false;
- }
- } while (d->zouts.avail_out == 0);
- return true;
-}
-
-bool QuaZIODevice::isSequential() const
-{
- return true;
-}
diff --git a/daemon/quazip/quaziodevice.h b/daemon/quazip/quaziodevice.h
deleted file mode 100644
index f8cd380..0000000
--- a/daemon/quazip/quaziodevice.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef QUAZIP_QUAZIODEVICE_H
-#define QUAZIP_QUAZIODEVICE_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include <QIODevice>
-#include "quazip_global.h"
-
-#include <zlib.h>
-
-class QuaZIODevicePrivate;
-
-/// A class to compress/decompress QIODevice.
-/**
- This class can be used to compress any data written to QIODevice or
- decompress it back. Compressing data sent over a QTcpSocket is a good
- example.
- */
-class QUAZIP_EXPORT QuaZIODevice: public QIODevice {
- Q_OBJECT
-public:
- /// Constructor.
- /**
- \param io The QIODevice to read/write.
- \param parent The parent object, as per QObject logic.
- */
- QuaZIODevice(QIODevice *io, QObject *parent = NULL);
- /// Destructor.
- ~QuaZIODevice();
- /// Flushes data waiting to be written.
- /**
- Unfortunately, as QIODevice doesn't support flush() by itself, the
- only thing this method does is write the compressed data into the
- device using Z_SYNC_FLUSH mode. If you need the compressed data to
- actually be flushed from the buffer of the underlying QIODevice, you
- need to call its flush() method as well, providing it supports it
- (like QTcpSocket does). Example:
- \code
- QuaZIODevice dev(&sock);
- dev.open(QIODevice::Write);
- dev.write(yourDataGoesHere);
- dev.flush();
- sock->flush(); // this actually sends data to network
- \endcode
-
- This may change in the future versions of QuaZIP by implementing an
- ugly hack: trying to cast the QIODevice using qobject_cast to known
- flush()-supporting subclasses, and calling flush if the resulting
- pointer is not zero.
- */
- virtual bool flush();
- /// Opens the device.
- /**
- \param mode Neither QIODevice::ReadWrite nor QIODevice::Append are
- not supported.
- */
- virtual bool open(QIODevice::OpenMode mode);
- /// Closes this device, but not the underlying one.
- /**
- The underlying QIODevice is not closed in case you want to write
- something else to it.
- */
- virtual void close();
- /// Returns the underlying device.
- QIODevice *getIoDevice() const;
- /// Returns true.
- virtual bool isSequential() const;
-protected:
- /// Implementation of QIODevice::readData().
- virtual qint64 readData(char *data, qint64 maxSize);
- /// Implementation of QIODevice::writeData().
- virtual qint64 writeData(const char *data, qint64 maxSize);
-private:
- QuaZIODevicePrivate *d;
-};
-#endif // QUAZIP_QUAZIODEVICE_H
diff --git a/daemon/quazip/quazip.cpp b/daemon/quazip/quazip.cpp
deleted file mode 100644
index 52019d2..0000000
--- a/daemon/quazip/quazip.cpp
+++ /dev/null
@@ -1,788 +0,0 @@
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant, see
-quazip/(un)zip.h files for details, basically it's zlib license.
- **/
-
-#include <QFile>
-#include <QFlags>
-#include <QHash>
-
-#include "quazip.h"
-
-/// All the internal stuff for the QuaZip class.
-/**
- \internal
-
- This class keeps all the private stuff for the QuaZip class so it can
- be changed without breaking binary compatibility, according to the
- Pimpl idiom.
- */
-class QuaZipPrivate {
- friend class QuaZip;
- private:
- /// The pointer to the corresponding QuaZip instance.
- QuaZip *q;
- /// The codec for file names.
- QTextCodec *fileNameCodec;
- /// The codec for comments.
- QTextCodec *commentCodec;
- /// The archive file name.
- QString zipName;
- /// The device to access the archive.
- QIODevice *ioDevice;
- /// The global comment.
- QString comment;
- /// The open mode.
- QuaZip::Mode mode;
- union {
- /// The internal handle for UNZIP modes.
- unzFile unzFile_f;
- /// The internal handle for ZIP modes.
- zipFile zipFile_f;
- };
- /// Whether a current file is set.
- bool hasCurrentFile_f;
- /// The last error.
- int zipError;
- /// Whether \ref QuaZip::setDataDescriptorWritingEnabled() "the data descriptor writing mode" is enabled.
- bool dataDescriptorWritingEnabled;
- /// The zip64 mode.
- bool zip64;
- /// The auto-close flag.
- bool autoClose;
- inline QTextCodec *getDefaultFileNameCodec()
- {
- if (defaultFileNameCodec == NULL) {
- return QTextCodec::codecForLocale();
- } else {
- return defaultFileNameCodec;
- }
- }
- /// The constructor for the corresponding QuaZip constructor.
- inline QuaZipPrivate(QuaZip *q):
- q(q),
- fileNameCodec(getDefaultFileNameCodec()),
- commentCodec(QTextCodec::codecForLocale()),
- ioDevice(NULL),
- mode(QuaZip::mdNotOpen),
- hasCurrentFile_f(false),
- zipError(UNZ_OK),
- dataDescriptorWritingEnabled(true),
- zip64(false),
- autoClose(true)
- {
- lastMappedDirectoryEntry.num_of_file = 0;
- lastMappedDirectoryEntry.pos_in_zip_directory = 0;
- }
- /// The constructor for the corresponding QuaZip constructor.
- inline QuaZipPrivate(QuaZip *q, const QString &zipName):
- q(q),
- fileNameCodec(getDefaultFileNameCodec()),
- commentCodec(QTextCodec::codecForLocale()),
- zipName(zipName),
- ioDevice(NULL),
- mode(QuaZip::mdNotOpen),
- hasCurrentFile_f(false),
- zipError(UNZ_OK),
- dataDescriptorWritingEnabled(true),
- zip64(false),
- autoClose(true)
- {
- lastMappedDirectoryEntry.num_of_file = 0;
- lastMappedDirectoryEntry.pos_in_zip_directory = 0;
- }
- /// The constructor for the corresponding QuaZip constructor.
- inline QuaZipPrivate(QuaZip *q, QIODevice *ioDevice):
- q(q),
- fileNameCodec(getDefaultFileNameCodec()),
- commentCodec(QTextCodec::codecForLocale()),
- ioDevice(ioDevice),
- mode(QuaZip::mdNotOpen),
- hasCurrentFile_f(false),
- zipError(UNZ_OK),
- dataDescriptorWritingEnabled(true),
- zip64(false),
- autoClose(true)
- {
- lastMappedDirectoryEntry.num_of_file = 0;
- lastMappedDirectoryEntry.pos_in_zip_directory = 0;
- }
- /// Returns either a list of file names or a list of QuaZipFileInfo.
- template<typename TFileInfo>
- bool getFileInfoList(QList<TFileInfo> *result) const;
-
- /// Stores map of filenames and file locations for unzipping
- inline void clearDirectoryMap();
- inline void addCurrentFileToDirectoryMap(const QString &fileName);
- bool goToFirstUnmappedFile();
- QHash<QString, unz64_file_pos> directoryCaseSensitive;
- QHash<QString, unz64_file_pos> directoryCaseInsensitive;
- unz64_file_pos lastMappedDirectoryEntry;
- static QTextCodec *defaultFileNameCodec;
-};
-
-QTextCodec *QuaZipPrivate::defaultFileNameCodec = NULL;
-
-void QuaZipPrivate::clearDirectoryMap()
-{
- directoryCaseInsensitive.clear();
- directoryCaseSensitive.clear();
- lastMappedDirectoryEntry.num_of_file = 0;
- lastMappedDirectoryEntry.pos_in_zip_directory = 0;
-}
-
-void QuaZipPrivate::addCurrentFileToDirectoryMap(const QString &fileName)
-{
- if (!hasCurrentFile_f || fileName.isEmpty()) {
- return;
- }
- // Adds current file to filename map as fileName
- unz64_file_pos fileDirectoryPos;
- unzGetFilePos64(unzFile_f, &fileDirectoryPos);
- directoryCaseSensitive.insert(fileName, fileDirectoryPos);
- // Only add lowercase to directory map if not already there
- // ensures only map the first one seen
- QString lower = fileName.toLower();
- if (!directoryCaseInsensitive.contains(lower))
- directoryCaseInsensitive.insert(lower, fileDirectoryPos);
- // Mark last one
- if (fileDirectoryPos.pos_in_zip_directory > lastMappedDirectoryEntry.pos_in_zip_directory)
- lastMappedDirectoryEntry = fileDirectoryPos;
-}
-
-bool QuaZipPrivate::goToFirstUnmappedFile()
-{
- zipError = UNZ_OK;
- if (mode != QuaZip::mdUnzip) {
- qWarning("QuaZipPrivate::goToNextUnmappedFile(): ZIP is not open in mdUnzip mode");
- return false;
- }
- // If not mapped anything, go to beginning
- if (lastMappedDirectoryEntry.pos_in_zip_directory == 0) {
- unzGoToFirstFile(unzFile_f);
- } else {
- // Goto the last one mapped, plus one
- unzGoToFilePos64(unzFile_f, &lastMappedDirectoryEntry);
- unzGoToNextFile(unzFile_f);
- }
- hasCurrentFile_f=zipError==UNZ_OK;
- if(zipError==UNZ_END_OF_LIST_OF_FILE)
- zipError=UNZ_OK;
- return hasCurrentFile_f;
-}
-
-QuaZip::QuaZip():
- p(new QuaZipPrivate(this))
-{
-}
-
-QuaZip::QuaZip(const QString& zipName):
- p(new QuaZipPrivate(this, zipName))
-{
-}
-
-QuaZip::QuaZip(QIODevice *ioDevice):
- p(new QuaZipPrivate(this, ioDevice))
-{
-}
-
-QuaZip::~QuaZip()
-{
- if(isOpen())
- close();
- delete p;
-}
-
-bool QuaZip::open(Mode mode, zlib_filefunc_def* ioApi)
-{
- p->zipError=UNZ_OK;
- if(isOpen()) {
- qWarning("QuaZip::open(): ZIP already opened");
- return false;
- }
- QIODevice *ioDevice = p->ioDevice;
- if (ioDevice == NULL) {
- if (p->zipName.isEmpty()) {
- qWarning("QuaZip::open(): set either ZIP file name or IO device first");
- return false;
- } else {
- ioDevice = new QFile(p->zipName);
- }
- }
- unsigned flags = 0;
- switch(mode) {
- case mdUnzip:
- if (ioApi == NULL) {
- if (p->autoClose)
- flags |= UNZ_AUTO_CLOSE;
- p->unzFile_f=unzOpenInternal(ioDevice, NULL, 1, flags);
- } else {
- // QuaZIP pre-zip64 compatibility mode
- p->unzFile_f=unzOpen2(ioDevice, ioApi);
- if (p->unzFile_f != NULL) {
- if (p->autoClose) {
- unzSetFlags(p->unzFile_f, UNZ_AUTO_CLOSE);
- } else {
- unzClearFlags(p->unzFile_f, UNZ_AUTO_CLOSE);
- }
- }
- }
- if(p->unzFile_f!=NULL) {
- if (ioDevice->isSequential()) {
- unzClose(p->unzFile_f);
- if (!p->zipName.isEmpty())
- delete ioDevice;
- qWarning("QuaZip::open(): "
- "only mdCreate can be used with "
- "sequential devices");
- return false;
- }
- p->mode=mode;
- p->ioDevice = ioDevice;
- return true;
- } else {
- p->zipError=UNZ_OPENERROR;
- if (!p->zipName.isEmpty())
- delete ioDevice;
- return false;
- }
- case mdCreate:
- case mdAppend:
- case mdAdd:
- if (ioApi == NULL) {
- if (p->autoClose)
- flags |= ZIP_AUTO_CLOSE;
- if (p->dataDescriptorWritingEnabled)
- flags |= ZIP_WRITE_DATA_DESCRIPTOR;
- p->zipFile_f=zipOpen3(ioDevice,
- mode==mdCreate?APPEND_STATUS_CREATE:
- mode==mdAppend?APPEND_STATUS_CREATEAFTER:
- APPEND_STATUS_ADDINZIP,
- NULL, NULL, flags);
- } else {
- // QuaZIP pre-zip64 compatibility mode
- p->zipFile_f=zipOpen2(ioDevice,
- mode==mdCreate?APPEND_STATUS_CREATE:
- mode==mdAppend?APPEND_STATUS_CREATEAFTER:
- APPEND_STATUS_ADDINZIP,
- NULL,
- ioApi);
- if (p->zipFile_f != NULL) {
- zipSetFlags(p->zipFile_f, flags);
- }
- }
- if(p->zipFile_f!=NULL) {
- if (ioDevice->isSequential()) {
- if (mode != mdCreate) {
- zipClose(p->zipFile_f, NULL);
- qWarning("QuaZip::open(): "
- "only mdCreate can be used with "
- "sequential devices");
- if (!p->zipName.isEmpty())
- delete ioDevice;
- return false;
- }
- zipSetFlags(p->zipFile_f, ZIP_SEQUENTIAL);
- }
- p->mode=mode;
- p->ioDevice = ioDevice;
- return true;
- } else {
- p->zipError=UNZ_OPENERROR;
- if (!p->zipName.isEmpty())
- delete ioDevice;
- return false;
- }
- default:
- qWarning("QuaZip::open(): unknown mode: %d", (int)mode);
- if (!p->zipName.isEmpty())
- delete ioDevice;
- return false;
- break;
- }
-}
-
-void QuaZip::close()
-{
- p->zipError=UNZ_OK;
- switch(p->mode) {
- case mdNotOpen:
- qWarning("QuaZip::close(): ZIP is not open");
- return;
- case mdUnzip:
- p->zipError=unzClose(p->unzFile_f);
- break;
- case mdCreate:
- case mdAppend:
- case mdAdd:
- p->zipError=zipClose(p->zipFile_f,
- p->comment.isNull() ? NULL
- : p->commentCodec->fromUnicode(p->comment).constData());
- break;
- default:
- qWarning("QuaZip::close(): unknown mode: %d", (int)p->mode);
- return;
- }
- // opened by name, need to delete the internal IO device
- if (!p->zipName.isEmpty()) {
- delete p->ioDevice;
- p->ioDevice = NULL;
- }
- p->clearDirectoryMap();
- if(p->zipError==UNZ_OK)
- p->mode=mdNotOpen;
-}
-
-void QuaZip::setZipName(const QString& zipName)
-{
- if(isOpen()) {
- qWarning("QuaZip::setZipName(): ZIP is already open!");
- return;
- }
- p->zipName=zipName;
- p->ioDevice = NULL;
-}
-
-void QuaZip::setIoDevice(QIODevice *ioDevice)
-{
- if(isOpen()) {
- qWarning("QuaZip::setIoDevice(): ZIP is already open!");
- return;
- }
- p->ioDevice = ioDevice;
- p->zipName = QString();
-}
-
-int QuaZip::getEntriesCount()const
-{
- QuaZip *fakeThis=(QuaZip*)this; // non-const
- fakeThis->p->zipError=UNZ_OK;
- if(p->mode!=mdUnzip) {
- qWarning("QuaZip::getEntriesCount(): ZIP is not open in mdUnzip mode");
- return -1;
- }
- unz_global_info64 globalInfo;
- if((fakeThis->p->zipError=unzGetGlobalInfo64(p->unzFile_f, &globalInfo))!=UNZ_OK)
- return p->zipError;
- return (int)globalInfo.number_entry;
-}
-
-QString QuaZip::getComment()const
-{
- QuaZip *fakeThis=(QuaZip*)this; // non-const
- fakeThis->p->zipError=UNZ_OK;
- if(p->mode!=mdUnzip) {
- qWarning("QuaZip::getComment(): ZIP is not open in mdUnzip mode");
- return QString();
- }
- unz_global_info64 globalInfo;
- QByteArray comment;
- if((fakeThis->p->zipError=unzGetGlobalInfo64(p->unzFile_f, &globalInfo))!=UNZ_OK)
- return QString();
- comment.resize(globalInfo.size_comment);
- if((fakeThis->p->zipError=unzGetGlobalComment(p->unzFile_f, comment.data(), comment.size())) < 0)
- return QString();
- fakeThis->p->zipError = UNZ_OK;
- return p->commentCodec->toUnicode(comment);
-}
-
-bool QuaZip::setCurrentFile(const QString& fileName, CaseSensitivity cs)
-{
- p->zipError=UNZ_OK;
- if(p->mode!=mdUnzip) {
- qWarning("QuaZip::setCurrentFile(): ZIP is not open in mdUnzip mode");
- return false;
- }
- if(fileName.isEmpty()) {
- p->hasCurrentFile_f=false;
- return true;
- }
- // Unicode-aware reimplementation of the unzLocateFile function
- if(p->unzFile_f==NULL) {
- p->zipError=UNZ_PARAMERROR;
- return false;
- }
- if(fileName.length()>MAX_FILE_NAME_LENGTH) {
- p->zipError=UNZ_PARAMERROR;
- return false;
- }
- // Find the file by name
- bool sens = convertCaseSensitivity(cs) == Qt::CaseSensitive;
- QString lower, current;
- if(!sens) lower=fileName.toLower();
- p->hasCurrentFile_f=false;
-
- // Check the appropriate Map
- unz64_file_pos fileDirPos;
- fileDirPos.pos_in_zip_directory = 0;
- if (sens) {
- if (p->directoryCaseSensitive.contains(fileName))
- fileDirPos = p->directoryCaseSensitive.value(fileName);
- } else {
- if (p->directoryCaseInsensitive.contains(lower))
- fileDirPos = p->directoryCaseInsensitive.value(lower);
- }
-
- if (fileDirPos.pos_in_zip_directory != 0) {
- p->zipError = unzGoToFilePos64(p->unzFile_f, &fileDirPos);
- p->hasCurrentFile_f = p->zipError == UNZ_OK;
- }
-
- if (p->hasCurrentFile_f)
- return p->hasCurrentFile_f;
-
- // Not mapped yet, start from where we have got to so far
- for(bool more=p->goToFirstUnmappedFile(); more; more=goToNextFile()) {
- current=getCurrentFileName();
- if(current.isEmpty()) return false;
- if(sens) {
- if(current==fileName) break;
- } else {
- if(current.toLower()==lower) break;
- }
- }
- return p->hasCurrentFile_f;
-}
-
-bool QuaZip::goToFirstFile()
-{
- p->zipError=UNZ_OK;
- if(p->mode!=mdUnzip) {
- qWarning("QuaZip::goToFirstFile(): ZIP is not open in mdUnzip mode");
- return false;
- }
- p->zipError=unzGoToFirstFile(p->unzFile_f);
- p->hasCurrentFile_f=p->zipError==UNZ_OK;
- return p->hasCurrentFile_f;
-}
-
-bool QuaZip::goToNextFile()
-{
- p->zipError=UNZ_OK;
- if(p->mode!=mdUnzip) {
- qWarning("QuaZip::goToFirstFile(): ZIP is not open in mdUnzip mode");
- return false;
- }
- p->zipError=unzGoToNextFile(p->unzFile_f);
- p->hasCurrentFile_f=p->zipError==UNZ_OK;
- if(p->zipError==UNZ_END_OF_LIST_OF_FILE)
- p->zipError=UNZ_OK;
- return p->hasCurrentFile_f;
-}
-
-bool QuaZip::getCurrentFileInfo(QuaZipFileInfo *info)const
-{
- QuaZipFileInfo64 info64;
- if (info == NULL) { // Very unlikely because of the overloads
- return false;
- }
- if (getCurrentFileInfo(&info64)) {
- info64.toQuaZipFileInfo(*info);
- return true;
- } else {
- return false;
- }
-}
-
-bool QuaZip::getCurrentFileInfo(QuaZipFileInfo64 *info)const
-{
- QuaZip *fakeThis=(QuaZip*)this; // non-const
- fakeThis->p->zipError=UNZ_OK;
- if(p->mode!=mdUnzip) {
- qWarning("QuaZip::getCurrentFileInfo(): ZIP is not open in mdUnzip mode");
- return false;
- }
- unz_file_info64 info_z;
- QByteArray fileName;
- QByteArray extra;
- QByteArray comment;
- if(info==NULL) return false;
- if(!isOpen()||!hasCurrentFile()) return false;
- if((fakeThis->p->zipError=unzGetCurrentFileInfo64(p->unzFile_f, &info_z, NULL, 0, NULL, 0, NULL, 0))!=UNZ_OK)
- return false;
- fileName.resize(info_z.size_filename);
- extra.resize(info_z.size_file_extra);
- comment.resize(info_z.size_file_comment);
- if((fakeThis->p->zipError=unzGetCurrentFileInfo64(p->unzFile_f, NULL,
- fileName.data(), fileName.size(),
- extra.data(), extra.size(),
- comment.data(), comment.size()))!=UNZ_OK)
- return false;
- info->versionCreated=info_z.version;
- info->versionNeeded=info_z.version_needed;
- info->flags=info_z.flag;
- info->method=info_z.compression_method;
- info->crc=info_z.crc;
- info->compressedSize=info_z.compressed_size;
- info->uncompressedSize=info_z.uncompressed_size;
- info->diskNumberStart=info_z.disk_num_start;
- info->internalAttr=info_z.internal_fa;
- info->externalAttr=info_z.external_fa;
- info->name=p->fileNameCodec->toUnicode(fileName);
- info->comment=p->commentCodec->toUnicode(comment);
- info->extra=extra;
- info->dateTime=QDateTime(
- QDate(info_z.tmu_date.tm_year, info_z.tmu_date.tm_mon+1, info_z.tmu_date.tm_mday),
- QTime(info_z.tmu_date.tm_hour, info_z.tmu_date.tm_min, info_z.tmu_date.tm_sec));
- // Add to directory map
- p->addCurrentFileToDirectoryMap(info->name);
- return true;
-}
-
-QString QuaZip::getCurrentFileName()const
-{
- QuaZip *fakeThis=(QuaZip*)this; // non-const
- fakeThis->p->zipError=UNZ_OK;
- if(p->mode!=mdUnzip) {
- qWarning("QuaZip::getCurrentFileName(): ZIP is not open in mdUnzip mode");
- return QString();
- }
- if(!isOpen()||!hasCurrentFile()) return QString();
- QByteArray fileName(MAX_FILE_NAME_LENGTH, 0);
- if((fakeThis->p->zipError=unzGetCurrentFileInfo64(p->unzFile_f, NULL, fileName.data(), fileName.size(),
- NULL, 0, NULL, 0))!=UNZ_OK)
- return QString();
- QString result = p->fileNameCodec->toUnicode(fileName.constData());
- if (result.isEmpty())
- return result;
- // Add to directory map
- p->addCurrentFileToDirectoryMap(result);
- return result;
-}
-
-void QuaZip::setFileNameCodec(QTextCodec *fileNameCodec)
-{
- p->fileNameCodec=fileNameCodec;
-}
-
-void QuaZip::setFileNameCodec(const char *fileNameCodecName)
-{
- p->fileNameCodec=QTextCodec::codecForName(fileNameCodecName);
-}
-
-QTextCodec *QuaZip::getFileNameCodec()const
-{
- return p->fileNameCodec;
-}
-
-void QuaZip::setCommentCodec(QTextCodec *commentCodec)
-{
- p->commentCodec=commentCodec;
-}
-
-void QuaZip::setCommentCodec(const char *commentCodecName)
-{
- p->commentCodec=QTextCodec::codecForName(commentCodecName);
-}
-
-QTextCodec *QuaZip::getCommentCodec()const
-{
- return p->commentCodec;
-}
-
-QString QuaZip::getZipName() const
-{
- return p->zipName;
-}
-
-QIODevice *QuaZip::getIoDevice() const
-{
- if (!p->zipName.isEmpty()) // opened by name, using an internal QIODevice
- return NULL;
- return p->ioDevice;
-}
-
-QuaZip::Mode QuaZip::getMode()const
-{
- return p->mode;
-}
-
-bool QuaZip::isOpen()const
-{
- return p->mode!=mdNotOpen;
-}
-
-int QuaZip::getZipError() const
-{
- return p->zipError;
-}
-
-void QuaZip::setComment(const QString& comment)
-{
- p->comment=comment;
-}
-
-bool QuaZip::hasCurrentFile()const
-{
- return p->hasCurrentFile_f;
-}
-
-unzFile QuaZip::getUnzFile()
-{
- return p->unzFile_f;
-}
-
-zipFile QuaZip::getZipFile()
-{
- return p->zipFile_f;
-}
-
-void QuaZip::setDataDescriptorWritingEnabled(bool enabled)
-{
- p->dataDescriptorWritingEnabled = enabled;
-}
-
-bool QuaZip::isDataDescriptorWritingEnabled() const
-{
- return p->dataDescriptorWritingEnabled;
-}
-
-template<typename TFileInfo>
-TFileInfo QuaZip_getFileInfo(QuaZip *zip, bool *ok);
-
-template<>
-QuaZipFileInfo QuaZip_getFileInfo(QuaZip *zip, bool *ok)
-{
- QuaZipFileInfo info;
- *ok = zip->getCurrentFileInfo(&info);
- return info;
-}
-
-template<>
-QuaZipFileInfo64 QuaZip_getFileInfo(QuaZip *zip, bool *ok)
-{
- QuaZipFileInfo64 info;
- *ok = zip->getCurrentFileInfo(&info);
- return info;
-}
-
-template<>
-QString QuaZip_getFileInfo(QuaZip *zip, bool *ok)
-{
- QString name = zip->getCurrentFileName();
- *ok = !name.isEmpty();
- return name;
-}
-
-template<typename TFileInfo>
-bool QuaZipPrivate::getFileInfoList(QList<TFileInfo> *result) const
-{
- QuaZipPrivate *fakeThis=const_cast<QuaZipPrivate*>(this);
- fakeThis->zipError=UNZ_OK;
- if (mode!=QuaZip::mdUnzip) {
- qWarning("QuaZip::getFileNameList/getFileInfoList(): "
- "ZIP is not open in mdUnzip mode");
- return false;
- }
- QString currentFile;
- if (q->hasCurrentFile()) {
- currentFile = q->getCurrentFileName();
- }
- if (q->goToFirstFile()) {
- do {
- bool ok;
- result->append(QuaZip_getFileInfo<TFileInfo>(q, &ok));
- if (!ok)
- return false;
- } while (q->goToNextFile());
- }
- if (zipError != UNZ_OK)
- return false;
- if (currentFile.isEmpty()) {
- if (!q->goToFirstFile())
- return false;
- } else {
- if (!q->setCurrentFile(currentFile))
- return false;
- }
- return true;
-}
-
-QStringList QuaZip::getFileNameList() const
-{
- QStringList list;
- if (p->getFileInfoList(&list))
- return list;
- else
- return QStringList();
-}
-
-QList<QuaZipFileInfo> QuaZip::getFileInfoList() const
-{
- QList<QuaZipFileInfo> list;
- if (p->getFileInfoList(&list))
- return list;
- else
- return QList<QuaZipFileInfo>();
-}
-
-QList<QuaZipFileInfo64> QuaZip::getFileInfoList64() const
-{
- QList<QuaZipFileInfo64> list;
- if (p->getFileInfoList(&list))
- return list;
- else
- return QList<QuaZipFileInfo64>();
-}
-
-Qt::CaseSensitivity QuaZip::convertCaseSensitivity(QuaZip::CaseSensitivity cs)
-{
- if (cs == csDefault) {
-#ifdef Q_WS_WIN
- return Qt::CaseInsensitive;
-#else
- return Qt::CaseSensitive;
-#endif
- } else {
- return cs == csSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive;
- }
-}
-
-void QuaZip::setDefaultFileNameCodec(QTextCodec *codec)
-{
- QuaZipPrivate::defaultFileNameCodec = codec;
-}
-
-void QuaZip::setDefaultFileNameCodec(const char *codecName)
-{
- setDefaultFileNameCodec(QTextCodec::codecForName(codecName));
-}
-
-void QuaZip::setZip64Enabled(bool zip64)
-{
- p->zip64 = zip64;
-}
-
-bool QuaZip::isZip64Enabled() const
-{
- return p->zip64;
-}
-
-bool QuaZip::isAutoClose() const
-{
- return p->autoClose;
-}
-
-void QuaZip::setAutoClose(bool autoClose) const
-{
- p->autoClose = autoClose;
-}
diff --git a/daemon/quazip/quazip.h b/daemon/quazip/quazip.h
deleted file mode 100644
index 0dd4023..0000000
--- a/daemon/quazip/quazip.h
+++ /dev/null
@@ -1,571 +0,0 @@
-#ifndef QUA_ZIP_H
-#define QUA_ZIP_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant, see
-quazip/(un)zip.h files for details, basically it's zlib license.
- **/
-
-#include <QString>
-#include <QStringList>
-#include <QTextCodec>
-
-#include "zip.h"
-#include "unzip.h"
-
-#include "quazip_global.h"
-#include "quazipfileinfo.h"
-
-// just in case it will be defined in the later versions of the ZIP/UNZIP
-#ifndef UNZ_OPENERROR
-// define additional error code
-#define UNZ_OPENERROR -1000
-#endif
-
-class QuaZipPrivate;
-
-/// ZIP archive.
-/** \class QuaZip quazip.h <quazip/quazip.h>
- * This class implements basic interface to the ZIP archive. It can be
- * used to read table contents of the ZIP archive and retreiving
- * information about the files inside it.
- *
- * You can also use this class to open files inside archive by passing
- * pointer to the instance of this class to the constructor of the
- * QuaZipFile class. But see QuaZipFile::QuaZipFile(QuaZip*, QObject*)
- * for the possible pitfalls.
- *
- * This class is indended to provide interface to the ZIP subpackage of
- * the ZIP/UNZIP package as well as to the UNZIP subpackage. But
- * currently it supports only UNZIP.
- *
- * The use of this class is simple - just create instance using
- * constructor, then set ZIP archive file name using setFile() function
- * (if you did not passed the name to the constructor), then open() and
- * then use different functions to work with it! Well, if you are
- * paranoid, you may also wish to call close before destructing the
- * instance, to check for errors on close.
- *
- * You may also use getUnzFile() and getZipFile() functions to get the
- * ZIP archive handle and use it with ZIP/UNZIP package API directly.
- *
- * This class supports localized file names inside ZIP archive, but you
- * have to set up proper codec with setCodec() function. By default,
- * locale codec will be used, which is probably ok for UNIX systems, but
- * will almost certainly fail with ZIP archives created in Windows. This
- * is because Windows ZIP programs have strange habit of using DOS
- * encoding for file names in ZIP archives. For example, ZIP archive
- * with cyrillic names created in Windows will have file names in \c
- * IBM866 encoding instead of \c WINDOWS-1251. I think that calling one
- * function is not much trouble, but for true platform independency it
- * would be nice to have some mechanism for file name encoding auto
- * detection using locale information. Does anyone know a good way to do
- * it?
- **/
-class QUAZIP_EXPORT QuaZip {
- friend class QuaZipPrivate;
- public:
- /// Useful constants.
- enum Constants {
- MAX_FILE_NAME_LENGTH=256 /**< Maximum file name length. Taken from
- \c UNZ_MAXFILENAMEINZIP constant in
- unzip.c. */
- };
- /// Open mode of the ZIP file.
- enum Mode {
- mdNotOpen, ///< ZIP file is not open. This is the initial mode.
- mdUnzip, ///< ZIP file is open for reading files inside it.
- mdCreate, ///< ZIP file was created with open() call.
- mdAppend, /**< ZIP file was opened in append mode. This refers to
- * \c APPEND_STATUS_CREATEAFTER mode in ZIP/UNZIP package
- * and means that zip is appended to some existing file
- * what is useful when that file contains
- * self-extractor code. This is obviously \em not what
- * you whant to use to add files to the existing ZIP
- * archive.
- **/
- mdAdd ///< ZIP file was opened for adding files in the archive.
- };
- /// Case sensitivity for the file names.
- /** This is what you specify when accessing files in the archive.
- * Works perfectly fine with any characters thanks to Qt's great
- * unicode support. This is different from ZIP/UNZIP API, where
- * only US-ASCII characters was supported.
- **/
- enum CaseSensitivity {
- csDefault=0, ///< Default for platform. Case sensitive for UNIX, not for Windows.
- csSensitive=1, ///< Case sensitive.
- csInsensitive=2 ///< Case insensitive.
- };
- /// Returns the actual case sensitivity for the specified QuaZIP one.
- /**
- \param cs The value to convert.
- \returns If CaseSensitivity::csDefault, then returns the default
- file name case sensitivity for the platform. Otherwise, just
- returns the appropriate value from the Qt::CaseSensitivity enum.
- */
- static Qt::CaseSensitivity convertCaseSensitivity(
- CaseSensitivity cs);
- private:
- QuaZipPrivate *p;
- // not (and will not be) implemented
- QuaZip(const QuaZip& that);
- // not (and will not be) implemented
- QuaZip& operator=(const QuaZip& that);
- public:
- /// Constructs QuaZip object.
- /** Call setName() before opening constructed object. */
- QuaZip();
- /// Constructs QuaZip object associated with ZIP file \a zipName.
- QuaZip(const QString& zipName);
- /// Constructs QuaZip object associated with ZIP file represented by \a ioDevice.
- /** The IO device must be seekable, otherwise an error will occur when opening. */
- QuaZip(QIODevice *ioDevice);
- /// Destroys QuaZip object.
- /** Calls close() if necessary. */
- ~QuaZip();
- /// Opens ZIP file.
- /**
- * Argument \a mode specifies open mode of the ZIP archive. See Mode
- * for details. Note that there is zipOpen2() function in the
- * ZIP/UNZIP API which accepts \a globalcomment argument, but it
- * does not use it anywhere, so this open() function does not have this
- * argument. See setComment() if you need to set global comment.
- *
- * If the ZIP file is accessed via explicitly set QIODevice, then
- * this device is opened in the necessary mode. If the device was
- * already opened by some other means, then QuaZIP checks if the
- * open mode is compatible to the mode needed for the requested operation.
- * If necessary, seeking is performed to position the device properly.
- *
- * \return \c true if successful, \c false otherwise.
- *
- * \note ZIP/UNZIP API open calls do not return error code - they
- * just return \c NULL indicating an error. But to make things
- * easier, quazip.h header defines additional error code \c
- * UNZ_ERROROPEN and getZipError() will return it if the open call
- * of the ZIP/UNZIP API returns \c NULL.
- *
- * Argument \a ioApi specifies IO function set for ZIP/UNZIP
- * package to use. See unzip.h, zip.h and ioapi.h for details. Note
- * that IO API for QuaZip is different from the original package.
- * The file path argument was changed to be of type \c voidpf, and
- * QuaZip passes a QIODevice pointer there. This QIODevice is either
- * set explicitly via setIoDevice() or the QuaZip(QIODevice*)
- * constructor, or it is created internally when opening the archive
- * by its file name. The default API (qioapi.cpp) just delegates
- * everything to the QIODevice API. Not only this allows to use a
- * QIODevice instead of file name, but also has a nice side effect
- * of raising the file size limit from 2G to 4G (in non-zip64 archives).
- *
- * \note If the zip64 support is needed, the ioApi argument \em must be NULL
- * because due to the backwards compatibility issues it can be used to
- * provide a 32-bit API only.
- *
- * \note If the \ref QuaZip::setAutoClose() "no-auto-close" feature is used,
- * then the \a ioApi argument \em should be NULL because the old API
- * doesn't support the 'fake close' operation, causing slight memory leaks
- * and other possible troubles (like closing the output device in case
- * when an error occurs during opening).
- *
- * In short: just forget about the \a ioApi argument and you'll be
- * fine.
- **/
- bool open(Mode mode, zlib_filefunc_def *ioApi =NULL);
- /// Closes ZIP file.
- /** Call getZipError() to determine if the close was successful.
- *
- * If the file was opened by name, then the underlying QIODevice is closed
- * and deleted.
- *
- * If the underlying QIODevice was set explicitly using setIoDevice() or
- * the appropriate constructor, then it is closed if the auto-close flag
- * is set (which it is by default). Call setAutoClose() to clear the
- * auto-close flag if this behavior is undesirable.
- *
- * Since Qt 5.1, the QSaveFile was introduced. It breaks the QIODevice API
- * by making close() private and crashing the application if it is called
- * from the base class where it is public. It is an excellent example
- * of poor design that illustrates why you should never ever break
- * an is-a relationship between the base class and a subclass. QuaZIP
- * works around this bug by checking if the QIODevice is an instance
- * of QSaveFile, using qobject_cast<>, and if it is, calls
- * QSaveFile::commit() instead of close(). It is a really ugly hack,
- * but at least it makes your programs work instead of crashing. Note that
- * if the auto-close flag is cleared, then this is a non-issue, and
- * commit() isn't called.
- */
- void close();
- /// Sets the codec used to encode/decode file names inside archive.
- /** This is necessary to access files in the ZIP archive created
- * under Windows with non-latin characters in file names. For
- * example, file names with cyrillic letters will be in \c IBM866
- * encoding.
- **/
- void setFileNameCodec(QTextCodec *fileNameCodec);
- /// Sets the codec used to encode/decode file names inside archive.
- /** \overload
- * Equivalent to calling setFileNameCodec(QTextCodec::codecForName(codecName));
- **/
- void setFileNameCodec(const char *fileNameCodecName);
- /// Returns the codec used to encode/decode comments inside archive.
- QTextCodec* getFileNameCodec() const;
- /// Sets the codec used to encode/decode comments inside archive.
- /** This codec defaults to locale codec, which is probably ok.
- **/
- void setCommentCodec(QTextCodec *commentCodec);
- /// Sets the codec used to encode/decode comments inside archive.
- /** \overload
- * Equivalent to calling setCommentCodec(QTextCodec::codecForName(codecName));
- **/
- void setCommentCodec(const char *commentCodecName);
- /// Returns the codec used to encode/decode comments inside archive.
- QTextCodec* getCommentCodec() const;
- /// Returns the name of the ZIP file.
- /** Returns null string if no ZIP file name has been set, for
- * example when the QuaZip instance is set up to use a QIODevice
- * instead.
- * \sa setZipName(), setIoDevice(), getIoDevice()
- **/
- QString getZipName() const;
- /// Sets the name of the ZIP file.
- /** Does nothing if the ZIP file is open.
- *
- * Does not reset error code returned by getZipError().
- * \sa setIoDevice(), getIoDevice(), getZipName()
- **/
- void setZipName(const QString& zipName);
- /// Returns the device representing this ZIP file.
- /** Returns null string if no device has been set explicitly, for
- * example when opening a ZIP file by name.
- * \sa setIoDevice(), getZipName(), setZipName()
- **/
- QIODevice *getIoDevice() const;
- /// Sets the device representing the ZIP file.
- /** Does nothing if the ZIP file is open.
- *
- * Does not reset error code returned by getZipError().
- * \sa getIoDevice(), getZipName(), setZipName()
- **/
- void setIoDevice(QIODevice *ioDevice);
- /// Returns the mode in which ZIP file was opened.
- Mode getMode() const;
- /// Returns \c true if ZIP file is open, \c false otherwise.
- bool isOpen() const;
- /// Returns the error code of the last operation.
- /** Returns \c UNZ_OK if the last operation was successful.
- *
- * Error code resets to \c UNZ_OK every time you call any function
- * that accesses something inside ZIP archive, even if it is \c
- * const (like getEntriesCount()). open() and close() calls reset
- * error code too. See documentation for the specific functions for
- * details on error detection.
- **/
- int getZipError() const;
- /// Returns number of the entries in the ZIP central directory.
- /** Returns negative error code in the case of error. The same error
- * code will be returned by subsequent getZipError() call.
- **/
- int getEntriesCount() const;
- /// Returns global comment in the ZIP file.
- QString getComment() const;
- /// Sets the global comment in the ZIP file.
- /** The comment will be written to the archive on close operation.
- * QuaZip makes a distinction between a null QByteArray() comment
- * and an empty &quot;&quot; comment in the QuaZip::mdAdd mode.
- * A null comment is the default and it means &quot;don't change
- * the comment&quot;. An empty comment removes the original comment.
- *
- * \sa open()
- **/
- void setComment(const QString& comment);
- /// Sets the current file to the first file in the archive.
- /** Returns \c true on success, \c false otherwise. Call
- * getZipError() to get the error code.
- **/
- bool goToFirstFile();
- /// Sets the current file to the next file in the archive.
- /** Returns \c true on success, \c false otherwise. Call
- * getZipError() to determine if there was an error.
- *
- * Should be used only in QuaZip::mdUnzip mode.
- *
- * \note If the end of file was reached, getZipError() will return
- * \c UNZ_OK instead of \c UNZ_END_OF_LIST_OF_FILE. This is to make
- * things like this easier:
- * \code
- * for(bool more=zip.goToFirstFile(); more; more=zip.goToNextFile()) {
- * // do something
- * }
- * if(zip.getZipError()==UNZ_OK) {
- * // ok, there was no error
- * }
- * \endcode
- **/
- bool goToNextFile();
- /// Sets current file by its name.
- /** Returns \c true if successful, \c false otherwise. Argument \a
- * cs specifies case sensitivity of the file name. Call
- * getZipError() in the case of a failure to get error code.
- *
- * This is not a wrapper to unzLocateFile() function. That is
- * because I had to implement locale-specific case-insensitive
- * comparison.
- *
- * Here are the differences from the original implementation:
- *
- * - If the file was not found, error code is \c UNZ_OK, not \c
- * UNZ_END_OF_LIST_OF_FILE (see also goToNextFile()).
- * - If this function fails, it unsets the current file rather than
- * resetting it back to what it was before the call.
- *
- * If \a fileName is null string then this function unsets the
- * current file and return \c true. Note that you should close the
- * file first if it is open! See
- * QuaZipFile::QuaZipFile(QuaZip*,QObject*) for the details.
- *
- * Should be used only in QuaZip::mdUnzip mode.
- *
- * \sa setFileNameCodec(), CaseSensitivity
- **/
- bool setCurrentFile(const QString& fileName, CaseSensitivity cs =csDefault);
- /// Returns \c true if the current file has been set.
- bool hasCurrentFile() const;
- /// Retrieves information about the current file.
- /** Fills the structure pointed by \a info. Returns \c true on
- * success, \c false otherwise. In the latter case structure pointed
- * by \a info remains untouched. If there was an error,
- * getZipError() returns error code.
- *
- * Should be used only in QuaZip::mdUnzip mode.
- *
- * Does nothing and returns \c false in any of the following cases.
- * - ZIP is not open;
- * - ZIP does not have current file.
- *
- * In both cases getZipError() returns \c UNZ_OK since there
- * is no ZIP/UNZIP API call.
- *
- * This overload doesn't support zip64, but will work OK on zip64 archives
- * except that if one of the sizes (compressed or uncompressed) is greater
- * than 0xFFFFFFFFu, it will be set to exactly 0xFFFFFFFFu.
- *
- * \sa getCurrentFileInfo(QuaZipFileInfo64* info)const
- * \sa QuaZipFileInfo64::toQuaZipFileInfo(QuaZipFileInfo&)const
- **/
- bool getCurrentFileInfo(QuaZipFileInfo* info)const;
- /// Retrieves information about the current file.
- /** \overload
- *
- * This function supports zip64. If the archive doesn't use zip64, it is
- * completely equivalent to getCurrentFileInfo(QuaZipFileInfo* info)
- * except for the argument type.
- *
- * \sa
- **/
- bool getCurrentFileInfo(QuaZipFileInfo64* info)const;
- /// Returns the current file name.
- /** Equivalent to calling getCurrentFileInfo() and then getting \c
- * name field of the QuaZipFileInfo structure, but faster and more
- * convenient.
- *
- * Should be used only in QuaZip::mdUnzip mode.
- **/
- QString getCurrentFileName()const;
- /// Returns \c unzFile handle.
- /** You can use this handle to directly call UNZIP part of the
- * ZIP/UNZIP package functions (see unzip.h).
- *
- * \warning When using the handle returned by this function, please
- * keep in mind that QuaZip class is unable to detect any changes
- * you make in the ZIP file state (e. g. changing current file, or
- * closing the handle). So please do not do anything with this
- * handle that is possible to do with the functions of this class.
- * Or at least return the handle in the original state before
- * calling some another function of this class (including implicit
- * destructor calls and calls from the QuaZipFile objects that refer
- * to this QuaZip instance!). So if you have changed the current
- * file in the ZIP archive - then change it back or you may
- * experience some strange behavior or even crashes.
- **/
- unzFile getUnzFile();
- /// Returns \c zipFile handle.
- /** You can use this handle to directly call ZIP part of the
- * ZIP/UNZIP package functions (see zip.h). Warnings about the
- * getUnzFile() function also apply to this function.
- **/
- zipFile getZipFile();
- /// Changes the data descriptor writing mode.
- /**
- According to the ZIP format specification, a file inside archive
- may have a data descriptor immediately following the file
- data. This is reflected by a special flag in the local file header
- and in the central directory. By default, QuaZIP sets this flag
- and writes the data descriptor unless both method and level were
- set to 0, in which case it operates in 1.0-compatible mode and
- never writes data descriptors.
-
- By setting this flag to false, it is possible to disable data
- descriptor writing, thus increasing compatibility with archive
- readers that don't understand this feature of the ZIP file format.
-
- Setting this flag affects all the QuaZipFile instances that are
- opened after this flag is set.
-
- The data descriptor writing mode is enabled by default.
-
- Note that if the ZIP archive is written into a QIODevice for which
- QIODevice::isSequential() returns \c true, then the data descriptor
- is mandatory and will be written even if this flag is set to false.
-
- \param enabled If \c true, enable local descriptor writing,
- disable it otherwise.
-
- \sa QuaZipFile::isDataDescriptorWritingEnabled()
- */
- void setDataDescriptorWritingEnabled(bool enabled);
- /// Returns the data descriptor default writing mode.
- /**
- \sa setDataDescriptorWritingEnabled()
- */
- bool isDataDescriptorWritingEnabled() const;
- /// Returns a list of files inside the archive.
- /**
- \return A list of file names or an empty list if there
- was an error or if the archive is empty (call getZipError() to
- figure out which).
- \sa getFileInfoList()
- */
- QStringList getFileNameList() const;
- /// Returns information list about all files inside the archive.
- /**
- \return A list of QuaZipFileInfo objects or an empty list if there
- was an error or if the archive is empty (call getZipError() to
- figure out which).
-
- This function doesn't support zip64, but will still work with zip64
- archives, converting results using QuaZipFileInfo64::toQuaZipFileInfo().
- If all file sizes are below 4 GB, it will work just fine.
-
- \sa getFileNameList()
- \sa getFileInfoList64()
- */
- QList<QuaZipFileInfo> getFileInfoList() const;
- /// Returns information list about all files inside the archive.
- /**
- \overload
-
- This function supports zip64.
-
- \sa getFileNameList()
- \sa getFileInfoList()
- */
- QList<QuaZipFileInfo64> getFileInfoList64() const;
- /// Enables the zip64 mode.
- /**
- * @param zip64 If \c true, the zip64 mode is enabled, disabled otherwise.
- *
- * Once this is enabled, all new files (until the mode is disabled again)
- * will be created in the zip64 mode, thus enabling the ability to write
- * files larger than 4 GB. By default, the zip64 mode is off due to
- * compatibility reasons.
- *
- * Note that this does not affect the ability to read zip64 archives in any
- * way.
- *
- * \sa isZip64Enabled()
- */
- void setZip64Enabled(bool zip64);
- /// Returns whether the zip64 mode is enabled.
- /**
- * @return \c true if and only if the zip64 mode is enabled.
- *
- * \sa setZip64Enabled()
- */
- bool isZip64Enabled() const;
- /// Returns the auto-close flag.
- /**
- @sa setAutoClose()
- */
- bool isAutoClose() const;
- /// Sets or unsets the auto-close flag.
- /**
- By default, QuaZIP opens the underlying QIODevice when open() is called,
- and closes it when close() is called. In some cases, when the device
- is set explicitly using setIoDevice(), it may be desirable to
- leave the device open. If the auto-close flag is unset using this method,
- then the device isn't closed automatically if it was set explicitly.
-
- If it is needed to clear this flag, it is recommended to do so before
- opening the archive because otherwise QuaZIP may close the device
- during the open() call if an error is encountered after the device
- is opened.
-
- If the device was not set explicitly, but rather the setZipName() or
- the appropriate constructor was used to set the ZIP file name instead,
- then the auto-close flag has no effect, and the internal device
- is closed nevertheless because there is no other way to close it.
-
- @sa isAutoClose()
- @sa setIoDevice()
- */
- void setAutoClose(bool autoClose) const;
- /// Sets the default file name codec to use.
- /**
- * The default codec is used by the constructors, so calling this function
- * won't affect the QuaZip instances already created at that moment.
- *
- * The codec specified here can be overriden by calling setFileNameCodec().
- * If neither function is called, QTextCodec::codecForLocale() will be used
- * to decode or encode file names. Use this function with caution if
- * the application uses other libraries that depend on QuaZIP. Those
- * libraries can either call this function by themselves, thus overriding
- * your setting or can rely on the default encoding, thus failing
- * mysteriously if you change it. For these reasons, it isn't recommended
- * to use this function if you are developing a library, not an application.
- * Instead, ask your library users to call it in case they need specific
- * encoding.
- *
- * In most cases, using setFileNameCodec() instead is the right choice.
- * However, if you depend on third-party code that uses QuaZIP, then the
- * reasons stated above can actually become a reason to use this function
- * in case the third-party code in question fails because it doesn't
- * understand the encoding you need and doesn't provide a way to specify it.
- * This applies to the JlCompress class as well, as it was contributed and
- * doesn't support explicit encoding parameters.
- *
- * In short: use setFileNameCodec() when you can, resort to
- * setDefaultFileNameCodec() when you don't have access to the QuaZip
- * instance.
- *
- * @param codec The codec to use by default. If NULL, resets to default.
- */
- static void setDefaultFileNameCodec(QTextCodec *codec);
- /**
- * @overload
- * Equivalent to calling
- * setDefltFileNameCodec(QTextCodec::codecForName(codecName)).
- */
- static void setDefaultFileNameCodec(const char *codecName);
-};
-
-#endif
diff --git a/daemon/quazip/quazip.pri b/daemon/quazip/quazip.pri
deleted file mode 100644
index 1a9db99..0000000
--- a/daemon/quazip/quazip.pri
+++ /dev/null
@@ -1,33 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-HEADERS += \
- $$PWD/crypt.h \
- $$PWD/ioapi.h \
- $$PWD/JlCompress.h \
- $$PWD/quaadler32.h \
- $$PWD/quachecksum32.h \
- $$PWD/quacrc32.h \
- $$PWD/quagzipfile.h \
- $$PWD/quaziodevice.h \
- $$PWD/quazipdir.h \
- $$PWD/quazipfile.h \
- $$PWD/quazipfileinfo.h \
- $$PWD/quazip_global.h \
- $$PWD/quazip.h \
- $$PWD/quazipnewinfo.h \
- $$PWD/unzip.h \
- $$PWD/zip.h
-
-SOURCES += $$PWD/qioapi.cpp \
- $$PWD/JlCompress.cpp \
- $$PWD/quaadler32.cpp \
- $$PWD/quacrc32.cpp \
- $$PWD/quagzipfile.cpp \
- $$PWD/quaziodevice.cpp \
- $$PWD/quazip.cpp \
- $$PWD/quazipdir.cpp \
- $$PWD/quazipfile.cpp \
- $$PWD/quazipfileinfo.cpp \
- $$PWD/quazipnewinfo.cpp \
- $$PWD/unzip.c \
- $$PWD/zip.c
diff --git a/daemon/quazip/quazip.pro b/daemon/quazip/quazip.pro
deleted file mode 100644
index c869e59..0000000
--- a/daemon/quazip/quazip.pro
+++ /dev/null
@@ -1,81 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt warn_on
-QT -= gui
-
-# The ABI version.
-
-!win32:VERSION = 1.0.0
-
-# 1.0.0 is the first stable ABI.
-# The next binary incompatible change will be 2.0.0 and so on.
-# The existing QuaZIP policy on changing ABI requires to bump the
-# major version of QuaZIP itself as well. Note that there may be
-# other reasons for chaging the major version of QuaZIP, so
-# in case where there is a QuaZIP major version bump but no ABI change,
-# the VERSION variable will stay the same.
-
-# For example:
-
-# QuaZIP 1.0 is released after some 0.x, keeping binary compatibility.
-# VERSION stays 1.0.0.
-# Then some binary incompatible change is introduced. QuaZIP goes up to
-# 2.0, VERSION to 2.0.0.
-# And so on.
-
-
-# This one handles dllimport/dllexport directives.
-DEFINES += QUAZIP_BUILD
-
-# You'll need to define this one manually if using a build system other
-# than qmake or using QuaZIP sources directly in your project.
-CONFIG(staticlib): DEFINES += QUAZIP_STATIC
-
-# Input
-include(quazip.pri)
-
-unix:!symbian {
- headers.path=$$PREFIX/include/quazip
- headers.files=$$HEADERS
- target.path=$$PREFIX/lib/$${LIB_ARCH}
- INSTALLS += headers target
-
- OBJECTS_DIR=.obj
- MOC_DIR=.moc
-
-}
-
-win32 {
- headers.path=$$PREFIX/include/quazip
- headers.files=$$HEADERS
- target.path=$$PREFIX/lib
- INSTALLS += headers target
- # workaround for qdatetime.h macro bug
- DEFINES += NOMINMAX
-}
-
-
-symbian {
-
- # Note, on Symbian you may run into troubles with LGPL.
- # The point is, if your application uses some version of QuaZip,
- # and a newer binary compatible version of QuaZip is released, then
- # the users of your application must be able to relink it with the
- # new QuaZip version. For example, to take advantage of some QuaZip
- # bug fixes.
-
- # This is probably best achieved by building QuaZip as a static
- # library and providing linkable object files of your application,
- # so users can relink it.
-
- CONFIG += staticlib
- CONFIG += debug_and_release
-
- LIBS += -lezip
-
- #Export headers to SDK Epoc32/include directory
- exportheaders.sources = $$HEADERS
- exportheaders.path = quazip
- for(header, exportheaders.sources) {
- BLD_INF_RULES.prj_exports += "$$header $$exportheaders.path/$$basename(header)"
- }
-}
diff --git a/daemon/quazip/quazip.sln b/daemon/quazip/quazip.sln
deleted file mode 100644
index 549f3a4..0000000
--- a/daemon/quazip/quazip.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quazip", "quazip.vcproj", "{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.ActiveCfg = Debug|Win32
- {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Debug|Win32.Build.0 = Debug|Win32
- {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.ActiveCfg = Release|Win32
- {E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/daemon/quazip/quazip.vcproj b/daemon/quazip/quazip.vcproj
deleted file mode 100644
index 8034007..0000000
--- a/daemon/quazip/quazip.vcproj
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="quazip"
- ProjectGUID="{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}"
- Keyword="Win32Proj"
- TargetFrameworkVersion="0"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;QUAZIP_BUILD"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QUAZIP_BUILD"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\crypt.h"
- >
- </File>
- <File
- RelativePath=".\ioapi.h"
- >
- </File>
- <File
- RelativePath=".\JlCompress.h"
- >
- </File>
- <File
- RelativePath=".\quaadler32.h"
- >
- </File>
- <File
- RelativePath=".\quachecksum32.h"
- >
- </File>
- <File
- RelativePath=".\quacrc32.h"
- >
- </File>
- <File
- RelativePath=".\quagzipfile.h"
- >
- </File>
- <File
- RelativePath=".\quaziodevice.h"
- >
- </File>
- <File
- RelativePath=".\quazip.h"
- >
- </File>
- <File
- RelativePath=".\quazip_global.h"
- >
- </File>
- <File
- RelativePath=".\quazipdir.h"
- >
- </File>
- <File
- RelativePath=".\quazipfile.h"
- >
- </File>
- <File
- RelativePath=".\quazipfileinfo.h"
- >
- </File>
- <File
- RelativePath=".\quazipnewinfo.h"
- >
- </File>
- <File
- RelativePath=".\unzip.h"
- >
- </File>
- <File
- RelativePath=".\zip.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\JlCompress.cpp"
- >
- </File>
- <File
- RelativePath=".\moc_quagzipfile.cpp"
- >
- </File>
- <File
- RelativePath=".\moc_quaziodevice.cpp"
- >
- </File>
- <File
- RelativePath=".\moc_quazipfile.cpp"
- >
- </File>
- <File
- RelativePath=".\qioapi.cpp"
- >
- </File>
- <File
- RelativePath=".\quaadler32.cpp"
- >
- </File>
- <File
- RelativePath=".\quacrc32.cpp"
- >
- </File>
- <File
- RelativePath=".\quagzipfile.cpp"
- >
- </File>
- <File
- RelativePath=".\quaziodevice.cpp"
- >
- </File>
- <File
- RelativePath=".\quazip.cpp"
- >
- </File>
- <File
- RelativePath=".\quazipdir.cpp"
- >
- </File>
- <File
- RelativePath=".\quazipfile.cpp"
- >
- </File>
- <File
- RelativePath=".\quazipfileinfo.cpp"
- >
- </File>
- <File
- RelativePath=".\quazipnewinfo.cpp"
- >
- </File>
- <File
- RelativePath=".\unzip.c"
- >
- </File>
- <File
- RelativePath=".\zip.c"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/daemon/quazip/quazip.vcxproj b/daemon/quazip/quazip.vcxproj
deleted file mode 100644
index 5400a6d..0000000
--- a/daemon/quazip/quazip.vcxproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E4AC5F56-B711-4F0E-BC83-CDE8B6CD53AD}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\qt4.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\..\qt4.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;QUAZIP_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>QtCored4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;QUAZIP_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>QtCore4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="crypt.h" />
- <ClInclude Include="ioapi.h" />
- <ClInclude Include="JlCompress.h" />
- <ClInclude Include="quaadler32.h" />
- <ClInclude Include="quachecksum32.h" />
- <ClInclude Include="quacrc32.h" />
- <ClInclude Include="quagzipfile.h" />
- <ClInclude Include="quaziodevice.h" />
- <ClInclude Include="quazip.h" />
- <ClInclude Include="quazip_global.h" />
- <ClInclude Include="quazipdir.h" />
- <ClInclude Include="quazipfile.h" />
- <ClInclude Include="quazipfileinfo.h" />
- <ClInclude Include="quazipnewinfo.h" />
- <ClInclude Include="unzip.h" />
- <ClInclude Include="zip.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="JlCompress.cpp" />
- <ClCompile Include="moc\moc_quagzipfile.cpp" />
- <ClCompile Include="moc\moc_quaziodevice.cpp" />
- <ClCompile Include="moc\moc_quazipfile.cpp" />
- <ClCompile Include="qioapi.cpp" />
- <ClCompile Include="quaadler32.cpp" />
- <ClCompile Include="quacrc32.cpp" />
- <ClCompile Include="quagzipfile.cpp" />
- <ClCompile Include="quaziodevice.cpp" />
- <ClCompile Include="quazip.cpp" />
- <ClCompile Include="quazipdir.cpp" />
- <ClCompile Include="quazipfile.cpp" />
- <ClCompile Include="quazipfileinfo.cpp" />
- <ClCompile Include="quazipnewinfo.cpp" />
- <ClCompile Include="unzip.c" />
- <ClCompile Include="zip.c" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/daemon/quazip/quazip.vcxproj.filters b/daemon/quazip/quazip.vcxproj.filters
deleted file mode 100644
index 68677d5..0000000
--- a/daemon/quazip/quazip.vcxproj.filters
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
- </Filter>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="crypt.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="ioapi.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="JlCompress.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quaadler32.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quachecksum32.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quacrc32.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quagzipfile.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quaziodevice.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quazip.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quazip_global.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quazipdir.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quazipfile.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quazipfileinfo.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="quazipnewinfo.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="unzip.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="zip.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="JlCompress.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="qioapi.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="quaadler32.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="quacrc32.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="quagzipfile.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="quaziodevice.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="quazip.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="quazipdir.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="quazipfile.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="quazipfileinfo.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="quazipnewinfo.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="unzip.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="zip.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="moc\moc_quagzipfile.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="moc\moc_quaziodevice.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="moc\moc_quazipfile.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project> \ No newline at end of file
diff --git a/daemon/quazip/quazip_global.h b/daemon/quazip/quazip_global.h
deleted file mode 100644
index 7ea5cd8..0000000
--- a/daemon/quazip/quazip_global.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef QUAZIP_GLOBAL_H
-#define QUAZIP_GLOBAL_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include <QtCore/qglobal.h>
-
-/**
- This is automatically defined when building a static library, but when
- including QuaZip sources directly into a project, QUAZIP_STATIC should
- be defined explicitly to avoid possible troubles with unnecessary
- importing/exporting.
- */
-#ifdef QUAZIP_STATIC
-#define QUAZIP_EXPORT
-#else
-/**
- * When building a DLL with MSVC, QUAZIP_BUILD must be defined.
- * qglobal.h takes care of defining Q_DECL_* correctly for msvc/gcc.
- */
-#if defined(QUAZIP_BUILD)
- #define QUAZIP_EXPORT Q_DECL_EXPORT
-#else
- #define QUAZIP_EXPORT Q_DECL_IMPORT
-#endif
-#endif // QUAZIP_STATIC
-
-#ifdef __GNUC__
-#define UNUSED __attribute__((__unused__))
-#else
-#define UNUSED
-#endif
-
-#define QUAZIP_EXTRA_NTFS_MAGIC 0x000Au
-#define QUAZIP_EXTRA_NTFS_TIME_MAGIC 0x0001u
-
-#endif // QUAZIP_GLOBAL_H
diff --git a/daemon/quazip/quazipdir.cpp b/daemon/quazip/quazipdir.cpp
deleted file mode 100644
index e1a2b94..0000000
--- a/daemon/quazip/quazipdir.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include "quazipdir.h"
-
-#include <QSet>
-#include <QSharedData>
-
-/// \cond internal
-class QuaZipDirPrivate: public QSharedData {
- friend class QuaZipDir;
-private:
- QuaZipDirPrivate(QuaZip *zip, const QString &dir = QString()):
- zip(zip), dir(dir), caseSensitivity(QuaZip::csDefault),
- filter(QDir::NoFilter), sorting(QDir::NoSort) {}
- QuaZip *zip;
- QString dir;
- QuaZip::CaseSensitivity caseSensitivity;
- QDir::Filters filter;
- QStringList nameFilters;
- QDir::SortFlags sorting;
- template<typename TFileInfoList>
- bool entryInfoList(QStringList nameFilters, QDir::Filters filter,
- QDir::SortFlags sort, TFileInfoList &result) const;
- inline QString simplePath() const {return QDir::cleanPath(dir);}
-};
-/// \endcond
-
-QuaZipDir::QuaZipDir(const QuaZipDir &that):
- d(that.d)
-{
-}
-
-QuaZipDir::QuaZipDir(QuaZip *zip, const QString &dir):
- d(new QuaZipDirPrivate(zip, dir))
-{
- if (d->dir.startsWith('/'))
- d->dir = d->dir.mid(1);
-}
-
-QuaZipDir::~QuaZipDir()
-{
-}
-
-bool QuaZipDir::operator==(const QuaZipDir &that)
-{
- return d->zip == that.d->zip && d->dir == that.d->dir;
-}
-
-QuaZipDir& QuaZipDir::operator=(const QuaZipDir &that)
-{
- this->d = that.d;
- return *this;
-}
-
-QString QuaZipDir::operator[](int pos) const
-{
- return entryList().at(pos);
-}
-
-QuaZip::CaseSensitivity QuaZipDir::caseSensitivity() const
-{
- return d->caseSensitivity;
-}
-
-bool QuaZipDir::cd(const QString &directoryName)
-{
- if (directoryName == "/") {
- d->dir = "";
- return true;
- }
- QString dirName = directoryName;
- if (dirName.endsWith('/'))
- dirName.chop(1);
- if (dirName.contains('/')) {
- QuaZipDir dir(*this);
- if (dirName.startsWith('/')) {
-#ifdef QUAZIP_QUAZIPDIR_DEBUG
- qDebug("QuaZipDir::cd(%s): going to /",
- dirName.toUtf8().constData());
-#endif
- if (!dir.cd("/"))
- return false;
- }
- QStringList path = dirName.split('/', QString::SkipEmptyParts);
- for (QStringList::const_iterator i = path.constBegin();
- i != path.end();
- ++i) {
- const QString &step = *i;
-#ifdef QUAZIP_QUAZIPDIR_DEBUG
- qDebug("QuaZipDir::cd(%s): going to %s",
- dirName.toUtf8().constData(),
- step.toUtf8().constData());
-#endif
- if (!dir.cd(step))
- return false;
- }
- d->dir = dir.path();
- return true;
- } else { // no '/'
- if (dirName == ".") {
- return true;
- } else if (dirName == "..") {
- if (isRoot()) {
- return false;
- } else {
- int slashPos = d->dir.lastIndexOf('/');
- if (slashPos == -1) {
- d->dir = "";
- } else {
- d->dir = d->dir.left(slashPos);
- }
- return true;
- }
- } else { // a simple subdirectory
- if (exists(dirName)) {
- if (isRoot())
- d->dir = dirName;
- else
- d->dir += "/" + dirName;
- return true;
- } else {
- return false;
- }
- }
- }
-}
-
-bool QuaZipDir::cdUp()
-{
- return cd("..");
-}
-
-uint QuaZipDir::count() const
-{
- return entryList().count();
-}
-
-QString QuaZipDir::dirName() const
-{
- return QDir(d->dir).dirName();
-}
-
-QuaZipFileInfo64 QuaZipDir_getFileInfo(QuaZip *zip, bool *ok,
- const QString &relativeName,
- bool isReal)
-{
- QuaZipFileInfo64 info;
- if (isReal) {
- *ok = zip->getCurrentFileInfo(&info);
- } else {
- *ok = true;
- info.compressedSize = 0;
- info.crc = 0;
- info.diskNumberStart = 0;
- info.externalAttr = 0;
- info.flags = 0;
- info.internalAttr = 0;
- info.method = 0;
- info.uncompressedSize = 0;
- info.versionCreated = info.versionNeeded = 0;
- }
- info.name = relativeName;
- return info;
-}
-
-static void QuaZipDir_convertInfoList(const QList<QuaZipFileInfo64> &from,
- QList<QuaZipFileInfo64> &to)
-{
- to = from;
-}
-
-static void QuaZipDir_convertInfoList(const QList<QuaZipFileInfo64> &from,
- QStringList &to)
-{
- to.clear();
- for (QList<QuaZipFileInfo64>::const_iterator i = from.constBegin();
- i != from.constEnd();
- ++i) {
- to.append(i->name);
- }
-}
-
-static void QuaZipDir_convertInfoList(const QList<QuaZipFileInfo64> &from,
- QList<QuaZipFileInfo> &to)
-{
- to.clear();
- for (QList<QuaZipFileInfo64>::const_iterator i = from.constBegin();
- i != from.constEnd();
- ++i) {
- QuaZipFileInfo info32;
- i->toQuaZipFileInfo(info32);
- to.append(info32);
- }
-}
-
-/// \cond internal
-/**
- An utility class to restore the current file.
- */
-class QuaZipDirRestoreCurrent {
-public:
- inline QuaZipDirRestoreCurrent(QuaZip *zip):
- zip(zip), currentFile(zip->getCurrentFileName()) {}
- inline ~QuaZipDirRestoreCurrent()
- {
- zip->setCurrentFile(currentFile);
- }
-private:
- QuaZip *zip;
- QString currentFile;
-};
-/// \endcond
-
-/// \cond internal
-class QuaZipDirComparator
-{
- private:
- QDir::SortFlags sort;
- static QString getExtension(const QString &name);
- int compareStrings(const QString &string1, const QString &string2);
- public:
- inline QuaZipDirComparator(QDir::SortFlags sort): sort(sort) {}
- bool operator()(const QuaZipFileInfo64 &info1, const QuaZipFileInfo64 &info2);
-};
-
-QString QuaZipDirComparator::getExtension(const QString &name)
-{
- if (name.endsWith('.') || name.indexOf('.', 1) == -1) {
- return "";
- } else {
- return name.mid(name.lastIndexOf('.') + 1);
- }
-
-}
-
-int QuaZipDirComparator::compareStrings(const QString &string1,
- const QString &string2)
-{
- if (sort & QDir::LocaleAware) {
- if (sort & QDir::IgnoreCase) {
- return string1.toLower().localeAwareCompare(string2.toLower());
- } else {
- return string1.localeAwareCompare(string2);
- }
- } else {
- return string1.compare(string2, (sort & QDir::IgnoreCase)
- ? Qt::CaseInsensitive : Qt::CaseSensitive);
- }
-}
-
-bool QuaZipDirComparator::operator()(const QuaZipFileInfo64 &info1,
- const QuaZipFileInfo64 &info2)
-{
- QDir::SortFlags order = sort
- & (QDir::Name | QDir::Time | QDir::Size | QDir::Type);
- if ((sort & QDir::DirsFirst) == QDir::DirsFirst
- || (sort & QDir::DirsLast) == QDir::DirsLast) {
- if (info1.name.endsWith('/') && !info2.name.endsWith('/'))
- return (sort & QDir::DirsFirst) == QDir::DirsFirst;
- else if (!info1.name.endsWith('/') && info2.name.endsWith('/'))
- return (sort & QDir::DirsLast) == QDir::DirsLast;
- }
- bool result;
- int extDiff;
- switch (order) {
- case QDir::Name:
- result = compareStrings(info1.name, info2.name) < 0;
- break;
- case QDir::Type:
- extDiff = compareStrings(getExtension(info1.name),
- getExtension(info2.name));
- if (extDiff == 0) {
- result = compareStrings(info1.name, info2.name) < 0;
- } else {
- result = extDiff < 0;
- }
- break;
- case QDir::Size:
- if (info1.uncompressedSize == info2.uncompressedSize) {
- result = compareStrings(info1.name, info2.name) < 0;
- } else {
- result = info1.uncompressedSize < info2.uncompressedSize;
- }
- break;
- case QDir::Time:
- if (info1.dateTime == info2.dateTime) {
- result = compareStrings(info1.name, info2.name) < 0;
- } else {
- result = info1.dateTime < info2.dateTime;
- }
- break;
- default:
- qWarning("QuaZipDirComparator(): Invalid sort mode 0x%2X",
- static_cast<unsigned>(sort));
- return false;
- }
- return (sort & QDir::Reversed) ? !result : result;
-}
-
-template<typename TFileInfoList>
-bool QuaZipDirPrivate::entryInfoList(QStringList nameFilters,
- QDir::Filters filter, QDir::SortFlags sort, TFileInfoList &result) const
-{
- QString basePath = simplePath();
- if (!basePath.isEmpty())
- basePath += "/";
- int baseLength = basePath.length();
- result.clear();
- QuaZipDirRestoreCurrent saveCurrent(zip);
- if (!zip->goToFirstFile()) {
- return zip->getZipError() == UNZ_OK;
- }
- QDir::Filters fltr = filter;
- if (fltr == QDir::NoFilter)
- fltr = this->filter;
- if (fltr == QDir::NoFilter)
- fltr = QDir::AllEntries;
- QStringList nmfltr = nameFilters;
- if (nmfltr.isEmpty())
- nmfltr = this->nameFilters;
- QSet<QString> dirsFound;
- QList<QuaZipFileInfo64> list;
- do {
- QString name = zip->getCurrentFileName();
- if (!name.startsWith(basePath))
- continue;
- QString relativeName = name.mid(baseLength);
- if (relativeName.isEmpty())
- continue;
- bool isDir = false;
- bool isReal = true;
- if (relativeName.contains('/')) {
- int indexOfSlash = relativeName.indexOf('/');
- // something like "subdir/"
- isReal = indexOfSlash == relativeName.length() - 1;
- relativeName = relativeName.left(indexOfSlash + 1);
- if (dirsFound.contains(relativeName))
- continue;
- isDir = true;
- }
- dirsFound.insert(relativeName);
- if ((fltr & QDir::Dirs) == 0 && isDir)
- continue;
- if ((fltr & QDir::Files) == 0 && !isDir)
- continue;
- if (!nmfltr.isEmpty() && !QDir::match(nmfltr, relativeName))
- continue;
- bool ok;
- QuaZipFileInfo64 info = QuaZipDir_getFileInfo(zip, &ok, relativeName,
- isReal);
- if (!ok) {
- return false;
- }
- list.append(info);
- } while (zip->goToNextFile());
- QDir::SortFlags srt = sort;
- if (srt == QDir::NoSort)
- srt = sorting;
-#ifdef QUAZIP_QUAZIPDIR_DEBUG
- qDebug("QuaZipDirPrivate::entryInfoList(): before sort:");
- foreach (QuaZipFileInfo64 info, list) {
- qDebug("%s\t%s", info.name.toUtf8().constData(),
- info.dateTime.toString(Qt::ISODate).toUtf8().constData());
- }
-#endif
- if (srt != QDir::NoSort && (srt & QDir::Unsorted) != QDir::Unsorted) {
- if (QuaZip::convertCaseSensitivity(caseSensitivity)
- == Qt::CaseInsensitive)
- srt |= QDir::IgnoreCase;
- QuaZipDirComparator lessThan(srt);
- qSort(list.begin(), list.end(), lessThan);
- }
- QuaZipDir_convertInfoList(list, result);
- return true;
-}
-
-/// \endcond
-
-QList<QuaZipFileInfo> QuaZipDir::entryInfoList(const QStringList &nameFilters,
- QDir::Filters filters, QDir::SortFlags sort) const
-{
- QList<QuaZipFileInfo> result;
- if (d->entryInfoList(nameFilters, filters, sort, result))
- return result;
- else
- return QList<QuaZipFileInfo>();
-}
-
-QList<QuaZipFileInfo> QuaZipDir::entryInfoList(QDir::Filters filters,
- QDir::SortFlags sort) const
-{
- return entryInfoList(QStringList(), filters, sort);
-}
-
-QList<QuaZipFileInfo64> QuaZipDir::entryInfoList64(const QStringList &nameFilters,
- QDir::Filters filters, QDir::SortFlags sort) const
-{
- QList<QuaZipFileInfo64> result;
- if (d->entryInfoList(nameFilters, filters, sort, result))
- return result;
- else
- return QList<QuaZipFileInfo64>();
-}
-
-QList<QuaZipFileInfo64> QuaZipDir::entryInfoList64(QDir::Filters filters,
- QDir::SortFlags sort) const
-{
- return entryInfoList64(QStringList(), filters, sort);
-}
-
-QStringList QuaZipDir::entryList(const QStringList &nameFilters,
- QDir::Filters filters, QDir::SortFlags sort) const
-{
- QStringList result;
- if (d->entryInfoList(nameFilters, filters, sort, result))
- return result;
- else
- return QStringList();
-}
-
-QStringList QuaZipDir::entryList(QDir::Filters filters,
- QDir::SortFlags sort) const
-{
- return entryList(QStringList(), filters, sort);
-}
-
-bool QuaZipDir::exists(const QString &filePath) const
-{
- if (filePath == "/" || filePath.isEmpty())
- return true;
- QString fileName = filePath;
- if (fileName.endsWith('/'))
- fileName.chop(1);
- if (fileName.contains('/')) {
- QFileInfo fileInfo(fileName);
-#ifdef QUAZIP_QUAZIPDIR_DEBUG
- qDebug("QuaZipDir::exists(): fileName=%s, fileInfo.fileName()=%s, "
- "fileInfo.path()=%s", fileName.toUtf8().constData(),
- fileInfo.fileName().toUtf8().constData(),
- fileInfo.path().toUtf8().constData());
-#endif
- QuaZipDir dir(*this);
- return dir.cd(fileInfo.path()) && dir.exists(fileInfo.fileName());
- } else {
- if (fileName == "..") {
- return !isRoot();
- } else if (fileName == ".") {
- return true;
- } else {
- QStringList entries = entryList(QDir::AllEntries, QDir::NoSort);
-#ifdef QUAZIP_QUAZIPDIR_DEBUG
- qDebug("QuaZipDir::exists(): looking for %s",
- fileName.toUtf8().constData());
- for (QStringList::const_iterator i = entries.constBegin();
- i != entries.constEnd();
- ++i) {
- qDebug("QuaZipDir::exists(): entry: %s",
- i->toUtf8().constData());
- }
-#endif
- Qt::CaseSensitivity cs = QuaZip::convertCaseSensitivity(
- d->caseSensitivity);
- if (filePath.endsWith('/')) {
- return entries.contains(filePath, cs);
- } else {
- return entries.contains(fileName, cs)
- || entries.contains(fileName + "/", cs);
- }
- }
- }
-}
-
-bool QuaZipDir::exists() const
-{
- return QuaZipDir(d->zip).exists(d->dir);
-}
-
-QString QuaZipDir::filePath(const QString &fileName) const
-{
- return QDir(d->dir).filePath(fileName);
-}
-
-QDir::Filters QuaZipDir::filter()
-{
- return d->filter;
-}
-
-bool QuaZipDir::isRoot() const
-{
- return d->simplePath().isEmpty();
-}
-
-QStringList QuaZipDir::nameFilters() const
-{
- return d->nameFilters;
-}
-
-QString QuaZipDir::path() const
-{
- return d->dir;
-}
-
-QString QuaZipDir::relativeFilePath(const QString &fileName) const
-{
- return QDir("/" + d->dir).relativeFilePath(fileName);
-}
-
-void QuaZipDir::setCaseSensitivity(QuaZip::CaseSensitivity caseSensitivity)
-{
- d->caseSensitivity = caseSensitivity;
-}
-
-void QuaZipDir::setFilter(QDir::Filters filters)
-{
- d->filter = filters;
-}
-
-void QuaZipDir::setNameFilters(const QStringList &nameFilters)
-{
- d->nameFilters = nameFilters;
-}
-
-void QuaZipDir::setPath(const QString &path)
-{
- QString newDir = path;
- if (newDir == "/") {
- d->dir = "";
- } else {
- if (newDir.endsWith('/'))
- newDir.chop(1);
- if (newDir.startsWith('/'))
- newDir = newDir.mid(1);
- d->dir = newDir;
- }
-}
-
-void QuaZipDir::setSorting(QDir::SortFlags sort)
-{
- d->sorting = sort;
-}
-
-QDir::SortFlags QuaZipDir::sorting() const
-{
- return d->sorting;
-}
diff --git a/daemon/quazip/quazipdir.h b/daemon/quazip/quazipdir.h
deleted file mode 100644
index 09d989b..0000000
--- a/daemon/quazip/quazipdir.h
+++ /dev/null
@@ -1,223 +0,0 @@
-#ifndef QUAZIP_QUAZIPDIR_H
-#define QUAZIP_QUAZIPDIR_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-class QuaZipDirPrivate;
-
-#include "quazip.h"
-#include "quazipfileinfo.h"
-#include <QDir>
-#include <QList>
-#include <QSharedDataPointer>
-
-/// Provides ZIP archive navigation.
-/**
-* This class is modelled after QDir, and is designed to provide similar
-* features for ZIP archives.
-*
-* The only significant difference from QDir is that the root path is not
-* '/', but an empty string since that's how the file paths are stored in
-* the archive. However, QuaZipDir understands the paths starting with
-* '/'. It is important in a few places:
-*
-* - In the cd() function.
-* - In the constructor.
-* - In the exists() function.
-* - In the relativePath() function.
-*
-* Note that since ZIP uses '/' on all platforms, the '\' separator is
-* not supported.
-*/
-class QUAZIP_EXPORT QuaZipDir {
-private:
- QSharedDataPointer<QuaZipDirPrivate> d;
-public:
- /// The copy constructor.
- QuaZipDir(const QuaZipDir &that);
- /// Constructs a QuaZipDir instance pointing to the specified directory.
- /**
- If \a dir is not specified, points to the root of the archive.
- The same happens if the \a dir is &quot;/&quot;.
- */
- QuaZipDir(QuaZip *zip, const QString &dir = QString());
- /// Destructor.
- ~QuaZipDir();
- /// The assignment operator.
- bool operator==(const QuaZipDir &that);
- /// operator!=
- /**
- \return \c true if either this and \a that use different QuaZip
- instances or if they point to different directories.
- */
- inline bool operator!=(const QuaZipDir &that) {return !operator==(that);}
- /// operator==
- /**
- \return \c true if both this and \a that use the same QuaZip
- instance and point to the same directory.
- */
- QuaZipDir& operator=(const QuaZipDir &that);
- /// Returns the name of the entry at the specified position.
- QString operator[](int pos) const;
- /// Returns the current case sensitivity mode.
- QuaZip::CaseSensitivity caseSensitivity() const;
- /// Changes the 'current' directory.
- /**
- * If the path starts with '/', it is interpreted as an absolute
- * path from the root of the archive. Otherwise, it is interpreted
- * as a path relative to the current directory as was set by the
- * previous cd() or the constructor.
- *
- * Note that the subsequent path() call will not return a path
- * starting with '/' in all cases.
- */
- bool cd(const QString &dirName);
- /// Goes up.
- bool cdUp();
- /// Returns the number of entries in the directory.
- uint count() const;
- /// Returns the current directory name.
- /**
- The name doesn't include the path.
- */
- QString dirName() const;
- /// Returns the list of the entries in the directory.
- /**
- \param nameFilters The list of file patterns to list, uses the same
- syntax as QDir.
- \param filters The entry type filters, only Files and Dirs are
- accepted.
- \param sort Sorting mode.
- */
- QList<QuaZipFileInfo> entryInfoList(const QStringList &nameFilters,
- QDir::Filters filters = QDir::NoFilter,
- QDir::SortFlags sort = QDir::NoSort) const;
- /// Returns the list of the entries in the directory.
- /**
- \overload
-
- The same as entryInfoList(QStringList(), filters, sort).
- */
- QList<QuaZipFileInfo> entryInfoList(QDir::Filters filters = QDir::NoFilter,
- QDir::SortFlags sort = QDir::NoSort) const;
- /// Returns the list of the entries in the directory with zip64 support.
- /**
- \param nameFilters The list of file patterns to list, uses the same
- syntax as QDir.
- \param filters The entry type filters, only Files and Dirs are
- accepted.
- \param sort Sorting mode.
- */
- QList<QuaZipFileInfo64> entryInfoList64(const QStringList &nameFilters,
- QDir::Filters filters = QDir::NoFilter,
- QDir::SortFlags sort = QDir::NoSort) const;
- /// Returns the list of the entries in the directory with zip64 support.
- /**
- \overload
-
- The same as entryInfoList64(QStringList(), filters, sort).
- */
- QList<QuaZipFileInfo64> entryInfoList64(QDir::Filters filters = QDir::NoFilter,
- QDir::SortFlags sort = QDir::NoSort) const;
- /// Returns the list of the entry names in the directory.
- /**
- The same as entryInfoList(nameFilters, filters, sort), but only
- returns entry names.
- */
- QStringList entryList(const QStringList &nameFilters,
- QDir::Filters filters = QDir::NoFilter,
- QDir::SortFlags sort = QDir::NoSort) const;
- /// Returns the list of the entry names in the directory.
- /**
- \overload
-
- The same as entryList(QStringList(), filters, sort).
- */
- QStringList entryList(QDir::Filters filters = QDir::NoFilter,
- QDir::SortFlags sort = QDir::NoSort) const;
- /// Returns \c true if the entry with the specified name exists.
- /**
- The &quot;..&quot; is considered to exist if the current directory
- is not root. The &quot;.&quot; and &quot;/&quot; are considered to
- always exist. Paths starting with &quot;/&quot; are relative to
- the archive root, other paths are relative to the current dir.
- */
- bool exists(const QString &fileName) const;
- /// Return \c true if the directory pointed by this QuaZipDir exists.
- bool exists() const;
- /// Returns the full path to the specified file.
- /**
- Doesn't check if the file actually exists.
- */
- QString filePath(const QString &fileName) const;
- /// Returns the default filter.
- QDir::Filters filter();
- /// Returns if the QuaZipDir points to the root of the archive.
- /**
- Not that the root path is the empty string, not '/'.
- */
- bool isRoot() const;
- /// Return the default name filter.
- QStringList nameFilters() const;
- /// Returns the path to the current dir.
- /**
- The path never starts with '/', and the root path is an empty
- string.
- */
- QString path() const;
- /// Returns the path to the specified file relative to the current dir.
- /**
- * This function is mostly useless, provided only for the sake of
- * completeness.
- *
- * @param fileName The path to the file, should start with &quot;/&quot;
- * if relative to the archive root.
- * @return Path relative to the current dir.
- */
- QString relativeFilePath(const QString &fileName) const;
- /// Sets the default case sensitivity mode.
- void setCaseSensitivity(QuaZip::CaseSensitivity caseSensitivity);
- /// Sets the default filter.
- void setFilter(QDir::Filters filters);
- /// Sets the default name filter.
- void setNameFilters(const QStringList &nameFilters);
- /// Goes to the specified path.
- /**
- The difference from cd() is that this function never checks if the
- path actually exists and doesn't use relative paths, so it's
- possible to go to the root directory with setPath(&quot;&quot;).
-
- Note that this function still chops the trailing and/or leading
- '/' and treats a single '/' as the root path (path() will still
- return an empty string).
- */
- void setPath(const QString &path);
- /// Sets the default sorting mode.
- void setSorting(QDir::SortFlags sort);
- /// Returns the default sorting mode.
- QDir::SortFlags sorting() const;
-};
-
-#endif // QUAZIP_QUAZIPDIR_H
diff --git a/daemon/quazip/quazipfile.cpp b/daemon/quazip/quazipfile.cpp
deleted file mode 100644
index 3f674b0..0000000
--- a/daemon/quazip/quazipfile.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant, see
-quazip/(un)zip.h files for details, basically it's zlib license.
- **/
-
-#include "quazipfile.h"
-
-using namespace std;
-
-/// The implementation class for QuaZip.
-/**
-\internal
-
-This class contains all the private stuff for the QuaZipFile class, thus
-allowing to preserve binary compatibility between releases, the
-technique known as the Pimpl (private implementation) idiom.
-*/
-class QuaZipFilePrivate {
- friend class QuaZipFile;
- private:
- /// The pointer to the associated QuaZipFile instance.
- QuaZipFile *q;
- /// The QuaZip object to work with.
- QuaZip *zip;
- /// The file name.
- QString fileName;
- /// Case sensitivity mode.
- QuaZip::CaseSensitivity caseSensitivity;
- /// Whether this file is opened in the raw mode.
- bool raw;
- /// Write position to keep track of.
- /**
- QIODevice::pos() is broken for non-seekable devices, so we need
- our own position.
- */
- qint64 writePos;
- /// Uncompressed size to write along with a raw file.
- quint64 uncompressedSize;
- /// CRC to write along with a raw file.
- quint32 crc;
- /// Whether \ref zip points to an internal QuaZip instance.
- /**
- This is true if the archive was opened by name, rather than by
- supplying an existing QuaZip instance.
- */
- bool internal;
- /// The last error.
- int zipError;
- /// Resets \ref zipError.
- inline void resetZipError() const {setZipError(UNZ_OK);}
- /// Sets the zip error.
- /**
- This function is marked as const although it changes one field.
- This allows to call it from const functions that don't change
- anything by themselves.
- */
- void setZipError(int zipError) const;
- /// The constructor for the corresponding QuaZipFile constructor.
- inline QuaZipFilePrivate(QuaZipFile *q):
- q(q), zip(NULL), internal(true), zipError(UNZ_OK) {}
- /// The constructor for the corresponding QuaZipFile constructor.
- inline QuaZipFilePrivate(QuaZipFile *q, const QString &zipName):
- q(q), internal(true), zipError(UNZ_OK)
- {
- zip=new QuaZip(zipName);
- }
- /// The constructor for the corresponding QuaZipFile constructor.
- inline QuaZipFilePrivate(QuaZipFile *q, const QString &zipName, const QString &fileName,
- QuaZip::CaseSensitivity cs):
- q(q), internal(true), zipError(UNZ_OK)
- {
- zip=new QuaZip(zipName);
- this->fileName=fileName;
- if (this->fileName.startsWith('/'))
- this->fileName = this->fileName.mid(1);
- this->caseSensitivity=cs;
- }
- /// The constructor for the QuaZipFile constructor accepting a file name.
- inline QuaZipFilePrivate(QuaZipFile *q, QuaZip *zip):
- q(q), zip(zip), internal(false), zipError(UNZ_OK) {}
- /// The destructor.
- inline ~QuaZipFilePrivate()
- {
- if (internal)
- delete zip;
- }
-};
-
-QuaZipFile::QuaZipFile():
- p(new QuaZipFilePrivate(this))
-{
-}
-
-QuaZipFile::QuaZipFile(QObject *parent):
- QIODevice(parent),
- p(new QuaZipFilePrivate(this))
-{
-}
-
-QuaZipFile::QuaZipFile(const QString& zipName, QObject *parent):
- QIODevice(parent),
- p(new QuaZipFilePrivate(this, zipName))
-{
-}
-
-QuaZipFile::QuaZipFile(const QString& zipName, const QString& fileName,
- QuaZip::CaseSensitivity cs, QObject *parent):
- QIODevice(parent),
- p(new QuaZipFilePrivate(this, zipName, fileName, cs))
-{
-}
-
-QuaZipFile::QuaZipFile(QuaZip *zip, QObject *parent):
- QIODevice(parent),
- p(new QuaZipFilePrivate(this, zip))
-{
-}
-
-QuaZipFile::~QuaZipFile()
-{
- if (isOpen())
- close();
- delete p;
-}
-
-QString QuaZipFile::getZipName() const
-{
- return p->zip==NULL ? QString() : p->zip->getZipName();
-}
-
-QuaZip *QuaZipFile::getZip() const
-{
- return p->internal ? NULL : p->zip;
-}
-
-QString QuaZipFile::getActualFileName()const
-{
- p->setZipError(UNZ_OK);
- if (p->zip == NULL || (openMode() & WriteOnly))
- return QString();
- QString name=p->zip->getCurrentFileName();
- if(name.isNull())
- p->setZipError(p->zip->getZipError());
- return name;
-}
-
-void QuaZipFile::setZipName(const QString& zipName)
-{
- if(isOpen()) {
- qWarning("QuaZipFile::setZipName(): file is already open - can not set ZIP name");
- return;
- }
- if(p->zip!=NULL && p->internal)
- delete p->zip;
- p->zip=new QuaZip(zipName);
- p->internal=true;
-}
-
-void QuaZipFile::setZip(QuaZip *zip)
-{
- if(isOpen()) {
- qWarning("QuaZipFile::setZip(): file is already open - can not set ZIP");
- return;
- }
- if(p->zip!=NULL && p->internal)
- delete p->zip;
- p->zip=zip;
- p->fileName=QString();
- p->internal=false;
-}
-
-void QuaZipFile::setFileName(const QString& fileName, QuaZip::CaseSensitivity cs)
-{
- if(p->zip==NULL) {
- qWarning("QuaZipFile::setFileName(): call setZipName() first");
- return;
- }
- if(!p->internal) {
- qWarning("QuaZipFile::setFileName(): should not be used when not using internal QuaZip");
- return;
- }
- if(isOpen()) {
- qWarning("QuaZipFile::setFileName(): can not set file name for already opened file");
- return;
- }
- p->fileName=fileName;
- if (p->fileName.startsWith('/'))
- p->fileName = p->fileName.mid(1);
- p->caseSensitivity=cs;
-}
-
-void QuaZipFilePrivate::setZipError(int zipError) const
-{
- QuaZipFilePrivate *fakeThis = const_cast<QuaZipFilePrivate*>(this); // non-const
- fakeThis->zipError=zipError;
- if(zipError==UNZ_OK)
- q->setErrorString(QString());
- else
- q->setErrorString(QuaZipFile::tr("ZIP/UNZIP API error %1").arg(zipError));
-}
-
-bool QuaZipFile::open(OpenMode mode)
-{
- return open(mode, NULL);
-}
-
-bool QuaZipFile::open(OpenMode mode, int *method, int *level, bool raw, const char *password)
-{
- p->resetZipError();
- if(isOpen()) {
- qWarning("QuaZipFile::open(): already opened");
- return false;
- }
- if(mode&Unbuffered) {
- qWarning("QuaZipFile::open(): Unbuffered mode is not supported");
- return false;
- }
- if((mode&ReadOnly)&&!(mode&WriteOnly)) {
- if(p->internal) {
- if(!p->zip->open(QuaZip::mdUnzip)) {
- p->setZipError(p->zip->getZipError());
- return false;
- }
- if(!p->zip->setCurrentFile(p->fileName, p->caseSensitivity)) {
- p->setZipError(p->zip->getZipError());
- p->zip->close();
- return false;
- }
- } else {
- if(p->zip==NULL) {
- qWarning("QuaZipFile::open(): zip is NULL");
- return false;
- }
- if(p->zip->getMode()!=QuaZip::mdUnzip) {
- qWarning("QuaZipFile::open(): file open mode %d incompatible with ZIP open mode %d",
- (int)mode, (int)p->zip->getMode());
- return false;
- }
- if(!p->zip->hasCurrentFile()) {
- qWarning("QuaZipFile::open(): zip does not have current file");
- return false;
- }
- }
- p->setZipError(unzOpenCurrentFile3(p->zip->getUnzFile(), method, level, (int)raw, password));
- if(p->zipError==UNZ_OK) {
- setOpenMode(mode);
- p->raw=raw;
- return true;
- } else
- return false;
- }
- qWarning("QuaZipFile::open(): open mode %d not supported by this function", (int)mode);
- return false;
-}
-
-bool QuaZipFile::open(OpenMode mode, const QuaZipNewInfo& info,
- const char *password, quint32 crc,
- int method, int level, bool raw,
- int windowBits, int memLevel, int strategy)
-{
- zip_fileinfo info_z;
- p->resetZipError();
- if(isOpen()) {
- qWarning("QuaZipFile::open(): already opened");
- return false;
- }
- if((mode&WriteOnly)&&!(mode&ReadOnly)) {
- if(p->internal) {
- qWarning("QuaZipFile::open(): write mode is incompatible with internal QuaZip approach");
- return false;
- }
- if(p->zip==NULL) {
- qWarning("QuaZipFile::open(): zip is NULL");
- return false;
- }
- if(p->zip->getMode()!=QuaZip::mdCreate&&p->zip->getMode()!=QuaZip::mdAppend&&p->zip->getMode()!=QuaZip::mdAdd) {
- qWarning("QuaZipFile::open(): file open mode %d incompatible with ZIP open mode %d",
- (int)mode, (int)p->zip->getMode());
- return false;
- }
- info_z.tmz_date.tm_year=info.dateTime.date().year();
- info_z.tmz_date.tm_mon=info.dateTime.date().month() - 1;
- info_z.tmz_date.tm_mday=info.dateTime.date().day();
- info_z.tmz_date.tm_hour=info.dateTime.time().hour();
- info_z.tmz_date.tm_min=info.dateTime.time().minute();
- info_z.tmz_date.tm_sec=info.dateTime.time().second();
- info_z.dosDate = 0;
- info_z.internal_fa=(uLong)info.internalAttr;
- info_z.external_fa=(uLong)info.externalAttr;
- if (p->zip->isDataDescriptorWritingEnabled())
- zipSetFlags(p->zip->getZipFile(), ZIP_WRITE_DATA_DESCRIPTOR);
- else
- zipClearFlags(p->zip->getZipFile(), ZIP_WRITE_DATA_DESCRIPTOR);
- p->setZipError(zipOpenNewFileInZip3_64(p->zip->getZipFile(),
- p->zip->getFileNameCodec()->fromUnicode(info.name).constData(), &info_z,
- info.extraLocal.constData(), info.extraLocal.length(),
- info.extraGlobal.constData(), info.extraGlobal.length(),
- p->zip->getCommentCodec()->fromUnicode(info.comment).constData(),
- method, level, (int)raw,
- windowBits, memLevel, strategy,
- password, (uLong)crc, p->zip->isZip64Enabled()));
- if(p->zipError==UNZ_OK) {
- p->writePos=0;
- setOpenMode(mode);
- p->raw=raw;
- if(raw) {
- p->crc=crc;
- p->uncompressedSize=info.uncompressedSize;
- }
- return true;
- } else
- return false;
- }
- qWarning("QuaZipFile::open(): open mode %d not supported by this function", (int)mode);
- return false;
-}
-
-bool QuaZipFile::isSequential()const
-{
- return true;
-}
-
-qint64 QuaZipFile::pos()const
-{
- if(p->zip==NULL) {
- qWarning("QuaZipFile::pos(): call setZipName() or setZip() first");
- return -1;
- }
- if(!isOpen()) {
- qWarning("QuaZipFile::pos(): file is not open");
- return -1;
- }
- if(openMode()&ReadOnly)
- // QIODevice::pos() is broken for sequential devices,
- // but thankfully bytesAvailable() returns the number of
- // bytes buffered, so we know how far ahead we are.
- return unztell(p->zip->getUnzFile()) - QIODevice::bytesAvailable();
- else
- return p->writePos;
-}
-
-bool QuaZipFile::atEnd()const
-{
- if(p->zip==NULL) {
- qWarning("QuaZipFile::atEnd(): call setZipName() or setZip() first");
- return false;
- }
- if(!isOpen()) {
- qWarning("QuaZipFile::atEnd(): file is not open");
- return false;
- }
- if(openMode()&ReadOnly)
- // the same problem as with pos()
- return QIODevice::bytesAvailable() == 0
- && unzeof(p->zip->getUnzFile())==1;
- else
- return true;
-}
-
-qint64 QuaZipFile::size()const
-{
- if(!isOpen()) {
- qWarning("QuaZipFile::atEnd(): file is not open");
- return -1;
- }
- if(openMode()&ReadOnly)
- return p->raw?csize():usize();
- else
- return p->writePos;
-}
-
-qint64 QuaZipFile::csize()const
-{
- unz_file_info64 info_z;
- p->setZipError(UNZ_OK);
- if(p->zip==NULL||p->zip->getMode()!=QuaZip::mdUnzip) return -1;
- p->setZipError(unzGetCurrentFileInfo64(p->zip->getUnzFile(), &info_z, NULL, 0, NULL, 0, NULL, 0));
- if(p->zipError!=UNZ_OK)
- return -1;
- return info_z.compressed_size;
-}
-
-qint64 QuaZipFile::usize()const
-{
- unz_file_info64 info_z;
- p->setZipError(UNZ_OK);
- if(p->zip==NULL||p->zip->getMode()!=QuaZip::mdUnzip) return -1;
- p->setZipError(unzGetCurrentFileInfo64(p->zip->getUnzFile(), &info_z, NULL, 0, NULL, 0, NULL, 0));
- if(p->zipError!=UNZ_OK)
- return -1;
- return info_z.uncompressed_size;
-}
-
-bool QuaZipFile::getFileInfo(QuaZipFileInfo *info)
-{
- QuaZipFileInfo64 info64;
- if (getFileInfo(&info64)) {
- info64.toQuaZipFileInfo(*info);
- return true;
- } else {
- return false;
- }
-}
-
-bool QuaZipFile::getFileInfo(QuaZipFileInfo64 *info)
-{
- if(p->zip==NULL||p->zip->getMode()!=QuaZip::mdUnzip) return false;
- p->zip->getCurrentFileInfo(info);
- p->setZipError(p->zip->getZipError());
- return p->zipError==UNZ_OK;
-}
-
-void QuaZipFile::close()
-{
- p->resetZipError();
- if(p->zip==NULL||!p->zip->isOpen()) return;
- if(!isOpen()) {
- qWarning("QuaZipFile::close(): file isn't open");
- return;
- }
- if(openMode()&ReadOnly)
- p->setZipError(unzCloseCurrentFile(p->zip->getUnzFile()));
- else if(openMode()&WriteOnly)
- if(isRaw()) p->setZipError(zipCloseFileInZipRaw64(p->zip->getZipFile(), p->uncompressedSize, p->crc));
- else p->setZipError(zipCloseFileInZip(p->zip->getZipFile()));
- else {
- qWarning("Wrong open mode: %d", (int)openMode());
- return;
- }
- if(p->zipError==UNZ_OK) setOpenMode(QIODevice::NotOpen);
- else return;
- if(p->internal) {
- p->zip->close();
- p->setZipError(p->zip->getZipError());
- }
-}
-
-qint64 QuaZipFile::readData(char *data, qint64 maxSize)
-{
- p->setZipError(UNZ_OK);
- qint64 bytesRead=unzReadCurrentFile(p->zip->getUnzFile(), data, (unsigned)maxSize);
- if (bytesRead < 0) {
- p->setZipError((int) bytesRead);
- return -1;
- }
- return bytesRead;
-}
-
-qint64 QuaZipFile::writeData(const char* data, qint64 maxSize)
-{
- p->setZipError(ZIP_OK);
- p->setZipError(zipWriteInFileInZip(p->zip->getZipFile(), data, (uint)maxSize));
- if(p->zipError!=ZIP_OK) return -1;
- else {
- p->writePos+=maxSize;
- return maxSize;
- }
-}
-
-QString QuaZipFile::getFileName() const
-{
- return p->fileName;
-}
-
-QuaZip::CaseSensitivity QuaZipFile::getCaseSensitivity() const
-{
- return p->caseSensitivity;
-}
-
-bool QuaZipFile::isRaw() const
-{
- return p->raw;
-}
-
-int QuaZipFile::getZipError() const
-{
- return p->zipError;
-}
-
-qint64 QuaZipFile::bytesAvailable() const
-{
- return size() - pos();
-}
diff --git a/daemon/quazip/quazipfile.h b/daemon/quazip/quazipfile.h
deleted file mode 100644
index ec91a40..0000000
--- a/daemon/quazip/quazipfile.h
+++ /dev/null
@@ -1,456 +0,0 @@
-#ifndef QUA_ZIPFILE_H
-#define QUA_ZIPFILE_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant, see
-quazip/(un)zip.h files for details, basically it's zlib license.
- **/
-
-#include <QIODevice>
-
-#include "quazip_global.h"
-#include "quazip.h"
-#include "quazipnewinfo.h"
-
-class QuaZipFilePrivate;
-
-/// A file inside ZIP archive.
-/** \class QuaZipFile quazipfile.h <quazip/quazipfile.h>
- * This is the most interesting class. Not only it provides C++
- * interface to the ZIP/UNZIP package, but also integrates it with Qt by
- * subclassing QIODevice. This makes possible to access files inside ZIP
- * archive using QTextStream or QDataStream, for example. Actually, this
- * is the main purpose of the whole QuaZIP library.
- *
- * You can either use existing QuaZip instance to create instance of
- * this class or pass ZIP archive file name to this class, in which case
- * it will create internal QuaZip object. See constructors' descriptions
- * for details. Writing is only possible with the existing instance.
- *
- * Note that due to the underlying library's limitation it is not
- * possible to use multiple QuaZipFile instances to open several files
- * in the same archive at the same time. If you need to write to
- * multiple files in parallel, then you should write to temporary files
- * first, then pack them all at once when you have finished writing. If
- * you need to read multiple files inside the same archive in parallel,
- * you should extract them all into a temporary directory first.
- *
- * \section quazipfile-sequential Sequential or random-access?
- *
- * At the first thought, QuaZipFile has fixed size, the start and the
- * end and should be therefore considered random-access device. But
- * there is one major obstacle to making it random-access: ZIP/UNZIP API
- * does not support seek() operation and the only way to implement it is
- * through reopening the file and re-reading to the required position,
- * but this is prohibitively slow.
- *
- * Therefore, QuaZipFile is considered to be a sequential device. This
- * has advantage of availability of the ungetChar() operation (QIODevice
- * does not implement it properly for non-sequential devices unless they
- * support seek()). Disadvantage is a somewhat strange behaviour of the
- * size() and pos() functions. This should be kept in mind while using
- * this class.
- *
- **/
-class QUAZIP_EXPORT QuaZipFile: public QIODevice {
- friend class QuaZipFilePrivate;
- Q_OBJECT
- private:
- QuaZipFilePrivate *p;
- // these are not supported nor implemented
- QuaZipFile(const QuaZipFile& that);
- QuaZipFile& operator=(const QuaZipFile& that);
- protected:
- /// Implementation of the QIODevice::readData().
- qint64 readData(char *data, qint64 maxSize);
- /// Implementation of the QIODevice::writeData().
- qint64 writeData(const char *data, qint64 maxSize);
- public:
- /// Constructs a QuaZipFile instance.
- /** You should use setZipName() and setFileName() or setZip() before
- * trying to call open() on the constructed object.
- **/
- QuaZipFile();
- /// Constructs a QuaZipFile instance.
- /** \a parent argument specifies this object's parent object.
- *
- * You should use setZipName() and setFileName() or setZip() before
- * trying to call open() on the constructed object.
- **/
- QuaZipFile(QObject *parent);
- /// Constructs a QuaZipFile instance.
- /** \a parent argument specifies this object's parent object and \a
- * zipName specifies ZIP archive file name.
- *
- * You should use setFileName() before trying to call open() on the
- * constructed object.
- *
- * QuaZipFile constructed by this constructor can be used for read
- * only access. Use QuaZipFile(QuaZip*,QObject*) for writing.
- **/
- QuaZipFile(const QString& zipName, QObject *parent =NULL);
- /// Constructs a QuaZipFile instance.
- /** \a parent argument specifies this object's parent object, \a
- * zipName specifies ZIP archive file name and \a fileName and \a cs
- * specify a name of the file to open inside archive.
- *
- * QuaZipFile constructed by this constructor can be used for read
- * only access. Use QuaZipFile(QuaZip*,QObject*) for writing.
- *
- * \sa QuaZip::setCurrentFile()
- **/
- QuaZipFile(const QString& zipName, const QString& fileName,
- QuaZip::CaseSensitivity cs =QuaZip::csDefault, QObject *parent =NULL);
- /// Constructs a QuaZipFile instance.
- /** \a parent argument specifies this object's parent object.
- *
- * \a zip is the pointer to the existing QuaZip object. This
- * QuaZipFile object then can be used to read current file in the
- * \a zip or to write to the file inside it.
- *
- * \warning Using this constructor for reading current file can be
- * tricky. Let's take the following example:
- * \code
- * QuaZip zip("archive.zip");
- * zip.open(QuaZip::mdUnzip);
- * zip.setCurrentFile("file-in-archive");
- * QuaZipFile file(&zip);
- * file.open(QIODevice::ReadOnly);
- * // ok, now we can read from the file
- * file.read(somewhere, some);
- * zip.setCurrentFile("another-file-in-archive"); // oops...
- * QuaZipFile anotherFile(&zip);
- * anotherFile.open(QIODevice::ReadOnly);
- * anotherFile.read(somewhere, some); // this is still ok...
- * file.read(somewhere, some); // and this is NOT
- * \endcode
- * So, what exactly happens here? When we change current file in the
- * \c zip archive, \c file that references it becomes invalid
- * (actually, as far as I understand ZIP/UNZIP sources, it becomes
- * closed, but QuaZipFile has no means to detect it).
- *
- * Summary: do not close \c zip object or change its current file as
- * long as QuaZipFile is open. Even better - use another constructors
- * which create internal QuaZip instances, one per object, and
- * therefore do not cause unnecessary trouble. This constructor may
- * be useful, though, if you already have a QuaZip instance and do
- * not want to access several files at once. Good example:
- * \code
- * QuaZip zip("archive.zip");
- * zip.open(QuaZip::mdUnzip);
- * // first, we need some information about archive itself
- * QByteArray comment=zip.getComment();
- * // and now we are going to access files inside it
- * QuaZipFile file(&zip);
- * for(bool more=zip.goToFirstFile(); more; more=zip.goToNextFile()) {
- * file.open(QIODevice::ReadOnly);
- * // do something cool with file here
- * file.close(); // do not forget to close!
- * }
- * zip.close();
- * \endcode
- **/
- QuaZipFile(QuaZip *zip, QObject *parent =NULL);
- /// Destroys a QuaZipFile instance.
- /** Closes file if open, destructs internal QuaZip object (if it
- * exists and \em is internal, of course).
- **/
- virtual ~QuaZipFile();
- /// Returns the ZIP archive file name.
- /** If this object was created by passing QuaZip pointer to the
- * constructor, this function will return that QuaZip's file name
- * (or null string if that object does not have file name yet).
- *
- * Otherwise, returns associated ZIP archive file name or null
- * string if there are no name set yet.
- *
- * \sa setZipName() getFileName()
- **/
- QString getZipName()const;
- /// Returns a pointer to the associated QuaZip object.
- /** Returns \c NULL if there is no associated QuaZip or it is
- * internal (so you will not mess with it).
- **/
- QuaZip* getZip()const;
- /// Returns file name.
- /** This function returns file name you passed to this object either
- * by using
- * QuaZipFile(const QString&,const QString&,QuaZip::CaseSensitivity,QObject*)
- * or by calling setFileName(). Real name of the file may differ in
- * case if you used case-insensitivity.
- *
- * Returns null string if there is no file name set yet. This is the
- * case when this QuaZipFile operates on the existing QuaZip object
- * (constructor QuaZipFile(QuaZip*,QObject*) or setZip() was used).
- *
- * \sa getActualFileName
- **/
- QString getFileName() const;
- /// Returns case sensitivity of the file name.
- /** This function returns case sensitivity argument you passed to
- * this object either by using
- * QuaZipFile(const QString&,const QString&,QuaZip::CaseSensitivity,QObject*)
- * or by calling setFileName().
- *
- * Returns unpredictable value if getFileName() returns null string
- * (this is the case when you did not used setFileName() or
- * constructor above).
- *
- * \sa getFileName
- **/
- QuaZip::CaseSensitivity getCaseSensitivity() const;
- /// Returns the actual file name in the archive.
- /** This is \em not a ZIP archive file name, but a name of file inside
- * archive. It is not necessary the same name that you have passed
- * to the
- * QuaZipFile(const QString&,const QString&,QuaZip::CaseSensitivity,QObject*),
- * setFileName() or QuaZip::setCurrentFile() - this is the real file
- * name inside archive, so it may differ in case if the file name
- * search was case-insensitive.
- *
- * Equivalent to calling getCurrentFileName() on the associated
- * QuaZip object. Returns null string if there is no associated
- * QuaZip object or if it does not have a current file yet. And this
- * is the case if you called setFileName() but did not open the
- * file yet. So this is perfectly fine:
- * \code
- * QuaZipFile file("somezip.zip");
- * file.setFileName("somefile");
- * QString name=file.getName(); // name=="somefile"
- * QString actual=file.getActualFileName(); // actual is null string
- * file.open(QIODevice::ReadOnly);
- * QString actual=file.getActualFileName(); // actual can be "SoMeFiLe" on Windows
- * \endcode
- *
- * \sa getZipName(), getFileName(), QuaZip::CaseSensitivity
- **/
- QString getActualFileName()const;
- /// Sets the ZIP archive file name.
- /** Automatically creates internal QuaZip object and destroys
- * previously created internal QuaZip object, if any.
- *
- * Will do nothing if this file is already open. You must close() it
- * first.
- **/
- void setZipName(const QString& zipName);
- /// Returns \c true if the file was opened in raw mode.
- /** If the file is not open, the returned value is undefined.
- *
- * \sa open(OpenMode,int*,int*,bool,const char*)
- **/
- bool isRaw() const;
- /// Binds to the existing QuaZip instance.
- /** This function destroys internal QuaZip object, if any, and makes
- * this QuaZipFile to use current file in the \a zip object for any
- * further operations. See QuaZipFile(QuaZip*,QObject*) for the
- * possible pitfalls.
- *
- * Will do nothing if the file is currently open. You must close()
- * it first.
- **/
- void setZip(QuaZip *zip);
- /// Sets the file name.
- /** Will do nothing if at least one of the following conditions is
- * met:
- * - ZIP name has not been set yet (getZipName() returns null
- * string).
- * - This QuaZipFile is associated with external QuaZip. In this
- * case you should call that QuaZip's setCurrentFile() function
- * instead!
- * - File is already open so setting the name is meaningless.
- *
- * \sa QuaZip::setCurrentFile
- **/
- void setFileName(const QString& fileName, QuaZip::CaseSensitivity cs =QuaZip::csDefault);
- /// Opens a file for reading.
- /** Returns \c true on success, \c false otherwise.
- * Call getZipError() to get error code.
- *
- * \note Since ZIP/UNZIP API provides buffered reading only,
- * QuaZipFile does not support unbuffered reading. So do not pass
- * QIODevice::Unbuffered flag in \a mode, or open will fail.
- **/
- virtual bool open(OpenMode mode);
- /// Opens a file for reading.
- /** \overload
- * Argument \a password specifies a password to decrypt the file. If
- * it is NULL then this function behaves just like open(OpenMode).
- **/
- inline bool open(OpenMode mode, const char *password)
- {return open(mode, NULL, NULL, false, password);}
- /// Opens a file for reading.
- /** \overload
- * Argument \a password specifies a password to decrypt the file.
- *
- * An integers pointed by \a method and \a level will receive codes
- * of the compression method and level used. See unzip.h.
- *
- * If raw is \c true then no decompression is performed.
- *
- * \a method should not be \c NULL. \a level can be \c NULL if you
- * don't want to know the compression level.
- **/
- bool open(OpenMode mode, int *method, int *level, bool raw, const char *password =NULL);
- /// Opens a file for writing.
- /** \a info argument specifies information about file. It should at
- * least specify a correct file name. Also, it is a good idea to
- * specify correct timestamp (by default, current time will be
- * used). See QuaZipNewInfo.
- *
- * The \a password argument specifies the password for crypting. Pass NULL
- * if you don't need any crypting. The \a crc argument was supposed
- * to be used for crypting too, but then it turned out that it's
- * false information, so you need to set it to 0 unless you want to
- * use the raw mode (see below).
- *
- * Arguments \a method and \a level specify compression method and
- * level. The only method supported is Z_DEFLATED, but you may also
- * specify 0 for no compression. If all of the files in the archive
- * use both method 0 and either level 0 is explicitly specified or
- * data descriptor writing is disabled with
- * QuaZip::setDataDescriptorWritingEnabled(), then the
- * resulting archive is supposed to be compatible with the 1.0 ZIP
- * format version, should you need that. Except for this, \a level
- * has no other effects with method 0.
- *
- * If \a raw is \c true, no compression is performed. In this case,
- * \a crc and uncompressedSize field of the \a info are required.
- *
- * Arguments \a windowBits, \a memLevel, \a strategy provide zlib
- * algorithms tuning. See deflateInit2() in zlib.
- **/
- bool open(OpenMode mode, const QuaZipNewInfo& info,
- const char *password =NULL, quint32 crc =0,
- int method =Z_DEFLATED, int level =Z_DEFAULT_COMPRESSION, bool raw =false,
- int windowBits =-MAX_WBITS, int memLevel =DEF_MEM_LEVEL, int strategy =Z_DEFAULT_STRATEGY);
- /// Returns \c true, but \ref quazipfile-sequential "beware"!
- virtual bool isSequential()const;
- /// Returns current position in the file.
- /** Implementation of the QIODevice::pos(). When reading, this
- * function is a wrapper to the ZIP/UNZIP unztell(), therefore it is
- * unable to keep track of the ungetChar() calls (which is
- * non-virtual and therefore is dangerous to reimplement). So if you
- * are using ungetChar() feature of the QIODevice, this function
- * reports incorrect value until you get back characters which you
- * ungot.
- *
- * When writing, pos() returns number of bytes already written
- * (uncompressed unless you use raw mode).
- *
- * \note Although
- * \ref quazipfile-sequential "QuaZipFile is a sequential device"
- * and therefore pos() should always return zero, it does not,
- * because it would be misguiding. Keep this in mind.
- *
- * This function returns -1 if the file or archive is not open.
- *
- * Error code returned by getZipError() is not affected by this
- * function call.
- **/
- virtual qint64 pos()const;
- /// Returns \c true if the end of file was reached.
- /** This function returns \c false in the case of error. This means
- * that you called this function on either not open file, or a file
- * in the not open archive or even on a QuaZipFile instance that
- * does not even have QuaZip instance associated. Do not do that
- * because there is no means to determine whether \c false is
- * returned because of error or because end of file was reached.
- * Well, on the other side you may interpret \c false return value
- * as "there is no file open to check for end of file and there is
- * no end of file therefore".
- *
- * When writing, this function always returns \c true (because you
- * are always writing to the end of file).
- *
- * Error code returned by getZipError() is not affected by this
- * function call.
- **/
- virtual bool atEnd()const;
- /// Returns file size.
- /** This function returns csize() if the file is open for reading in
- * raw mode, usize() if it is open for reading in normal mode and
- * pos() if it is open for writing.
- *
- * Returns -1 on error, call getZipError() to get error code.
- *
- * \note This function returns file size despite that
- * \ref quazipfile-sequential "QuaZipFile is considered to be sequential device",
- * for which size() should return bytesAvailable() instead. But its
- * name would be very misguiding otherwise, so just keep in mind
- * this inconsistence.
- **/
- virtual qint64 size()const;
- /// Returns compressed file size.
- /** Equivalent to calling getFileInfo() and then getting
- * compressedSize field, but more convenient and faster.
- *
- * File must be open for reading before calling this function.
- *
- * Returns -1 on error, call getZipError() to get error code.
- **/
- qint64 csize()const;
- /// Returns uncompressed file size.
- /** Equivalent to calling getFileInfo() and then getting
- * uncompressedSize field, but more convenient and faster. See
- * getFileInfo() for a warning.
- *
- * File must be open for reading before calling this function.
- *
- * Returns -1 on error, call getZipError() to get error code.
- **/
- qint64 usize()const;
- /// Gets information about current file.
- /** This function does the same thing as calling
- * QuaZip::getCurrentFileInfo() on the associated QuaZip object,
- * but you can not call getCurrentFileInfo() if the associated
- * QuaZip is internal (because you do not have access to it), while
- * you still can call this function in that case.
- *
- * File must be open for reading before calling this function.
- *
- * \return \c false in the case of an error.
- *
- * This function doesn't support zip64, but will still work fine on zip64
- * archives if file sizes are below 4 GB, otherwise the values will be set
- * as if converted using QuaZipFileInfo64::toQuaZipFileInfo().
- *
- * \sa getFileInfo(QuaZipFileInfo64*)
- **/
- bool getFileInfo(QuaZipFileInfo *info);
- /// Gets information about current file with zip64 support.
- /**
- * @overload
- *
- * \sa getFileInfo(QuaZipFileInfo*)
- */
- bool getFileInfo(QuaZipFileInfo64 *info);
- /// Closes the file.
- /** Call getZipError() to determine if the close was successful.
- **/
- virtual void close();
- /// Returns the error code returned by the last ZIP/UNZIP API call.
- int getZipError() const;
- /// Returns the number of bytes available for reading.
- virtual qint64 bytesAvailable() const;
-};
-
-#endif
diff --git a/daemon/quazip/quazipfileinfo.cpp b/daemon/quazip/quazipfileinfo.cpp
deleted file mode 100644
index a855e01..0000000
--- a/daemon/quazip/quazipfileinfo.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include "quazipfileinfo.h"
-
-static QFile::Permissions permissionsFromExternalAttr(quint32 externalAttr) {
- quint32 uPerm = (externalAttr & 0xFFFF0000u) >> 16;
- QFile::Permissions perm = 0;
- if ((uPerm & 0400) != 0)
- perm |= QFile::ReadOwner;
- if ((uPerm & 0200) != 0)
- perm |= QFile::WriteOwner;
- if ((uPerm & 0100) != 0)
- perm |= QFile::ExeOwner;
- if ((uPerm & 0040) != 0)
- perm |= QFile::ReadGroup;
- if ((uPerm & 0020) != 0)
- perm |= QFile::WriteGroup;
- if ((uPerm & 0010) != 0)
- perm |= QFile::ExeGroup;
- if ((uPerm & 0004) != 0)
- perm |= QFile::ReadOther;
- if ((uPerm & 0002) != 0)
- perm |= QFile::WriteOther;
- if ((uPerm & 0001) != 0)
- perm |= QFile::ExeOther;
- return perm;
-
-}
-
-QFile::Permissions QuaZipFileInfo::getPermissions() const
-{
- return permissionsFromExternalAttr(externalAttr);
-}
-
-QFile::Permissions QuaZipFileInfo64::getPermissions() const
-{
- return permissionsFromExternalAttr(externalAttr);
-}
-
-bool QuaZipFileInfo64::toQuaZipFileInfo(QuaZipFileInfo &info) const
-{
- bool noOverflow = true;
- info.name = name;
- info.versionCreated = versionCreated;
- info.versionNeeded = versionNeeded;
- info.flags = flags;
- info.method = method;
- info.dateTime = dateTime;
- info.crc = crc;
- if (compressedSize > 0xFFFFFFFFu) {
- info.compressedSize = 0xFFFFFFFFu;
- noOverflow = false;
- } else {
- info.compressedSize = compressedSize;
- }
- if (uncompressedSize > 0xFFFFFFFFu) {
- info.uncompressedSize = 0xFFFFFFFFu;
- noOverflow = false;
- } else {
- info.uncompressedSize = uncompressedSize;
- }
- info.diskNumberStart = diskNumberStart;
- info.internalAttr = internalAttr;
- info.externalAttr = externalAttr;
- info.comment = comment;
- info.extra = extra;
- return noOverflow;
-}
-
-static QDateTime getNTFSTime(const QByteArray &extra, int position,
- int *fineTicks)
-{
- QDateTime dateTime;
- for (int i = 0; i <= extra.size() - 4; ) {
- unsigned type = static_cast<unsigned>(static_cast<unsigned char>(
- extra.at(i)))
- | (static_cast<unsigned>(static_cast<unsigned char>(
- extra.at(i + 1))) << 8);
- i += 2;
- unsigned length = static_cast<unsigned>(static_cast<unsigned char>(
- extra.at(i)))
- | (static_cast<unsigned>(static_cast<unsigned char>(
- extra.at(i + 1))) << 8);
- i += 2;
- if (type == QUAZIP_EXTRA_NTFS_MAGIC && length >= 32) {
- i += 4; // reserved
- while (i <= extra.size() - 4) {
- unsigned tag = static_cast<unsigned>(
- static_cast<unsigned char>(extra.at(i)))
- | (static_cast<unsigned>(
- static_cast<unsigned char>(extra.at(i + 1)))
- << 8);
- i += 2;
- int tagsize = static_cast<unsigned>(
- static_cast<unsigned char>(extra.at(i)))
- | (static_cast<unsigned>(
- static_cast<unsigned char>(extra.at(i + 1)))
- << 8);
- i += 2;
- if (tag == QUAZIP_EXTRA_NTFS_TIME_MAGIC
- && tagsize >= position + 8) {
- i += position;
- quint64 mtime = static_cast<quint64>(
- static_cast<unsigned char>(extra.at(i)))
- | (static_cast<quint64>(static_cast<unsigned char>(
- extra.at(i + 1))) << 8)
- | (static_cast<quint64>(static_cast<unsigned char>(
- extra.at(i + 2))) << 16)
- | (static_cast<quint64>(static_cast<unsigned char>(
- extra.at(i + 3))) << 24)
- | (static_cast<quint64>(static_cast<unsigned char>(
- extra.at(i + 4))) << 32)
- | (static_cast<quint64>(static_cast<unsigned char>(
- extra.at(i + 5))) << 40)
- | (static_cast<quint64>(static_cast<unsigned char>(
- extra.at(i + 6))) << 48)
- | (static_cast<quint64>(static_cast<unsigned char>(
- extra.at(i + 7))) << 56);
- // the NTFS time is measured from 1601 for whatever reason
- QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
- dateTime = base.addMSecs(mtime / 10000);
- if (fineTicks != NULL) {
- *fineTicks = static_cast<int>(mtime % 10000);
- }
- i += tagsize - position;
- } else {
- i += tagsize;
- }
-
- }
- } else {
- i += length;
- }
- }
- if (fineTicks != NULL && dateTime.isNull()) {
- *fineTicks = 0;
- }
- return dateTime;
-}
-
-QDateTime QuaZipFileInfo64::getNTFSmTime(int *fineTicks) const
-{
- return getNTFSTime(extra, 0, fineTicks);
-}
-
-QDateTime QuaZipFileInfo64::getNTFSaTime(int *fineTicks) const
-{
- return getNTFSTime(extra, 8, fineTicks);
-}
-
-QDateTime QuaZipFileInfo64::getNTFScTime(int *fineTicks) const
-{
- return getNTFSTime(extra, 16, fineTicks);
-}
diff --git a/daemon/quazip/quazipfileinfo.h b/daemon/quazip/quazipfileinfo.h
deleted file mode 100644
index dc527cb..0000000
--- a/daemon/quazip/quazipfileinfo.h
+++ /dev/null
@@ -1,172 +0,0 @@
-#ifndef QUA_ZIPFILEINFO_H
-#define QUA_ZIPFILEINFO_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include <QByteArray>
-#include <QDateTime>
-#include <QFile>
-
-#include "quazip_global.h"
-
-/// Information about a file inside archive.
-/** Call QuaZip::getCurrentFileInfo() or QuaZipFile::getFileInfo() to
- * fill this structure. */
-struct QUAZIP_EXPORT QuaZipFileInfo {
- /// File name.
- QString name;
- /// Version created by.
- quint16 versionCreated;
- /// Version needed to extract.
- quint16 versionNeeded;
- /// General purpose flags.
- quint16 flags;
- /// Compression method.
- quint16 method;
- /// Last modification date and time.
- QDateTime dateTime;
- /// CRC.
- quint32 crc;
- /// Compressed file size.
- quint32 compressedSize;
- /// Uncompressed file size.
- quint32 uncompressedSize;
- /// Disk number start.
- quint16 diskNumberStart;
- /// Internal file attributes.
- quint16 internalAttr;
- /// External file attributes.
- quint32 externalAttr;
- /// Comment.
- QString comment;
- /// Extra field.
- QByteArray extra;
- /// Get the file permissions.
- /**
- Returns the high 16 bits of external attributes converted to
- QFile::Permissions.
- */
- QFile::Permissions getPermissions() const;
-};
-
-/// Information about a file inside archive (with zip64 support).
-/** Call QuaZip::getCurrentFileInfo() or QuaZipFile::getFileInfo() to
- * fill this structure. */
-struct QUAZIP_EXPORT QuaZipFileInfo64 {
- /// File name.
- QString name;
- /// Version created by.
- quint16 versionCreated;
- /// Version needed to extract.
- quint16 versionNeeded;
- /// General purpose flags.
- quint16 flags;
- /// Compression method.
- quint16 method;
- /// Last modification date and time.
- /**
- * This is the time stored in the standard ZIP header. This format only allows
- * to store time with 2-second precision, so the seconds will always be even
- * and the milliseconds will always be zero. If you need more precise
- * date and time, you can try to call the getNTFSmTime() function or
- * its siblings, provided that the archive itself contains these NTFS times.
- */
- QDateTime dateTime;
- /// CRC.
- quint32 crc;
- /// Compressed file size.
- quint64 compressedSize;
- /// Uncompressed file size.
- quint64 uncompressedSize;
- /// Disk number start.
- quint16 diskNumberStart;
- /// Internal file attributes.
- quint16 internalAttr;
- /// External file attributes.
- quint32 externalAttr;
- /// Comment.
- QString comment;
- /// Extra field.
- QByteArray extra;
- /// Get the file permissions.
- /**
- Returns the high 16 bits of external attributes converted to
- QFile::Permissions.
- */
- QFile::Permissions getPermissions() const;
- /// Converts to QuaZipFileInfo
- /**
- If any of the fields are greater than 0xFFFFFFFFu, they are set to
- 0xFFFFFFFFu exactly, not just truncated. This function should be mainly used
- for compatibility with the old code expecting QuaZipFileInfo, in the cases
- when it's impossible or otherwise unadvisable (due to ABI compatibility
- reasons, for example) to modify that old code to use QuaZipFileInfo64.
-
- \return \c true if all fields converted correctly, \c false if an overflow
- occured.
- */
- bool toQuaZipFileInfo(QuaZipFileInfo &info) const;
- /// Returns the NTFS modification time
- /**
- * The getNTFS*Time() functions only work if there is an NTFS extra field
- * present. Otherwise, they all return invalid null timestamps.
- * @param fineTicks If not NULL, the fractional part of milliseconds returned
- * there, measured in 100-nanosecond ticks. Will be set to
- * zero if there is no NTFS extra field.
- * @sa dateTime
- * @sa getNTFSaTime()
- * @sa getNTFScTime()
- * @return The NTFS modification time, UTC
- */
- QDateTime getNTFSmTime(int *fineTicks = NULL) const;
- /// Returns the NTFS access time
- /**
- * The getNTFS*Time() functions only work if there is an NTFS extra field
- * present. Otherwise, they all return invalid null timestamps.
- * @param fineTicks If not NULL, the fractional part of milliseconds returned
- * there, measured in 100-nanosecond ticks. Will be set to
- * zero if there is no NTFS extra field.
- * @sa dateTime
- * @sa getNTFSmTime()
- * @sa getNTFScTime()
- * @return The NTFS access time, UTC
- */
- QDateTime getNTFSaTime(int *fineTicks = NULL) const;
- /// Returns the NTFS creation time
- /**
- * The getNTFS*Time() functions only work if there is an NTFS extra field
- * present. Otherwise, they all return invalid null timestamps.
- * @param fineTicks If not NULL, the fractional part of milliseconds returned
- * there, measured in 100-nanosecond ticks. Will be set to
- * zero if there is no NTFS extra field.
- * @sa dateTime
- * @sa getNTFSmTime()
- * @sa getNTFSaTime()
- * @return The NTFS creation time, UTC
- */
- QDateTime getNTFScTime(int *fineTicks = NULL) const;
-};
-
-#endif
diff --git a/daemon/quazip/quazipnewinfo.cpp b/daemon/quazip/quazipnewinfo.cpp
deleted file mode 100644
index db6c70a..0000000
--- a/daemon/quazip/quazipnewinfo.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant and contributors,
-see quazip/(un)zip.h files for details. Basically it's the zlib license.
-*/
-
-#include <QFileInfo>
-
-#include "quazipnewinfo.h"
-
-#include <string.h>
-
-static void QuaZipNewInfo_setPermissions(QuaZipNewInfo *info,
- QFile::Permissions perm, bool isDir)
-{
- quint32 uPerm = isDir ? 0040000 : 0100000;
- if ((perm & QFile::ReadOwner) != 0)
- uPerm |= 0400;
- if ((perm & QFile::WriteOwner) != 0)
- uPerm |= 0200;
- if ((perm & QFile::ExeOwner) != 0)
- uPerm |= 0100;
- if ((perm & QFile::ReadGroup) != 0)
- uPerm |= 0040;
- if ((perm & QFile::WriteGroup) != 0)
- uPerm |= 0020;
- if ((perm & QFile::ExeGroup) != 0)
- uPerm |= 0010;
- if ((perm & QFile::ReadOther) != 0)
- uPerm |= 0004;
- if ((perm & QFile::WriteOther) != 0)
- uPerm |= 0002;
- if ((perm & QFile::ExeOther) != 0)
- uPerm |= 0001;
- info->externalAttr = (info->externalAttr & ~0xFFFF0000u) | (uPerm << 16);
-}
-
-template<typename FileInfo>
-void QuaZipNewInfo_init(QuaZipNewInfo &self, const FileInfo &existing)
-{
- self.name = existing.name;
- self.dateTime = existing.dateTime;
- self.internalAttr = existing.internalAttr;
- self.externalAttr = existing.externalAttr;
- self.comment = existing.comment;
- self.extraLocal = existing.extra;
- self.extraGlobal = existing.extra;
- self.uncompressedSize = existing.uncompressedSize;
-}
-
-QuaZipNewInfo::QuaZipNewInfo(const QuaZipFileInfo &existing)
-{
- QuaZipNewInfo_init(*this, existing);
-}
-
-QuaZipNewInfo::QuaZipNewInfo(const QuaZipFileInfo64 &existing)
-{
- QuaZipNewInfo_init(*this, existing);
-}
-
-QuaZipNewInfo::QuaZipNewInfo(const QString& name):
- name(name), dateTime(QDateTime::currentDateTime()), internalAttr(0), externalAttr(0),
- uncompressedSize(0)
-{
-}
-
-QuaZipNewInfo::QuaZipNewInfo(const QString& name, const QString& file):
- name(name), internalAttr(0), externalAttr(0), uncompressedSize(0)
-{
- QFileInfo info(file);
- QDateTime lm = info.lastModified();
- if (!info.exists()) {
- dateTime = QDateTime::currentDateTime();
- } else {
- dateTime = lm;
- QuaZipNewInfo_setPermissions(this, info.permissions(), info.isDir());
- }
-}
-
-void QuaZipNewInfo::setFileDateTime(const QString& file)
-{
- QFileInfo info(file);
- QDateTime lm = info.lastModified();
- if (info.exists())
- dateTime = lm;
-}
-
-void QuaZipNewInfo::setFilePermissions(const QString &file)
-{
- QFileInfo info = QFileInfo(file);
- QFile::Permissions perm = info.permissions();
- QuaZipNewInfo_setPermissions(this, perm, info.isDir());
-}
-
-void QuaZipNewInfo::setPermissions(QFile::Permissions permissions)
-{
- QuaZipNewInfo_setPermissions(this, permissions, name.endsWith('/'));
-}
-
-void QuaZipNewInfo::setFileNTFSTimes(const QString &fileName)
-{
- QFileInfo fi(fileName);
- if (!fi.exists()) {
- qWarning("QuaZipNewInfo::setFileNTFSTimes(): '%s' doesn't exist",
- fileName.toUtf8().constData());
- return;
- }
- setFileNTFSmTime(fi.lastModified());
- setFileNTFSaTime(fi.lastRead());
- setFileNTFScTime(fi.created());
-}
-
-static void setNTFSTime(QByteArray &extra, const QDateTime &time, int position,
- int fineTicks) {
- int ntfsPos = -1, timesPos = -1;
- unsigned ntfsLength = 0, ntfsTimesLength = 0;
- for (int i = 0; i <= extra.size() - 4; ) {
- unsigned type = static_cast<unsigned>(static_cast<unsigned char>(
- extra.at(i)))
- | (static_cast<unsigned>(static_cast<unsigned char>(
- extra.at(i + 1))) << 8);
- i += 2;
- unsigned length = static_cast<unsigned>(static_cast<unsigned char>(
- extra.at(i)))
- | (static_cast<unsigned>(static_cast<unsigned char>(
- extra.at(i + 1))) << 8);
- i += 2;
- if (type == QUAZIP_EXTRA_NTFS_MAGIC) {
- ntfsPos = i - 4; // the beginning of the NTFS record
- ntfsLength = length;
- if (length <= 4) {
- break; // no times in the NTFS record
- }
- i += 4; // reserved
- while (i <= extra.size() - 4) {
- unsigned tag = static_cast<unsigned>(
- static_cast<unsigned char>(extra.at(i)))
- | (static_cast<unsigned>(
- static_cast<unsigned char>(extra.at(i + 1)))
- << 8);
- i += 2;
- unsigned tagsize = static_cast<unsigned>(
- static_cast<unsigned char>(extra.at(i)))
- | (static_cast<unsigned>(
- static_cast<unsigned char>(extra.at(i + 1)))
- << 8);
- i += 2;
- if (tag == QUAZIP_EXTRA_NTFS_TIME_MAGIC) {
- timesPos = i - 4; // the beginning of the NTFS times tag
- ntfsTimesLength = tagsize;
- break;
- } else {
- i += tagsize;
- }
- }
- break; // I ain't going to search for yet another NTFS record!
- } else {
- i += length;
- }
- }
- if (ntfsPos == -1) {
- // No NTFS record, need to create one.
- ntfsPos = extra.size();
- ntfsLength = 32;
- extra.resize(extra.size() + 4 + ntfsLength);
- // the NTFS record header
- extra[ntfsPos] = static_cast<char>(QUAZIP_EXTRA_NTFS_MAGIC);
- extra[ntfsPos + 1] = static_cast<char>(QUAZIP_EXTRA_NTFS_MAGIC >> 8);
- extra[ntfsPos + 2] = 32; // the 2-byte size in LittleEndian
- extra[ntfsPos + 3] = 0;
- // zero the record
- memset(extra.data() + ntfsPos + 4, 0, 32);
- timesPos = ntfsPos + 8;
- // now set the tag data
- extra[timesPos] = static_cast<char>(QUAZIP_EXTRA_NTFS_TIME_MAGIC);
- extra[timesPos + 1] = static_cast<char>(QUAZIP_EXTRA_NTFS_TIME_MAGIC
- >> 8);
- // the size:
- extra[timesPos + 2] = 24;
- extra[timesPos + 3] = 0;
- ntfsTimesLength = 24;
- }
- if (timesPos == -1) {
- // No time tag in the NTFS record, need to add one.
- timesPos = ntfsPos + 4 + ntfsLength;
- extra.resize(extra.size() + 28);
- // Now we need to move the rest of the field
- // (possibly zero bytes, but memmove() is OK with that).
- // 0 ......... ntfsPos .. ntfsPos + 4 ... timesPos
- // <some data> <header> <NTFS record> <need-to-move data> <end>
- memmove(extra.data() + timesPos + 28, extra.data() + timesPos,
- extra.size() - 28 - timesPos);
- ntfsLength += 28;
- // now set the tag data
- extra[timesPos] = static_cast<char>(QUAZIP_EXTRA_NTFS_TIME_MAGIC);
- extra[timesPos + 1] = static_cast<char>(QUAZIP_EXTRA_NTFS_TIME_MAGIC
- >> 8);
- // the size:
- extra[timesPos + 2] = 24;
- extra[timesPos + 3] = 0;
- // zero the record
- memset(extra.data() + timesPos + 4, 0, 24);
- ntfsTimesLength = 24;
- }
- if (ntfsTimesLength < 24) {
- // Broken times field. OK, this is really unlikely, but just in case...
- size_t timesEnd = timesPos + 4 + ntfsTimesLength;
- extra.resize(extra.size() + (24 - ntfsTimesLength));
- // Move it!
- // 0 ......... timesPos .... timesPos + 4 .. timesEnd
- // <some data> <time header> <broken times> <need-to-move data> <end>
- memmove(extra.data() + timesEnd + (24 - ntfsTimesLength),
- extra.data() + timesEnd,
- extra.size() - (24 - ntfsTimesLength) - timesEnd);
- // Now we have to increase the NTFS record and time tag lengths.
- ntfsLength += (24 - ntfsTimesLength);
- ntfsTimesLength = 24;
- extra[ntfsPos + 2] = static_cast<char>(ntfsLength);
- extra[ntfsPos + 3] = static_cast<char>(ntfsLength >> 8);
- extra[timesPos + 2] = static_cast<char>(ntfsTimesLength);
- extra[timesPos + 3] = static_cast<char>(ntfsTimesLength >> 8);
- }
- QDateTime base(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
-#if (QT_VERSION >= 0x040700)
- quint64 ticks = base.msecsTo(time) * 10000 + fineTicks;
-#else
- QDateTime utc = time.toUTC();
- quint64 ticks = (static_cast<qint64>(base.date().daysTo(utc.date()))
- * Q_INT64_C(86400000)
- + static_cast<qint64>(base.time().msecsTo(utc.time())))
- * Q_INT64_C(10000) + fineTicks;
-#endif
- extra[timesPos + 4 + position] = static_cast<char>(ticks);
- extra[timesPos + 5 + position] = static_cast<char>(ticks >> 8);
- extra[timesPos + 6 + position] = static_cast<char>(ticks >> 16);
- extra[timesPos + 7 + position] = static_cast<char>(ticks >> 24);
- extra[timesPos + 8 + position] = static_cast<char>(ticks >> 32);
- extra[timesPos + 9 + position] = static_cast<char>(ticks >> 40);
- extra[timesPos + 10 + position] = static_cast<char>(ticks >> 48);
- extra[timesPos + 11 + position] = static_cast<char>(ticks >> 56);
-}
-
-void QuaZipNewInfo::setFileNTFSmTime(const QDateTime &mTime, int fineTicks)
-{
- setNTFSTime(extraLocal, mTime, 0, fineTicks);
- setNTFSTime(extraGlobal, mTime, 0, fineTicks);
-}
-
-void QuaZipNewInfo::setFileNTFSaTime(const QDateTime &aTime, int fineTicks)
-{
- setNTFSTime(extraLocal, aTime, 8, fineTicks);
- setNTFSTime(extraGlobal, aTime, 8, fineTicks);
-}
-
-void QuaZipNewInfo::setFileNTFScTime(const QDateTime &cTime, int fineTicks)
-{
- setNTFSTime(extraLocal, cTime, 16, fineTicks);
- setNTFSTime(extraGlobal, cTime, 16, fineTicks);
-}
diff --git a/daemon/quazip/quazipnewinfo.h b/daemon/quazip/quazipnewinfo.h
deleted file mode 100644
index 88b5b60..0000000
--- a/daemon/quazip/quazipnewinfo.h
+++ /dev/null
@@ -1,207 +0,0 @@
-#ifndef QUA_ZIPNEWINFO_H
-#define QUA_ZIPNEWINFO_H
-
-/*
-Copyright (C) 2005-2014 Sergey A. Tachenov
-
-This file is part of QuaZIP.
-
-QuaZIP 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 3 of the License, or
-(at your option) any later version.
-
-QuaZIP 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 QuaZIP. If not, see <http://www.gnu.org/licenses/>.
-
-See COPYING file for the full LGPL text.
-
-Original ZIP package is copyrighted by Gilles Vollant, see
-quazip/(un)zip.h files for details, basically it's zlib license.
- **/
-
-#include <QDateTime>
-#include <QFile>
-#include <QString>
-
-#include "quazip_global.h"
-
-#include "quazipfileinfo.h"
-
-/// Information about a file to be created.
-/** This structure holds information about a file to be created inside
- * ZIP archive. At least name should be set to something correct before
- * passing this structure to
- * QuaZipFile::open(OpenMode,const QuaZipNewInfo&,int,int,bool).
- *
- * Zip64 support of this structure is slightly limited: in the raw mode (when
- * a pre-compressed file is written into a ZIP file as-is), it is necessary
- * to specify the uncompressed file size and the appropriate field is 32 bit.
- * Since the raw mode is used extremely rare, there is no real need to have
- * a separate QuaZipNewInfo64 structure like QuaZipFileInfo64. It may be added
- * in the future though, if there is a demand for the raw mode with zip64
- * archives.
- **/
-struct QUAZIP_EXPORT QuaZipNewInfo {
- /// File name.
- /** This field holds file name inside archive, including path relative
- * to archive root.
- **/
- QString name;
- /// File timestamp.
- /** This is the last file modification date and time. Will be stored
- * in the archive central directory. It is a good practice to set it
- * to the source file timestamp instead of archive creating time. Use
- * setFileDateTime() or QuaZipNewInfo(const QString&, const QString&).
- **/
- QDateTime dateTime;
- /// File internal attributes.
- quint16 internalAttr;
- /// File external attributes.
- /**
- The highest 16 bits contain Unix file permissions and type (dir or
- file). The constructor QuaZipNewInfo(const QString&, const QString&)
- takes permissions from the provided file.
- */
- quint32 externalAttr;
- /// File comment.
- /** Will be encoded using QuaZip::getCommentCodec().
- **/
- QString comment;
- /// File local extra field.
- QByteArray extraLocal;
- /// File global extra field.
- QByteArray extraGlobal;
- /// Uncompressed file size.
- /** This is only needed if you are using raw file zipping mode, i. e.
- * adding precompressed file in the zip archive.
- **/
- ulong uncompressedSize;
- /// Constructs QuaZipNewInfo instance.
- /** Initializes name with \a name, dateTime with current date and
- * time. Attributes are initialized with zeros, comment and extra
- * field with null values.
- **/
- QuaZipNewInfo(const QString& name);
- /// Constructs QuaZipNewInfo instance.
- /** Initializes name with \a name. Timestamp and permissions are taken
- * from the specified file. If the \a file does not exists or its timestamp
- * is inaccessible (e. g. you do not have read permission for the
- * directory file in), uses current time and zero permissions. Other attributes are
- * initialized with zeros, comment and extra field with null values.
- *
- * \sa setFileDateTime()
- **/
- QuaZipNewInfo(const QString& name, const QString& file);
- /// Initializes the new instance from existing file info.
- /** Mainly used when copying files between archives.
- *
- * Both extra fields are initialized to existing.extra.
- * @brief QuaZipNewInfo
- * @param existing
- */
- QuaZipNewInfo(const QuaZipFileInfo &existing);
- /// Initializes the new instance from existing file info.
- /** Mainly used when copying files between archives.
- *
- * Both extra fields are initialized to existing.extra.
- * @brief QuaZipNewInfo
- * @param existing
- */
- QuaZipNewInfo(const QuaZipFileInfo64 &existing);
- /// Sets the file timestamp from the existing file.
- /** Use this function to set the file timestamp from the existing
- * file. Use it like this:
- * \code
- * QuaZipFile zipFile(&zip);
- * QFile file("file-to-add");
- * file.open(QIODevice::ReadOnly);
- * QuaZipNewInfo info("file-name-in-archive");
- * info.setFileDateTime("file-to-add"); // take the timestamp from file
- * zipFile.open(QIODevice::WriteOnly, info);
- * \endcode
- *
- * This function does not change dateTime if some error occured (e. g.
- * file is inaccessible).
- **/
- void setFileDateTime(const QString& file);
- /// Sets the file permissions from the existing file.
- /**
- Takes permissions from the file and sets the high 16 bits of
- external attributes. Uses QFileInfo to get permissions on all
- platforms.
- */
- void setFilePermissions(const QString &file);
- /// Sets the file permissions.
- /**
- Modifies the highest 16 bits of external attributes. The type part
- is set to dir if the name ends with a slash, and to regular file
- otherwise.
- */
- void setPermissions(QFile::Permissions permissions);
- /// Sets the NTFS times from an existing file.
- /**
- * If the file doesn't exist, a warning is printed to the stderr and nothing
- * is done. Otherwise, all three times, as reported by
- * QFileInfo::lastModified(), QFileInfo::lastRead() and QFileInfo::created(),
- * are written to the NTFS extra field record.
- *
- * The NTFS record is written to
- * both the local and the global extra fields, updating the existing record
- * if there is one, or creating a new one and appending it to the end
- * of each extra field.
- *
- * The microseconds will be zero, as they aren't reported by QFileInfo.
- * @param fileName
- */
- void setFileNTFSTimes(const QString &fileName);
- /// Sets the NTFS modification time.
- /**
- * The time is written into the NTFS record in
- * both the local and the global extra fields, updating the existing record
- * if there is one, or creating a new one and appending it to the end
- * of each extra field. When updating an existing record, all other fields
- * are left intact.
- * @param mTime The new modification time.
- * @param fineTicks The fractional part of milliseconds, in 100-nanosecond
- * ticks (i. e. 9999 ticks = 999.9 microsecond). Values greater than
- * 9999 will add milliseconds or even seconds, but this can be
- * confusing and therefore is discouraged.
- */
- void setFileNTFSmTime(const QDateTime &mTime, int fineTicks = 0);
- /// Sets the NTFS access time.
- /**
- * The time is written into the NTFS record in
- * both the local and the global extra fields, updating the existing record
- * if there is one, or creating a new one and appending it to the end
- * of each extra field. When updating an existing record, all other fields
- * are left intact.
- * @param aTime The new access time.
- * @param fineTicks The fractional part of milliseconds, in 100-nanosecond
- * ticks (i. e. 9999 ticks = 999.9 microsecond). Values greater than
- * 9999 will add milliseconds or even seconds, but this can be
- * confusing and therefore is discouraged.
- */
- void setFileNTFSaTime(const QDateTime &aTime, int fineTicks = 0);
- /// Sets the NTFS creation time.
- /**
- * The time is written into the NTFS record in
- * both the local and the global extra fields, updating the existing record
- * if there is one, or creating a new one and appending it to the end
- * of each extra field. When updating an existing record, all other fields
- * are left intact.
- * @param cTime The new creation time.
- * @param fineTicks The fractional part of milliseconds, in 100-nanosecond
- * ticks (i. e. 9999 ticks = 999.9 microsecond). Values greater than
- * 9999 will add milliseconds or even seconds, but this can be
- * confusing and therefore is discouraged.
- */
- void setFileNTFScTime(const QDateTime &cTime, int fineTicks = 0);
-};
-
-#endif
diff --git a/daemon/quazip/run_moc.bat b/daemon/quazip/run_moc.bat
deleted file mode 100644
index f9aa4d9..0000000
--- a/daemon/quazip/run_moc.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-moc -o moc\moc_quazipfile.cpp quazipfile.h
-moc -o moc\moc_quagzipfile.cpp quagzipfile.h
-moc -o moc\moc_quaziodevice.cpp quaziodevice.h
diff --git a/daemon/quazip/unzip.c b/daemon/quazip/unzip.c
deleted file mode 100644
index bca03f8..0000000
--- a/daemon/quazip/unzip.c
+++ /dev/null
@@ -1,2155 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib
- Version 1.1, February 14h, 2010
- part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
- Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
- Modifications of Unzip for Zip64
- Copyright (C) 2007-2008 Even Rouault
-
- Modifications for Zip64 support on both zip and unzip
- Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
- Modifications for QIODevice support and other QuaZIP fixes
- Copyright (C) 2005-2014 Sergey A. Tachenov
-
- For more info read MiniZip_info.txt
-
-
- ------------------------------------------------------------------------------------
- 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).
-
- ------------------------------------------------------------------------------------
-
- Changes in unzip.c
-
- 2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
- 2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
- 2007-2008 - Even Rouault - Remove old C style function prototypes
- 2007-2008 - Even Rouault - Add unzip support for ZIP64
-
- Copyright (C) 2007-2008 Even Rouault
-
-
- Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
- Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
- should only read the compressed/uncompressed size from the Zip64 format if
- the size from normal header was 0xFFFFFFFF
- Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
- Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
- Patch created by Daniel Borca
-
- Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
- Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
-
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "zlib.h"
-#if (ZLIB_VERNUM < 0x1270)
-typedef uLongf z_crc_t;
-#endif
-#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
-
-
-#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) {if (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_info64_internal_s
-{
- ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
-} unz_file_info64_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 */
-
-#ifdef HAVE_BZIP2
- bz_stream bstream; /* bzLib stream structure for bziped */
-#endif
-
- ZPOS64_T pos_in_zipfile; /* position in byte on the zipfile, for fseek*/
- uLong stream_initialised; /* flag set if stream structure is initialised*/
-
- ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
- uInt size_local_extrafield;/* size of the local extra field */
- ZPOS64_T pos_local_extrafield; /* position in the local extra field in read*/
- ZPOS64_T total_out_64;
-
- uLong crc32; /* crc32 of all data uncompressed */
- uLong crc32_wait; /* crc32 we must obtain after decompress all */
- ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
- ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
- zlib_filefunc64_32_def z_filefunc;
- voidpf filestream; /* io structore of the zipfile */
- uLong compression_method; /* compression method (0==store) */
- ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
- int raw;
-} file_in_zip64_read_info_s;
-
-
-/* unz64_s contain internal information about the zipfile
-*/
-typedef struct
-{
- zlib_filefunc64_32_def z_filefunc;
- int is64bitOpenFunction;
- voidpf filestream; /* io structore of the zipfile */
- unz_global_info64 gi; /* public global information */
- ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
- ZPOS64_T num_file; /* number of the current file in the zipfile*/
- ZPOS64_T pos_in_central_dir; /* pos of the current file in the central dir*/
- ZPOS64_T current_file_ok; /* flag about the usability of the current file*/
- ZPOS64_T central_pos; /* position of the beginning of the central dir*/
-
- ZPOS64_T size_central_dir; /* size of the central directory */
- ZPOS64_T offset_central_dir; /* offset of start of central directory with
- respect to the starting disk number */
-
- unz_file_info64 cur_file_info; /* public info about the current file in zip*/
- unz_file_info64_internal cur_file_info_internal; /* private info about it*/
- file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
- file if we are decompressing it */
- int encrypted;
-
- int isZip64;
- unsigned flags;
-
-# ifndef NOUNCRYPT
- unsigned long keys[3]; /* keys defining the pseudo-random sequence */
- const z_crc_t FAR * pcrc_32_tab;
-# endif
-} unz64_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 unz64local_getByte OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- int *pi));
-
-local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
-{
- unsigned char c;
- int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
- if (err==1)
- {
- *pi = (int)c;
- return UNZ_OK;
- }
- else
- {
- if (ZERROR64(*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 unz64local_getShort OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX));
-
-local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX)
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((uLong)i)<<8;
-
- if (err==UNZ_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-local int unz64local_getLong OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX));
-
-local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- uLong *pX)
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((uLong)i)<<8;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((uLong)i)<<16;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<24;
-
- if (err==UNZ_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-local int unz64local_getLong64 OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- ZPOS64_T *pX));
-
-
-local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream,
- ZPOS64_T *pX)
-{
- ZPOS64_T x ;
- int i = 0;
- int err;
-
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (ZPOS64_T)i;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<8;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<16;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<24;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<32;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<40;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<48;
-
- if (err==UNZ_OK)
- err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
- x |= ((ZPOS64_T)i)<<56;
-
- if (err==UNZ_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (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 (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 ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
- unsigned char* buf;
- ZPOS64_T uSizeFile;
- ZPOS64_T uBackRead;
- ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
- ZPOS64_T uPosFound=0;
-
- if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
- return 0;
-
-
- uSizeFile = ZTELL64(*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;
- ZPOS64_T uReadPos ;
- int i;
- if (uBackRead+BUFREADCOMMENT>uMaxBack)
- uBackRead = uMaxBack;
- else
- uBackRead+=BUFREADCOMMENT;
- uReadPos = uSizeFile-uBackRead ;
-
- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
- if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- break;
-
- if (ZREAD64(*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;
-}
-
-
-/*
- Locate the Central directory 64 of a zipfile (at the end, just before
- the global comment)
-*/
-local ZPOS64_T unz64local_SearchCentralDir64 OF((
- const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream));
-
-local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
- voidpf filestream)
-{
- unsigned char* buf;
- ZPOS64_T uSizeFile;
- ZPOS64_T uBackRead;
- ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
- ZPOS64_T uPosFound=0;
- uLong uL;
- ZPOS64_T relativeOffset;
-
- if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
- return 0;
-
-
- uSizeFile = ZTELL64(*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;
- ZPOS64_T uReadPos;
- int i;
- if (uBackRead+BUFREADCOMMENT>uMaxBack)
- uBackRead = uMaxBack;
- else
- uBackRead+=BUFREADCOMMENT;
- uReadPos = uSizeFile-uBackRead ;
-
- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
- if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- break;
-
- if (ZREAD64(*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))==0x06) && ((*(buf+i+3))==0x07))
- {
- uPosFound = uReadPos+i;
- break;
- }
-
- if (uPosFound!=0)
- break;
- }
- TRYFREE(buf);
- if (uPosFound == 0)
- return 0;
-
- /* Zip64 end of central directory locator */
- if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
- return 0;
-
- /* the signature, already checked */
- if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
- return 0;
-
- /* number of the disk with the start of the zip64 end of central directory */
- if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
- return 0;
- if (uL != 0)
- return 0;
-
- /* relative offset of the zip64 end of central directory record */
- if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
- return 0;
-
- /* total number of disks */
- if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
- return 0;
- if (uL != 1)
- return 0;
-
- /* Goto end of central directory record */
- if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
- return 0;
-
- /* the signature */
- if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
- return 0;
-
- if (uL != 0x06064b50)
- return 0;
-
- return relativeOffset;
-}
-
-/*
- 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 unzOpenInternal (voidpf file,
- zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
- int is64bitOpenFunction, unsigned flags)
-{
- unz64_s us;
- unz64_s *s;
- ZPOS64_T central_pos;
- uLong 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*/
- ZPOS64_T 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;
-
- us.flags = flags;
- us.z_filefunc.zseek32_file = NULL;
- us.z_filefunc.ztell32_file = NULL;
- if (pzlib_filefunc64_32_def==NULL)
- fill_qiodevice64_filefunc(&us.z_filefunc.zfile_func64);
- else
- us.z_filefunc = *pzlib_filefunc64_32_def;
- us.is64bitOpenFunction = is64bitOpenFunction;
-
-
-
- us.filestream = ZOPEN64(us.z_filefunc,
- file,
- ZLIB_FILEFUNC_MODE_READ |
- ZLIB_FILEFUNC_MODE_EXISTING);
- if (us.filestream==NULL)
- return NULL;
-
- central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
- if (central_pos)
- {
- uLong uS;
- ZPOS64_T uL64;
-
- us.isZip64 = 1;
-
- if (ZSEEK64(us.z_filefunc, us.filestream,
- central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err=UNZ_ERRNO;
-
- /* the signature, already checked */
- if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* size of zip64 end of central directory record */
- if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* version made by */
- if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* version needed to extract */
- if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* number of this disk */
- if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* number of the disk with the start of the central directory */
- if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* total number of entries in the central directory on this disk */
- if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* total number of entries in the central directory */
- if (unz64local_getLong64(&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 (unz64local_getLong64(&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 (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- us.gi.size_comment = 0;
- }
- else
- {
- central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
- if (central_pos==0)
- err=UNZ_ERRNO;
-
- us.isZip64 = 0;
-
- if (ZSEEK64(us.z_filefunc, us.filestream,
- central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err=UNZ_ERRNO;
-
- /* the signature, already checked */
- if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
- err=UNZ_ERRNO;
-
- /* number of this disk */
- if (unz64local_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 (unz64local_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 (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
- err=UNZ_ERRNO;
- us.gi.number_entry = uL;
-
- /* total number of entries in the central dir */
- if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
- err=UNZ_ERRNO;
- number_entry_CD = uL;
-
- 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 (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
- err=UNZ_ERRNO;
- us.size_central_dir = uL;
-
- /* offset of start of central directory with respect to the
- starting disk number */
- if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
- err=UNZ_ERRNO;
- us.offset_central_dir = uL;
-
- /* zipfile comment length */
- if (unz64local_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)
- {
- if ((us.flags & UNZ_AUTO_CLOSE) != 0)
- ZCLOSE64(us.z_filefunc, us.filestream);
- else
- ZFAKECLOSE64(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=(unz64_s*)ALLOC(sizeof(unz64_s));
- if( s != NULL)
- {
- *s=us;
- unzGoToFirstFile((unzFile)s);
- }
- return (unzFile)s;
-}
-
-
-extern unzFile ZEXPORT unzOpen2 (voidpf file,
- zlib_filefunc_def* pzlib_filefunc32_def)
-{
- if (pzlib_filefunc32_def != NULL)
- {
- zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
- fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
- return unzOpenInternal(file, &zlib_filefunc64_32_def_fill, 0, UNZ_DEFAULT_FLAGS);
- }
- else
- return unzOpenInternal(file, NULL, 0, UNZ_DEFAULT_FLAGS);
-}
-
-extern unzFile ZEXPORT unzOpen2_64 (voidpf file,
- zlib_filefunc64_def* pzlib_filefunc_def)
-{
- if (pzlib_filefunc_def != NULL)
- {
- zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
- zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
- zlib_filefunc64_32_def_fill.ztell32_file = NULL;
- zlib_filefunc64_32_def_fill.zseek32_file = NULL;
- return unzOpenInternal(file, &zlib_filefunc64_32_def_fill, 1, UNZ_DEFAULT_FLAGS);
- }
- else
- return unzOpenInternal(file, NULL, 1, UNZ_DEFAULT_FLAGS);
-}
-
-extern unzFile ZEXPORT unzOpen (voidpf file)
-{
- return unzOpenInternal(file, NULL, 0, UNZ_DEFAULT_FLAGS);
-}
-
-extern unzFile ZEXPORT unzOpen64 (voidpf file)
-{
- return unzOpenInternal(file, NULL, 1, UNZ_DEFAULT_FLAGS);
-}
-
-/*
- 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 (unzFile file)
-{
- unz64_s* s;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_s*)file;
-
- if (s->pfile_in_zip_read!=NULL)
- unzCloseCurrentFile(file);
-
- if ((s->flags & UNZ_AUTO_CLOSE) != 0)
- ZCLOSE64(s->z_filefunc, s->filestream);
- else
- ZFAKECLOSE64(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 unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
-{
- unz64_s* s;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_s*)file;
- *pglobal_info=s->gi;
- return UNZ_OK;
-}
-
-extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
-{
- unz64_s* s;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_s*)file;
- /* to do : check if number_entry is not truncated */
- pglobal_info32->number_entry = (uLong)s->gi.number_entry;
- pglobal_info32->size_comment = s->gi.size_comment;
- return UNZ_OK;
-}
-/*
- Translate date/time from Dos format to tm_unz (readable more easilty)
-*/
-local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
-{
- ZPOS64_T uDate;
- uDate = (ZPOS64_T)(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 unz64local_GetCurrentFileInfoInternal OF((unzFile file,
- unz_file_info64 *pfile_info,
- unz_file_info64_internal
- *pfile_info_internal,
- char *szFileName,
- uLong fileNameBufferSize,
- void *extraField,
- uLong extraFieldBufferSize,
- char *szComment,
- uLong commentBufferSize));
-
-local int unz64local_GetCurrentFileInfoInternal (unzFile file,
- unz_file_info64 *pfile_info,
- unz_file_info64_internal
- *pfile_info_internal,
- char *szFileName,
- uLong fileNameBufferSize,
- void *extraField,
- uLong extraFieldBufferSize,
- char *szComment,
- uLong commentBufferSize)
-{
- unz64_s* s;
- unz_file_info64 file_info;
- unz_file_info64_internal file_info_internal;
- int err=UNZ_OK;
- uLong uMagic;
- ZPOS64_T llSeek=0;
- uLong uL;
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_s*)file;
- if (ZSEEK64(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 (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
- err=UNZ_ERRNO;
- else if (uMagic!=0x02014b50)
- err=UNZ_BADZIPFILE;
- }
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
- err=UNZ_ERRNO;
-
- unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
- if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
- err=UNZ_ERRNO;
- file_info.compressed_size = uL;
-
- if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
- err=UNZ_ERRNO;
- file_info.uncompressed_size = uL;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
- err=UNZ_ERRNO;
-
- /* relative offset of local header */
- if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
- err=UNZ_ERRNO;
- file_info_internal.offset_curfile = uL;
-
- llSeek+=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 (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
- err=UNZ_ERRNO;
- llSeek -= uSizeRead;
- }
-
- /* Read extrafield */
- if ((err==UNZ_OK) && (extraField!=NULL))
- {
- ZPOS64_T uSizeRead ;
- if (file_info.size_file_extra<extraFieldBufferSize)
- uSizeRead = file_info.size_file_extra;
- else
- uSizeRead = extraFieldBufferSize;
-
- if (llSeek!=0)
- {
- if (ZSEEK64(s->z_filefunc, s->filestream,llSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
- llSeek=0;
- else
- err=UNZ_ERRNO;
- }
-
- if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
- if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
- err=UNZ_ERRNO;
-
- llSeek += file_info.size_file_extra - (uLong)uSizeRead;
- }
- else
- llSeek += file_info.size_file_extra;
-
-
- if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
- {
- uLong acc = 0;
-
- /* since lSeek now points to after the extra field we need to move back */
- llSeek -= file_info.size_file_extra;
-
- if (llSeek!=0)
- {
- if (ZSEEK64(s->z_filefunc, s->filestream,llSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
- llSeek=0;
- else
- err=UNZ_ERRNO;
- }
-
- while(acc < file_info.size_file_extra)
- {
- uLong headerId;
- uLong dataSize;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
- err=UNZ_ERRNO;
-
- /* ZIP64 extra fields */
- if (headerId == 0x0001)
- {
- uLong uL;
-
- if(file_info.uncompressed_size == (ZPOS64_T)0xFFFFFFFFu)
- {
- if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
- err=UNZ_ERRNO;
- }
-
- if(file_info.compressed_size == (ZPOS64_T)0xFFFFFFFFu)
- {
- if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
- err=UNZ_ERRNO;
- }
-
- if(file_info_internal.offset_curfile == (ZPOS64_T)0xFFFFFFFFu)
- {
- /* Relative Header offset */
- if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
- err=UNZ_ERRNO;
- }
-
- if(file_info.disk_num_start == 0xFFFFFFFFu)
- {
- /* Disk Start Number */
- if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
- err=UNZ_ERRNO;
- }
-
- }
- else
- {
- if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
- err=UNZ_ERRNO;
- }
-
- acc += 2 + 2 + dataSize;
- }
- }
-
- 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 (llSeek!=0)
- {
- if (ZSEEK64(s->z_filefunc, s->filestream,llSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
- llSeek=0;
- else
- err=UNZ_ERRNO;
- }
-
- if ((file_info.size_file_comment>0) && (commentBufferSize>0))
- if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
- err=UNZ_ERRNO;
- llSeek+=file_info.size_file_comment - uSizeRead;
- }
- else
- llSeek+=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 unzGetCurrentFileInfo64 (unzFile file,
- unz_file_info64 * pfile_info,
- char * szFileName, uLong fileNameBufferSize,
- void *extraField, uLong extraFieldBufferSize,
- char* szComment, uLong commentBufferSize)
-{
- return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
- szFileName,fileNameBufferSize,
- extraField,extraFieldBufferSize,
- szComment,commentBufferSize);
-}
-
-extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
- unz_file_info * pfile_info,
- char * szFileName, uLong fileNameBufferSize,
- void *extraField, uLong extraFieldBufferSize,
- char* szComment, uLong commentBufferSize)
-{
- int err;
- unz_file_info64 file_info64;
- err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
- szFileName,fileNameBufferSize,
- extraField,extraFieldBufferSize,
- szComment,commentBufferSize);
- if (err==UNZ_OK && pfile_info != NULL)
- {
- pfile_info->version = file_info64.version;
- pfile_info->version_needed = file_info64.version_needed;
- pfile_info->flag = file_info64.flag;
- pfile_info->compression_method = file_info64.compression_method;
- pfile_info->dosDate = file_info64.dosDate;
- pfile_info->crc = file_info64.crc;
-
- pfile_info->size_filename = file_info64.size_filename;
- pfile_info->size_file_extra = file_info64.size_file_extra;
- pfile_info->size_file_comment = file_info64.size_file_comment;
-
- pfile_info->disk_num_start = file_info64.disk_num_start;
- pfile_info->internal_fa = file_info64.internal_fa;
- pfile_info->external_fa = file_info64.external_fa;
-
- pfile_info->tmu_date = file_info64.tmu_date,
-
-
- pfile_info->compressed_size = (uLong)file_info64.compressed_size;
- pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
-
- }
- return err;
-}
-/*
- Set the current file of the zipfile to the first file.
- return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile (unzFile file)
-{
- int err=UNZ_OK;
- unz64_s* s;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_s*)file;
- s->pos_in_central_dir=s->offset_central_dir;
- s->num_file=0;
- err=unz64local_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 (unzFile file)
-{
- unz64_s* s;
- int err;
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_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 = unz64local_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 (unzFile file, const char *szFileName, int iCaseSensitivity)
-{
- unz64_s* s;
- int err;
-
- /* We remember the 'current' position in the file so that we can jump
- * back there if we fail.
- */
- unz_file_info64 cur_file_infoSaved;
- unz_file_info64_internal cur_file_info_internalSaved;
- ZPOS64_T num_fileSaved;
- ZPOS64_T pos_in_central_dirSaved;
-
-
- if (file==NULL)
- return UNZ_PARAMERROR;
-
- if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
- return UNZ_PARAMERROR;
-
- s=(unz64_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 = unzGetCurrentFileInfo64(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
-{
- ZPOS64_T pos_in_zip_directory; // offset in file
- ZPOS64_T num_of_file; // # of file
-} unz_file_pos;
-*/
-
-extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos* file_pos)
-{
- unz64_s* s;
-
- if (file==NULL || file_pos==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_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 unzGetFilePos(
- unzFile file,
- unz_file_pos* file_pos)
-{
- unz64_file_pos file_pos64;
- int err = unzGetFilePos64(file,&file_pos64);
- if (err==UNZ_OK)
- {
- file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
- file_pos->num_of_file = (uLong)file_pos64.num_of_file;
- }
- return err;
-}
-
-extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
-{
- unz64_s* s;
- int err;
-
- if (file==NULL || file_pos==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_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 = unz64local_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;
-}
-
-extern int ZEXPORT unzGoToFilePos(
- unzFile file,
- unz_file_pos* file_pos)
-{
- unz64_file_pos file_pos64;
- if (file_pos == NULL)
- return UNZ_PARAMERROR;
-
- file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
- file_pos64.num_of_file = file_pos->num_of_file;
- return unzGoToFilePos64(file,&file_pos64);
-}
-
-/* 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 unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
- ZPOS64_T * 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 (ZSEEK64(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 (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
- err=UNZ_ERRNO;
- else if (uMagic!=0x04034b50)
- err=UNZ_BADZIPFILE;
- }
-
- if (unz64local_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 (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
- err=UNZ_ERRNO;
-
- if (unz64local_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) &&
-/* #ifdef HAVE_BZIP2 */
- (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
- (s->cur_file_info.compression_method!=Z_DEFLATED))
- err=UNZ_BADZIPFILE;
-
- if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
- err=UNZ_ERRNO;
-
- if (unz64local_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 (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
- err=UNZ_ERRNO;
- else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
- err=UNZ_BADZIPFILE;
-
- if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
- err=UNZ_ERRNO;
- else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
- err=UNZ_BADZIPFILE;
-
- if (unz64local_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 (unz64local_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 (unzFile file, int* method,
- int* level, int raw, const char* password)
-{
- int err=UNZ_OK;
- uInt iSizeVar;
- unz64_s* s;
- file_in_zip64_read_info_s* pfile_in_zip_read_info;
- ZPOS64_T 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=(unz64_s*)file;
- if (!s->current_file_ok)
- return UNZ_PARAMERROR;
-
- if (s->pfile_in_zip_read != NULL)
- unzCloseCurrentFile(file);
-
- if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
- return UNZ_BADZIPFILE;
-
- pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_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) &&
-/* #ifdef HAVE_BZIP2 */
- (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
-/* #endif */
- (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->total_out_64=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_BZIP2ED) && (!raw))
- {
-#ifdef HAVE_BZIP2
- pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
- pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
- pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
- pfile_in_zip_read_info->bstream.state = (voidpf)0;
-
- pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
- pfile_in_zip_read_info->stream.zfree = (free_func)0;
- pfile_in_zip_read_info->stream.opaque = (voidpf)0;
- pfile_in_zip_read_info->stream.next_in = (voidpf)0;
- pfile_in_zip_read_info->stream.avail_in = 0;
-
- err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
- if (err == Z_OK)
- pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
- else
- {
- TRYFREE(pfile_in_zip_read_info);
- return err;
- }
-#else
- pfile_in_zip_read_info->raw=1;
-#endif
- }
- else 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 = 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=Z_DEFLATED;
- 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;
- s->encrypted = 0;
-
-# ifndef NOUNCRYPT
- if (password != NULL)
- {
- int i;
- s->pcrc_32_tab = get_crc_table();
- init_keys(password,s->keys,s->pcrc_32_tab);
- if (ZSEEK64(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(ZREAD64(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 (unzFile file)
-{
- return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
-}
-
-extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char* password)
-{
- return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
-}
-
-extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
-{
- return unzOpenCurrentFile3(file, method, level, raw, NULL);
-}
-
-/** Addition for GDAL : START */
-
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
-{
- unz64_s* s;
- file_in_zip64_read_info_s* pfile_in_zip_read_info;
- s=(unz64_s*)file;
- if (file==NULL)
- return 0; /*UNZ_PARAMERROR; */
- pfile_in_zip_read_info=s->pfile_in_zip_read;
- if (pfile_in_zip_read_info==NULL)
- return 0; /*UNZ_PARAMERROR; */
- return pfile_in_zip_read_info->pos_in_zipfile +
- pfile_in_zip_read_info->byte_before_the_zipfile;
-}
-
-/** Addition for GDAL : END */
-
-/*
- 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 (unzFile file, voidp buf, unsigned len)
-{
- int err=UNZ_OK;
- uInt iRead = 0;
- unz64_s* s;
- file_in_zip64_read_info_s* pfile_in_zip_read_info;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_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 (ZSEEK64(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 (ZREAD64(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->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
-
- 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 if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
- {
-#ifdef HAVE_BZIP2
- uLong uTotalOutBefore,uTotalOutAfter;
- const Bytef *bufBefore;
- uLong uOutThis;
-
- pfile_in_zip_read_info->bstream.next_in = (char*)pfile_in_zip_read_info->stream.next_in;
- pfile_in_zip_read_info->bstream.avail_in = pfile_in_zip_read_info->stream.avail_in;
- pfile_in_zip_read_info->bstream.total_in_lo32 = pfile_in_zip_read_info->stream.total_in;
- pfile_in_zip_read_info->bstream.total_in_hi32 = 0;
- pfile_in_zip_read_info->bstream.next_out = (char*)pfile_in_zip_read_info->stream.next_out;
- pfile_in_zip_read_info->bstream.avail_out = pfile_in_zip_read_info->stream.avail_out;
- pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
- pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
-
- uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
- bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
-
- err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
-
- uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
- uOutThis = uTotalOutAfter-uTotalOutBefore;
-
- pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
-
- 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);
-
- pfile_in_zip_read_info->stream.next_in = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
- pfile_in_zip_read_info->stream.avail_in = pfile_in_zip_read_info->bstream.avail_in;
- pfile_in_zip_read_info->stream.total_in = pfile_in_zip_read_info->bstream.total_in_lo32;
- pfile_in_zip_read_info->stream.next_out = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
- pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
- pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
-
- if (err==BZ_STREAM_END)
- return (iRead==0) ? UNZ_EOF : iRead;
- if (err!=BZ_OK)
- break;
-#endif
- } /* end Z_BZIP2ED */
- else
- {
- ZPOS64_T uTotalOutBefore,uTotalOutAfter;
- const Bytef *bufBefore;
- ZPOS64_T 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->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
-
- 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 (unzFile file)
-{
- unz64_s* s;
- file_in_zip64_read_info_s* pfile_in_zip_read_info;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_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;
-}
-
-extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
-{
-
- unz64_s* s;
- file_in_zip64_read_info_s* pfile_in_zip_read_info;
- if (file==NULL)
- return (ZPOS64_T)-1;
- s=(unz64_s*)file;
- pfile_in_zip_read_info=s->pfile_in_zip_read;
-
- if (pfile_in_zip_read_info==NULL)
- return (ZPOS64_T)-1;
-
- return pfile_in_zip_read_info->total_out_64;
-}
-
-
-/*
- return 1 if the end of file was reached, 0 elsewhere
-*/
-extern int ZEXPORT unzeof (unzFile file)
-{
- unz64_s* s;
- file_in_zip64_read_info_s* pfile_in_zip_read_info;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_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 (unzFile file, voidp buf, unsigned len)
-{
- unz64_s* s;
- file_in_zip64_read_info_s* pfile_in_zip_read_info;
- uInt read_now;
- ZPOS64_T size_to_read;
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_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 (ZSEEK64(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 (ZREAD64(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 (unzFile file)
-{
- int err=UNZ_OK;
-
- unz64_s* s;
- file_in_zip64_read_info_s* pfile_in_zip_read_info;
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_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 == Z_DEFLATED)
- inflateEnd(&pfile_in_zip_read_info->stream);
-#ifdef HAVE_BZIP2
- else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
- BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
-#endif
-
-
- 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 (unzFile file, char * szComment, uLong uSizeBuf)
-{
- unz64_s* s;
- uLong uReadThis ;
- if (file==NULL)
- return (int)UNZ_PARAMERROR;
- s=(unz64_s*)file;
-
- uReadThis = uSizeBuf;
- if (uReadThis>s->gi.size_comment)
- uReadThis = s->gi.size_comment;
-
- if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
- return UNZ_ERRNO;
-
- if (uReadThis>0)
- {
- *szComment='\0';
- if (ZREAD64(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 ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
-{
- unz64_s* s;
-
- if (file==NULL)
- return 0; /*UNZ_PARAMERROR; */
- s=(unz64_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 uLong ZEXPORT unzGetOffset (unzFile file)
-{
- ZPOS64_T offset64;
-
- if (file==NULL)
- return 0; /*UNZ_PARAMERROR; */
- offset64 = unzGetOffset64(file);
- return (uLong)offset64;
-}
-
-extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
-{
- unz64_s* s;
- int err;
-
- if (file==NULL)
- return UNZ_PARAMERROR;
- s=(unz64_s*)file;
-
- s->pos_in_central_dir = pos;
- s->num_file = s->gi.number_entry; /* hack */
- err = unz64local_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;
-}
-
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
-{
- return unzSetOffset64(file,pos);
-}
-
-
-int ZEXPORT unzSetFlags(unzFile file, unsigned flags)
-{
- unz64_s* s;
- if (file == NULL)
- return UNZ_PARAMERROR;
- s = (unz64_s*)file;
- s->flags |= flags;
- return UNZ_OK;
-}
-
-
-int ZEXPORT unzClearFlags(unzFile file, unsigned flags)
-{
- unz64_s* s;
- if (file == NULL)
- return UNZ_PARAMERROR;
- s = (unz64_s*)file;
- s->flags &= ~flags;
- return UNZ_OK;
-}
diff --git a/daemon/quazip/unzip.h b/daemon/quazip/unzip.h
deleted file mode 100644
index da7b062..0000000
--- a/daemon/quazip/unzip.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
- Version 1.1, February 14h, 2010
- part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
- Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
- Modifications of Unzip for Zip64
- Copyright (C) 2007-2008 Even Rouault
-
- Modifications for Zip64 support on both zip and unzip
- Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
- For more info read MiniZip_info.txt
-
- ---------------------------------------------------------------------------------
-
- 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.
-
- ---------------------------------------------------------------------------------
-
- Changes
-
- See header of unzip64.c
-
- ---------------------------------------------------------------------------
-
- As per the requirement above, this file is plainly marked as modified
- by Sergey A. Tachenov. Most modifications include the I/O API redesign
- to support QIODevice interface. Some improvements and small fixes were also made.
-*/
-
-#ifndef _unz64_H
-#define _unz64_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#ifdef HAVE_BZIP2
-#include "bzlib.h"
-#endif
-
-#define Z_BZIP2ED 12
-
-#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)
-
-#define UNZ_AUTO_CLOSE 0x01u
-#define UNZ_DEFAULT_FLAGS UNZ_AUTO_CLOSE
-
-/* 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_info64_s
-{
- ZPOS64_T 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_info64;
-
-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_info64_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 */
- ZPOS64_T compressed_size; /* compressed size 8 bytes */
- ZPOS64_T uncompressed_size; /* uncompressed size 8 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_info64;
-
-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 OF ((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 OF((voidpf file));
-extern unzFile ZEXPORT unzOpen64 OF((voidpf file));
-/*
- 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.
- the "64" function take a const void* pointer, because the path is just the
- value passed to the open64_file_func callback.
- Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
- is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
- does not describe the reality
-*/
-
-
-extern unzFile ZEXPORT unzOpen2 OF((voidpf file,
- 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 unzFile ZEXPORT unzOpen2_64 OF((voidpf file,
- zlib_filefunc64_def* pzlib_filefunc_def));
-/*
- Open a Zip file, like unz64Open, but provide a set of file low level API
- for read/write the zip file (see ioapi.h)
-*/
-
-
-/*
- * Exported by Sergey A. Tachenov to implement some QuaZIP features. This
- * function MAY change signature in order to implement even more features.
- * You have been warned!
- * */
-extern unzFile unzOpenInternal (voidpf file,
- zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
- int is64bitOpenFunction, unsigned flags);
-
-
-
-extern int ZEXPORT unzClose OF((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 OF((unzFile file,
- unz_global_info *pglobal_info));
-
-extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
- unz_global_info64 *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 OF((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 OF((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 OF((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 OF((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);
-
-typedef struct unz64_file_pos_s
-{
- ZPOS64_T pos_in_zip_directory; /* offset in zip file directory */
- ZPOS64_T num_of_file; /* # of file */
-} unz64_file_pos;
-
-extern int ZEXPORT unzGetFilePos64(
- unzFile file,
- unz64_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos64(
- unzFile file,
- const unz64_file_pos* file_pos);
-
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
- unz_file_info64 *pfile_info,
- char *szFileName,
- uLong fileNameBufferSize,
- void *extraField,
- uLong extraFieldBufferSize,
- char *szComment,
- uLong commentBufferSize));
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((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)
-*/
-
-
-/** Addition for GDAL : START */
-
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
-
-/** Addition for GDAL : END */
-
-
-/***************************************************************************/
-/* 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 OF((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 OF((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 OF((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 OF((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 OF((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 OF((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 OF((unzFile file));
-
-extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
-/*
- Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
- return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((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 ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
-extern uLong ZEXPORT unzGetOffset (unzFile file);
-
-/* Set the current file offset */
-extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
-
-extern int ZEXPORT unzSetFlags(unzFile file, unsigned flags);
-extern int ZEXPORT unzClearFlags(unzFile file, unsigned flags);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz64_H */
diff --git a/daemon/quazip/zip.c b/daemon/quazip/zip.c
deleted file mode 100644
index 9649653..0000000
--- a/daemon/quazip/zip.c
+++ /dev/null
@@ -1,2103 +0,0 @@
-/* zip.c -- IO on .zip files using zlib
- Version 1.1, February 14h, 2010
- part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
- Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
- Modifications for Zip64 support
- Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
- For more info read MiniZip_info.txt
-
- Modifications for QIODevice support and other QuaZIP fixes
- Copyright (C) 2005-2014 Sergey A. Tachenov
-
- Changes
- Oct-2009 - Mathias Svensson - Remove old C style function prototypes
- Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
- Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
- Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
- It is used when recreting zip archive with RAW when deleting items from a zip.
- ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
- Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
- Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include "zlib.h"
-#if (ZLIB_VERNUM < 0x1270)
-typedef uLongf z_crc_t;
-#endif
-#include "zip.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
-
-
-#ifndef local
-# define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-#ifndef VERSIONMADEBY
-# define VERSIONMADEBY (0x031e) /* best for standard pkware crypt */
-#endif
-
-#ifndef Z_BUFSIZE
-#define Z_BUFSIZE (64*1024) /* (16384) */
-#endif
-
-#ifndef Z_MAXFILENAMEINZIP
-#define Z_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-/*
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-*/
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-
-/* NOT sure that this work on ALL platform */
-#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
-
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END 2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-
-#ifndef DEF_MEM_LEVEL
-#if MAX_MEM_LEVEL >= 8
-# define DEF_MEM_LEVEL 8
-#else
-# define DEF_MEM_LEVEL MAX_MEM_LEVEL
-#endif
-#endif
-const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-
-#define SIZEDATA_INDATABLOCK (4096-(4*4))
-
-#define LOCALHEADERMAGIC (0x04034b50)
-#define DESCRIPTORHEADERMAGIC (0x08074b50)
-#define CENTRALHEADERMAGIC (0x02014b50)
-#define ENDHEADERMAGIC (0x06054b50)
-#define ZIP64ENDHEADERMAGIC (0x6064b50)
-#define ZIP64ENDLOCHEADERMAGIC (0x7064b50)
-
-#define FLAG_LOCALHEADER_OFFSET (0x06)
-#define CRC_LOCALHEADER_OFFSET (0x0e)
-
-#define SIZECENTRALHEADER (0x2e) /* 46 */
-
-typedef struct linkedlist_datablock_internal_s
-{
- struct linkedlist_datablock_internal_s* next_datablock;
- uLong avail_in_this_block;
- uLong filled_in_this_block;
- uLong unused; /* for future use and alignement */
- unsigned char data[SIZEDATA_INDATABLOCK];
-} linkedlist_datablock_internal;
-
-typedef struct linkedlist_data_s
-{
- linkedlist_datablock_internal* first_block;
- linkedlist_datablock_internal* last_block;
-} linkedlist_data;
-
-
-typedef struct
-{
- z_stream stream; /* zLib stream structure for inflate */
-#ifdef HAVE_BZIP2
- bz_stream bstream; /* bzLib stream structure for bziped */
-#endif
-
- int stream_initialised; /* 1 is stream is initialised */
- uInt pos_in_buffered_data; /* last written byte in buffered_data */
-
- ZPOS64_T pos_local_header; /* offset of the local header of the file
- currenty writing */
- char* central_header; /* central header data for the current file */
- uLong size_centralExtra;
- uLong size_centralheader; /* size of the central header for cur file */
- uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
- uLong flag; /* flag of the file currently writing */
-
- int method; /* compression method of file currenty wr.*/
- int raw; /* 1 for directly writing raw data */
- Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
- uLong dosDate;
- uLong crc32;
- int encrypt;
- int zip64; /* Add ZIP64 extened information in the extra field */
- ZPOS64_T pos_zip64extrainfo;
- ZPOS64_T totalCompressedData;
- ZPOS64_T totalUncompressedData;
-#ifndef NOCRYPT
- unsigned long keys[3]; /* keys defining the pseudo-random sequence */
- const z_crc_t FAR * pcrc_32_tab;
- int crypt_header_size;
-#endif
-} curfile64_info;
-
-typedef struct
-{
- zlib_filefunc64_32_def z_filefunc;
- voidpf filestream; /* io structore of the zipfile */
- linkedlist_data central_dir;/* datablock with central dir in construction*/
- int in_opened_file_inzip; /* 1 if a file in the zip is currently writ.*/
- curfile64_info ci; /* info on the file curretly writing */
-
- ZPOS64_T begin_pos; /* position of the beginning of the zipfile */
- ZPOS64_T add_position_when_writting_offset;
- ZPOS64_T number_entry;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
- char *globalcomment;
-#endif
-
- unsigned flags;
-
-} zip64_internal;
-
-
-#ifndef NOCRYPT
-#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-#include "crypt.h"
-#endif
-
-local linkedlist_datablock_internal* allocate_new_datablock()
-{
- linkedlist_datablock_internal* ldi;
- ldi = (linkedlist_datablock_internal*)
- ALLOC(sizeof(linkedlist_datablock_internal));
- if (ldi!=NULL)
- {
- ldi->next_datablock = NULL ;
- ldi->filled_in_this_block = 0 ;
- ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
- }
- return ldi;
-}
-
-local void free_datablock(linkedlist_datablock_internal* ldi)
-{
- while (ldi!=NULL)
- {
- linkedlist_datablock_internal* ldinext = ldi->next_datablock;
- TRYFREE(ldi);
- ldi = ldinext;
- }
-}
-
-local void init_linkedlist(linkedlist_data* ll)
-{
- ll->first_block = ll->last_block = NULL;
-}
-
-local void free_linkedlist(linkedlist_data* ll)
-{
- free_datablock(ll->first_block);
- ll->first_block = ll->last_block = NULL;
-}
-
-
-local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
-{
- linkedlist_datablock_internal* ldi;
- const unsigned char* from_copy;
-
- if (ll==NULL)
- return ZIP_INTERNALERROR;
-
- if (ll->last_block == NULL)
- {
- ll->first_block = ll->last_block = allocate_new_datablock();
- if (ll->first_block == NULL)
- return ZIP_INTERNALERROR;
- }
-
- ldi = ll->last_block;
- from_copy = (unsigned char*)buf;
-
- while (len>0)
- {
- uInt copy_this;
- uInt i;
- unsigned char* to_copy;
-
- if (ldi->avail_in_this_block==0)
- {
- ldi->next_datablock = allocate_new_datablock();
- if (ldi->next_datablock == NULL)
- return ZIP_INTERNALERROR;
- ldi = ldi->next_datablock ;
- ll->last_block = ldi;
- }
-
- if (ldi->avail_in_this_block < len)
- copy_this = (uInt)ldi->avail_in_this_block;
- else
- copy_this = (uInt)len;
-
- to_copy = &(ldi->data[ldi->filled_in_this_block]);
-
- for (i=0;i<copy_this;i++)
- *(to_copy+i)=*(from_copy+i);
-
- ldi->filled_in_this_block += copy_this;
- ldi->avail_in_this_block -= copy_this;
- from_copy += copy_this ;
- len -= copy_this;
- }
- return ZIP_OK;
-}
-
-
-
-/****************************************************************************/
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-/* ===========================================================================
- Inputs a long in LSB order to the given file
- nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
-*/
-
-local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
-local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
-{
- unsigned char buf[8];
- int n;
- for (n = 0; n < nbByte; n++)
- {
- buf[n] = (unsigned char)(x & 0xff);
- x >>= 8;
- }
- if (x != 0)
- { /* data overflow - hack for ZIP64 (X Roche) */
- for (n = 0; n < nbByte; n++)
- {
- buf[n] = 0xff;
- }
- }
-
- if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
- return ZIP_ERRNO;
- else
- return ZIP_OK;
-}
-
-local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
-local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
-{
- unsigned char* buf=(unsigned char*)dest;
- int n;
- for (n = 0; n < nbByte; n++) {
- buf[n] = (unsigned char)(x & 0xff);
- x >>= 8;
- }
-
- if (x != 0)
- { /* data overflow - hack for ZIP64 */
- for (n = 0; n < nbByte; n++)
- {
- buf[n] = 0xff;
- }
- }
-}
-
-/****************************************************************************/
-
-
-local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
-{
- uLong year = (uLong)ptm->tm_year;
- if (year>=1980)
- year-=1980;
- else if (year>=80)
- year-=80;
- return
- (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
- ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
-}
-
-
-/****************************************************************************/
-
-local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
-
-local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
-{
- unsigned char c;
- int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
- if (err==1)
- {
- *pi = (int)c;
- return ZIP_OK;
- }
- else
- {
- if (ZERROR64(*pzlib_filefunc_def,filestream))
- return ZIP_ERRNO;
- else
- return ZIP_EOF;
- }
-}
-
-
-/* ===========================================================================
- Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
-
-local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<8;
-
- if (err==ZIP_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
-
-local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<8;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<16;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<24;
-
- if (err==ZIP_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
-
-
-local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
-{
- ZPOS64_T x;
- int i = 0;
- int err;
-
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (ZPOS64_T)i;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<8;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<16;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<24;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<32;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<40;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<48;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<56;
-
- if (err==ZIP_OK)
- *pX = x;
- else
- *pX = 0;
-
- return err;
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-/*
- Locate the Central directory of a zipfile (at the end, just before
- the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-
-local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
- unsigned char* buf;
- ZPOS64_T uSizeFile;
- ZPOS64_T uBackRead;
- ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
- ZPOS64_T uPosFound=0;
-
- if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
- return 0;
-
-
- uSizeFile = ZTELL64(*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;
- ZPOS64_T uReadPos ;
- int i;
- if (uBackRead+BUFREADCOMMENT>uMaxBack)
- uBackRead = uMaxBack;
- else
- uBackRead+=BUFREADCOMMENT;
- uReadPos = uSizeFile-uBackRead ;
-
- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
- if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- break;
-
- if (ZREAD64(*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;
-}
-
-/*
-Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
-the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-
-local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
- unsigned char* buf;
- ZPOS64_T uSizeFile;
- ZPOS64_T uBackRead;
- ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
- ZPOS64_T uPosFound=0;
- uLong uL;
- ZPOS64_T relativeOffset;
-
- if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
- return 0;
-
- uSizeFile = ZTELL64(*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;
- ZPOS64_T uReadPos;
- int i;
- if (uBackRead+BUFREADCOMMENT>uMaxBack)
- uBackRead = uMaxBack;
- else
- uBackRead+=BUFREADCOMMENT;
- uReadPos = uSizeFile-uBackRead ;
-
- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
- if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- break;
-
- if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
- break;
-
- for (i=(int)uReadSize-3; (i--)>0;)
- {
- /* Signature "0x07064b50" Zip64 end of central directory locater */
- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
- {
- uPosFound = uReadPos+i;
- break;
- }
- }
-
- if (uPosFound!=0)
- break;
- }
-
- TRYFREE(buf);
- if (uPosFound == 0)
- return 0;
-
- /* Zip64 end of central directory locator */
- if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
- return 0;
-
- /* the signature, already checked */
- if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
- return 0;
-
- /* number of the disk with the start of the zip64 end of central directory */
- if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
- return 0;
- if (uL != 0)
- return 0;
-
- /* relative offset of the zip64 end of central directory record */
- if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
- return 0;
-
- /* total number of disks */
- if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
- return 0;
- if (uL != 1)
- return 0;
-
- /* Goto Zip64 end of central directory record */
- if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
- return 0;
-
- /* the signature */
- if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
- return 0;
-
- if (uL != 0x06064b50) /* signature of 'Zip64 end of central directory' */
- return 0;
-
- return relativeOffset;
-}
-
-int LoadCentralDirectoryRecord(zip64_internal* pziinit)
-{
- int err=ZIP_OK;
- ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-
- ZPOS64_T size_central_dir; /* size of the central directory */
- ZPOS64_T offset_central_dir; /* offset of start of central directory */
- ZPOS64_T central_pos;
- uLong 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*/
- ZPOS64_T number_entry;
- ZPOS64_T number_entry_CD; /* total number of entries in
- the central dir
- (same than number_entry on nospan) */
- uLong VersionMadeBy;
- uLong VersionNeeded;
- uLong size_comment;
-
- int hasZIP64Record = 0;
-
- /* check first if we find a ZIP64 record */
- central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
- if(central_pos > 0)
- {
- hasZIP64Record = 1;
- }
- else if(central_pos == 0)
- {
- central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
- }
-
-/* disable to allow appending to empty ZIP archive
- if (central_pos==0)
- err=ZIP_ERRNO;
-*/
-
- if(hasZIP64Record)
- {
- ZPOS64_T sizeEndOfCentralDirectory;
- if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
- err=ZIP_ERRNO;
-
- /* the signature, already checked */
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* size of zip64 end of central directory record */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* version made by */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* version needed to extract */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* number of this disk */
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* number of the disk with the start of the central directory */
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* total number of entries in the central directory on this disk */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* total number of entries in the central directory */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
- err=ZIP_BADZIPFILE;
-
- /* size of the central directory */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* offset of start of central directory with respect to the
- starting disk number */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* TODO.. */
- /* read the comment from the standard central header. */
- size_comment = 0;
- }
- else
- {
- /* Read End of central Directory info */
- if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err=ZIP_ERRNO;
-
- /* the signature, already checked */
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* number of this disk */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* number of the disk with the start of the central directory */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* total number of entries in the central dir on this disk */
- number_entry = 0;
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
- err=ZIP_ERRNO;
- else
- number_entry = uL;
-
- /* total number of entries in the central dir */
- number_entry_CD = 0;
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
- err=ZIP_ERRNO;
- else
- number_entry_CD = uL;
-
- if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
- err=ZIP_BADZIPFILE;
-
- /* size of the central directory */
- size_central_dir = 0;
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
- err=ZIP_ERRNO;
- else
- size_central_dir = uL;
-
- /* offset of start of central directory with respect to the starting disk number */
- offset_central_dir = 0;
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
- err=ZIP_ERRNO;
- else
- offset_central_dir = uL;
-
-
- /* zipfile global comment length */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
- err=ZIP_ERRNO;
- }
-
- if ((central_pos<offset_central_dir+size_central_dir) &&
- (err==ZIP_OK))
- err=ZIP_BADZIPFILE;
-
- if (err!=ZIP_OK)
- {
- if ((pziinit->flags & ZIP_AUTO_CLOSE) != 0) {
- ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
- } else {
- ZFAKECLOSE64(pziinit->z_filefunc, pziinit->filestream);
- }
- return ZIP_ERRNO;
- }
-
- if (size_comment>0)
- {
- pziinit->globalcomment = (char*)ALLOC(size_comment+1);
- if (pziinit->globalcomment)
- {
- size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
- pziinit->globalcomment[size_comment]=0;
- }
- }
-
- byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
- pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
-
- {
- ZPOS64_T size_central_dir_to_read = size_central_dir;
- size_t buf_size = SIZEDATA_INDATABLOCK;
- void* buf_read = (void*)ALLOC(buf_size);
- if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
- err=ZIP_ERRNO;
-
- while ((size_central_dir_to_read>0) && (err==ZIP_OK))
- {
- ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
- if (read_this > size_central_dir_to_read)
- read_this = size_central_dir_to_read;
-
- if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
- err=ZIP_ERRNO;
-
- if (err==ZIP_OK)
- err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
-
- size_central_dir_to_read-=read_this;
- }
- TRYFREE(buf_read);
- }
- pziinit->begin_pos = byte_before_the_zipfile;
- pziinit->number_entry = number_entry_CD;
-
- if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
- err=ZIP_ERRNO;
-
- return err;
-}
-
-
-#endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-
-/************************************************************/
-extern zipFile ZEXPORT zipOpen3 (voidpf file, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
- unsigned flags)
-{
- zip64_internal ziinit;
- zip64_internal* zi;
- int err=ZIP_OK;
-
- ziinit.flags = flags;
- ziinit.z_filefunc.zseek32_file = NULL;
- ziinit.z_filefunc.ztell32_file = NULL;
- if (pzlib_filefunc64_32_def==NULL)
- fill_qiodevice64_filefunc(&ziinit.z_filefunc.zfile_func64);
- else
- ziinit.z_filefunc = *pzlib_filefunc64_32_def;
-
- ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
- file,
- (append == APPEND_STATUS_CREATE) ?
- (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
- (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
-
- if (ziinit.filestream == NULL)
- return NULL;
-
- if (append == APPEND_STATUS_CREATEAFTER)
- ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
-
- ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
- ziinit.in_opened_file_inzip = 0;
- ziinit.ci.stream_initialised = 0;
- ziinit.number_entry = 0;
- ziinit.add_position_when_writting_offset = 0;
- init_linkedlist(&(ziinit.central_dir));
-
-
-
- zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
- if (zi==NULL)
- {
- if ((ziinit.flags & ZIP_AUTO_CLOSE) != 0) {
- ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
- } else {
- ZFAKECLOSE64(ziinit.z_filefunc,ziinit.filestream);
- }
- return NULL;
- }
-
- /* now we add file in a zipfile */
-# ifndef NO_ADDFILEINEXISTINGZIP
- ziinit.globalcomment = NULL;
- if (append == APPEND_STATUS_ADDINZIP)
- {
- /* Read and Cache Central Directory Records */
- err = LoadCentralDirectoryRecord(&ziinit);
- }
-
- if (globalcomment)
- {
- *globalcomment = ziinit.globalcomment;
- }
-# endif /* !NO_ADDFILEINEXISTINGZIP*/
-
- if (err != ZIP_OK)
- {
-# ifndef NO_ADDFILEINEXISTINGZIP
- TRYFREE(ziinit.globalcomment);
-# endif /* !NO_ADDFILEINEXISTINGZIP*/
- TRYFREE(zi);
- return NULL;
- }
- else
- {
- *zi = ziinit;
- return (zipFile)zi;
- }
-}
-
-extern zipFile ZEXPORT zipOpen2 (voidpf file, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
-{
- if (pzlib_filefunc32_def != NULL)
- {
- zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
- fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
- return zipOpen3(file, append, globalcomment, &zlib_filefunc64_32_def_fill, ZIP_DEFAULT_FLAGS);
- }
- else
- return zipOpen3(file, append, globalcomment, NULL, ZIP_DEFAULT_FLAGS);
-}
-
-extern zipFile ZEXPORT zipOpen2_64 (voidpf file, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
-{
- if (pzlib_filefunc_def != NULL)
- {
- zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
- zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
- zlib_filefunc64_32_def_fill.ztell32_file = NULL;
- zlib_filefunc64_32_def_fill.zseek32_file = NULL;
- return zipOpen3(file, append, globalcomment, &zlib_filefunc64_32_def_fill, ZIP_DEFAULT_FLAGS);
- }
- else
- return zipOpen3(file, append, globalcomment, NULL, ZIP_DEFAULT_FLAGS);
-}
-
-
-
-extern zipFile ZEXPORT zipOpen (voidpf file, int append)
-{
- return zipOpen3(file,append,NULL,NULL, ZIP_DEFAULT_FLAGS);
-}
-
-extern zipFile ZEXPORT zipOpen64 (voidpf file, int append)
-{
- return zipOpen3(file,append,NULL,NULL, ZIP_DEFAULT_FLAGS);
-}
-
-int Write_LocalFileHeader(zip64_internal* zi, const char* filename,
- uInt size_extrafield_local,
- const void* extrafield_local,
- uLong version_to_extract)
-{
- /* write the local header */
- int err;
- uInt size_filename = (uInt)strlen(filename);
- uInt size_extrafield = size_extrafield_local;
-
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
-
- if (err==ZIP_OK)
- {
- if(zi->ci.zip64)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)version_to_extract,2);
- }
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
-
- /* CRC / Compressed size / Uncompressed size will be filled in later and rewritten later */
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
- if (err==ZIP_OK)
- {
- if(zi->ci.zip64)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
- }
- if (err==ZIP_OK)
- {
- if(zi->ci.zip64)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
- }
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
-
- if(zi->ci.zip64)
- {
- size_extrafield += 20;
- }
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
-
- if ((err==ZIP_OK) && (size_filename > 0))
- {
- if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
- err = ZIP_ERRNO;
- }
-
- if ((err==ZIP_OK) && (size_extrafield_local > 0))
- {
- if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
- err = ZIP_ERRNO;
- }
-
-
- if ((err==ZIP_OK) && (zi->ci.zip64))
- {
- /* write the Zip64 extended info */
- short HeaderID = 1;
- short DataSize = 16;
- ZPOS64_T CompressedSize = 0;
- ZPOS64_T UncompressedSize = 0;
-
- /* Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file) */
- zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
-
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
-
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
- }
-
- return err;
-}
-
-/*
- NOTE.
- When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
- before calling this function it can be done with zipRemoveExtraInfoBlock
-
- It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
- unnecessary allocations.
- */
-extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw,
- int windowBits,int memLevel, int strategy,
- const char* password, uLong crcForCrypting,
- uLong versionMadeBy, uLong flagBase, int zip64)
-{
- zip64_internal* zi;
- uInt size_filename;
- uInt size_comment;
- uInt i;
- int err = ZIP_OK;
- uLong version_to_extract;
-
-# ifdef NOCRYPT
- if (password != NULL)
- return ZIP_PARAMERROR;
-# endif
-
- if (file == NULL)
- return ZIP_PARAMERROR;
-
-#ifdef HAVE_BZIP2
- if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
- return ZIP_PARAMERROR;
-#else
- if ((method!=0) && (method!=Z_DEFLATED))
- return ZIP_PARAMERROR;
-#endif
-
- zi = (zip64_internal*)file;
-
- if (zi->in_opened_file_inzip == 1)
- {
- err = zipCloseFileInZip (file);
- if (err != ZIP_OK)
- return err;
- }
-
- if (method == 0
- && (level == 0 || (zi->flags & ZIP_WRITE_DATA_DESCRIPTOR) == 0)
- && (zi->flags & ZIP_SEQUENTIAL) == 0)
- {
- version_to_extract = 10;
- }
- else
- {
- version_to_extract = 20;
- }
-
- if (filename==NULL)
- filename="-";
-
- if (comment==NULL)
- size_comment = 0;
- else
- size_comment = (uInt)strlen(comment);
-
- size_filename = (uInt)strlen(filename);
-
- if (zipfi == NULL)
- zi->ci.dosDate = 0;
- else
- {
- if (zipfi->dosDate != 0)
- zi->ci.dosDate = zipfi->dosDate;
- else
- zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
- }
-
- zi->ci.flag = flagBase;
- if ((level==8) || (level==9))
- zi->ci.flag |= 2;
- if (level==2)
- zi->ci.flag |= 4;
- if (level==1)
- zi->ci.flag |= 6;
- if (password != NULL)
- zi->ci.flag |= 1;
- if (version_to_extract >= 20
- && ((zi->flags & ZIP_WRITE_DATA_DESCRIPTOR) != 0
- || (zi->flags & ZIP_SEQUENTIAL) != 0))
- zi->ci.flag |= 8;
-
- zi->ci.crc32 = 0;
- zi->ci.method = method;
- zi->ci.encrypt = 0;
- zi->ci.stream_initialised = 0;
- zi->ci.pos_in_buffered_data = 0;
- zi->ci.raw = raw;
- zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
-
- zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
- zi->ci.size_centralExtraFree = 32; /* Extra space we have reserved in case we need to add ZIP64 extra info data */
-
- zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
-
- zi->ci.size_centralExtra = size_extrafield_global;
- zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
- /* version info */
- zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
- zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)version_to_extract,2);
- zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
- zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
- zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
- zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
- zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
- zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
- zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
- zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
- zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
- zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
-
- if (zipfi==NULL)
- zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
- else
- zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
-
- if (zipfi==NULL)
- zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
- else
- zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
-
- if(zi->ci.pos_local_header >= 0xffffffff)
- zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
- else
- zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
-
- for (i=0;i<size_filename;i++)
- *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
-
- for (i=0;i<size_extrafield_global;i++)
- *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
- *(((const char*)extrafield_global)+i);
-
- for (i=0;i<size_comment;i++)
- *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
- size_extrafield_global+i) = *(comment+i);
- if (zi->ci.central_header == NULL)
- return ZIP_INTERNALERROR;
-
- zi->ci.zip64 = zip64;
- zi->ci.totalCompressedData = 0;
- zi->ci.totalUncompressedData = 0;
- zi->ci.pos_zip64extrainfo = 0;
-
- err = Write_LocalFileHeader(zi, filename, size_extrafield_local,
- extrafield_local, version_to_extract);
-
-#ifdef HAVE_BZIP2
- zi->ci.bstream.avail_in = (uInt)0;
- zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
- zi->ci.bstream.total_in_hi32 = 0;
- zi->ci.bstream.total_in_lo32 = 0;
- zi->ci.bstream.total_out_hi32 = 0;
- zi->ci.bstream.total_out_lo32 = 0;
-#endif
-
- zi->ci.stream.avail_in = (uInt)0;
- zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.stream.next_out = zi->ci.buffered_data;
- zi->ci.stream.total_in = 0;
- zi->ci.stream.total_out = 0;
- zi->ci.stream.data_type = Z_BINARY;
-
-#ifdef HAVE_BZIP2
- if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-#else
- if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-#endif
- {
- if(zi->ci.method == Z_DEFLATED)
- {
- zi->ci.stream.zalloc = (alloc_func)0;
- zi->ci.stream.zfree = (free_func)0;
- zi->ci.stream.opaque = (voidpf)0;
-
- if (windowBits>0)
- windowBits = -windowBits;
-
- err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
-
- if (err==Z_OK)
- zi->ci.stream_initialised = Z_DEFLATED;
- }
- else if(zi->ci.method == Z_BZIP2ED)
- {
-#ifdef HAVE_BZIP2
- /* Init BZip stuff here */
- zi->ci.bstream.bzalloc = 0;
- zi->ci.bstream.bzfree = 0;
- zi->ci.bstream.opaque = (voidpf)0;
-
- err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
- if(err == BZ_OK)
- zi->ci.stream_initialised = Z_BZIP2ED;
-#endif
- }
-
- }
-
-# ifndef NOCRYPT
- zi->ci.crypt_header_size = 0;
- if ((err==Z_OK) && (password != NULL))
- {
- unsigned char bufHead[RAND_HEAD_LEN];
- unsigned int sizeHead;
- zi->ci.encrypt = 1;
- zi->ci.pcrc_32_tab = get_crc_table();
- /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
- if (crcForCrypting == 0) {
- crcForCrypting = (uLong)zi->ci.dosDate << 16; /* ATTANTION! Without this row, you don't unpack your password protected archive in other app. */
- }
- sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
- zi->ci.crypt_header_size = sizeHead;
-
- if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
- err = ZIP_ERRNO;
- }
-# endif
-
- if (err==Z_OK)
- zi->in_opened_file_inzip = 1;
- return err;
-}
-
-extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw,
- int windowBits,int memLevel, int strategy,
- const char* password, uLong crcForCrypting,
- uLong versionMadeBy, uLong flagBase)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- windowBits, memLevel, strategy,
- password, crcForCrypting, versionMadeBy, flagBase, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw,
- int windowBits,int memLevel, int strategy,
- const char* password, uLong crcForCrypting)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- windowBits, memLevel, strategy,
- password, crcForCrypting, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw,
- int windowBits,int memLevel, int strategy,
- const char* password, uLong crcForCrypting, int zip64)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- windowBits, memLevel, strategy,
- password, crcForCrypting, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
- NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw, int zip64)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
- NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void*extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int zip64)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, 0,
- -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
- NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void*extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, 0,
- -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
- NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-local int zip64FlushWriteBuffer(zip64_internal* zi)
-{
- int err=ZIP_OK;
-
- if (zi->ci.encrypt != 0)
- {
-#ifndef NOCRYPT
- uInt i;
- int t;
- for (i=0;i<zi->ci.pos_in_buffered_data;i++)
- zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
-#endif
- }
-
- if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
- err = ZIP_ERRNO;
-
- zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
-
-#ifdef HAVE_BZIP2
- if(zi->ci.method == Z_BZIP2ED)
- {
- zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
- zi->ci.bstream.total_in_lo32 = 0;
- zi->ci.bstream.total_in_hi32 = 0;
- }
- else
-#endif
- {
- zi->ci.totalUncompressedData += zi->ci.stream.total_in;
- zi->ci.stream.total_in = 0;
- }
-
-
- zi->ci.pos_in_buffered_data = 0;
-
- return err;
-}
-
-extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
-{
- zip64_internal* zi;
- int err=ZIP_OK;
-
- if (file == NULL)
- return ZIP_PARAMERROR;
- zi = (zip64_internal*)file;
-
- if (zi->in_opened_file_inzip == 0)
- return ZIP_PARAMERROR;
-
- zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
-
-#ifdef HAVE_BZIP2
- if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
- {
- zi->ci.bstream.next_in = (void*)buf;
- zi->ci.bstream.avail_in = len;
- err = BZ_RUN_OK;
-
- while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
- {
- if (zi->ci.bstream.avail_out == 0)
- {
- if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
- err = ZIP_ERRNO;
- zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
- }
-
-
- if(err != BZ_RUN_OK)
- break;
-
- if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
- {
- uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
-/* uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32; */
- err=BZ2_bzCompress(&zi->ci.bstream, BZ_RUN);
-
- zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
- }
- }
-
- if(err == BZ_RUN_OK)
- err = ZIP_OK;
- }
- else
-#endif
- {
- zi->ci.stream.next_in = (Bytef*)buf;
- zi->ci.stream.avail_in = len;
-
- while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
- {
- if (zi->ci.stream.avail_out == 0)
- {
- if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
- err = ZIP_ERRNO;
- zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.stream.next_out = zi->ci.buffered_data;
- }
-
-
- if(err != ZIP_OK)
- break;
-
- if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
- {
- uLong uTotalOutBefore = zi->ci.stream.total_out;
- err=deflate(&zi->ci.stream, Z_NO_FLUSH);
- if(uTotalOutBefore > zi->ci.stream.total_out)
- {
- int bBreak = 0;
- bBreak++;
- }
-
- zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
- }
- else
- {
- uInt copy_this,i;
- if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
- copy_this = zi->ci.stream.avail_in;
- else
- copy_this = zi->ci.stream.avail_out;
-
- for (i = 0; i < copy_this; i++)
- *(((char*)zi->ci.stream.next_out)+i) =
- *(((const char*)zi->ci.stream.next_in)+i);
- {
- zi->ci.stream.avail_in -= copy_this;
- zi->ci.stream.avail_out-= copy_this;
- zi->ci.stream.next_in+= copy_this;
- zi->ci.stream.next_out+= copy_this;
- zi->ci.stream.total_in+= copy_this;
- zi->ci.stream.total_out+= copy_this;
- zi->ci.pos_in_buffered_data += copy_this;
- }
- }
- }/* while(...) */
- }
-
- return err;
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
-{
- return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
-{
- zip64_internal* zi;
- ZPOS64_T compressed_size;
- uLong invalidValue = 0xffffffff;
- short datasize = 0;
- int err=ZIP_OK;
-
- if (file == NULL)
- return ZIP_PARAMERROR;
- zi = (zip64_internal*)file;
-
- if (zi->in_opened_file_inzip == 0)
- return ZIP_PARAMERROR;
- zi->ci.stream.avail_in = 0;
-
- if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
- {
- while (err==ZIP_OK)
- {
- uLong uTotalOutBefore;
- if (zi->ci.stream.avail_out == 0)
- {
- if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
- err = ZIP_ERRNO;
- zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.stream.next_out = zi->ci.buffered_data;
- }
- uTotalOutBefore = zi->ci.stream.total_out;
- err=deflate(&zi->ci.stream, Z_FINISH);
- zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
- }
- }
- else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
- {
-#ifdef HAVE_BZIP2
- err = BZ_FINISH_OK;
- while (err==BZ_FINISH_OK)
- {
- uLong uTotalOutBefore;
- if (zi->ci.bstream.avail_out == 0)
- {
- if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
- err = ZIP_ERRNO;
- zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
- }
- uTotalOutBefore = zi->ci.bstream.total_out_lo32;
- err=BZ2_bzCompress(&zi->ci.bstream, BZ_FINISH);
- if(err == BZ_STREAM_END)
- err = Z_STREAM_END;
-
- zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
- }
-
- if(err == BZ_FINISH_OK)
- err = ZIP_OK;
-#endif
- }
-
- if (err==Z_STREAM_END)
- err=ZIP_OK; /* this is normal */
-
- if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
- {
- if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
- err = ZIP_ERRNO;
- }
-
- if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
- {
- int tmp_err = deflateEnd(&zi->ci.stream);
- if (err == ZIP_OK)
- err = tmp_err;
- zi->ci.stream_initialised = 0;
- }
-#ifdef HAVE_BZIP2
- else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
- {
- int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
- if (err==ZIP_OK)
- err = tmperr;
- zi->ci.stream_initialised = 0;
- }
-#endif
-
- if (!zi->ci.raw)
- {
- crc32 = (uLong)zi->ci.crc32;
- uncompressed_size = zi->ci.totalUncompressedData;
- }
- compressed_size = zi->ci.totalCompressedData;
-
-# ifndef NOCRYPT
- compressed_size += zi->ci.crypt_header_size;
-# endif
-
- /* update Current Item crc and sizes, */
- if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
- {
- /*version Made by*/
- zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
- /*version needed*/
- zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
-
- }
-
- zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
-
-
- if(compressed_size >= 0xffffffff)
- zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
- else
- zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
-
- /* set internal file attributes field */
- if (zi->ci.stream.data_type == Z_ASCII)
- zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
-
- if(uncompressed_size >= 0xffffffff)
- zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
- else
- zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
-
- /* Add ZIP64 extra info field for uncompressed size */
- if(uncompressed_size >= 0xffffffff)
- datasize += 8;
-
- /* Add ZIP64 extra info field for compressed size */
- if(compressed_size >= 0xffffffff)
- datasize += 8;
-
- /* Add ZIP64 extra info field for relative offset to local file header of current file */
- if(zi->ci.pos_local_header >= 0xffffffff)
- datasize += 8;
-
- if(datasize > 0)
- {
- char* p = NULL;
-
- if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
- {
- /* we can not write more data to the buffer that we have room for. */
- return ZIP_BADZIPFILE;
- }
-
- p = zi->ci.central_header + zi->ci.size_centralheader;
-
- /* Add Extra Information Header for 'ZIP64 information' */
- zip64local_putValue_inmemory(p, 0x0001, 2); /* HeaderID */
- p += 2;
- zip64local_putValue_inmemory(p, datasize, 2); /* DataSize */
- p += 2;
-
- if(uncompressed_size >= 0xffffffff)
- {
- zip64local_putValue_inmemory(p, uncompressed_size, 8);
- p += 8;
- }
-
- if(compressed_size >= 0xffffffff)
- {
- zip64local_putValue_inmemory(p, compressed_size, 8);
- p += 8;
- }
-
- if(zi->ci.pos_local_header >= 0xffffffff)
- {
- zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
- p += 8;
- }
-
- /* Update how much extra free space we got in the memory buffer */
- /* and increase the centralheader size so the new ZIP64 fields are included */
- /* ( 4 below is the size of HeaderID and DataSize field ) */
- zi->ci.size_centralExtraFree -= datasize + 4;
- zi->ci.size_centralheader += datasize + 4;
-
- /* Update the extra info size field */
- zi->ci.size_centralExtra += datasize + 4;
- zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
- }
-
- if (err==ZIP_OK)
- err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
-
- free(zi->ci.central_header);
-
- if (err==ZIP_OK)
- {
- if ((zi->flags & ZIP_SEQUENTIAL) == 0) {
- /* Update the LocalFileHeader with the new values. */
-
- ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
- if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err = ZIP_ERRNO;
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
-
- if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff)
- {
- if(zi->ci.pos_zip64extrainfo > 0)
- {
- /* Update the size in the ZIP64 extended field. */
- if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err = ZIP_ERRNO;
-
- if (err==ZIP_OK) /* compressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
-
- if (err==ZIP_OK) /* uncompressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
- }
- }
- else
- {
- if (err==ZIP_OK) /* compressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
-
- if (err==ZIP_OK) /* uncompressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
- }
-
- if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err = ZIP_ERRNO;
- }
-
- if ((zi->ci.flag & 8) != 0) {
- /* Write local Descriptor after file data */
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)DESCRIPTORHEADERMAGIC,4);
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
- if (zi->ci.zip64) {
- if (err==ZIP_OK) /* compressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,8);
-
- if (err==ZIP_OK) /* uncompressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,8);
- } else {
- if (err==ZIP_OK) /* compressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
- if (err==ZIP_OK) /* uncompressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
- }
- }
- }
-
- zi->number_entry ++;
- zi->in_opened_file_inzip = 0;
-
- return err;
-}
-
-extern int ZEXPORT zipCloseFileInZip (zipFile file)
-{
- return zipCloseFileInZipRaw (file,0,0);
-}
-
-int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
-{
- int err = ZIP_OK;
- ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
-
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
-
- /*num disks*/
- if (err==ZIP_OK) /* number of the disk with the start of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
- /*relative offset*/
- if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
-
- /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
- if (err==ZIP_OK) /* number of the disk with the start of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
-
- return err;
-}
-
-int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-{
- int err = ZIP_OK;
-
- uLong Zip64DataSize = 44;
-
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
-
- if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); /* why ZPOS64_T of this ? */
-
- if (err==ZIP_OK) /* version made by */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
- if (err==ZIP_OK) /* version needed */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
- if (err==ZIP_OK) /* number of this disk */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
- if (err==ZIP_OK) /* number of the disk with the start of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
- if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
- if (err==ZIP_OK) /* total number of entries in the central dir */
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
- if (err==ZIP_OK) /* size of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
-
- if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
- {
- ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
- }
- return err;
-}
-int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-{
- int err = ZIP_OK;
-
- /*signature*/
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
-
- if (err==ZIP_OK) /* number of this disk */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
- if (err==ZIP_OK) /* number of the disk with the start of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
- if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
- {
- {
- if(zi->number_entry >= 0xFFFF)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); /* use value in ZIP64 record */
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
- }
- }
-
- if (err==ZIP_OK) /* total number of entries in the central dir */
- {
- if(zi->number_entry >= 0xFFFF)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); /* use value in ZIP64 record */
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
- }
-
- if (err==ZIP_OK) /* size of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
-
- if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
- {
- ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
- if(pos >= 0xffffffff)
- {
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
- }
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
- }
-
- return err;
-}
-
-int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
-{
- int err = ZIP_OK;
- uInt size_global_comment = 0;
-
- if(global_comment != NULL)
- size_global_comment = (uInt)strlen(global_comment);
-
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
-
- if (err == ZIP_OK && size_global_comment > 0)
- {
- if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
- err = ZIP_ERRNO;
- }
- return err;
-}
-
-extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
-{
- zip64_internal* zi;
- int err = 0;
- uLong size_centraldir = 0;
- ZPOS64_T centraldir_pos_inzip;
- ZPOS64_T pos;
-
- if (file == NULL)
- return ZIP_PARAMERROR;
-
- zi = (zip64_internal*)file;
-
- if (zi->in_opened_file_inzip == 1)
- {
- err = zipCloseFileInZip (file);
- }
-
-#ifndef NO_ADDFILEINEXISTINGZIP
- if (global_comment==NULL)
- global_comment = zi->globalcomment;
-#endif
-
- centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
- if (err==ZIP_OK)
- {
- linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
- while (ldi!=NULL)
- {
- if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
- {
- if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
- err = ZIP_ERRNO;
- }
-
- size_centraldir += ldi->filled_in_this_block;
- ldi = ldi->next_datablock;
- }
- }
- free_linkedlist(&(zi->central_dir));
-
- pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
- if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
- {
- ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
- Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
- Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
- }
-
- if (err==ZIP_OK)
- err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
- if(err == ZIP_OK)
- err = Write_GlobalComment(zi, global_comment);
-
- if ((zi->flags & ZIP_AUTO_CLOSE) != 0) {
- if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0) {
- if (err == ZIP_OK)
- err = ZIP_ERRNO;
- }
- } else {
- if (ZFAKECLOSE64(zi->z_filefunc,zi->filestream) != 0) {
- if (err == ZIP_OK)
- err = ZIP_ERRNO;
- }
- }
-
-#ifndef NO_ADDFILEINEXISTINGZIP
- TRYFREE(zi->globalcomment);
-#endif
- TRYFREE(zi);
-
- return err;
-}
-
-extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
-{
- char* p = pData;
- int size = 0;
- char* pNewHeader;
- char* pTmp;
- short header;
- short dataSize;
-
- int retVal = ZIP_OK;
-
- if(pData == NULL || *dataLen < 4)
- return ZIP_PARAMERROR;
-
- pNewHeader = (char*)ALLOC(*dataLen);
- pTmp = pNewHeader;
-
- while(p < (pData + *dataLen))
- {
- header = *(short*)p;
- dataSize = *(((short*)p)+1);
-
- if( header == sHeader ) /* Header found. */
- {
- p += dataSize + 4; /* skip it. do not copy to temp buffer */
- }
- else
- {
- /* Extra Info block should not be removed, So copy it to the temp buffer. */
- memcpy(pTmp, p, dataSize + 4);
- p += dataSize + 4;
- size += dataSize + 4;
- }
-
- }
-
- if(size < *dataLen)
- {
- /* clean old extra info block. */
- memset(pData,0, *dataLen);
-
- /* copy the new extra info block over the old */
- if(size > 0)
- memcpy(pData, pNewHeader, size);
-
- /* set the new extra info size */
- *dataLen = size;
-
- retVal = ZIP_OK;
- }
- else
- retVal = ZIP_ERRNO;
-
- TRYFREE(pNewHeader);
-
- return retVal;
-}
-
-int ZEXPORT zipSetFlags(zipFile file, unsigned flags)
-{
- zip64_internal* zi;
- if (file == NULL)
- return ZIP_PARAMERROR;
- zi = (zip64_internal*)file;
- zi->flags |= flags;
- // If the output is non-seekable, the data descriptor is needed.
- if ((zi->flags & ZIP_SEQUENTIAL) != 0) {
- zi->flags |= ZIP_WRITE_DATA_DESCRIPTOR;
- }
- return ZIP_OK;
-}
-
-int ZEXPORT zipClearFlags(zipFile file, unsigned flags)
-{
- zip64_internal* zi;
- if (file == NULL)
- return ZIP_PARAMERROR;
- zi = (zip64_internal*)file;
- zi->flags &= ~flags;
- // If the data descriptor is not written, we can't use a non-seekable output.
- if ((zi->flags & ZIP_WRITE_DATA_DESCRIPTOR) == 0) {
- zi->flags &= ~ZIP_SEQUENTIAL;
- }
- return ZIP_OK;
-}
diff --git a/daemon/quazip/zip.h b/daemon/quazip/zip.h
deleted file mode 100644
index a6617ad..0000000
--- a/daemon/quazip/zip.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/* zip.h -- IO on .zip files using zlib
- Version 1.1, February 14h, 2010
- part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
- Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
- Modifications for Zip64 support
- Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
- For more info read MiniZip_info.txt
-
- ---------------------------------------------------------------------------
-
- 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.
-
- ---------------------------------------------------------------------------
-
- Changes
-
- See header of zip.h
-
- ---------------------------------------------------------------------------
-
- As per the requirement above, this file is plainly marked as modified
- by Sergey A. Tachenov. Most modifications include the I/O API redesign
- to support QIODevice interface. Some improvements and small fixes were also made.
-
-*/
-
-#ifndef _zip12_H
-#define _zip12_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//#define HAVE_BZIP2
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#ifdef HAVE_BZIP2
-#include "bzlib.h"
-#endif
-
-#define Z_BZIP2ED 12
-
-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
- from (void*) without cast */
-typedef struct TagzipFile__ { int unused; } zipFile__;
-typedef zipFile__ *zipFile;
-#else
-typedef voidp zipFile;
-#endif
-
-#define ZIP_OK (0)
-#define ZIP_EOF (0)
-#define ZIP_ERRNO (Z_ERRNO)
-#define ZIP_PARAMERROR (-102)
-#define ZIP_BADZIPFILE (-103)
-#define ZIP_INTERNALERROR (-104)
-
-#define ZIP_WRITE_DATA_DESCRIPTOR 0x8u
-#define ZIP_AUTO_CLOSE 0x1u
-#define ZIP_SEQUENTIAL 0x2u
-#define ZIP_DEFAULT_FLAGS (ZIP_AUTO_CLOSE | ZIP_WRITE_DATA_DESCRIPTOR)
-
-#ifndef DEF_MEM_LEVEL
-# if MAX_MEM_LEVEL >= 8
-# define DEF_MEM_LEVEL 8
-# else
-# define DEF_MEM_LEVEL MAX_MEM_LEVEL
-# endif
-#endif
-/* default memLevel */
-
-/* tm_zip contain date/time info */
-typedef struct tm_zip_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_zip;
-
-typedef struct
-{
- tm_zip tmz_date; /* date in understandable format */
- uLong dosDate; /* if dos_date == 0, tmu_date is used */
-/* uLong flag; */ /* general purpose bit flag 2 bytes */
-
- uLong internal_fa; /* internal file attributes 2 bytes */
- uLong external_fa; /* external file attributes 4 bytes */
-} zip_fileinfo;
-
-typedef const char* zipcharpc;
-
-
-#define APPEND_STATUS_CREATE (0)
-#define APPEND_STATUS_CREATEAFTER (1)
-#define APPEND_STATUS_ADDINZIP (2)
-
-extern zipFile ZEXPORT zipOpen OF((voidpf file, int append));
-extern zipFile ZEXPORT zipOpen64 OF((voidpf file, int append));
-/*
- Create a zipfile.
- the file argument depends on the API used, for QuaZIP it's a QIODevice
- pointer.
- if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
- will be created at the end of the file.
- (useful if the file contain a self extractor code)
- if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
- add files in existing zip (be sure you don't add file that doesn't exist)
- If the zipfile cannot be opened, the return value is NULL.
- Else, the return value is a zipFile Handle, usable with other function
- of this zip package.
-*/
-
-/* Note : there is no delete function into a zipfile.
- If you want delete file into a zipfile, you must open a zipfile, and create another
- Of couse, you can use RAW reading and writing to copy the file you did not want delte
-*/
-
-extern zipFile ZEXPORT zipOpen2 OF((voidpf file,
- int append,
- zipcharpc* globalcomment,
- zlib_filefunc_def* pzlib_filefunc_def));
-
-extern zipFile ZEXPORT zipOpen2_64 OF((voidpf file,
- int append,
- zipcharpc* globalcomment,
- zlib_filefunc64_def* pzlib_filefunc_def));
-
-/*
- * Exported by Sergey A. Tachenov to suit the needs of QuaZIP.
- * Note that this function MAY change signature in order to
- * provide new QuaZIP features. You have been warned!
- * */
-extern zipFile ZEXPORT zipOpen3 (voidpf file,
- int append,
- zipcharpc* globalcomment,
- zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
- unsigned flags);
-
-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
- const char* filename,
- const zip_fileinfo* zipfi,
- const void* extrafield_local,
- uInt size_extrafield_local,
- const void* extrafield_global,
- uInt size_extrafield_global,
- const char* comment,
- int method,
- int level));
-
-extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
- const char* filename,
- const zip_fileinfo* zipfi,
- const void* extrafield_local,
- uInt size_extrafield_local,
- const void* extrafield_global,
- uInt size_extrafield_global,
- const char* comment,
- int method,
- int level,
- int zip64));
-
-/*
- Open a file in the ZIP for writing.
- filename : the filename in zip (if NULL, '-' without quote will be used
- *zipfi contain supplemental information
- if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
- contains the extrafield data the the local header
- if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
- contains the extrafield data the the local header
- if comment != NULL, comment contain the comment string
- method contain the compression method (0 for store, Z_DEFLATED for deflate)
- level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
- zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
- this MUST be '1' if the uncompressed size is >= 0xffffffff.
-
-*/
-
-
-extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
- const char* filename,
- const zip_fileinfo* zipfi,
- const void* extrafield_local,
- uInt size_extrafield_local,
- const void* extrafield_global,
- uInt size_extrafield_global,
- const char* comment,
- int method,
- int level,
- int raw));
-
-
-extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
- const char* filename,
- const zip_fileinfo* zipfi,
- const void* extrafield_local,
- uInt size_extrafield_local,
- const void* extrafield_global,
- uInt size_extrafield_global,
- const char* comment,
- int method,
- int level,
- int raw,
- int zip64));
-/*
- Same than zipOpenNewFileInZip, except if raw=1, we write raw file
- */
-
-extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
- const char* filename,
- const zip_fileinfo* zipfi,
- const void* extrafield_local,
- uInt size_extrafield_local,
- const void* extrafield_global,
- uInt size_extrafield_global,
- const char* comment,
- int method,
- int level,
- int raw,
- int windowBits,
- int memLevel,
- int strategy,
- const char* password,
- uLong crcForCrypting));
-
-extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
- const char* filename,
- const zip_fileinfo* zipfi,
- const void* extrafield_local,
- uInt size_extrafield_local,
- const void* extrafield_global,
- uInt size_extrafield_global,
- const char* comment,
- int method,
- int level,
- int raw,
- int windowBits,
- int memLevel,
- int strategy,
- const char* password,
- uLong crcForCrypting,
- int zip64
- ));
-
-/*
- Same than zipOpenNewFileInZip2, except
- windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
- password : crypting password (NULL for no crypting)
- crcForCrypting : crc of file to compress (needed for crypting)
- */
-
-extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
- const char* filename,
- const zip_fileinfo* zipfi,
- const void* extrafield_local,
- uInt size_extrafield_local,
- const void* extrafield_global,
- uInt size_extrafield_global,
- const char* comment,
- int method,
- int level,
- int raw,
- int windowBits,
- int memLevel,
- int strategy,
- const char* password,
- uLong crcForCrypting,
- uLong versionMadeBy,
- uLong flagBase
- ));
-
-
-extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
- const char* filename,
- const zip_fileinfo* zipfi,
- const void* extrafield_local,
- uInt size_extrafield_local,
- const void* extrafield_global,
- uInt size_extrafield_global,
- const char* comment,
- int method,
- int level,
- int raw,
- int windowBits,
- int memLevel,
- int strategy,
- const char* password,
- uLong crcForCrypting,
- uLong versionMadeBy,
- uLong flagBase,
- int zip64
- ));
-/*
- Same than zipOpenNewFileInZip4, except
- versionMadeBy : value for Version made by field
- flag : value for flag field (compression level info will be added)
- */
-
-
-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
- const void* buf,
- unsigned len));
-/*
- Write data in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
-/*
- Close the current file in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
- uLong uncompressed_size,
- uLong crc32));
-
-extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
- ZPOS64_T uncompressed_size,
- uLong crc32));
-
-/*
- Close the current file in the zipfile, for file opened with
- parameter raw=1 in zipOpenNewFileInZip2
- uncompressed_size and crc32 are value for the uncompressed size
-*/
-
-extern int ZEXPORT zipClose OF((zipFile file,
- const char* global_comment));
-/*
- Close the zipfile
-*/
-
-
-extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
-/*
- zipRemoveExtraInfoBlock - Added by Mathias Svensson
-
- Remove extra information block from a extra information data for the local file header or central directory header
-
- It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
-
- 0x0001 is the signature header for the ZIP64 extra information blocks
-
- usage.
- Remove ZIP64 Extra information from a central director extra field data
- zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
-
- Remove ZIP64 Extra information from a Local File Header extra field data
- zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
-*/
-
-/*
- Added by Sergey A. Tachenov to tweak zipping behaviour.
-*/
-extern int ZEXPORT zipSetFlags(zipFile file, unsigned flags);
-extern int ZEXPORT zipClearFlags(zipFile file, unsigned flags);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _zip64_H */
diff --git a/rpm/pebble.spec b/rpm/pebble.spec
index 62113d7..2b0ac5b 100644
--- a/rpm/pebble.spec
+++ b/rpm/pebble.spec
@@ -23,6 +23,7 @@ Source100: pebble.yaml
Requires: sailfishsilica-qt5 >= 0.10.9
Requires: systemd-user-session-targets
Requires: nemo-qml-plugin-dbus-qt5
+Requires: quazip
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Bluetooth)
BuildRequires: pkgconfig(Qt5Contacts)
diff --git a/rpm/pebble.yaml b/rpm/pebble.yaml
index a0771de..631a0bf 100644
--- a/rpm/pebble.yaml
+++ b/rpm/pebble.yaml
@@ -1,39 +1,40 @@
-Name: pebble
-Summary: Support for Pebble watch in SailfishOS
-Version: 1.6
-Release: 1
-Group: Qt/Qt
-URL: http://getpebble.com/
-License: GPL3
-Sources:
-- '%{name}-%{version}.tar.xz'
-Description: |
- Support for Pebble watch to receive events from SailfishOS device via Bluetooth.
-Configure: none
-Builder: qtc5
-QMakeOptions:
-- VERSION='%{version}-%{release}'
-PkgConfigBR:
-- Qt5DBus
-- Qt5Bluetooth
-- Qt5Contacts
-- Qt5Quick
-- Qt5Qml
-- Qt5Core
-- mlite5
-- sailfishapp >= 0.0.10
-- icu-i18n
-- zlib
-Requires:
-- sailfishsilica-qt5 >= 0.10.9
-- systemd-user-session-targets
-- nemo-qml-plugin-dbus-qt5
-Files:
-- '%{_bindir}'
-- '%{_datadir}/%{name}/qml'
-- '%{_datadir}/%{name}/js'
-- '%{_datadir}/%{name}/translations'
-- '%{_datadir}/applications/%{name}.desktop'
-- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
-- '%{_libdir}/systemd/user/%{name}d.service'
-- '%{_libdir}/systemd/user/user-session.target.wants/%{name}d.service'
+Name: pebble
+Summary: Support for Pebble watch in SailfishOS
+Version: 1.6
+Release: 1
+Group: Qt/Qt
+URL: http://getpebble.com/
+License: GPL3
+Sources:
+- '%{name}-%{version}.tar.xz'
+Description: |
+ Support for Pebble watch to receive events from SailfishOS device via Bluetooth.
+Configure: none
+Builder: qtc5
+QMakeOptions:
+- VERSION='%{version}-%{release}'
+PkgConfigBR:
+- Qt5DBus
+- Qt5Bluetooth
+- Qt5Contacts
+- Qt5Quick
+- Qt5Qml
+- Qt5Core
+- mlite5
+- sailfishapp >= 0.0.10
+- icu-i18n
+- zlib
+Requires:
+- sailfishsilica-qt5 >= 0.10.9
+- systemd-user-session-targets
+- nemo-qml-plugin-dbus-qt5
+- quazip
+Files:
+- '%{_bindir}'
+- '%{_datadir}/%{name}/qml'
+- '%{_datadir}/%{name}/js'
+- '%{_datadir}/%{name}/translations'
+- '%{_datadir}/applications/%{name}.desktop'
+- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
+- '%{_libdir}/systemd/user/%{name}d.service'
+- '%{_libdir}/systemd/user/user-session.target.wants/%{name}d.service'