Follow-up to bug 379633: Scriptable zipwriter component. r+a=bsmedberg

browser/installer/unix/packages-static

@@ -187,6 +187,7 @@ bin/components/xremoteservice.xpt
 bin/components/xulapp.xpt
 bin/components/xuldoc.xpt
 bin/components/xultmpl.xpt
+bin/components/zipwriter.xpt
 bin/components/shellservice.xpt
 ; JavaScript components
 bin/components/FeedProcessor.js

browser/installer/windows/packages-static

@@ -192,6 +192,7 @@ bin\components\xpinstall.xpt
 bin\components\xulapp.xpt
 bin\components\xuldoc.xpt
 bin\components\xultmpl.xpt
+bin\components\zipwriter.xpt
 ; JavaScript components
 bin\components\FeedProcessor.js
 bin\components\FeedConverter.js

modules/libjar/zipwriter/Makefile.in

@@ -46,8 +46,8 @@ MODULE                = zipwriter
 
 DIRS                  = public src
 
-#ifdef ENABLE_TESTS
-#DIRS                 += test
-#endif
+ifdef ENABLE_TESTS
+DIRS                 += test
+endif
 
 include $(topsrcdir)/config/rules.mk

modules/libjar/zipwriter/src/nsZipWriter.cpp

@@ -271,15 +271,18 @@ NS_IMETHODIMP nsZipWriter::Open(nsIFile *aFile, PRInt32 aIoFlags)
     // Need to be able to write to the file
     if (aIoFlags & PR_RDONLY)
         return NS_ERROR_FAILURE;
+    
+    nsresult rv = aFile->Clone(getter_AddRefs(mFile));
+    NS_ENSURE_SUCCESS(rv, rv);
 
     PRBool exists;
-    nsresult rv = aFile->Exists(&exists);
+    rv = mFile->Exists(&exists);
     NS_ENSURE_SUCCESS(rv, rv);
     if (!exists && !(aIoFlags & PR_CREATE_FILE))
         return NS_ERROR_FILE_NOT_FOUND;
 
     if (exists && !(aIoFlags & (PR_TRUNCATE | PR_WRONLY))) {
-        rv = ReadFile(aFile);
+        rv = ReadFile(mFile);
         NS_ENSURE_SUCCESS(rv, rv);
         mCDSDirty = PR_FALSE;
     }
@@ -293,7 +296,7 @@ NS_IMETHODIMP nsZipWriter::Open(nsIFile *aFile, PRInt32 aIoFlags)
     aIoFlags &= 0xef;
 
     nsCOMPtr<nsIOutputStream> stream;
-    rv = NS_NewLocalFileOutputStream(getter_AddRefs(stream), aFile, aIoFlags);
+    rv = NS_NewLocalFileOutputStream(getter_AddRefs(stream), mFile, aIoFlags);
     if (NS_FAILED(rv)) {
         mHeaders.Clear();
         mEntryHash.Clear();
@@ -313,8 +316,6 @@ NS_IMETHODIMP nsZipWriter::Open(nsIFile *aFile, PRInt32 aIoFlags)
         NS_ENSURE_SUCCESS(rv, rv);
     }
 
-    mFile = aFile;
-
     return NS_OK;
 }
 
@@ -373,12 +374,14 @@ NS_IMETHODIMP nsZipWriter::AddEntryFile(const nsACString & aZipEntry,
     if (!mStream)
         return NS_ERROR_NOT_INITIALIZED;
 
+    nsresult rv;
     if (aQueue) {
         nsZipQueueItem item;
         item.mOperation = OPERATION_ADD;
         item.mZipEntry = aZipEntry;
         item.mCompression = aCompression;
-        item.mFile = aFile;
+        rv = aFile->Clone(getter_AddRefs(item.mFile));
+        NS_ENSURE_SUCCESS(rv, rv);
         if (!mQueue.AppendElement(item))
             return NS_ERROR_OUT_OF_MEMORY;
         return NS_OK;
@@ -388,7 +391,7 @@ NS_IMETHODIMP nsZipWriter::AddEntryFile(const nsACString & aZipEntry,
         return NS_ERROR_IN_PROGRESS;
 
     PRBool exists;
-    nsresult rv = aFile->Exists(&exists);
+    rv = aFile->Exists(&exists);
     NS_ENSURE_SUCCESS(rv, rv);
     if (!exists)
         return NS_ERROR_FILE_NOT_FOUND;

modules/libjar/zipwriter/test/unit/test_asyncremove.js

@@ -53,7 +53,8 @@ var observer = {
     zipW.close();
 
     // Empty zip file should just be the end of central directory marker
-    do_check_eq(tmpFile.fileSize, ZIP_EOCDR_HEADER_SIZE);
+    var newTmpFile = tmpFile.clone();
+    do_check_eq(newTmpFile.fileSize, ZIP_EOCDR_HEADER_SIZE);
     do_test_finished();
   }
 };

modules/libjar/zipwriter/test/unit/test_undochange.js

@@ -70,5 +70,6 @@ function run_test()
   zipW.close();
 
   // Empty zip file should just be the end of central directory marker
-  do_check_eq(tmpFile.fileSize, ZIP_EOCDR_HEADER_SIZE);
+  var newTmpFile = tmpFile.clone();
+  do_check_eq(newTmpFile.fileSize, ZIP_EOCDR_HEADER_SIZE);
 }