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

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

@@ -1103 +1103 @@
     if (!g_cylinders)
         printf(" cylinders");
-    printf(
 #if ENABLE_FEATURE_FDISK_WRITABLE
-        " (settable in the extra functions menu)"
-#endif
-        "\n");
+    puts(" (settable in the extra functions menu)");
+#else
+    bb_putchar('\n');
+#endif
     return 1;
 }
@@ -1151 +1151 @@
     p = pex->part_table;
     if (!get_start_sect(p)) {
-        printf("Bad offset in primary extended partition\n");
+        puts("Bad offset in primary extended partition");
         return;
     }
@@ -1451 +1451 @@
             return 0;
         }
-        printf("This disk has both DOS and BSD magic.\n"
-             "Give the 'b' command to go to BSD mode.\n");
+        puts("This disk has both DOS and BSD magic.\n"
+             "Give the 'b' command to go to BSD mode.");
     }
 #endif
@@ -1462 +1462 @@
     if (!valid_part_table_flag(MBRbuffer)) {
         if (what == OPEN_MAIN) {
-            printf("Device contains neither a valid DOS "
-                  "partition table, nor Sun, SGI, OSF or GPT "
-                  "disklabel\n");
+            puts("Device contains neither a valid DOS "
+                 "partition table, nor Sun, SGI, OSF or GPT "
+                 "disklabel");
 #ifdef __sparc__
             IF_FEATURE_SUN_LABEL(create_sunlabel();)
@@ -1597 +1597 @@
         if (value >= low && value <= high)
             break;
-        printf("Value is out of range\n");
+        puts("Value is out of range");
     }
     return value;
@@ -1642 +1642 @@
         return pno;
     }
-    printf("No partition is defined yet!\n");
+    puts("No partition is defined yet!");
     return -1;
 
@@ -1669 +1669 @@
         return pno;
     }
-    printf("All primary partitions have been defined already!\n");
+    puts("All primary partitions have been defined already!");
     return -1;
 
@@ -1704 +1704 @@
     if (dos_compatible_flag) {
         sector_offset = g_sectors;
-        printf("DOS Compatibility flag is set\n");
+        printf("DOS Compatibility flag is %sset\n", "");
     } else {
         sector_offset = 1;
-        printf("DOS Compatibility flag is not set\n");
+        printf("DOS Compatibility flag is %sset\n", "not ");
     }
 }
@@ -1814 +1814 @@
 
         if (!sys && !LABEL_IS_SGI && !LABEL_IS_SUN) {
-            printf("Type 0 means free space to many systems\n"
-                   "(but not to Linux). Having partitions of\n"
-                   "type 0 is probably unwise.\n");
+            puts("Type 0 means free space to many systems\n"
+                "(but not to Linux). Having partitions of\n"
+                "type 0 is probably unwise.");
             /* break; */
         }
@@ -1822 +1822 @@
         if (!LABEL_IS_SUN && !LABEL_IS_SGI) {
             if (IS_EXTENDED(sys) != IS_EXTENDED(p->sys_ind)) {
-                printf("You cannot change a partition into"
-                       " an extended one or vice versa\n");
+                puts("You cannot change a partition into"
+                    " an extended one or vice versa");
                 break;
             }
@@ -1831 +1831 @@
 #if ENABLE_FEATURE_SUN_LABEL
             if (LABEL_IS_SUN && i == 2 && sys != SUN_WHOLE_DISK)
-                printf("Consider leaving partition 3 "
-                       "as Whole disk (5),\n"
-                       "as SunOS/Solaris expects it and "
-                       "even Linux likes it\n\n");
+                puts("Consider leaving partition 3 "
+                    "as Whole disk (5),\n"
+                    "as SunOS/Solaris expects it and "
+                    "even Linux likes it\n");
 #endif
 #if ENABLE_FEATURE_SGI_LABEL
@@ -1843 +1843 @@
                 )
             ) {
-                printf("Consider leaving partition 9 "
-                       "as volume header (0),\nand "
-                       "partition 11 as entire volume (6)"
-                       "as IRIX expects it\n\n");
+                puts("Consider leaving partition 9 "
+                    "as volume header (0),\nand "
+                    "partition 11 as entire volume (6)"
+                    "as IRIX expects it\n");
             }
 #endif
@@ -2068 +2068 @@
 
     if (!wrong_p_order(NULL)) {
-        printf("Ordering is already correct\n\n");
+        puts("Ordering is already correct\n");
         return;
     }
@@ -2096 +2096 @@
         fix_chain_of_logicals();
 
-    printf("Done.\n");
+    puts("Done");
 }
 #endif
@@ -2179 +2179 @@
     if (LABEL_IS_DOS && wrong_p_order(NULL)) {
         /* FIXME */
-        printf("\nPartition table entries are not in disk order\n");
+        puts("\nPartition table entries are not in disk order");
     }
 }
@@ -2193 +2193 @@
     printf("\nDisk %s: %u heads, %u sectors, %u cylinders\n\n",
         disk_device, g_heads, g_sectors, g_cylinders);
-    printf("Nr AF  Hd Sec  Cyl  Hd Sec  Cyl      Start       Size ID\n");
+    puts("Nr AF  Hd Sec  Cyl  Hd Sec  Cyl      Start       Size ID");
     for (i = 0; i < g_partitions; i++) {
         pe = &ptes[i];
@@ -2420 +2420 @@
     }
     if (start > limit) {
-        printf("No free sectors available\n");
+        puts("No free sectors available");
         if (n > 4)
             g_partitions--;
@@ -2491 +2491 @@
     }
     if (LABEL_IS_AIX) {
-        printf("Sorry - this fdisk cannot handle AIX disk labels.\n"
+        puts("Sorry - this fdisk cannot handle AIX disk labels.\n"
 "If you want to add DOS-type partitions, create a new empty DOS partition\n"
-"table first (use 'o'). This will destroy the present disk contents.\n");
+"table first (use 'o'). This will destroy the present disk contents.");
         return;
     }
@@ -2501 +2501 @@
 
     if (!free_primary && g_partitions >= MAXIMUM_PARTS) {
-        printf("The maximum number of partitions has been created\n");
+        puts("The maximum number of partitions has been created");
         return;
     }
@@ -2509 +2509 @@
             add_logical();
         else
-            printf("You must delete some partition and add "
-                 "an extended partition first\n");
+            puts("You must delete some partition and add "
+                 "an extended partition first");
     } else {
         char c, line[80];
@@ -2548 +2548 @@
     int i;
 
-    printf("Calling ioctl() to re-read partition table\n");
+    puts("Calling ioctl() to re-read partition table");
     sync();
     /* Users with slow external USB disks on a 320MHz ARM system (year 2011)
@@ -2559 +2559 @@
 #if 0
     if (dos_changed)
-        printf(
+        puts(
         "\nWARNING: If you have created or modified any DOS 6.x\n"
         "partitions, please see the fdisk manual page for additional\n"
-        "information\n");
+        "information");
 #endif
 
@@ -2590 +2590 @@
     }
     else if (LABEL_IS_SGI) {
-        /* no test on change? the printf below might be mistaken */
+        /* no test on change? the "altered" msg below might be mistaken */
         sgi_write_table();
     }
@@ -2602 +2602 @@
     }
 
-    printf("The partition table has been altered.\n");
+    puts("The partition table has been altered.");
     reread_partition_table(1);
 }
@@ -2745 +2745 @@
             if (dos_compatible_flag) {
                 sector_offset = g_sectors;
-                printf("Warning: setting sector offset for DOS "
-                    "compatiblity\n");
+                puts("Warning: setting sector offset for DOS "
+                    "compatiblity");
             }
             update_units();
@@ -2782 +2782 @@
        So try to be careful. This only works since 2.1.73. */
 
-    if (strncmp("/dev/hd", device, 7))
+    if (!is_prefixed_with(device, "/dev/hd"))
         return 0;
 
@@ -2788 +2788 @@
     procf = fopen_for_read(buf);
     if (procf != NULL && fgets(buf, sizeof(buf), procf))
-        is_ide = (!strncmp(buf, "cdrom", 5) ||
-              !strncmp(buf, "tape", 4));
+        is_ide = (is_prefixed_with(buf, "cdrom") ||
+              is_prefixed_with(buf, "tape"));
     else
         /* Now when this proc file does not exist, skip the
@@ -3025 +3025 @@
                 if (read_maybe_empty("Please enter the name of the "
                         "new boot file: ") == '\n')
-                    printf("Boot file unchanged\n");
+                    puts("Boot file unchanged");
                 else
                     sgi_set_bootfile(line_ptr);
@@ -3107 +3107 @@
         case 'x':
             if (LABEL_IS_SGI) {
-                printf("\n\tSorry, no experts menu for SGI "
-                    "partition tables available\n\n");
+                puts("\n\tSorry, no experts menu for SGI "
+                    "partition tables available\n");
             } else
                 xselect();