Fixing the bug of CGPT when primary entry table is invalid.

cgpt/cmd_show.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.
 
 #include "cgpt.h"
 
 #define __STDC_FORMAT_MACROS
 #include <getopt.h>
 #include <inttypes.h>
 #include <stdio.h>
@@ skipping 256 matching lines @@
   }
 
   if (partition) {                      // show single partition
 
     if (partition > GetNumberOfEntries(&drive.gpt)) {
       Error("invalid partition number: %d\n", partition);
       return CGPT_FAILED;
     }
 
     uint32_t index = partition - 1;
-    GptEntry *entry = GetEntry(&drive.gpt, PRIMARY, index);
+    GptEntry *entry = GetEntry(&drive.gpt, ANY_VALID, index);
     char buf[256];                      // scratch buffer for string conversion
 
     if (single_item) {
       switch(single_item) {
       case 'b':
         printf("%" PRId64 "\n", entry->starting_lba);
         break;
       case 's':
         printf("%" PRId64 "\n", entry->ending_lba - entry->starting_lba + 1);
         break;
       case 't':
         GuidToStr(&entry->type, buf, sizeof(buf));
         printf("%s\n", buf);
         break;
       case 'u':
         GuidToStr(&entry->unique, buf, sizeof(buf));
         printf("%s\n", buf);
         break;
       case 'l':
         UTF16ToUTF8(entry->name, sizeof(entry->name) / sizeof(entry->name[0]),
                     (uint8_t *)buf, sizeof(buf));
         printf("%s\n", buf);
         break;
       case 'S':
-        printf("%d\n", GetSuccessful(&drive.gpt, PRIMARY, index));
+        printf("%d\n", GetSuccessful(&drive.gpt, ANY_VALID, index));
         break;
       case 'T':
-        printf("%d\n", GetTries(&drive.gpt, PRIMARY, index));
+        printf("%d\n", GetTries(&drive.gpt, ANY_VALID, index));
         break;
       case 'P':
-        printf("%d\n", GetPriority(&drive.gpt, PRIMARY, index));
+        printf("%d\n", GetPriority(&drive.gpt, ANY_VALID, index));
         break;
       case 'A':
         printf("0x%x\n", entry->attrs.fields.gpt_att);
         break;
       }
     } else {
       printf(TITLE_FMT, "start", "size", "part", "contents");
       EntryDetails(entry, index, numeric);
     }
 
   } else if (quick) {                   // show all partitions, quickly
     uint32_t i;
     GptEntry *entry;
     char type[GUID_STRLEN];
 
     for (i = 0; i < GetNumberOfEntries(&drive.gpt); ++i) {
-      entry = GetEntry(&drive.gpt, PRIMARY, i);
+      entry = GetEntry(&drive.gpt, ANY_VALID, i);
 
       if (IsZero(&entry->type))
         continue;
 
       if (!numeric && CGPT_OK == ResolveType(&entry->type, type)) {
       } else {
         GuidToStr(&entry->type, type, GUID_STRLEN);
       }
       printf(PARTITION_FMT, (int)entry->starting_lba,
              (int)(entry->ending_lba - entry->starting_lba + 1),
@@ skipping 75 matching lines @@
         HeaderDetails(header, indent, numeric);
       }
     }
   }
 
   (void) CheckValid(&drive);
   (void) DriveClose(&drive, 0);
 
   return CGPT_OK;
 }