From: Kenny Root <kroot@google.com>
Date: Thu, 26 Aug 2010 00:25:15 +0000 (-0700)
Subject: am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/2fe0ceeab530ad81160222823ab0a316b9a7e309?ds=inline;hp=-c

am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread

Merge commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a'

* commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a':
  Add LFH offset to verbose list of APK
---

2fe0ceeab530ad81160222823ab0a316b9a7e309
diff --combined Command.cpp
index abccf9b,b0f086b..b50a393
--- a/Command.cpp
+++ b/Command.cpp
@@@ -141,9 -141,9 +141,9 @@@ int doList(Bundle* bundle
      if (bundle->getVerbose()) {
          printf("Archive:  %s\n", zipFileName);
          printf(
-             " Length   Method    Size  Ratio   Date   Time   CRC-32    Name\n");
+             " Length   Method    Size  Ratio   Offset      Date  Time  CRC-32    Name\n");
          printf(
-             "--------  ------  ------- -----   ----   ----   ------    ----\n");
+             "--------  ------  ------- -----  -------      ----  ----  ------    ----\n");
      }
  
      totalUncLen = totalCompLen = 0;
@@@ -159,12 -159,13 +159,13 @@@
              strftime(dateBuf, sizeof(dateBuf), "%m-%d-%y %H:%M",
                  localtime(&when));
  
-             printf("%8ld  %-7.7s %7ld %3d%%  %s  %08lx  %s\n",
+             printf("%8ld  %-7.7s %7ld %3d%%  %8zd  %s  %08lx  %s\n",
                  (long) entry->getUncompressedLen(),
                  compressionName(entry->getCompressionMethod()),
                  (long) entry->getCompressedLen(),
                  calcPercent(entry->getUncompressedLen(),
                              entry->getCompressedLen()),
+                 (size_t) entry->getLFHOffset(),
                  dateBuf,
                  entry->getCRC32(),
                  entry->getFileName());
@@@ -197,10 -198,8 +198,10 @@@
          if (&res == NULL) {
              printf("\nNo resource table found.\n");
          } else {
 +#ifndef HAVE_ANDROID_OS
              printf("\nResource table:\n");
              res.print(false);
 +#endif
          }
  
          Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
@@@ -391,9 -390,8 +392,9 @@@ int doDump(Bundle* bundle
      }
  
      if (strcmp("resources", option) == 0) {
 +#ifndef HAVE_ANDROID_OS
          res.print(bundle->getValues());
 -
 +#endif
      } else if (strcmp("xmltree", option) == 0) {
          if (bundle->getFileSpecCount() < 3) {
              fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");