Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/fdisk.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/fdisk.c (modified) (10 diffs)

branches/3.2/mindi-busybox/util-linux/fdisk.c

@@ -7 +7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+/* Looks like someone forgot to add this to config system */
+//usage:#ifndef ENABLE_FEATURE_FDISK_BLKSIZE
+//usage:# define ENABLE_FEATURE_FDISK_BLKSIZE 0
+//usage:# define IF_FEATURE_FDISK_BLKSIZE(a)
+//usage:#endif
+//usage:
+//usage:#define fdisk_trivial_usage
+//usage:       "[-ul" IF_FEATURE_FDISK_BLKSIZE("s") "] "
+//usage:       "[-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK"
+//usage:#define fdisk_full_usage "\n\n"
+//usage:       "Change partition table\n"
+//usage:     "\n    -u      Start and End are in sectors (instead of cylinders)"
+//usage:     "\n    -l      Show partition table for each DISK, then exit"
+//usage:    IF_FEATURE_FDISK_BLKSIZE(
+//usage:     "\n    -s      Show partition sizes in kb for each DISK, then exit"
+//usage:    )
+//usage:     "\n    -b 2048     (for certain MO disks) use 2048-byte sectors"
+//usage:     "\n    -C CYLINDERS    Set number of cylinders/heads/sectors"
+//usage:     "\n    -H HEADS"
+//usage:     "\n    -S SECTORS"
 
 #ifndef _LARGEFILE64_SOURCE
@@ -549 +570 @@
     int sz;
 
-    sz = read_line_input(prompt, line_buffer, sizeof(line_buffer), NULL);
+    sz = read_line_input(NULL, prompt, line_buffer, sizeof(line_buffer), /*timeout*/ -1);
     if (sz <= 0)
         exit(EXIT_SUCCESS); /* Ctrl-D or Ctrl-C */
@@ -2523 +2544 @@
 
 static void
-write_table(void)
-{
-    int i;
-
-    if (LABEL_IS_DOS) {
-        for (i = 0; i < 3; i++)
-            if (ptes[i].changed)
-                ptes[3].changed = 1;
-        for (i = 3; i < g_partitions; i++) {
-            struct pte *pe = &ptes[i];
-
-            if (pe->changed) {
-                write_part_table_flag(pe->sectorbuffer);
-                write_sector(pe->offset_from_dev_start, pe->sectorbuffer);
-            }
-        }
-    }
-    else if (LABEL_IS_SGI) {
-        /* no test on change? the printf below might be mistaken */
-        sgi_write_table();
-    }
-    else if (LABEL_IS_SUN) {
-        int needw = 0;
-
-        for (i = 0; i < 8; i++)
-            if (ptes[i].changed)
-                needw = 1;
-        if (needw)
-            sun_write_table();
-    }
-
-    printf("The partition table has been altered!\n\n");
-    reread_partition_table(1);
-}
-
-static void
 reread_partition_table(int leave)
 {
@@ -2565 +2550 @@
     printf("Calling ioctl() to re-read partition table\n");
     sync();
-    /* sleep(2); Huh? */
+    /* Users with slow external USB disks on a 320MHz ARM system (year 2011)
+     * report that sleep is needed, otherwise BLKRRPART may fail with -EIO:
+     */
+    sleep(1);
     i = ioctl_or_perror(dev_fd, BLKRRPART, NULL,
             "WARNING: rereading partition table "
@@ -2582 +2570 @@
         exit(i != 0);
     }
+}
+
+static void
+write_table(void)
+{
+    int i;
+
+    if (LABEL_IS_DOS) {
+        for (i = 0; i < 3; i++)
+            if (ptes[i].changed)
+                ptes[3].changed = 1;
+        for (i = 3; i < g_partitions; i++) {
+            struct pte *pe = &ptes[i];
+            if (pe->changed) {
+                write_part_table_flag(pe->sectorbuffer);
+                write_sector(pe->offset_from_dev_start, pe->sectorbuffer);
+            }
+        }
+    }
+    else if (LABEL_IS_SGI) {
+        /* no test on change? the printf below might be mistaken */
+        sgi_write_table();
+    }
+    else if (LABEL_IS_SUN) {
+        for (i = 0; i < 8; i++) {
+            if (ptes[i].changed) {
+                sun_write_table();
+                break;
+            }
+        }
+    }
+
+    printf("The partition table has been altered.\n");
+    reread_partition_table(1);
 }
 #endif /* FEATURE_FDISK_WRITABLE */
@@ -2825 +2847 @@
 }
 
+/* Is it a whole disk? The digit check is still useful
+   for Xen devices for example. */
+static int is_whole_disk(const char *disk)
+{
+    unsigned len;
+    int fd = open(disk, O_RDONLY);
+
+    if (fd != -1) {
+        struct hd_geometry geometry;
+        int err = ioctl(fd, HDIO_GETGEO, &geometry);
+        close(fd);
+        if (!err)
+            return (geometry.start == 0);
+    }
+
+    /* Treat "nameN" as a partition name, not whole disk */
+    /* note: mmcblk0 should work from the geometry check above */
+    len = strlen(disk);
+    if (len != 0 && isdigit(disk[len - 1]))
+        return 0;
+
+    return 1;
+}
+
 /* for fdisk -l: try all things in /proc/partitions
    that look like a partition name (do not end in a digit) */
@@ -2831 +2877 @@
 {
     FILE *procpt;
-    char line[100], ptname[100], devname[120], *s;
+    char line[100], ptname[100], devname[120];
     int ma, mi, sz;
 
@@ -2840 +2886 @@
                 &ma, &mi, &sz, ptname) != 4)
             continue;
-        for (s = ptname; *s; s++)
-            continue;
-        /* note: excluding '0': e.g. mmcblk0 is not a partition name! */
-        if (s[-1] >= '1' && s[-1] <= '9')
-            continue;
+
         sprintf(devname, "/dev/%s", ptname);
-        open_list_and_close(devname, 0);
+        if (is_whole_disk(devname))
+            open_list_and_close(devname, 0);
     }
 #if ENABLE_FEATURE_CLEAN_UP
@@ -2981 +3024 @@
                     sgi_get_bootfile());
                 if (read_maybe_empty("Please enter the name of the "
-                           "new boot file: ") == '\n')
+                        "new boot file: ") == '\n')
                     printf("Boot file unchanged\n");
                 else
@@ -3059 +3102 @@
             break;
         case 'w':
-            write_table();          /* does not return */
+            write_table();  /* does not return */
             break;
 #if ENABLE_FEATURE_FDISK_ADVANCED