Main.cpp

   1 //
   2 // Copyright 2006 The Android Open Source Project
   3 //
   4 // Android Asset Packaging Tool main entry point.
   5 //
   6 #include "Main.h"
   7 #include "Bundle.h"
   8
   9 #include <utils/Log.h>
  10 #include <utils/threads.h>
  11 #include <utils/List.h>
  12 #include <utils/Errors.h>
  13
  14 #include <stdlib.h>
  15 #include <getopt.h>
  16 #include <assert.h>
  17
  18 using namespace android;
  19
  20 static const char* gProgName = "aapt";
  21
  22 /*
  23  * When running under Cygwin on Windows, this will convert slash-based
  24  * paths into back-slash-based ones. Otherwise the ApptAssets file comparisons
  25  * fail later as they use back-slash separators under Windows.
  26  *
  27  * This operates in-place on the path string.
  28  */
  29 void convertPath(char *path) {
  30   if (path != NULL && OS_PATH_SEPARATOR != '/') {
  31     for (; *path; path++) {
  32       if (*path == '/') {
  33         *path = OS_PATH_SEPARATOR;
  34       }
  35     }
  36   }
  37 }
  38
  39 /*
  40  * Print usage info.
  41  */
  42 void usage(void)
  43 {
  44     fprintf(stderr, "Android Asset Packaging Tool\n\n");
  45     fprintf(stderr, "Usage:\n");
  46     fprintf(stderr,
  47         " %s l[ist] [-v] [-a] file.{zip,jar,apk}\n"
  48         "   List contents of Zip-compatible archive.\n\n", gProgName);
  49     fprintf(stderr,
  50         " %s d[ump] [--values] WHAT file.{apk} [asset [asset ...]]\n"
  51         "   badging          Print the label and icon for the app declared in APK.\n"
  52         "   permissions      Print the permissions from the APK.\n"
  53         "   resources        Print the resource table from the APK.\n"
  54         "   configurations   Print the configurations in the APK.\n"
  55         "   xmltree          Print the compiled xmls in the given assets.\n"
  56         "   xmlstrings       Print the strings of the given compiled xml assets.\n\n", gProgName);
  57     fprintf(stderr,
  58         " %s p[ackage] [-d][-f][-m][-u][-v][-x][-z][-M AndroidManifest.xml] \\\n"
  59         "        [-0 extension [-0 extension ...]] [-g tolerance] [-j jarfile] \\\n"
  60         "        [--debug-mode] [--min-sdk-version VAL] [--target-sdk-version VAL] \\\n"
  61         "        [--app-version VAL] [--app-version-name TEXT] [--custom-package VAL] \\\n"
  62         "        [--rename-manifest-package PACKAGE] \\\n"
  63         "        [--rename-instrumentation-target-package PACKAGE] \\\n"
  64         "        [--utf16] [--auto-add-overlay] \\\n"
  65         "        [--max-res-version VAL] \\\n"
  66         "        [-I base-package [-I base-package ...]] \\\n"
  67         "        [-A asset-source-dir]  [-G class-list-file] [-P public-definitions-file] \\\n"
  68         "        [-S resource-sources [-S resource-sources ...]] \\\n"
  69         "        [-F apk-file] [-J R-file-dir] \\\n"
  70         "        [--product product1,product2,...] \\\n"
  71         "        [-c CONFIGS] [--preferred-configurations CONFIGS] \\\n"
  72         "        [-o] \\\n"
  73         "        [raw-files-dir [raw-files-dir] ...] \\\n"
  74         "        [--output-text-symbols DIR]\n"
  75         "\n"
  76         "   Package the android resources.  It will read assets and resources that are\n"
  77         "   supplied with the -M -A -S or raw-files-dir arguments.  The -J -P -F and -R\n"
  78         "   options control which files are output.\n\n"
  79         , gProgName);
  80     fprintf(stderr,
  81         " %s r[emove] [-v] file.{zip,jar,apk} file1 [file2 ...]\n"
  82         "   Delete specified files from Zip-compatible archive.\n\n",
  83         gProgName);
  84     fprintf(stderr,
  85         " %s a[dd] [-v] file.{zip,jar,apk} file1 [file2 ...]\n"
  86         "   Add specified files to Zip-compatible archive.\n\n", gProgName);
  87     fprintf(stderr,
  88         " %s c[runch] [-v] -S resource-sources ... -C output-folder ...\n"
  89         "   Do PNG preprocessing and store the results in output folder.\n\n", gProgName);
  90     fprintf(stderr,
  91         " %s v[ersion]\n"
  92         "   Print program version.\n\n", gProgName);
  93     fprintf(stderr,
  94         " Modifiers:\n"
  95         "   -a  print Android-specific data (resources, manifest) when listing\n"
  96         "   -c  specify which configurations to include.  The default is all\n"
  97         "       configurations.  The value of the parameter should be a comma\n"
  98         "       separated list of configuration values.  Locales should be specified\n"
  99         "       as either a language or language-region pair.  Some examples:\n"
 100         "            en\n"
 101         "            port,en\n"
 102         "            port,land,en_US\n"
 103         "       If you put the special locale, zz_ZZ on the list, it will perform\n"
 104         "       pseudolocalization on the default locale, modifying all of the\n"
 105         "       strings so you can look for strings that missed the\n"
 106         "       internationalization process.  For example:\n"
 107         "            port,land,zz_ZZ\n"
 108         "   -d  one or more device assets to include, separated by commas\n"
 109         "   -f  force overwrite of existing files\n"
 110         "   -g  specify a pixel tolerance to force images to grayscale, default 0\n"
 111         "   -j  specify a jar or zip file containing classes to include\n"
 112         "   -k  junk path of file(s) added\n"
 113         "   -m  make package directories under location specified by -J\n"
 114         "   -o  create overlay package (ie only resources; expects <overlay-package> in manifest)\n"
 115 #if 0
 116         "   -p  pseudolocalize the default configuration\n"
 117 #endif
 118         "   -u  update existing packages (add new, replace older, remove deleted files)\n"
 119         "   -v  verbose output\n"
 120         "   -x  create extending (non-application) resource IDs\n"
 121         "   -z  require localization of resource attributes marked with\n"
 122         "       localization=\"suggested\"\n"
 123         "   -A  additional directory in which to find raw asset files\n"
 124         "   -G  A file to output proguard options into.\n"
 125         "   -F  specify the apk file to output\n"
 126         "   -I  add an existing package to base include set\n"
 127         "   -J  specify where to output R.java resource constant definitions\n"
 128         "   -M  specify full path to AndroidManifest.xml to include in zip\n"
 129         "   -P  specify where to output public resource definitions\n"
 130         "   -S  directory in which to find resources.  Multiple directories will be scanned\n"
 131         "       and the first match found (left to right) will take precedence.\n"
 132         "   -0  specifies an additional extension for which such files will not\n"
 133         "       be stored compressed in the .apk.  An empty string means to not\n"
 134         "       compress any files at all.\n"
 135         "   --debug-mode\n"
 136         "       inserts android:debuggable=\"true\" in to the application node of the\n"
 137         "       manifest, making the application debuggable even on production devices.\n"
 138         "   --min-sdk-version\n"
 139         "       inserts android:minSdkVersion in to manifest.  If the version is 7 or\n"
 140         "       higher, the default encoding for resources will be in UTF-8.\n"
 141         "   --target-sdk-version\n"
 142         "       inserts android:targetSdkVersion in to manifest.\n"
 143         "   --max-res-version\n"
 144         "       ignores versioned resource directories above the given value.\n"
 145         "   --values\n"
 146         "       when used with \"dump resources\" also includes resource values.\n"
 147         "   --version-code\n"
 148         "       inserts android:versionCode in to manifest.\n"
 149         "   --version-name\n"
 150         "       inserts android:versionName in to manifest.\n"
 151         "   --custom-package\n"
 152         "       generates R.java into a different package.\n"
 153         "   --extra-packages\n"
 154         "       generate R.java for libraries. Separate libraries with ':'.\n"
 155         "   --generate-dependencies\n"
 156         "       generate dependency files in the same directories for R.java and resource package\n"
 157         "   --auto-add-overlay\n"
 158         "       Automatically add resources that are only in overlays.\n"
 159         "   --preferred-configurations\n"
 160         "       Like the -c option for filtering out unneeded configurations, but\n"
 161         "       only expresses a preference.  If there is no resource available with\n"
 162         "       the preferred configuration then it will not be stripped.\n"
 163         "   --rename-manifest-package\n"
 164         "       Rewrite the manifest so that its package name is the package name\n"
 165         "       given here.  Relative class names (for example .Foo) will be\n"
 166         "       changed to absolute names with the old package so that the code\n"
 167         "       does not need to change.\n"
 168         "   --rename-instrumentation-target-package\n"
 169         "       Rewrite the manifest so that all of its instrumentation\n"
 170         "       components target the given package.  Useful when used in\n"
 171         "       conjunction with --rename-manifest-package to fix tests against\n"
 172         "       a package that has been renamed.\n"
 173         "   --product\n"
 174         "       Specifies which variant to choose for strings that have\n"
 175         "       product variants\n"
 176         "   --utf16\n"
 177         "       changes default encoding for resources to UTF-16.  Only useful when API\n"
 178         "       level is set to 7 or higher where the default encoding is UTF-8.\n"
 179         "   --non-constant-id\n"
 180         "       Make the resources ID non constant. This is required to make an R java class\n"
 181         "       that does not contain the final value but is used to make reusable compiled\n"
 182         "       libraries that need to access resources.\n"
 183         "   --output-text-symbols\n"
 184         "       Generates a text file containing the resource symbols of the R class in the\n"
 185         "       specified folder.\n"
 186         "   --ignore-assets\n"
 187         "       Assets to be ignored. Default pattern is:\n"
 188         "       %s\n",
 189         gDefaultIgnoreAssets);
 190 }
 191
 192 /*
 193  * Dispatch the command.
 194  */
 195 int handleCommand(Bundle* bundle)
 196 {
 197     //printf("--- command %d (verbose=%d force=%d):\n",
 198     //    bundle->getCommand(), bundle->getVerbose(), bundle->getForce());
 199     //for (int i = 0; i < bundle->getFileSpecCount(); i++)
 200     //    printf("  %d: '%s'\n", i, bundle->getFileSpecEntry(i));
 201
 202     switch (bundle->getCommand()) {
 203     case kCommandVersion:   return doVersion(bundle);
 204     case kCommandList:      return doList(bundle);
 205     case kCommandDump:      return doDump(bundle);
 206     case kCommandAdd:       return doAdd(bundle);
 207     case kCommandRemove:    return doRemove(bundle);
 208     case kCommandPackage:   return doPackage(bundle);
 209     case kCommandCrunch:    return doCrunch(bundle);
 210     default:
 211         fprintf(stderr, "%s: requested command not yet supported\n", gProgName);
 212         return 1;
 213     }
 214 }
 215
 216 /*
 217  * Parse args.
 218  */
 219 int main(int argc, char* const argv[])
 220 {
 221     char *prog = argv[0];
 222     Bundle bundle;
 223     bool wantUsage = false;
 224     int result = 1;    // pessimistically assume an error.
 225     int tolerance = 0;
 226
 227     /* default to compression */
 228     bundle.setCompressionMethod(ZipEntry::kCompressDeflated);
 229
 230     if (argc < 2) {
 231         wantUsage = true;
 232         goto bail;
 233     }
 234
 235     if (argv[1][0] == 'v')
 236         bundle.setCommand(kCommandVersion);
 237     else if (argv[1][0] == 'd')
 238         bundle.setCommand(kCommandDump);
 239     else if (argv[1][0] == 'l')
 240         bundle.setCommand(kCommandList);
 241     else if (argv[1][0] == 'a')
 242         bundle.setCommand(kCommandAdd);
 243     else if (argv[1][0] == 'r')
 244         bundle.setCommand(kCommandRemove);
 245     else if (argv[1][0] == 'p')
 246         bundle.setCommand(kCommandPackage);
 247     else if (argv[1][0] == 'c')
 248         bundle.setCommand(kCommandCrunch);
 249     else {
 250         fprintf(stderr, "ERROR: Unknown command '%s'\n", argv[1]);
 251         wantUsage = true;
 252         goto bail;
 253     }
 254     argc -= 2;
 255     argv += 2;
 256
 257     /*
 258      * Pull out flags.  We support "-fv" and "-f -v".
 259      */
 260     while (argc && argv[0][0] == '-') {
 261         /* flag(s) found */
 262         const char* cp = argv[0] +1;
 263
 264         while (*cp != '\0') {
 265             switch (*cp) {
 266             case 'v':
 267                 bundle.setVerbose(true);
 268                 break;
 269             case 'a':
 270                 bundle.setAndroidList(true);
 271                 break;
 272             case 'c':
 273                 argc--;
 274                 argv++;
 275                 if (!argc) {
 276                     fprintf(stderr, "ERROR: No argument supplied for '-c' option\n");
 277                     wantUsage = true;
 278                     goto bail;
 279                 }
 280                 bundle.addConfigurations(argv[0]);
 281                 break;
 282             case 'f':
 283                 bundle.setForce(true);
 284                 break;
 285             case 'g':
 286                 argc--;
 287                 argv++;
 288                 if (!argc) {
 289                     fprintf(stderr, "ERROR: No argument supplied for '-g' option\n");
 290                     wantUsage = true;
 291                     goto bail;
 292                 }
 293                 tolerance = atoi(argv[0]);
 294                 bundle.setGrayscaleTolerance(tolerance);
 295                 printf("%s: Images with deviation <= %d will be forced to grayscale.\n", prog, tolerance);
 296                 break;
 297             case 'k':
 298                 bundle.setJunkPath(true);
 299                 break;
 300             case 'm':
 301                 bundle.setMakePackageDirs(true);
 302                 break;
 303             case 'o':
 304                 bundle.setIsOverlayPackage(true);
 305                 break;
 306 #if 0
 307             case 'p':
 308                 bundle.setPseudolocalize(true);
 309                 break;
 310 #endif
 311             case 'u':
 312                 bundle.setUpdate(true);
 313                 break;
 314             case 'x':
 315                 bundle.setExtending(true);
 316                 break;
 317             case 'z':
 318                 bundle.setRequireLocalization(true);
 319                 break;
 320             case 'j':
 321                 argc--;
 322                 argv++;
 323                 if (!argc) {
 324                     fprintf(stderr, "ERROR: No argument supplied for '-j' option\n");
 325                     wantUsage = true;
 326                     goto bail;
 327                 }
 328                 convertPath(argv[0]);
 329                 bundle.addJarFile(argv[0]);
 330                 break;
 331             case 'A':
 332                 argc--;
 333                 argv++;
 334                 if (!argc) {
 335                     fprintf(stderr, "ERROR: No argument supplied for '-A' option\n");
 336                     wantUsage = true;
 337                     goto bail;
 338                 }
 339                 convertPath(argv[0]);
 340                 bundle.setAssetSourceDir(argv[0]);
 341                 break;
 342             case 'G':
 343                 argc--;
 344                 argv++;
 345                 if (!argc) {
 346                     fprintf(stderr, "ERROR: No argument supplied for '-G' option\n");
 347                     wantUsage = true;
 348                     goto bail;
 349                 }
 350                 convertPath(argv[0]);
 351                 bundle.setProguardFile(argv[0]);
 352                 break;
 353             case 'I':
 354                 argc--;
 355                 argv++;
 356                 if (!argc) {
 357                     fprintf(stderr, "ERROR: No argument supplied for '-I' option\n");
 358                     wantUsage = true;
 359                     goto bail;
 360                 }
 361                 convertPath(argv[0]);
 362                 bundle.addPackageInclude(argv[0]);
 363                 break;
 364             case 'F':
 365                 argc--;
 366                 argv++;
 367                 if (!argc) {
 368                     fprintf(stderr, "ERROR: No argument supplied for '-F' option\n");
 369                     wantUsage = true;
 370                     goto bail;
 371                 }
 372                 convertPath(argv[0]);
 373                 bundle.setOutputAPKFile(argv[0]);
 374                 break;
 375             case 'J':
 376                 argc--;
 377                 argv++;
 378                 if (!argc) {
 379                     fprintf(stderr, "ERROR: No argument supplied for '-J' option\n");
 380                     wantUsage = true;
 381                     goto bail;
 382                 }
 383                 convertPath(argv[0]);
 384                 bundle.setRClassDir(argv[0]);
 385                 break;
 386             case 'M':
 387                 argc--;
 388                 argv++;
 389                 if (!argc) {
 390                     fprintf(stderr, "ERROR: No argument supplied for '-M' option\n");
 391                     wantUsage = true;
 392                     goto bail;
 393                 }
 394                 convertPath(argv[0]);
 395                 bundle.setAndroidManifestFile(argv[0]);
 396                 break;
 397             case 'P':
 398                 argc--;
 399                 argv++;
 400                 if (!argc) {
 401                     fprintf(stderr, "ERROR: No argument supplied for '-P' option\n");
 402                     wantUsage = true;
 403                     goto bail;
 404                 }
 405                 convertPath(argv[0]);
 406                 bundle.setPublicOutputFile(argv[0]);
 407                 break;
 408             case 'S':
 409                 argc--;
 410                 argv++;
 411                 if (!argc) {
 412                     fprintf(stderr, "ERROR: No argument supplied for '-S' option\n");
 413                     wantUsage = true;
 414                     goto bail;
 415                 }
 416                 convertPath(argv[0]);
 417                 bundle.addResourceSourceDir(argv[0]);
 418                 break;
 419             case 'C':
 420                 argc--;
 421                 argv++;
 422                 if (!argc) {
 423                     fprintf(stderr, "ERROR: No argument supplied for '-C' option\n");
 424                     wantUsage = true;
 425                     goto bail;
 426                 }
 427                 convertPath(argv[0]);
 428                 bundle.setCrunchedOutputDir(argv[0]);
 429                 break;
 430             case '0':
 431                 argc--;
 432                 argv++;
 433                 if (!argc) {
 434                     fprintf(stderr, "ERROR: No argument supplied for '-e' option\n");
 435                     wantUsage = true;
 436                     goto bail;
 437                 }
 438                 if (argv[0][0] != 0) {
 439                     bundle.addNoCompressExtension(argv[0]);
 440                 } else {
 441                     bundle.setCompressionMethod(ZipEntry::kCompressStored);
 442                 }
 443                 break;
 444             case '-':
 445                 if (strcmp(cp, "-debug-mode") == 0) {
 446                     bundle.setDebugMode(true);
 447                 } else if (strcmp(cp, "-min-sdk-version") == 0) {
 448                     argc--;
 449                     argv++;
 450                     if (!argc) {
 451                         fprintf(stderr, "ERROR: No argument supplied for '--min-sdk-version' option\n");
 452                         wantUsage = true;
 453                         goto bail;
 454                     }
 455                     bundle.setMinSdkVersion(argv[0]);
 456                 } else if (strcmp(cp, "-target-sdk-version") == 0) {
 457                     argc--;
 458                     argv++;
 459                     if (!argc) {
 460                         fprintf(stderr, "ERROR: No argument supplied for '--target-sdk-version' option\n");
 461                         wantUsage = true;
 462                         goto bail;
 463                     }
 464                     bundle.setTargetSdkVersion(argv[0]);
 465                 } else if (strcmp(cp, "-max-sdk-version") == 0) {
 466                     argc--;
 467                     argv++;
 468                     if (!argc) {
 469                         fprintf(stderr, "ERROR: No argument supplied for '--max-sdk-version' option\n");
 470                         wantUsage = true;
 471                         goto bail;
 472                     }
 473                     bundle.setMaxSdkVersion(argv[0]);
 474                 } else if (strcmp(cp, "-max-res-version") == 0) {
 475                     argc--;
 476                     argv++;
 477                     if (!argc) {
 478                         fprintf(stderr, "ERROR: No argument supplied for '--max-res-version' option\n");
 479                         wantUsage = true;
 480                         goto bail;
 481                     }
 482                     bundle.setMaxResVersion(argv[0]);
 483                 } else if (strcmp(cp, "-version-code") == 0) {
 484                     argc--;
 485                     argv++;
 486                     if (!argc) {
 487                         fprintf(stderr, "ERROR: No argument supplied for '--version-code' option\n");
 488                         wantUsage = true;
 489                         goto bail;
 490                     }
 491                     bundle.setVersionCode(argv[0]);
 492                 } else if (strcmp(cp, "-version-name") == 0) {
 493                     argc--;
 494                     argv++;
 495                     if (!argc) {
 496                         fprintf(stderr, "ERROR: No argument supplied for '--version-name' option\n");
 497                         wantUsage = true;
 498                         goto bail;
 499                     }
 500                     bundle.setVersionName(argv[0]);
 501                 } else if (strcmp(cp, "-values") == 0) {
 502                     bundle.setValues(true);
 503                 } else if (strcmp(cp, "-custom-package") == 0) {
 504                     argc--;
 505                     argv++;
 506                     if (!argc) {
 507                         fprintf(stderr, "ERROR: No argument supplied for '--custom-package' option\n");
 508                         wantUsage = true;
 509                         goto bail;
 510                     }
 511                     bundle.setCustomPackage(argv[0]);
 512                 } else if (strcmp(cp, "-extra-packages") == 0) {
 513                     argc--;
 514                     argv++;
 515                     if (!argc) {
 516                         fprintf(stderr, "ERROR: No argument supplied for '--extra-packages' option\n");
 517                         wantUsage = true;
 518                         goto bail;
 519                     }
 520                     bundle.setExtraPackages(argv[0]);
 521                 } else if (strcmp(cp, "-generate-dependencies") == 0) {
 522                     bundle.setGenDependencies(true);
 523                 } else if (strcmp(cp, "-utf16") == 0) {
 524                     bundle.setWantUTF16(true);
 525                 } else if (strcmp(cp, "-preferred-configurations") == 0) {
 526                     argc--;
 527                     argv++;
 528                     if (!argc) {
 529                         fprintf(stderr, "ERROR: No argument supplied for '--preferred-configurations' option\n");
 530                         wantUsage = true;
 531                         goto bail;
 532                     }
 533                     bundle.addPreferredConfigurations(argv[0]);
 534                 } else if (strcmp(cp, "-rename-manifest-package") == 0) {
 535                     argc--;
 536                     argv++;
 537                     if (!argc) {
 538                         fprintf(stderr, "ERROR: No argument supplied for '--rename-manifest-package' option\n");
 539                         wantUsage = true;
 540                         goto bail;
 541                     }
 542                     bundle.setManifestPackageNameOverride(argv[0]);
 543                 } else if (strcmp(cp, "-rename-instrumentation-target-package") == 0) {
 544                     argc--;
 545                     argv++;
 546                     if (!argc) {
 547                         fprintf(stderr, "ERROR: No argument supplied for '--rename-instrumentation-target-package' option\n");
 548                         wantUsage = true;
 549                         goto bail;
 550                     }
 551                     bundle.setInstrumentationPackageNameOverride(argv[0]);
 552                 } else if (strcmp(cp, "-auto-add-overlay") == 0) {
 553                     bundle.setAutoAddOverlay(true);
 554                 } else if (strcmp(cp, "-output-text-symbols") == 0) {
 555                     argc--;
 556                     argv++;
 557                     if (!argc) {
 558                         fprintf(stderr, "ERROR: No argument supplied for '-output-text-symbols' option\n");
 559                         wantUsage = true;
 560                         goto bail;
 561                     }
 562                     bundle.setOutputTextSymbols(argv[0]);
 563                 } else if (strcmp(cp, "-product") == 0) {
 564                     argc--;
 565                     argv++;
 566                     if (!argc) {
 567                         fprintf(stderr, "ERROR: No argument supplied for '--product' option\n");
 568                         wantUsage = true;
 569                         goto bail;
 570                     }
 571                     bundle.setProduct(argv[0]);
 572                 } else if (strcmp(cp, "-non-constant-id") == 0) {
 573                     bundle.setNonConstantId(true);
 574                 } else if (strcmp(cp, "-no-crunch") == 0) {
 575                     bundle.setUseCrunchCache(true);
 576                 } else if (strcmp(cp, "-ignore-assets") == 0) {
 577                     argc--;
 578                     argv++;
 579                     if (!argc) {
 580                         fprintf(stderr, "ERROR: No argument supplied for '--ignore-assets' option\n");
 581                         wantUsage = true;
 582                         goto bail;
 583                     }
 584                     gUserIgnoreAssets = argv[0];
 585                 } else {
 586                     fprintf(stderr, "ERROR: Unknown option '-%s'\n", cp);
 587                     wantUsage = true;
 588                     goto bail;
 589                 }
 590                 cp += strlen(cp) - 1;
 591                 break;
 592             default:
 593                 fprintf(stderr, "ERROR: Unknown flag '-%c'\n", *cp);
 594                 wantUsage = true;
 595                 goto bail;
 596             }
 597
 598             cp++;
 599         }
 600         argc--;
 601         argv++;
 602     }
 603
 604     /*
 605      * We're past the flags.  The rest all goes straight in.
 606      */
 607     bundle.setFileSpec(argv, argc);
 608
 609     result = handleCommand(&bundle);
 610
 611 bail:
 612     if (wantUsage) {
 613         usage();
 614         result = 2;
 615     }
 616
 617     //printf("--> returning %d\n", result);
 618     return result;
 619 }