| author | Tom Sutcliffe <thomas.sutcliffe@accenture.com> | 
| Tue, 14 Sep 2010 09:49:39 +0100 | |
| changeset 58 | 377ac716dabb | 
| parent 31 | d0e1c40de386 | 
| child 66 | 2a78c4ff2eab | 
| permissions | -rw-r--r-- | 
| 0 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 1 | // fzip.cpp | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 2 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 3 | // Copyright (c) 2008 - 2010 Accenture. All rights reserved. | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 4 | // This component and the accompanying materials are made available | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 5 | // under the terms of the "Eclipse Public License v1.0" | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 6 | // which accompanies this distribution, and is available | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 7 | // at the URL "http://www.eclipse.org/legal/epl-v10.html". | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 8 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 9 | // Initial Contributors: | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 10 | // Accenture - Initial contribution | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 11 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 12 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 13 | #include <zipfile.h> | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 14 | #include <ezgzip.h> | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 15 | #include "fzip.h" | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 16 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 17 | _LIT(KGzExtension, ".gz"); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 18 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 19 | CCommandBase* CCmdZip::NewLC() | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 20 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 21 | CCmdZip* self = new (ELeave) CCmdZip(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 22 | CleanupStack::PushL(self); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 23 | self->BaseConstructL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 24 | return self; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 25 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 26 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 27 | CCmdZip::~CCmdZip() | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 28 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 29 | if (iFileToZip.Count() > 0) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 30 | iFileToZip.Close(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 31 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 32 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 33 | CCmdZip::CCmdZip() : CCommandBase(CCommandBase::EManualComplete) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 34 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 35 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 36 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 37 | const TDesC& CCmdZip::Name() const | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 38 | 	{	
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 39 | _LIT(KName, "fzip"); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 40 | return KName; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 41 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 42 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 43 | void CCmdZip::DoRunL() | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 44 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 45 | FsL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 46 | if (iUnzip) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 47 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 48 | if (!iOptions.IsPresent(&iUnzipPath)) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 49 | 			{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 50 | iUnzipPath = Env().Pwd(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 51 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 52 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 53 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 54 | 			{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 55 | // command-line sanity checks | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 56 | if (iFileToZip.Count() > 0) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 57 | 				{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 58 | 				PrintWarning(_L("Ignoring \'-f\' file option."));
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 59 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 60 | if (iRecurse) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 61 | 				{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 62 | 				PrintWarning(_L("Ignoring \'-r\' recurse option."));
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 63 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 64 | } | 
| 31 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 65 | ExpandArchiveL(); | 
| 0 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 66 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 67 | else | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 68 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 69 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 70 | 			{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 71 | // command-line sanity checks | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 72 | if (iUnzipPath.Length() > 0) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 73 | 				{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 74 | 				PrintWarning(_L("Ignoring '-d' directory option."));	
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 75 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 76 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 77 | if (iFileToZip.Count() == 0) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 78 | 			{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 79 | 			PrintError(KErrArgument, _L("Use '-f' to specify source files."));
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 80 | User::Leave(KErrArgument); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 81 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 82 | TRAPD(err, CreateArchiveL()); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 83 | if (err != KErrNone) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 84 | 			{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 85 | 			PrintError(err, _L("Couldn't create archive"));
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 86 | Fs().Delete(iArchive); // ignore error | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 87 | User::Leave(err); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 88 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 89 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 90 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 91 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 92 | 		Printf(_L("Done\r\n"));	
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 93 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 94 | Complete(KErrNone); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 95 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 96 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 97 | void CCmdZip::ArgumentsL(RCommandArgumentList& aArguments) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 98 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 99 | _LIT(KArg1, "archive"); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 100 | aArguments.AppendFileNameL(iArchive, KArg1); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 101 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 102 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 103 | void CCmdZip::OptionsL(RCommandOptionList& aOptions) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 104 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 105 | _LIT(KOptVerbose, "verbose"); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 106 | aOptions.AppendBoolL(iVerbose, KOptVerbose); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 107 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 108 | _LIT(KOptUnzip, "unzip"); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 109 | aOptions.AppendBoolL(iUnzip, KOptUnzip); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 110 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 111 | _LIT(KOptDirectory, "directory"); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 112 | aOptions.AppendFileNameL(iUnzipPath, KOptDirectory); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 113 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 114 | _LIT(KOptRecurse, "recurse"); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 115 | aOptions.AppendBoolL(iRecurse, KOptRecurse); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 116 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 117 | _LIT(KOptSource, "file"); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 118 | aOptions.AppendFileNameL(iFileToZip, KOptSource); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 119 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 120 | _LIT(KOptCompressionType, "compression-type"); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 121 | aOptions.AppendEnumL((TInt&)iCompressionType, KOptCompressionType); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 122 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 123 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 124 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 125 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 126 | // COMPRESSION FUNCTIONS | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 127 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 128 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 129 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 130 | // CCmdZip::CreateArchiveL | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 131 | // determine which zip format to use and go ahead & create the archive | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 132 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 133 | void CCmdZip::CreateArchiveL() | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 134 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 135 | if (iCompressionType == EGZip) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 136 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 137 | CreateGzArchiveL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 138 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 139 | else | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 140 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 141 | CreateZipArchiveL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 142 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 143 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 144 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 145 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 146 | // CCmdZip::CreateGzArchiveL | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 147 | // create an archive, zipping up all the specified files | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 148 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 149 | void CCmdZip::CreateGzArchiveL() | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 150 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 151 | if (iRecurse) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 152 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 153 | 		LeaveIfErr(KErrArgument, _L("GNU Zip format does not support recursion"));
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 154 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 155 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 156 | if (iFileToZip.Count() > 1) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 157 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 158 | 		LeaveIfErr(KErrArgument, _L("GNU Zip format can only handle a single file"));
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 159 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 160 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 161 | if (iArchive.Length() == 0) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 162 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 163 | iArchive = iFileToZip[0]; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 164 | iArchive.Append(KGzExtension); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 165 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 166 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 167 | RFile input; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 168 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 169 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 170 | 		Printf(_L("Creating '%S'\r\n"), &iArchive);
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 171 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 172 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 173 | // open the input file | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 174 | User::LeaveIfError(input.Open(Fs(), iFileToZip[0], EFileStream | EFileRead | EFileShareAny)); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 175 | CleanupClosePushL(input); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 176 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 177 | CEZFileToGZip* zip = CEZFileToGZip::NewLC(Fs(), iArchive, input); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 178 | while (zip->DeflateL()) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 179 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 180 | // do nothing | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 181 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 182 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 183 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 184 | 		Printf(_L("Deflating '%S'\r\n"), &iFileToZip[0]);
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 185 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 186 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 187 | CleanupStack::PopAndDestroy(2); // zip, input | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 188 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 189 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 190 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 191 | // CCmdZip::CreateZipArchiveL | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 192 | // zip format archive creation | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 193 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 194 | void CCmdZip::CreateZipArchiveL() | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 195 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 196 | CZipItUp* zipArchive = CZipItUp::NewLC(Fs(), iArchive); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 197 | for (TInt ii = 0 ; ii < iFileToZip.Count() ; ii++) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 198 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 199 | TFileName2& fileName = iFileToZip[ii]; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 200 | fileName.SetTypeL(Fs()); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 201 | AddFileL(*zipArchive, fileName); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 202 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 203 | zipArchive->CreateZipL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 204 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 205 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 206 | 		Printf(_L("Created '%S'\r\n"), &iArchive);
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 207 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 208 | CleanupStack::PopAndDestroy(); // zipArchive | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 209 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 210 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 211 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 212 | // CCmdZip::AddFileL | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 213 | // examines a file for wildcards, directories/recursion etc | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 214 | // if it finds an actual file, it'll add it to the zip archive | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 215 | // recursive function | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 216 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 217 | void CCmdZip::AddFileL(CZipItUp& aZipArchive, const TFileName2& aFile) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 218 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 219 | if (aFile.IsDir()) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 220 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 221 | CDir* dir; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 222 | 		LeaveIfErr(Fs().GetDir(aFile, KEntryAttMatchMask, EDirsLast, dir), _L("Unable to read directory '%S'"), &aFile);
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 223 | CleanupStack::PushL(dir); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 224 | for (TInt ii = 0 ; ii < dir->Count() ; ii++) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 225 | 			{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 226 | const TEntry& entry = (*dir)[ii]; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 227 | TFileName2* newFile = new(ELeave) TFileName2(entry.iName); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 228 | CleanupStack::PushL(newFile); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 229 | newFile->MakeAbsoluteL(aFile.DriveAndPath()); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 230 | newFile->SetTypeL(Fs()); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 231 | if (newFile->IsDir()) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 232 | 				{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 233 | if (iRecurse) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 234 | 					{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 235 | AddFileL(aZipArchive, *newFile); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 236 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 237 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 238 | else | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 239 | 				{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 240 | AddFileL(aZipArchive, *newFile); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 241 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 242 | CleanupStack::PopAndDestroy(newFile); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 243 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 244 | CleanupStack::PopAndDestroy(dir); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 245 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 246 | else | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 247 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 248 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 249 | 			{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 250 | 			Printf(_L("Adding '%S'\r\n"), &aFile);
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 251 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 252 | aZipArchive.AddFileL(aFile); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 253 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 254 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 255 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 256 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 257 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 258 | // DECOMPRESSION FUNCTIONS | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 259 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 260 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 261 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 262 | // CCmdZip::ExpandArchiveL | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 263 | // determine which zip format to use and go ahead & expand the archive | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 264 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 265 | void CCmdZip::ExpandArchiveL() | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 266 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 267 | if (iCompressionType == EGZip) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 268 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 269 | ExpandGzArchiveL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 270 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 271 | else | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 272 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 273 | ExpandZipArchiveL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 274 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 275 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 276 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 277 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 278 | // CCmdZip::ExpandGzArchiveL | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 279 | // unzip an existing gzip compressed file | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 280 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 281 | void CCmdZip::ExpandGzArchiveL() | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 282 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 283 | // open the destination file, determine where it goes | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 284 | RFile newFile; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 285 | TFileName2 dest(iUnzipPath); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 286 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 287 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 288 | 		Printf(_L("Opening\t\t\'%S\'\r\n"), &iArchive);
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 289 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 290 | if (iArchive.Ext().CompareF(KGzExtension) != 0) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 291 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 292 | 		LeaveIfErr(KErrArgument, _L("Compressed file must have '.gz' extension."));
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 293 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 294 | dest.AppendComponentL(iArchive.Name()); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 295 | TInt err = Fs().MkDirAll(dest); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 296 | if ((err != KErrNone) && (err != KErrAlreadyExists)) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 297 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 298 | 		LeaveIfErr(err, _L("Couldn't create path '%S'"), &dest);
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 299 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 300 | User::LeaveIfError(newFile.Replace(Fs(), dest, EFileStream | EFileRead | EFileShareAny)); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 301 | CleanupClosePushL(newFile); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 302 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 303 | // inflate the compressed file | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 304 | CEZGZipToFile* zip = CEZGZipToFile::NewLC(Fs(), iArchive, newFile); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 305 | while (zip->InflateL()) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 306 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 307 | // do nothing | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 308 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 309 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 310 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 311 | 		Printf(_L("Inflating '%S'\r\n"), &dest);
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 312 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 313 | CleanupStack::PopAndDestroy(2); // zip, newFile | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 314 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 315 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 316 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 317 | // CCmdZip::ExpandZipArchiveL | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 318 | // Unzip an existing archive iterating through each member file contained within the archive | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 319 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 320 | void CCmdZip::ExpandZipArchiveL() | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 321 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 322 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 323 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 324 | 		Printf(_L("Opening\t\t\'%S\'\r\n"), &iArchive);
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 325 | } | 
| 31 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 326 | CZipFile* zip = NULL; | 
| 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 327 | 	TRAPL(zip = CZipFile::NewL(Fs(), iArchive), _L("Couldn't create CZipFile for %S"), &iArchive);
 | 
| 0 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 328 | CleanupStack::PushL(zip); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 329 | CZipFileMemberIterator* zipIterator = zip->GetMembersL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 330 | CleanupStack::PushL(zipIterator); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 331 | CZipFileMember* zipMember = zipIterator->NextL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 332 | while (zipMember) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 333 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 334 | CleanupStack::PushL(zipMember); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 335 | ExtractZipFileL(*zip, *zipMember); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 336 | CleanupStack::PopAndDestroy(zipMember); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 337 | zipMember = zipIterator->NextL(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 338 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 339 | CleanupStack::PopAndDestroy(2); // zipIterator, zip | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 340 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 341 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 342 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 343 | // CCmdZip::ExtractZipFileL | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 344 | // extracts a single file from within the zip archive | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 345 | // | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 346 | void CCmdZip::ExtractZipFileL(CZipFile& aZip, const CZipFileMember& aMember) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 347 | 	{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 348 | // prep. the destination file. | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 349 | // note if iUnzipPath is not specified, it'll stuff the extracted file in the current directory from which fzip.exe runs | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 350 | RFile newFile; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 351 | TFileName2 dest(iUnzipPath); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 352 | dest.AppendComponentL(*aMember.Name()); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 353 | TInt err = Fs().MkDirAll(dest); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 354 | if ((err != KErrNone) && (err != KErrAlreadyExists)) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 355 | 		{
 | 
| 31 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 356 | 		LeaveIfErr(err, _L("Couldn't create directory for file %S"), &dest);
 | 
| 0 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 357 | } | 
| 31 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 358 | 	if (aMember.Name()->Right(1) == _L("\\")) return; // It's a directory entry, nothing more to be done
 | 
| 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 359 | |
| 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 360 | // prep. the stream | 
| 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 361 | RZipFileMemberReaderStream* readStream; | 
| 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 362 | aZip.GetInputStreamL(&aMember, readStream); | 
| 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 363 | CleanupStack::PushL(readStream); | 
| 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 364 | |
| 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 365 | 	LeaveIfErr(newFile.Replace(Fs(), dest, EFileShareExclusive), _L("Couldn't create file %S"), &dest);
 | 
| 0 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 366 | CleanupClosePushL(newFile); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 367 | if (iVerbose) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 368 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 369 | 		Printf(_L("Inflating '%S'\r\n\tcrc: 0x%x\r\n\tcompressed size: %d\r\n\tuncompressed size: %d\r\n"), &dest, aMember.CRC32(), aMember.CompressedSize(), aMember.UncompressedSize());
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 370 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 371 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 372 | // stream from the zip archive member into the destination file | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 373 | TInt bytesRead = 0; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 374 | TInt length = KDefaultZipBufferLength; // 32Kb | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 375 | if (aMember.UncompressedSize() < KDefaultZipBufferLength) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 376 | 		{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 377 | length = aMember.UncompressedSize(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 378 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 379 | HBufC8* data = HBufC8::NewLC(length); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 380 | TPtr8 ptr = data->Des(); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 381 | do | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 382 | 		{
 | 
| 31 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 383 | 		LeaveIfErr(readStream->Read(ptr, length), _L("Error reading from zip stream"));
 | 
| 
d0e1c40de386
Fixed fzip's extracting of nested folders, added --logging-allocator option to leak.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: 
0diff
changeset | 384 | 		LeaveIfErr(newFile.Write(ptr), _L("Error writing to file %S"), &dest);
 | 
| 0 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 385 | bytesRead += length; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 386 | if ((aMember.UncompressedSize() - bytesRead) < KDefaultZipBufferLength) | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 387 | 			{
 | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 388 | length = aMember.UncompressedSize() - bytesRead; | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 389 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 390 | } while (length > 0); | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 391 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 392 | // cleanup | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 393 | CleanupStack::PopAndDestroy(3); // data, newfile, readstream | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 394 | } | 
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 395 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 396 | |
| 
7f656887cf89
First submission to Symbian Foundation staging server.
 Tom Sutcliffe <thomas.sutcliffe@accenture.com> parents: diff
changeset | 397 | EXE_BOILER_PLATE(CCmdZip) |