diff options
| author | Andy McFadden <fadden@android.com> | 2009-05-05 10:45:51 -0700 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2009-05-05 10:45:51 -0700 |
| commit | bcb095953a1a4a91d86911377e4bc1a72a56e891 (patch) | |
| tree | 819a4a6a1ca6edfac432170502e2d3b9aaa0abe7 /libdex | |
| parent | 8eeeefccffb5e06107cd444436cc229f282a2b72 (diff) | |
| download | android_dalvik-bcb095953a1a4a91d86911377e4bc1a72a56e891.tar.gz android_dalvik-bcb095953a1a4a91d86911377e4bc1a72a56e891.tar.bz2 android_dalvik-bcb095953a1a4a91d86911377e4bc1a72a56e891.zip | |
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.
Diffstat (limited to 'libdex')
| -rw-r--r-- | libdex/CmdUtils.c | 8 | ||||
| -rw-r--r-- | libdex/CmdUtils.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libdex/CmdUtils.c b/libdex/CmdUtils.c index ca1054c7f..35ced14bc 100644 --- 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 fa354a9d9..e0b010598 100644 --- 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, |