Pull fix from master branch, and correct filename juggling.

The original fix was in p4 144906.  This also corrects some problems that
arise when the temp file is specified.

diff --git a/libdex/CmdUtils.c b/libdex/CmdUtils.c
index ca1054c..35ced14 100644 (file)
--- a/libdex/CmdUtils.c
+++ b/libdex/CmdUtils.c
@@ -97,12 +97,12 @@ bail:
  *
  * If "quiet" is set, don't report common errors.
  *
- * Returns 0 on success.
+ * Returns 0 (kUTFRSuccess) on success.
  */
 UnzipToFileResult dexOpenAndMap(const char* fileName, const char* tempFileName,
     MemMapping* pMap, bool quiet)
 {
-    UnzipToFileResult result = kUTFRSuccess;
+    UnzipToFileResult result = kUTFRGenericFailure;
     int len = strlen(fileName);
     char tempName[32];
     bool removeTemp = false;
@@ -132,11 +132,11 @@ UnzipToFileResult dexOpenAndMap(const char* fileName, const char* tempFileName,
             tempFileName = tempName;
         }
 
-        result = dexUnzipToFile(fileName, tempName, quiet);
+        result = dexUnzipToFile(fileName, tempFileName, quiet);
         
         if (result == kUTFRSuccess) {
             //printf("+++ Good unzip to '%s'\n", tempName);
-            fileName = tempName;
+            fileName = tempFileName;
             removeTemp = true;
         } else if (result == kUTFRNotZip) {
             if (!quiet) {

diff --git a/libdex/CmdUtils.h b/libdex/CmdUtils.h
index fa354a9..e0b0105 100644 (file)
--- a/libdex/CmdUtils.h
+++ b/libdex/CmdUtils.h
@@ -34,6 +34,7 @@
 /* encode the result of unzipping to a file */
 typedef enum UnzipToFileResult {
     kUTFRSuccess = 0,
+    kUTFRGenericFailure,
     kUTFRBadArgs,
     kUTFRNotZip,
     kUTFRNoClassesDex,