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

Landing nsIFile.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@58490 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
2000-01-24 21:28:28 +00:00
parent 1f351b9156
commit 714da09a59
162 changed files with 4387 additions and 2566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@
#include "nsCOMPtr.h"
#include "nsIEventQueueService.h"
#include "nsILocalFile.h"
static NS_DEFINE_CID(kSoftwareUpdateCID, NS_SoftwareUpdate_CID);
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
@@ -135,7 +136,11 @@ GetInstallScriptFromJarfile(nsFileSpec& jarFile, char** scriptBuffer, PRUint32 *
if (NS_FAILED(rv))
return nsInstall::CANT_READ_ARCHIVE;
rv = hZip->Init(jarFile);
nsCOMPtr<nsILocalFile> jFile;
rv = NS_NewLocalFile(jarFile, getter_AddRefs(jFile));
if (NS_SUCCEEDED(rv))
rv = hZip->Init(jFile);
if (NS_FAILED(rv))
return nsInstall::CANT_READ_ARCHIVE;
@@ -149,7 +154,10 @@ GetInstallScriptFromJarfile(nsFileSpec& jarFile, char** scriptBuffer, PRUint32 *
installJSFileSpec.MakeUnique();
// Extract the install.js file.
rv = hZip->Extract("install.js", installJSFileSpec);
nsCOMPtr<nsILocalFile> iFile;
rv = NS_NewLocalFile(installJSFileSpec, getter_AddRefs(iFile));
if (NS_SUCCEEDED(rv))
rv = hZip->Extract("install.js", iFile);
if ( NS_SUCCEEDED(rv) )
{
// Read it into a buffer