Merge branch 'busybox' into merge

12 files changed, 88 insertions, 78 deletions

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 81ba1c9d1..e543446c1 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -16,6 +16,7 @@
 //usage:     "\n        -c              Clear ring buffer after printing"
 //usage:     "\n        -n LEVEL        Set console logging level"
 //usage:     "\n        -s SIZE         Buffer size"
+//usage:     "\n        -r              Print raw message buffer"
 
 #include <sys/klog.h>
 #include "libbb.h"
@@ -29,11 +30,12 @@ int dmesg_main(int argc UNUSED_PARAM, char **argv)
         enum {
                 OPT_c = 1 << 0,
                 OPT_s = 1 << 1,
-                OPT_n = 1 << 2
+                OPT_n = 1 << 2,
+                OPT_r = 1 << 3
         };
 
         opt_complementary = "s+:n+"; /* numeric */
-        opts = getopt32(argv, "cs:n:", &len, &level);
+        opts = getopt32(argv, "cs:n:r", &len, &level);
         if (opts & OPT_n) {
                 if (klogctl(8, NULL, (long) level))
                         bb_perror_msg_and_die("klogctl");
@@ -55,7 +57,7 @@ int dmesg_main(int argc UNUSED_PARAM, char **argv)
                 return EXIT_SUCCESS;
 
 
-        if (ENABLE_FEATURE_DMESG_PRETTY) {
+        if (ENABLE_FEATURE_DMESG_PRETTY && !(opts & OPT_r)) {
                 int last = '\n';
                 int in = 0;
 
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 6f49cec8f..6ef6445e6 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -93,7 +93,7 @@ int fdformat_main(int argc UNUSED_PARAM, char **argv)
         }
 
         xioctl(fd, FDFMTEND, NULL);
-        printf("done\n");
+        puts("Done");
 
         /* VERIFY */
         if (verify) {
@@ -126,7 +126,7 @@ int fdformat_main(int argc UNUSED_PARAM, char **argv)
 
                 if (ENABLE_FEATURE_CLEAN_UP) free(data);
 
-                printf("done\n");
+                puts("Done");
         }
 
         if (ENABLE_FEATURE_CLEAN_UP) close(fd);
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 7fe70fb72..f49ce95a4 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1102,11 +1102,11 @@ warn_geometry(void)
                 printf(" sectors");
         if (!g_cylinders)
                 printf(" cylinders");
-        printf(
 #if ENABLE_FEATURE_FDISK_WRITABLE
-                " (settable in the extra functions menu)"
+        puts(" (settable in the extra functions menu)");
+#else
+        bb_putchar('\n');
 #endif
-                "\n");
         return 1;
 }
 
@@ -1150,7 +1150,7 @@ read_extended(int ext)
 
         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;
         }
 
@@ -1450,8 +1450,8 @@ static int get_boot(void)
                         current_label_type = LABEL_OSF;
                         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
 
@@ -1461,9 +1461,9 @@ static int get_boot(void)
 #else
         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();)
 #else
@@ -1596,7 +1596,7 @@ read_int(sector_t low, sector_t dflt, sector_t high, sector_t base, const char *
                 }
                 if (value >= low && value <= high)
                         break;
-                printf("Value is out of range\n");
+                puts("Value is out of range");
         }
         return value;
 }
@@ -1641,7 +1641,7 @@ get_existing_partition(int warn, unsigned max)
                 printf("Selected partition %u\n", pno+1);
                 return pno;
         }
-        printf("No partition is defined yet!\n");
+        puts("No partition is defined yet!");
         return -1;
 
  not_unique:
@@ -1668,7 +1668,7 @@ get_nonexisting_partition(int warn, unsigned max)
                 printf("Selected partition %u\n", pno+1);
                 return pno;
         }
-        printf("All primary partitions have been defined already!\n");
+        puts("All primary partitions have been defined already!");
         return -1;
 
  not_unique:
@@ -1703,10 +1703,10 @@ toggle_dos_compatibility_flag(void)
         dos_compatible_flag = 1 - dos_compatible_flag;
         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 ");
         }
 }
 
@@ -1813,16 +1813,16 @@ change_sysid(void)
                 sys = read_hex(get_sys_types());
 
                 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; */
                 }
 
                 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;
                         }
                 }
@@ -1830,10 +1830,10 @@ change_sysid(void)
                 if (sys < 256) {
 #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
                         if (LABEL_IS_SGI &&
@@ -1842,10 +1842,10 @@ change_sysid(void)
                                         (i == 8 && sys != 0)
                                 )
                         ) {
-                                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
                         if (sys == origsys)
@@ -2067,7 +2067,7 @@ fix_partition_table_order(void)
         int i,k;
 
         if (!wrong_p_order(NULL)) {
-                printf("Ordering is already correct\n\n");
+                puts("Ordering is already correct\n");
                 return;
         }
 
@@ -2095,7 +2095,7 @@ fix_partition_table_order(void)
         if (i)
                 fix_chain_of_logicals();
 
-        printf("Done.\n");
+        puts("Done");
 }
 #endif
 
@@ -2178,7 +2178,7 @@ list_table(int xtra)
          * if this is a sgi, sun or aix labeled disk... */
         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");
         }
 }
 
@@ -2192,7 +2192,7 @@ x_list_table(int extend)
 
         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];
                 p = (extend ? pe->ext_pointer : pe->part_table);
@@ -2419,7 +2419,7 @@ add_partition(int n, int sys)
                         limit = first[i] - 1;
         }
         if (start > limit) {
-                printf("No free sectors available\n");
+                puts("No free sectors available");
                 if (n > 4)
                         g_partitions--;
                 return;
@@ -2490,9 +2490,9 @@ new_partition(void)
                 return;
         }
         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;
         }
 
@@ -2500,7 +2500,7 @@ new_partition(void)
                 free_primary += !ptes[i].part_table->sys_ind;
 
         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;
         }
 
@@ -2508,8 +2508,8 @@ new_partition(void)
                 if (extended_offset)
                         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];
                 snprintf(line, sizeof(line),
@@ -2547,7 +2547,7 @@ reread_partition_table(int leave)
 {
         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)
          * report that sleep is needed, otherwise BLKRRPART may fail with -EIO:
@@ -2558,10 +2558,10 @@ reread_partition_table(int leave)
                         "failed, kernel still uses old table");
 #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
 
         if (leave) {
@@ -2589,7 +2589,7 @@ write_table(void)
                 }
         }
         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();
         }
         else if (LABEL_IS_SUN) {
@@ -2601,7 +2601,7 @@ write_table(void)
                 }
         }
 
-        printf("The partition table has been altered.\n");
+        puts("The partition table has been altered.");
         reread_partition_table(1);
 }
 #endif /* FEATURE_FDISK_WRITABLE */
@@ -2744,8 +2744,8 @@ xselect(void)
                         user_sectors = g_sectors = read_int(1, g_sectors, 63, 0, "Number of sectors");
                         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();
                         break;
@@ -3024,7 +3024,7 @@ int fdisk_main(int argc UNUSED_PARAM, char **argv)
                                         sgi_get_bootfile());
                                 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);
                         }
@@ -3106,8 +3106,8 @@ int fdisk_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_FDISK_ADVANCED
                 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();
                         break;
diff --git a/util-linux/fdisk_gpt.c b/util-linux/fdisk_gpt.c
index 5786d5f7d..715e227ca 100644
--- a/util-linux/fdisk_gpt.c
+++ b/util-linux/fdisk_gpt.c
@@ -106,7 +106,7 @@ gpt_list_table(int xtra UNUSED_PARAM)
                 (unsigned long long)SWAP_LE64(gpt_hdr->first_usable_lba),
                 (unsigned long long)SWAP_LE64(gpt_hdr->last_usable_lba));
 
-        printf("Number  Start (sector)    End (sector)  Size       Code  Name\n");
+        puts("Number  Start (sector)    End (sector)  Size       Code  Name");
         for (i = 0; i < n_parts; i++) {
                 gpt_partition *p = gpt_part(i);
                 if (p->lba_start) {
@@ -119,7 +119,7 @@ gpt_list_table(int xtra UNUSED_PARAM)
                                 numstr6,
                                 0x0700 /* FIXME */);
                         gpt_print_wide(p->name, 18);
-                        printf("\n");
+                        bb_putchar('\n');
                 }
         }
 }
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 33767a1af..d2f3524b4 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -371,9 +371,9 @@ static int ask(const char *string, int def)
                 }
         }
         if (def)
-                printf("y\n");
+                puts("y");
         else {
-                printf("n\n");
+                puts("n");
                 errors_uncorrected = 1;
         }
         return def;
@@ -405,7 +405,7 @@ static void check_mount(void)
                 if (isatty(0) && isatty(1))
                         cont = ask("Do you really want to continue", 0);
                 if (!cont) {
-                        printf("Check aborted\n");
+                        puts("Check aborted");
                         exit(EXIT_SUCCESS);
                 }
         }
@@ -470,8 +470,8 @@ static void write_block(unsigned nr, void *addr)
         if (!nr)
                 return;
         if (nr < FIRSTZONE || nr >= ZONES) {
-                printf("Internal error: trying to write bad block\n"
-                           "Write request ignored\n");
+                puts("Internal error: trying to write bad block\n"
+                        "Write request ignored");
                 errors_uncorrected = 1;
                 return;
         }
@@ -659,7 +659,7 @@ static void read_tables(void)
         if (INODE_BUFFER_SIZE != read(dev_fd, inode_buffer, INODE_BUFFER_SIZE))
                 die("can't read inodes");
         if (NORM_FIRSTZONE != FIRSTZONE) {
-                printf("warning: firstzone!=norm_firstzone\n");
+                puts("warning: firstzone!=norm_firstzone");
                 errors_uncorrected = 1;
         }
         get_dirsize();
@@ -713,7 +713,7 @@ static void get_inode_common(unsigned nr, uint16_t i_mode)
         } else
                 links++;
         if (!++inode_count[nr]) {
-                printf("Warning: inode count too big\n");
+                puts("Warning: inode count too big");
                 inode_count[nr]--;
                 errors_uncorrected = 1;
         }
@@ -1299,7 +1299,7 @@ int fsck_minix_main(int argc UNUSED_PARAM, char **argv)
         }
         if (changed) {
                 write_tables();
-                printf("FILE SYSTEM HAS BEEN CHANGED\n");
+                puts("FILE SYSTEM HAS BEEN CHANGED");
                 sync();
         } else if (OPT_repair)
                 write_superblock();
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index 58df1c823..b9dadf13c 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -378,7 +378,7 @@ int getopt_main(int argc, char **argv)
                 if (compatible) {
                         /* For some reason, the original getopt gave no error
                          * when there were no arguments. */
-                        printf(" --\n");
+                        puts(" --");
                         return 0;
                 }
                 bb_error_msg_and_die("missing optstring argument");
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 888f70ef8..38d81af50 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -119,7 +119,7 @@ int ipcrm_main(int argc, char **argv)
 
                         if (remove_ids(what, &argv[2]))
                                 fflush_stdout_and_exit(EXIT_FAILURE);
-                        printf("resource(s) deleted\n");
+                        puts("resource(s) deleted");
                         return 0;
                 }
         }
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 662e8ab38..51781d597 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -406,7 +406,7 @@ static void parse_next_rule(void)
                 }
 
                 /* 3rd field: mode - device permissions */
-                bb_parse_mode(tokens[2], &G.cur_rule.mode);
+                G.cur_rule.mode = bb_parse_mode(tokens[2], G.cur_rule.mode);
 
                 /* 4th field (opt): ">|=alias" or "!" to not create the node */
                 val = tokens[3];
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index d65a5161c..88d797584 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -576,11 +576,11 @@ static void setup_tables(void)
         for (i = MINIX_ROOT_INO; i <= SB_INODES; i++)
                 unmark_inode(i);
         G.inode_buffer = xzalloc(INODE_BUFFER_SIZE);
-        printf("%ld inodes\n", (long)SB_INODES);
-        printf("%ld blocks\n", (long)SB_ZONES);
-        printf("Firstdatazone=%ld (%ld)\n", (long)SB_FIRSTZONE, (long)norm_firstzone);
-        printf("Zonesize=%d\n", BLOCK_SIZE << SB_ZONE_SIZE);
-        printf("Maxsize=%ld\n", (long)SB_MAXSIZE);
+        printf("%lu inodes\n", (unsigned long)SB_INODES);
+        printf("%lu blocks\n", (unsigned long)SB_ZONES);
+        printf("Firstdatazone=%lu (%lu)\n", (unsigned long)SB_FIRSTZONE, (unsigned long)norm_firstzone);
+        printf("Zonesize=%u\n", BLOCK_SIZE << SB_ZONE_SIZE);
+        printf("Maxsize=%lu\n", (unsigned long)SB_MAXSIZE);
 }
 
 int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index a301b365b..7960b672c 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -206,7 +206,7 @@ because they're what all paths your process uses would be relative to.
 
 That's why the careful sequencing above: we cd into the new mount point before
 we do the mount --move.  Moving the mount point would otherwise make it
-totally inaccessible to is because cd-ing to the old path wouldn't give it to
+totally inaccessible to us because cd-ing to the old path wouldn't give it to
 us anymore, and cd "/" just gives us the cached dentry from when the process
 was created (in this case the old initramfs one).  But the "." symlink gives
 us the dentry of the filesystem we just moved, so we can then "chroot ." to
diff --git a/util-linux/uevent.c b/util-linux/uevent.c
index fb98b4845..514a9e934 100644
--- a/util-linux/uevent.c
+++ b/util-linux/uevent.c
@@ -37,7 +37,7 @@ enum {
 #ifndef SO_RCVBUFFORCE
 #define SO_RCVBUFFORCE 33
 #endif
-static const int RCVBUF = 2 * 1024 * 1024;
+enum { RCVBUF = 2 * 1024 * 1024 };
 
 int uevent_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int uevent_main(int argc UNUSED_PARAM, char **argv)
@@ -63,8 +63,8 @@ int uevent_main(int argc UNUSED_PARAM, char **argv)
         //      find /sys -name uevent -exec sh -c 'echo add >"{}"' ';'
         //
         // SO_RCVBUFFORCE (root only) can go above net.core.rmem_max sysctl
-        setsockopt(fd, SOL_SOCKET, SO_RCVBUF,      &RCVBUF, sizeof(RCVBUF));
-        setsockopt(fd, SOL_SOCKET, SO_RCVBUFFORCE, &RCVBUF, sizeof(RCVBUF));
+        setsockopt_SOL_SOCKET_int(fd, SO_RCVBUF,      RCVBUF);
+        setsockopt_SOL_SOCKET_int(fd, SO_RCVBUFFORCE, RCVBUF);
         if (0) {
                 int z;
                 socklen_t zl = sizeof(z);
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 4c2e8821e..00910977d 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -81,8 +81,9 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
         argv += optind;
 
         // MNT_FORCE and MNT_DETACH (from linux/fs.h) must match
-        // OPT_FORCE and OPT_LAZY, otherwise this trick won't work:
-        doForce = MAX((opt & OPT_FORCE), (opt & OPT_LAZY));
+        // OPT_FORCE and OPT_LAZY.
+        BUILD_BUG_ON(OPT_FORCE != MNT_FORCE || OPT_LAZY != MNT_DETACH);
+        doForce = opt & (OPT_FORCE|OPT_LAZY);
 
         /* Get a list of mount points from mtab.  We read them all in now mostly
          * for umount -a (so we don't have to worry about the list changing while
@@ -147,11 +148,18 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
                 // umount the directory even if we were given the block device.
                 if (m) zapit = m->dir;
 
+// umount from util-linux 2.22.2 does not do this:
+// umount -f uses umount2(MNT_FORCE) immediately,
+// not trying umount() first.
+// (Strangely, umount -fl ignores -f: it is equivalent to umount -l.
+// We do pass both flags in this case)
+#if 0
                 // Let's ask the thing nicely to unmount.
                 curstat = umount(zapit);
 
-                // Force the unmount, if necessary.
+                // Unmount with force and/or lazy flags, if necessary.
                 if (curstat && doForce)
+#endif
                         curstat = umount2(zapit, doForce);
 
                 // If still can't umount, maybe remount read-only?
@@ -168,7 +176,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
                                 bb_error_msg(msg, m->device);
                         } else {
                                 status = EXIT_FAILURE;
-                                bb_perror_msg("can't %sumount %s", (doForce ? "forcibly " : ""), zapit);
+                                bb_perror_msg("can't unmount %s", zapit);
                         }
                 } else {
                         // De-allocate the loop device.  This ioctl should be ignored on