summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-04-26 11:27:23 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-04-26 11:27:23 +0000
commitf43515eaf70e661bf53691e2a9d67291f7ed062b (patch)
treeae5ee367f67ed906f2aecebc7aad74192ca2fc1d /rbutil
parent8e8c36019c4f42ed7c991545f13a7404690c5bf7 (diff)
downloadrockbox-f43515eaf70e661bf53691e2a9d67291f7ed062b.tar.gz
rockbox-f43515eaf70e661bf53691e2a9d67291f7ed062b.zip
Update OSDaB Zip class to most current version from the projects svn repo (r7).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20802 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/zip/README3
-rw-r--r--rbutil/rbutilqt/zip/README.ROCKBOX7
-rw-r--r--rbutil/rbutilqt/zip/unzip.cpp7
-rw-r--r--rbutil/rbutilqt/zip/unzip.h4
-rw-r--r--rbutil/rbutilqt/zip/unzip_p.h2
-rw-r--r--rbutil/rbutilqt/zip/zip.cpp2
-rw-r--r--rbutil/rbutilqt/zip/zip.h2
-rw-r--r--rbutil/rbutilqt/zip/zip_p.h2
-rw-r--r--rbutil/rbutilqt/zip/zipentry_p.h2
9 files changed, 17 insertions, 14 deletions
diff --git a/rbutil/rbutilqt/zip/README b/rbutil/rbutilqt/zip/README
index 81891e8516..b5f88cb6ae 100644
--- a/rbutil/rbutilqt/zip/README
+++ b/rbutil/rbutilqt/zip/README
@@ -1,5 +1,5 @@
The *.cpp and *.h files in this archive are
-Copyright (C) 2007 Angius Fabrizio (blue_death@users.sourceforge.net)
+Copyright (C) 2007-2008 Angius Fabrizio (blue_death@users.sourceforge.net)
You may use, distribute and copy the files under the terms of
GNU General Public License version 2 (see the file LICENSE.GPL for details)
@@ -27,6 +27,7 @@ Please refer to the example application's main.cpp file or to the class comments
history
-------
+2008-09-97 - Bug fix: end of central directory was sometimes not being found when the archive had a comment.
2007-02-01 - New IgnorePaths compression option and two more "addDirectoryContents()" convenience methods to use this option.
2007-01-28 - Major changes:
- Bug fix: there was a big problem with directory names.
diff --git a/rbutil/rbutilqt/zip/README.ROCKBOX b/rbutil/rbutilqt/zip/README.ROCKBOX
index 36bc9f59fd..46bdd9a15e 100644
--- a/rbutil/rbutilqt/zip/README.ROCKBOX
+++ b/rbutil/rbutilqt/zip/README.ROCKBOX
@@ -1,7 +1,8 @@
This folder contains the zip extraction classes of the OSDaB project.
These classes are distributed under the GPL license (see the file
-LICENSE.GPL in this folder). The source files are included unmodified as
-of 2007-07-24 with the examples folder left out.
+LICENSE.GPL in this folder).
+The source files have been last synced with the projects svn repo
+at http://osdab.googlecode.com/svn/trunk revision 7 on 2009-04-26.
-Details at http://osdab.sourceforge.net/snippets/zip.php
+Details at http://code.google.com/p/osdab/
diff --git a/rbutil/rbutilqt/zip/unzip.cpp b/rbutil/rbutilqt/zip/unzip.cpp
index d49529bad9..a0a60db84b 100644
--- a/rbutil/rbutilqt/zip/unzip.cpp
+++ b/rbutil/rbutilqt/zip/unzip.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
** Filename: unzip.cpp
-** Last updated [dd/mm/yyyy]: 28/01/2007
+** Last updated [dd/mm/yyyy]: 07/09/2008
**
** pkzip 2.0 decompression.
**
@@ -8,7 +8,7 @@
** (mainly Info-Zip and Gilles Vollant's minizip).
** Compression and decompression actually uses the zlib library.
**
-** Copyright (C) 2007 Angius Fabrizio. All rights reserved.
+** Copyright (C) 2007-2008 Angius Fabrizio. All rights reserved.
**
** This file is part of the OSDaB project (http://osdab.sourceforge.net/).
**
@@ -761,7 +761,8 @@ UnZip::ErrorCode UnzipPrivate::seekToCentralDirectory()
break;
}
- offset -= UNZIP_EOCD_SIZE;
+ // TODO: This is very slow and only a temporary bug fix. Need some pattern matching algorithm here.
+ offset -= 1 /*UNZIP_EOCD_SIZE*/;
if (offset <= 0)
return UnZip::InvalidArchive;
diff --git a/rbutil/rbutilqt/zip/unzip.h b/rbutil/rbutilqt/zip/unzip.h
index e480541716..4839e12027 100644
--- a/rbutil/rbutilqt/zip/unzip.h
+++ b/rbutil/rbutilqt/zip/unzip.h
@@ -8,7 +8,7 @@
** (mainly Info-Zip and Gilles Vollant's minizip).
** Compression and decompression actually uses the zlib library.
**
-** Copyright (C) 2007 Angius Fabrizio. All rights reserved.
+** Copyright (C) 2007-2008 Angius Fabrizio. All rights reserved.
**
** This file is part of the OSDaB project (http://osdab.sourceforge.net/).
**
@@ -86,7 +86,7 @@ public:
File, Directory
};
- typedef struct ZipEntry
+ struct ZipEntry
{
ZipEntry();
diff --git a/rbutil/rbutilqt/zip/unzip_p.h b/rbutil/rbutilqt/zip/unzip_p.h
index c0ea11b7bf..394c9d5346 100644
--- a/rbutil/rbutilqt/zip/unzip_p.h
+++ b/rbutil/rbutilqt/zip/unzip_p.h
@@ -8,7 +8,7 @@
** (mainly Info-Zip and Gilles Vollant's minizip).
** Compression and decompression actually uses the zlib library.
**
-** Copyright (C) 2007 Angius Fabrizio. All rights reserved.
+** Copyright (C) 2007-2008 Angius Fabrizio. All rights reserved.
**
** This file is part of the OSDaB project (http://osdab.sourceforge.net/).
**
diff --git a/rbutil/rbutilqt/zip/zip.cpp b/rbutil/rbutilqt/zip/zip.cpp
index 6732278fe6..9ecd5531ef 100644
--- a/rbutil/rbutilqt/zip/zip.cpp
+++ b/rbutil/rbutilqt/zip/zip.cpp
@@ -8,7 +8,7 @@
** (mainly Info-Zip and Gilles Vollant's minizip).
** Compression and decompression actually uses the zlib library.
**
-** Copyright (C) 2007 Angius Fabrizio. All rights reserved.
+** Copyright (C) 2007-2008 Angius Fabrizio. All rights reserved.
**
** This file is part of the OSDaB project (http://osdab.sourceforge.net/).
**
diff --git a/rbutil/rbutilqt/zip/zip.h b/rbutil/rbutilqt/zip/zip.h
index 8f82f1738a..dfe5deb064 100644
--- a/rbutil/rbutilqt/zip/zip.h
+++ b/rbutil/rbutilqt/zip/zip.h
@@ -8,7 +8,7 @@
** (mainly Info-Zip and Gilles Vollant's minizip).
** Compression and decompression actually uses the zlib library.
**
-** Copyright (C) 2007 Angius Fabrizio. All rights reserved.
+** Copyright (C) 2007-2008 Angius Fabrizio. All rights reserved.
**
** This file is part of the OSDaB project (http://osdab.sourceforge.net/).
**
diff --git a/rbutil/rbutilqt/zip/zip_p.h b/rbutil/rbutilqt/zip/zip_p.h
index 8c57f99225..271cc1859f 100644
--- a/rbutil/rbutilqt/zip/zip_p.h
+++ b/rbutil/rbutilqt/zip/zip_p.h
@@ -8,7 +8,7 @@
** (mainly Info-Zip and Gilles Vollant's minizip).
** Compression and decompression actually uses the zlib library.
**
-** Copyright (C) 2007 Angius Fabrizio. All rights reserved.
+** Copyright (C) 2007-2008 Angius Fabrizio. All rights reserved.
**
** This file is part of the OSDaB project (http://osdab.sourceforge.net/).
**
diff --git a/rbutil/rbutilqt/zip/zipentry_p.h b/rbutil/rbutilqt/zip/zipentry_p.h
index dfdcf174d0..c88253ee8c 100644
--- a/rbutil/rbutilqt/zip/zipentry_p.h
+++ b/rbutil/rbutilqt/zip/zipentry_p.h
@@ -8,7 +8,7 @@
** (mainly Info-Zip and Gilles Vollant's minizip).
** Compression and decompression actually uses the zlib library.
**
-** Copyright (C) 2007 Angius Fabrizio. All rights reserved.
+** Copyright (C) 2007-2008 Angius Fabrizio. All rights reserved.
**
** This file is part of the OSDaB project (http://osdab.sourceforge.net/).
**