Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/fdisk_sgi.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_sgi.c (modified) (4 diffs)

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

@@ -441 +441 @@
 
     write_sector(0, sgilabel);
-    if (!strncmp((char*)sgilabel->directory[0].vol_file_name, "sgilabel", 8)) {
+    if (is_prefixed_with((char*)sgilabel->directory[0].vol_file_name, "sgilabel")) {
         /*
          * keep this habit of first writing the "sgilabel".
@@ -505 +505 @@
         if ((Index[0] != 10) && verbose)
             printf("IRIX likes when Partition 11 covers the entire disk\n");
-        if ((sgi_get_start_sector(Index[0]) != 0) && verbose)
+        if ((sgi_get_start_sector(Index[0]) != 0) && verbose) {
             printf("The entire disk partition should start "
                 "at block 0,\n"
                 "not at diskblock %u\n",
                 sgi_get_start_sector(Index[0]));
-        if (SGI_DEBUG)      /* I do not understand how some disks fulfil it */
+        }
+        if (SGI_DEBUG) {     /* I do not understand how some disks fulfil it */
             if ((sgi_get_num_sectors(Index[0]) != lastblock) && verbose)
                 printf("The entire disk partition is only %u diskblock large,\n"
@@ -516 +517 @@
                     sgi_get_num_sectors(Index[0]), lastblock);
             lastblock = sgi_get_num_sectors(Index[0]);
+        }
     } else {
         if (verbose)
@@ -670 +672 @@
 
     for (n = 8; n < g_partitions; n++) {
-    if (!sgi_get_num_sectors(n)) {
-        /*
-         * 5 cylinders is an arbitrary value I like
-         * IRIX 5.3 stored files in the volume header
-         * (like sash, symmon, fx, ide) with ca. 3200
-         * sectors.
-         */
-        if (g_heads * g_sectors * 5 < sgi_get_lastblock())
-            sgi_set_partition(n, 0, g_heads * g_sectors * 5, SGI_VOLHDR);
-            break;
+        if (!sgi_get_num_sectors(n)) {
+            /*
+             * 5 cylinders is an arbitrary value I like
+             * IRIX 5.3 stored files in the volume header
+             * (like sash, symmon, fx, ide) with ca. 3200
+             * sectors.
+             */
+            if (g_heads * g_sectors * 5 < sgi_get_lastblock()) {
+                sgi_set_partition(n, 0, g_heads * g_sectors * 5, SGI_VOLHDR);
+                break;
+            }
         }
     }