Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using new XPCOMified libjar interface.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@36516 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sgehani%netscape.com
1999-06-23 06:16:53 +00:00
parent 0b6007b26d
commit 07d74b61fc
4 changed files with 113 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
View File

@@ -28,7 +28,7 @@
#include "nsSoftwareUpdateIIDs.h"
#include "nsInstall.h"
#include "zipfile.h"
//#include "zipfile.h" // replaced by nsIJAR.h
#include "nsRepository.h"
#include "nsIServiceManager.h"
@@ -40,7 +40,8 @@
#include "jsapi.h"
#include "nsIEventQueueService.h"
#include "nsIEnumerator.h"
#include "nsIJAR.h"
static NS_DEFINE_IID(kISoftwareUpdateIID, NS_ISOFTWAREUPDATE_IID);
static NS_DEFINE_IID(kSoftwareUpdateCID, NS_SoftwareUpdate_CID);
@@ -126,16 +127,29 @@ XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report
static nsresult
GetInstallScriptFromJarfile(const char* jarFile, char** scriptBuffer, PRUint32 *scriptLength)
{
// Open the jarfile.
void* hZip;
nsIJAR* hZip = nsnull;
PRInt32 result;
*scriptBuffer = nsnull;
*scriptLength = 0;
nsresult rv = ZIP_OpenArchive(jarFile , &hZip);
if (rv != ZIP_OK)
static NS_DEFINE_IID(kIJARIID, NS_IJAR_IID);
static NS_DEFINE_IID(kJARCID, NS_JAR_CID);
nsresult rv = nsComponentManager::CreateInstance(kJARCID, nsnull, kIJARIID,
(void**) &hZip);
// Open the jarfile
if (hZip)
rv = hZip->Open( jarFile, &result );
if (NS_FAILED(rv))
{
NS_IF_RELEASE(hZip);
return rv;
}
if (result != 0)
{
NS_IF_RELEASE(hZip);
return NS_ERROR_FAILURE;
}
// Read manifest file for Install Script filename.
@@ -147,13 +161,18 @@ GetInstallScriptFromJarfile(const char* jarFile, char** scriptBuffer, PRUint32 *
installJSFileSpec.MakeUnique();
// Extract the install.js file.
rv = ZIP_ExtractFile( hZip, "install.js", nsNSPRPath(installJSFileSpec) );
if (rv != ZIP_OK)
rv = hZip->Extract( "install.js", nsNSPRPath(installJSFileSpec), &result );
if (NS_FAILED(rv))
{
ZIP_CloseArchive(&hZip);
NS_IF_RELEASE( hZip );
return rv;
}
if (result != 0)
{
NS_IF_RELEASE(hZip);
return NS_ERROR_FAILURE;
}
// Read it into a buffer
char* buffer;
PRUint32 bufferLength;
@@ -175,7 +194,7 @@ GetInstallScriptFromJarfile(const char* jarFile, char** scriptBuffer, PRUint32 *
delete [] buffer;
}
ZIP_CloseArchive(&hZip);
NS_IF_RELEASE( hZip );
fileStream.close();
installJSFileSpec.Delete(PR_FALSE);