Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/fdisk_sgi.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/util-linux/fdisk_sgi.c (modified) (26 diffs)

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

@@ -1 @@
-#if ENABLE_FEATURE_SGI_LABEL
-
 /*
  * Copyright (C) Andreas Neuper, Sep 1998.
- *      This file may be modified and redistributed under
- *      the terms of the GNU Public License.
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+#if ENABLE_FEATURE_SGI_LABEL
+
+#define SGI_DEBUG 0
 
 #define SGI_VOLHDR      0x00
@@ -35 +37 @@
     unsigned short bytes;
     unsigned short ilfact;
-    unsigned int   flags;           /* controller flags */
+    unsigned int   flags;   /* controller flags */
     unsigned int   datarate;
     unsigned int   retries_on_error;
@@ -69 +71 @@
         unsigned int  vol_file_size;    /* number of bytes */
     } directory[15];
-    struct sgi_partinfo {                  /* 16 * 12 bytes */
+    struct sgi_partinfo {                   /* 16 * 12 bytes */
         unsigned int num_sectors;       /* number of blocks */
         unsigned int start_sector;      /* must be cylinder aligned */
@@ -118 +120 @@
 
 
-static int sgi_other_endian;
-static int debug;
-static short sgi_volumes = 1;
+static smallint sgi_other_endian; /* bool */
+static smallint sgi_volumes = 1; /* max 15 */
 
 /*
@@ -235 +236 @@
      && sgilabel->magic != SGI_LABEL_MAGIC_SWAPPED
     ) {
-        current_label_type = label_dos;
+        current_label_type = LABEL_DOS;
         return 0;
     }
@@ -248 +249 @@
     }
     update_units();
-    current_label_type = label_sgi;
-    partitions = 16;
+    current_label_type = LABEL_SGI;
+    g_partitions = 16;
     sgi_volumes = 15;
     return 1;
@@ -291 +292 @@
 
     if (xtra) {
-        printf("\nDisk %s (SGI disk label): %d heads, %d sectors\n"
-            "%d cylinders, %d physical cylinders\n"
-            "%d extra sects/cyl, interleave %d:1\n"
+        printf("\nDisk %s (SGI disk label): %u heads, %u sectors\n"
+            "%u cylinders, %u physical cylinders\n"
+            "%u extra sects/cyl, interleave %u:1\n"
             "%s\n"
-            "Units = %s of %d * 512 bytes\n\n",
-            disk_device, heads, sectors, cylinders,
+            "Units = %s of %u * 512 bytes\n\n",
+            disk_device, g_heads, g_sectors, g_cylinders,
             SGI_SSWAP16(sgiparam.pcylcount),
             SGI_SSWAP16(sgiparam.sparecyl),
@@ -304 +305 @@
     } else {
         printf("\nDisk %s (SGI disk label): "
-            "%d heads, %d sectors, %d cylinders\n"
-            "Units = %s of %d * 512 bytes\n\n",
-            disk_device, heads, sectors, cylinders,
+            "%u heads, %u sectors, %u cylinders\n"
+            "Units = %s of %u * 512 bytes\n\n",
+            disk_device, g_heads, g_sectors, g_cylinders,
             str_units(PLURAL), units_per_sector );
     }
@@ -318 +319 @@
         "Pt# %*s  Info     Start       End   Sectors  Id  System\n",
         w + 2, "Device");
-    for (i = 0; i < partitions; i++) {
-        if (sgi_get_num_sectors(i) || debug ) {
+    for (i = 0; i < g_partitions; i++) {
+        if (sgi_get_num_sectors(i) || SGI_DEBUG) {
             uint32_t start = sgi_get_start_sector(i);
             uint32_t len = sgi_get_num_sectors(i);
             kpi++;              /* only count nonempty partitions */
             printf(
-            "%2d: %s %4s %9ld %9ld %9ld  %2x  %s\n",
+            "%2u: %s %4s %9lu %9lu %9lu  %2x  %s\n",
 /* fdisk part number */ i+1,
 /* device */            partname(disk_device, kpi, w+3),
@@ -345 +346 @@
             unsigned char *name = sgilabel->directory[i].vol_file_name;
 
-            printf("%2d: %-10s sector%5u size%8u\n",
+            printf("%2u: %-10s sector%5u size%8u\n",
                 i, (char*)name, (unsigned int) start, (unsigned int) len);
         }
@@ -360 +361 @@
 sgi_get_lastblock(void)
 {
-    return heads * sectors * cylinders;
+    return g_heads * g_sectors * g_cylinders;
 }
 
@@ -439 +440 @@
         (unsigned int*)sgilabel, sizeof(*sgilabel)) == 0);
 
-    if (lseek(fd, 0, SEEK_SET) < 0)
-        fdisk_fatal(unable_to_seek);
-    if (write(fd, sgilabel, SECTOR_SIZE) != SECTOR_SIZE)
-        fdisk_fatal(unable_to_write);
+    write_sector(0, sgilabel);
     if (!strncmp((char*)sgilabel->directory[0].vol_file_name, "sgilabel", 8)) {
         /*
@@ -450 +448 @@
         sgiinfo *info = fill_sgiinfo();
         int infostartblock = SGI_SSWAP32(sgilabel->directory[0].vol_file_start);
-        if (lseek(fd, infostartblock*SECTOR_SIZE, SEEK_SET) < 0)
-            fdisk_fatal(unable_to_seek);
-        if (write(fd, info, SECTOR_SIZE) != SECTOR_SIZE)
-            fdisk_fatal(unable_to_write);
+        write_sector(infostartblock, info);
         free(info);
     }
@@ -513 +508 @@
             printf("The entire disk partition should start "
                 "at block 0,\n"
-                "not at diskblock %d\n",
+                "not at diskblock %u\n",
                 sgi_get_start_sector(Index[0]));
-        if (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 %d diskblock large,\n"
-                    "but the disk is %d diskblocks long\n",
+                printf("The entire disk partition is only %u diskblock large,\n"
+                    "but the disk is %u diskblocks long\n",
                     sgi_get_num_sectors(Index[0]), lastblock);
             lastblock = sgi_get_num_sectors(Index[0]);
@@ -524 +519 @@
         if (verbose)
             printf("One Partition (#11) should cover the entire disk\n");
-        if (debug > 2)
-            printf("sysid=%d\tpartition=%d\n",
+        if (SGI_DEBUG > 2)
+            printf("sysid=%u\tpartition=%u\n",
                 sgi_get_sysid(Index[0]), Index[0]+1);
     }
@@ -532 +527 @@
 
         if ((sgi_get_start_sector(Index[i]) % cylsize) != 0) {
-            if (debug)      /* I do not understand how some disks fulfil it */
+            if (SGI_DEBUG)      /* I do not understand how some disks fulfil it */
                 if (verbose)
-                    printf("Partition %d does not start on cylinder boundary\n",
+                    printf("Partition %u does not start on cylinder boundary\n",
                         Index[i]+1);
         }
         if (sgi_get_num_sectors(Index[i]) % cylsize != 0) {
-            if (debug)      /* I do not understand how some disks fulfil it */
+            if (SGI_DEBUG)      /* I do not understand how some disks fulfil it */
                 if (verbose)
-                    printf("Partition %d does not end on cylinder boundary\n",
+                    printf("Partition %u does not end on cylinder boundary\n",
                         Index[i]+1);
         }
@@ -547 +542 @@
         if (start > sgi_get_start_sector(Index[i])) {
             if (verbose)
-                printf("Partitions %d and %d overlap by %d sectors\n",
+                printf("Partitions %u and %u overlap by %u sectors\n",
                     Index[i-1]+1, Index[i]+1,
                     start - sgi_get_start_sector(Index[i]));
@@ -555 +550 @@
         if (start < sgi_get_start_sector(Index[i])) {
             if (verbose)
-                printf("Unused gap of %8u sectors - sectors %8u-%8u\n",
+                printf("Unused gap of %u sectors - sectors %u-%u\n",
                     sgi_get_start_sector(Index[i]) - start,
                     start, sgi_get_start_sector(Index[i])-1);
@@ -563 +558 @@
         start = sgi_get_start_sector(Index[i])
                + sgi_get_num_sectors(Index[i]);
-        if (debug > 1) {
+        if (SGI_DEBUG > 1) {
             if (verbose)
-                printf("%2d:%12d\t%12d\t%12d\n", Index[i],
+                printf("%2u:%12u\t%12u\t%12u\n", Index[i],
                     sgi_get_start_sector(Index[i]),
                     sgi_get_num_sectors(Index[i]),
@@ -573 +568 @@
     if (start < lastblock) {
         if (verbose)
-            printf("Unused gap of %8u sectors - sectors %8u-%8u\n",
+            printf("Unused gap of %u sectors - sectors %u-%u\n",
                 lastblock - start, start, lastblock-1);
         gap += lastblock - start;
@@ -661 +656 @@
     int n;
 
-    for (n = 10; n < partitions; n++) {
+    for (n = 10; n < g_partitions; n++) {
         if (!sgi_get_num_sectors(n) ) {
             sgi_set_partition(n, 0, sgi_get_lastblock(), SGI_VOLUME);
@@ -674 +669 @@
     int n;
 
-    for (n = 8; n < partitions; n++) {
+    for (n = 8; n < g_partitions; n++) {
     if (!sgi_get_num_sectors(n)) {
         /*
@@ -682 +677 @@
          * sectors.
          */
-        if (heads * sectors * 5 < sgi_get_lastblock())
-            sgi_set_partition(n, 0, heads * sectors * 5, SGI_VOLHDR);
+        if (g_heads * g_sectors * 5 < sgi_get_lastblock())
+            sgi_set_partition(n, 0, g_heads * g_sectors * 5, SGI_VOLHDR);
             break;
         }
@@ -781 +776 @@
     printf(msg_building_new_label, "SGI disklabel");
 
-    sgi_other_endian = (BYTE_ORDER == LITTLE_ENDIAN);
-    res = ioctl(fd, BLKGETSIZE, &longsectors);
-    if (!ioctl(fd, HDIO_GETGEO, &geometry)) {
-        heads = geometry.heads;
-        sectors = geometry.sectors;
+    sgi_other_endian = BB_LITTLE_ENDIAN;
+    res = ioctl(dev_fd, BLKGETSIZE, &longsectors);
+    if (!ioctl(dev_fd, HDIO_GETGEO, &geometry)) {
+        g_heads = geometry.heads;
+        g_sectors = geometry.sectors;
         if (res == 0) {
             /* the get device size ioctl was successful */
-            cylinders = longsectors / (heads * sectors);
-            cylinders /= sec_fac;
+            g_cylinders = longsectors / (g_heads * g_sectors);
+            g_cylinders /= sec_fac;
         } else {
             /* otherwise print error and use truncated version */
-            cylinders = geometry.cylinders;
+            g_cylinders = geometry.cylinders;
             printf(
-"Warning: BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %d.\n"
-"This value may be truncated for devices > 33.8 GB.\n", disk_device, cylinders);
+"Warning: BLKGETSIZE ioctl failed on %s.  Using geometry cylinder value of %u.\n"
+"This value may be truncated for devices > 33.8 GB.\n", disk_device, g_cylinders);
         }
     }
@@ -805 +800 @@
                 old[i].start = get_start_sect(get_part_table(i));
                 old[i].nsect = get_nr_sects(get_part_table(i));
-                printf("Trying to keep parameters of partition %d\n", i);
-                if (debug)
-                    printf("ID=%02x\tSTART=%d\tLENGTH=%d\n",
+                printf("Trying to keep parameters of partition %u\n", i);
+                if (SGI_DEBUG)
+                    printf("ID=%02x\tSTART=%u\tLENGTH=%u\n",
                 old[i].sysid, old[i].start, old[i].nsect);
             }
@@ -851 +846 @@
     //memset( &(sgilabel->directory), 0, sizeof(struct volume_directory)*15 );
     //memset( &(sgilabel->partitions), 0, sizeof(struct sgi_partinfo)*16 );
-    current_label_type = label_sgi;
-    partitions = 16;
+    current_label_type = LABEL_SGI;
+    g_partitions = 16;
     sgi_volumes = 15;
     sgi_set_entire();