Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/fdisk_gpt.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/fdisk_gpt.c (modified) (3 diffs)

branches/3.3/mindi-busybox/util-linux/fdisk_gpt.c

@@ -94 +94 @@
     char numstr6[6];
 
-    numstr6[5] = '\0';
-
-    smart_ulltoa5(total_number_of_sectors, numstr6, " KMGTPEZY");
+    smart_ulltoa5(total_number_of_sectors * sector_size, numstr6, " KMGTPEZY")[0] = '\0';
     printf("Disk %s: %llu sectors, %s\n", disk_device,
         (unsigned long long)total_number_of_sectors,
@@ -109 +107 @@
         (unsigned long long)SWAP_LE64(gpt_hdr->last_usable_lba));
 
-    printf("Number  Start (sector)    End (sector)  Size       Code  Name\n");
+    puts("Number  Start (sector)    End (sector)  Size       Code  Name");
     for (i = 0; i < n_parts; i++) {
         gpt_partition *p = gpt_part(i);
         if (p->lba_start) {
-            smart_ulltoa5(1 + SWAP_LE64(p->lba_end) - SWAP_LE64(p->lba_start),
-                numstr6, " KMGTPEZY");
+            smart_ulltoa5((1 + SWAP_LE64(p->lba_end) - SWAP_LE64(p->lba_start)) * sector_size,
+                numstr6, " KMGTPEZY")[0] = '\0';
             printf("%4u %15llu %15llu %11s   %04x  ",
                 i + 1,
@@ -122 +120 @@
                 0x0700 /* FIXME */);
             gpt_print_wide(p->name, 18);
-            printf("\n");
+            bb_putchar('\n');
         }
     }