Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/fdisk_sun.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_sun.c (modified) (28 diffs)

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

@@ -1 @@
-#if ENABLE_FEATURE_SUN_LABEL
-
-#define SUNOS_SWAP 3
-#define SUN_WHOLE_DISK 5
-
-#define SUN_LABEL_MAGIC          0xDABE
-#define SUN_LABEL_MAGIC_SWAPPED  0xBEDA
-#define SUN_SSWAP16(x) (sun_other_endian ? fdisk_swap16(x) : (uint16_t)(x))
-#define SUN_SSWAP32(x) (sun_other_endian ? fdisk_swap32(x) : (uint32_t)(x))
-
-/* Copied from linux/major.h */
-#define FLOPPY_MAJOR    2
-
-#define SCSI_IOCTL_GET_IDLUN 0x5382
-
 /*
- * fdisksunlabel.c
+ * fdisk_sun.c
  *
  * I think this is mostly, or entirely, due to
@@ -24 +9 @@
  * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
  *      Internationalization
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-
-static int sun_other_endian;
-static int scsi_disk;
-static int floppy;
+#if ENABLE_FEATURE_SUN_LABEL
+
+#define SUNOS_SWAP 3
+#define SUN_WHOLE_DISK 5
+
+#define SUN_LABEL_MAGIC          0xDABE
+#define SUN_LABEL_MAGIC_SWAPPED  0xBEDA
+#define SUN_SSWAP16(x) (sun_other_endian ? fdisk_swap16(x) : (uint16_t)(x))
+#define SUN_SSWAP32(x) (sun_other_endian ? fdisk_swap32(x) : (uint32_t)(x))
+
+/* Copied from linux/major.h */
+#define FLOPPY_MAJOR    2
+
+#define SCSI_IOCTL_GET_IDLUN 0x5382
+
+static smallint sun_other_endian;
+static smallint scsi_disk;
+static smallint floppy;
 
 #ifndef IDE0_MAJOR
@@ -43 +44 @@
     struct stat bootstat;
 
-    if (fstat(fd, &bootstat) < 0) {
+    if (fstat(dev_fd, &bootstat) < 0) {
         scsi_disk = 0;
         floppy = 0;
@@ -81 +82 @@
 
 static void
-set_sun_partition(int i, uint start, uint stop, int sysid)
+set_sun_partition(int i, unsigned start, unsigned stop, int sysid)
 {
     sunlabel->infos[i].id = sysid;
     sunlabel->partitions[i].start_cylinder =
-        SUN_SSWAP32(start / (heads * sectors));
+        SUN_SSWAP32(start / (g_heads * g_sectors));
     sunlabel->partitions[i].num_sectors =
         SUN_SSWAP32(stop - start);
@@ -98 +99 @@
 
     if (sunlabel->magic != SUN_LABEL_MAGIC
-     && sunlabel->magic != SUN_LABEL_MAGIC_SWAPPED) {
-        current_label_type = label_dos;
+     && sunlabel->magic != SUN_LABEL_MAGIC_SWAPPED
+    ) {
+        current_label_type = LABEL_DOS;
         sun_other_endian = 0;
         return 0;
@@ -112 +114 @@
 "or force a fresh label (s command in main menu)\n");
     } else {
-        heads = SUN_SSWAP16(sunlabel->ntrks);
-        cylinders = SUN_SSWAP16(sunlabel->ncyl);
-        sectors = SUN_SSWAP16(sunlabel->nsect);
+        g_heads = SUN_SSWAP16(sunlabel->ntrks);
+        g_cylinders = SUN_SSWAP16(sunlabel->ncyl);
+        g_sectors = SUN_SSWAP16(sunlabel->nsect);
     }
     update_units();
-    current_label_type = label_sun;
-    partitions = 8;
+    current_label_type = LABEL_SUN;
+    g_partitions = 8;
     return 1;
 }
@@ -169 +171 @@
     int i;
 
-    if (ioctl(fd, SCSI_IOCTL_GET_IDLUN, &id))
+    if (ioctl(dev_fd, SCSI_IOCTL_GET_IDLUN, &id))
         return NULL;
 
     sprintf(buffer,
-        "Host: scsi%d Channel: %02d Id: %02d Lun: %02d\n",
+        "Host: scsi%u Channel: %02u Id: %02u Lun: %02u\n",
         /* This is very wrong (works only if you have one HBA),
            but I haven't found a way how to get hostno
@@ -182 +184 @@
         (id[0]>>8) & 0xff
     );
-    pfd = fopen("/proc/scsi/scsi", "r");
+    pfd = fopen_for_read("/proc/scsi/scsi");
     if (!pfd) {
         return NULL;
@@ -231 +233 @@
 {
     struct hd_geometry geometry;
-    unsigned int ndiv;
-    int i;
+    unsigned ndiv;
     unsigned char c;
     const struct sun_predefined_drives *p = NULL;
@@ -242 +243 @@
     sunlabel->magic = SUN_SSWAP16(SUN_LABEL_MAGIC);
     if (!floppy) {
+        unsigned i;
         puts("Drive type\n"
          "   ?   auto configure\n"
@@ -273 +275 @@
     }
     if (!p || floppy) {
-        if (!ioctl(fd, HDIO_GETGEO, &geometry)) {
-            heads = geometry.heads;
-            sectors = geometry.sectors;
-            cylinders = geometry.cylinders;
+        if (!ioctl(dev_fd, HDIO_GETGEO, &geometry)) {
+            g_heads = geometry.heads;
+            g_sectors = geometry.sectors;
+            g_cylinders = geometry.cylinders;
         } else {
-            heads = 0;
-            sectors = 0;
-            cylinders = 0;
+            g_heads = 0;
+            g_sectors = 0;
+            g_cylinders = 0;
         }
         if (floppy) {
             sunlabel->nacyl = 0;
-            sunlabel->pcylcount = SUN_SSWAP16(cylinders);
+            sunlabel->pcylcount = SUN_SSWAP16(g_cylinders);
             sunlabel->rspeed = SUN_SSWAP16(300);
             sunlabel->ilfact = SUN_SSWAP16(1);
             sunlabel->sparecyl = 0;
         } else {
-            heads = read_int(1, heads, 1024, 0, "Heads");
-            sectors = read_int(1, sectors, 1024, 0, "Sectors/track");
-        if (cylinders)
-            cylinders = read_int(1, cylinders-2, 65535, 0, "Cylinders");
+            g_heads = read_int(1, g_heads, 1024, 0, "Heads");
+            g_sectors = read_int(1, g_sectors, 1024, 0, "Sectors/track");
+        if (g_cylinders)
+            g_cylinders = read_int(1, g_cylinders - 2, 65535, 0, "Cylinders");
         else
-            cylinders = read_int(1, 0, 65535, 0, "Cylinders");
+            g_cylinders = read_int(1, 0, 65535, 0, "Cylinders");
             sunlabel->nacyl = SUN_SSWAP16(read_int(0, 2, 65535, 0, "Alternate cylinders"));
-            sunlabel->pcylcount = SUN_SSWAP16(read_int(0, cylinders+SUN_SSWAP16(sunlabel->nacyl), 65535, 0, "Physical cylinders"));
+            sunlabel->pcylcount = SUN_SSWAP16(read_int(0, g_cylinders + SUN_SSWAP16(sunlabel->nacyl), 65535, 0, "Physical cylinders"));
             sunlabel->rspeed = SUN_SSWAP16(read_int(1, 5400, 100000, 0, "Rotation speed (rpm)"));
             sunlabel->ilfact = SUN_SSWAP16(read_int(1, 1, 32, 0, "Interleave factor"));
-            sunlabel->sparecyl = SUN_SSWAP16(read_int(0, 0, sectors, 0, "Extra sectors per cylinder"));
+            sunlabel->sparecyl = SUN_SSWAP16(read_int(0, 0, g_sectors, 0, "Extra sectors per cylinder"));
         }
     } else {
@@ -310 +312 @@
         sunlabel->rspeed = SUN_SSWAP16(p->rspeed);
         sunlabel->ilfact = SUN_SSWAP16(1);
-        cylinders = p->ncyl;
-        heads = p->ntrks;
-        sectors = p->nsect;
+        g_cylinders = p->ncyl;
+        g_heads = p->ntrks;
+        g_sectors = p->nsect;
         puts("You may change all the disk params from the x menu");
     }
 
     snprintf((char *)(sunlabel->info), sizeof(sunlabel->info),
-        "%s%s%s cyl %d alt %d hd %d sec %d",
+        "%s%s%s cyl %u alt %u hd %u sec %u",
         p ? p->vendor : "", (p && *p->vendor) ? " " : "",
         p ? p->model : (floppy ? "3,5\" floppy" : "Linux custom"),
-        cylinders, SUN_SSWAP16(sunlabel->nacyl), heads, sectors);
-
-    sunlabel->ntrks = SUN_SSWAP16(heads);
-    sunlabel->nsect = SUN_SSWAP16(sectors);
-    sunlabel->ncyl = SUN_SSWAP16(cylinders);
+        g_cylinders, SUN_SSWAP16(sunlabel->nacyl), g_heads, g_sectors);
+
+    sunlabel->ntrks = SUN_SSWAP16(g_heads);
+    sunlabel->nsect = SUN_SSWAP16(g_sectors);
+    sunlabel->ncyl = SUN_SSWAP16(g_cylinders);
     if (floppy)
-        set_sun_partition(0, 0, cylinders * heads * sectors, LINUX_NATIVE);
+        set_sun_partition(0, 0, g_cylinders * g_heads * g_sectors, LINUX_NATIVE);
     else {
-        if (cylinders * heads * sectors >= 150 * 2048) {
-            ndiv = cylinders - (50 * 2048 / (heads * sectors)); /* 50M swap */
+        if (g_cylinders * g_heads * g_sectors >= 150 * 2048) {
+            ndiv = g_cylinders - (50 * 2048 / (g_heads * g_sectors)); /* 50M swap */
         } else
-            ndiv = cylinders * 2 / 3;
-        set_sun_partition(0, 0, ndiv * heads * sectors, LINUX_NATIVE);
-        set_sun_partition(1, ndiv * heads * sectors, cylinders * heads * sectors, LINUX_SWAP);
+            ndiv = g_cylinders * 2 / 3;
+        set_sun_partition(0, 0, ndiv * g_heads * g_sectors, LINUX_NATIVE);
+        set_sun_partition(1, ndiv * g_heads * g_sectors, g_cylinders * g_heads * g_sectors, LINUX_SWAP);
         sunlabel->infos[1].flags |= 0x01; /* Not mountable */
     }
-    set_sun_partition(2, 0, cylinders * heads * sectors, SUN_WHOLE_DISK);
+    set_sun_partition(2, 0, g_cylinders * g_heads * g_sectors, SUN_WHOLE_DISK);
     {
         unsigned short *ush = (unsigned short *)sunlabel;
@@ -347 +349 @@
     set_all_unchanged();
     set_changed(0);
-    get_boot(create_empty_sun);
+    get_boot(CREATE_EMPTY_SUN);
 }
 
@@ -361 +363 @@
 
 static void
-fetch_sun(uint *starts, uint *lens, uint *start, uint *stop)
+fetch_sun(unsigned *starts, unsigned *lens, unsigned *start, unsigned *stop)
 {
     int i, continuous = 1;
 
     *start = 0;
-    *stop = cylinders * heads * sectors;
-    for (i = 0; i < partitions; i++) {
+    *stop = g_cylinders * g_heads * g_sectors;
+    for (i = 0; i < g_partitions; i++) {
         if (sunlabel->partitions[i].num_sectors
          && sunlabel->infos[i].id
          && sunlabel->infos[i].id != SUN_WHOLE_DISK) {
-            starts[i] = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors;
+            starts[i] = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * g_heads * g_sectors;
             lens[i] = SUN_SSWAP32(sunlabel->partitions[i].num_sectors);
             if (continuous) {
@@ -390 +392 @@
 }
 
-static uint *verify_sun_starts;
+static unsigned *verify_sun_starts;
 
 static int
@@ -404 +406 @@
 verify_sun(void)
 {
-    uint starts[8], lens[8], start, stop;
+    unsigned starts[8], lens[8], start, stop;
     int i,j,k,starto,endo;
     int array[8];
 
     verify_sun_starts = starts;
-    fetch_sun(starts,lens,&start,&stop);
+    fetch_sun(starts, lens, &start, &stop);
     for (k = 0; k < 7; k++) {
         for (i = 0; i < 8; i++) {
-            if (k && (lens[i] % (heads * sectors))) {
-                printf("Partition %d doesn't end on cylinder boundary\n", i+1);
+            if (k && (lens[i] % (g_heads * g_sectors))) {
+                printf("Partition %u doesn't end on cylinder boundary\n", i+1);
             }
             if (lens[i]) {
@@ -433 +435 @@
                                 if (starts[j]+lens[j] < endo)
                                     endo = starts[j]+lens[j];
-                                printf("Partition %d overlaps with others in "
-                                    "sectors %d-%d\n", i+1, starto, endo);
+                                printf("Partition %u overlaps with others in "
+                                    "sectors %u-%u\n", i+1, starto, endo);
                             }
                         }
@@ -453 +455 @@
         return;
     }
-    stop = cylinders * heads * sectors;
+    stop = g_cylinders * g_heads * g_sectors;
     if (starts[array[0]])
-        printf("Unused gap - sectors 0-%d\n", starts[array[0]]);
+        printf("Unused gap - sectors %u-%u\n", 0, starts[array[0]]);
     for (i = 0; i < 7 && array[i+1] != -1; i++) {
-        printf("Unused gap - sectors %d-%d\n", starts[array[i]]+lens[array[i]], starts[array[i+1]]);
+        printf("Unused gap - sectors %u-%u\n", starts[array[i]]+lens[array[i]], starts[array[i+1]]);
     }
     start = starts[array[i]] + lens[array[i]];
     if (start < stop)
-        printf("Unused gap - sectors %d-%d\n", start, stop);
+        printf("Unused gap - sectors %u-%u\n", start, stop);
 }
 
@@ -467 +469 @@
 add_sun_partition(int n, int sys)
 {
-    uint start, stop, stop2;
-    uint starts[8], lens[8];
+    unsigned start, stop, stop2;
+    unsigned starts[8], lens[8];
     int whole_disk = 0;
 
@@ -479 +481 @@
     }
 
-    fetch_sun(starts,lens,&start,&stop);
+    fetch_sun(starts, lens, &start, &stop);
     if (stop <= start) {
         if (n == 2)
@@ -500 +502 @@
         else
             /* Starting sector has to be properly aligned */
-            first = (first + heads * sectors - 1) / (heads * sectors);
+            first = (first + g_heads * g_sectors - 1) / (g_heads * g_sectors);
         if (n == 2 && first != 0)
             printf("\
@@ -521 +523 @@
            starting at block 0 in an md, or the label will
            be trashed. */
-        for (i = 0; i < partitions; i++)
+        for (i = 0; i < g_partitions; i++)
             if (lens[i] && starts[i] <= first && starts[i] + lens[i] > first)
                 break;
-        if (i < partitions && !whole_disk) {
+        if (i < g_partitions && !whole_disk) {
             if (n == 2 && !first) {
                 whole_disk = 1;
                 break;
             }
-            printf("Sector %d is already allocated\n", first);
+            printf("Sector %u is already allocated\n", first);
         } else
             break;
     }
-    stop = cylinders * heads * sectors;
+    stop = g_cylinders * g_heads * g_sectors;
     stop2 = stop;
-    for (i = 0; i < partitions; i++) {
+    for (i = 0; i < g_partitions; i++) {
         if (starts[i] > first && starts[i] < stop)
             stop = starts[i];
@@ -560 +562 @@
             printf(
 "You haven't covered the whole disk with the 3rd partition,\n"
-"but your value %d %s covers some other partition.\n"
-"Your entry has been changed to %d %s\n",
+"but your value %u %s covers some other partition.\n"
+"Your entry has been changed to %u %s\n",
                 scround(last), str_units(SINGULAR),
                 scround(stop), str_units(SINGULAR));
@@ -582 +584 @@
      && sunlabel->infos[i].id == SUN_WHOLE_DISK
      && !sunlabel->partitions[i].start_cylinder
-     && (nsec = SUN_SSWAP32(sunlabel->partitions[i].num_sectors)) == heads * sectors * cylinders)
+     && (nsec = SUN_SSWAP32(sunlabel->partitions[i].num_sectors)) == g_heads * g_sectors * g_cylinders)
         printf("If you want to maintain SunOS/Solaris compatibility, "
             "consider leaving this\n"
@@ -627 +629 @@
     if (xtra)
         printf(
-        "\nDisk %s (Sun disk label): %d heads, %d sectors, %d rpm\n"
-        "%d cylinders, %d alternate cylinders, %d physical cylinders\n"
-        "%d extra sects/cyl, interleave %d:1\n"
+        "\nDisk %s (Sun disk label): %u heads, %u sectors, %u rpm\n"
+        "%u cylinders, %u alternate 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, SUN_SSWAP16(sunlabel->rspeed),
-            cylinders, SUN_SSWAP16(sunlabel->nacyl),
+        "Units = %s of %u * 512 bytes\n\n",
+            disk_device, g_heads, g_sectors, SUN_SSWAP16(sunlabel->rspeed),
+            g_cylinders, SUN_SSWAP16(sunlabel->nacyl),
             SUN_SSWAP16(sunlabel->pcylcount),
             SUN_SSWAP16(sunlabel->sparecyl),
@@ -641 +643 @@
     else
         printf(
-    "\nDisk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n"
-    "Units = %s of %d * 512 bytes\n\n",
-            disk_device, heads, sectors, cylinders,
+    "\nDisk %s (Sun disk label): %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);
 
     printf("%*s Flag    Start       End    Blocks   Id  System\n",
         w + 1, "Device");
-    for (i = 0; i < partitions; i++) {
+    for (i = 0; i < g_partitions; i++) {
         if (sunlabel->partitions[i].num_sectors) {
-            uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors;
+            uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * g_heads * g_sectors;
             uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors);
-            printf("%s %c%c %9ld %9ld %9ld%c  %2x  %s\n",
-                partname(disk_device, i+1, w),          /* device */
+            printf("%s %c%c %9lu %9lu %9lu%c  %2x  %s\n",
+                partname(disk_device, i+1, w),                  /* device */
                 (sunlabel->infos[i].flags & 0x01) ? 'u' : ' ',  /* flags */
                 (sunlabel->infos[i].flags & 0x10) ? 'r' : ' ',
@@ -685 +687 @@
 {
     sunlabel->sparecyl =
-        SUN_SSWAP16(read_int(0, SUN_SSWAP16(sunlabel->sparecyl), sectors, 0,
+        SUN_SSWAP16(read_int(0, SUN_SSWAP16(sunlabel->sparecyl), g_sectors, 0,
                 "Extra sectors per cylinder"));
 }
@@ -723 +725 @@
         csum ^= *ush++;
     sunlabel->csum = csum;
-    if (lseek(fd, 0, SEEK_SET) < 0)
-        fdisk_fatal(unable_to_seek);
-    if (write(fd, sunlabel, SECTOR_SIZE) != SECTOR_SIZE)
-        fdisk_fatal(unable_to_write);
+    write_sector(0, sunlabel);
 }
 #endif /* SUN_LABEL */