Make optional flag optional

utility/load_kernel_test.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* Routines for verifying a file's signature. Useful in testing the core
  * RSA verification implementation.
  */
 
 #include <inttypes.h>  /* For PRIu64 macro */
@@ skipping 64 matching lines @@
 int main(int argc, char* argv[]) {
 
   const char* image_name;
   const char* keyfile_name;
   int rv;
 
   Memset(&lkp, 0, sizeof(LoadKernelParams));
   lkp.bytes_per_lba = LBA_BYTES;
 
   /* Read command line parameters */
-  if (4 > argc) {
+  if (3 > argc) {
     fprintf(stderr, "usage: %s <drive_image> <sign_key> [boot flag]\n", argv[0]);
     return 1;
   }
   image_name = argv[1];
   keyfile_name = argv[2];
 
   /* Read header signing key blob */
   {
     uint64_t key_size;
     lkp.header_sign_key_blob = ReadFile(keyfile_name, &key_size);
@@ skipping 17 matching lines @@
 
   /* Allocate a buffer for the kernel */
   lkp.kernel_buffer = Malloc(KERNEL_BUFFER_SIZE);
   if(!lkp.kernel_buffer) {
     fprintf(stderr, "Unable to allocate kernel buffer.\n");
     return 1;
   }
 
   /* Need to skip the address check, since we're putting it somewhere on the
    * heap instead of its actual target address in the firmware. */
   if (argc == 4) {

[Randall Spangler, 2010/07/10 00:09:42]

Might make this >=4, so it'll work if we add a 5th arg...

     lkp.boot_flags = atoi(argv[3]) | BOOT_FLAG_SKIP_ADDR_CHECK;
   } else {
     /* Default to recovery. */
     lkp.boot_flags = BOOT_FLAG_SKIP_ADDR_CHECK | BOOT_FLAG_RECOVERY;
   }
   /* Call LoadKernel() */
   rv = LoadKernel(&lkp);
   printf("LoadKernel() returned %d\n", rv);
 
   if (LOAD_KERNEL_SUCCESS == rv) {
     printf("Partition number:   %" PRIu64 "\n", lkp.partition_number);
     printf("Bootloader address: %" PRIu64 "\n", lkp.bootloader_address);
     printf("Bootloader size:    %" PRIu64 "\n", lkp.bootloader_size);
   }
 
   fclose(image_file);
   Free(lkp.kernel_buffer);
   return rv != LOAD_KERNEL_SUCCESS;
 }