Merge branch 'busybox' into merge

3 files changed, 13 insertions, 9 deletions

diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 41cc29f37..768ab80eb 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -518,7 +518,13 @@ int fbset_main(int argc, char **argv)
                         case CMD_DEPTH:
                                 var_set.bits_per_pixel = xatou32(argv[1]);
                                 break;
+                        case CMD_PIXCLOCK:
+                                var_set.pixclock = xatou32(argv[1]);
+                                break;
 #endif
+                        default:
+                                bb_perror_msg_and_die("option '%s' not handled",
+                                                      g_cmdoptions[i].name);
                         }
                         switch (g_cmdoptions[i].code) {
                         case CMD_FB:
diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c
index 9173f5d43..9738a76ad 100644
--- a/util-linux/hexdump_xxd.c
+++ b/util-linux/hexdump_xxd.c
@@ -41,7 +41,7 @@
 //    -u          use upper case hex letters.
 
 //usage:#define xxd_trivial_usage
-//usage:       "[-pri] [-g N] [-c N] [-n LEN] [-s OFS] [-o OFS] [FILE]"
+//usage:       "[-pri] [-g N] [-c N] [-l LEN] [-s OFS] [-o OFS] [FILE]"
 //usage:#define xxd_full_usage "\n\n"
 //usage:       "Hex dump FILE (or stdin)\n"
 //usage:     "\n        -g N            Bytes per group"
@@ -78,7 +78,7 @@ static void write_zeros(off_t count)
         do {
                 unsigned sz = count < COMMON_BUFSIZE ? (unsigned)count : COMMON_BUFSIZE;
                 if (fwrite(fillbuf, 1, sz, stdout) != sz)
-                        bb_perror_msg_and_die("write error");
+                        bb_simple_perror_msg_and_die("write error");
                 count -= sz;
         } while (count != 0);
 }
@@ -120,7 +120,7 @@ static void reverse(unsigned opt, const char *filename, char *opt_s)
                         if (ofs != cur) {
                                 if (fseeko(stdout, ofs, SEEK_SET) != 0) {
                                         if (ofs < cur)
-                                                bb_perror_msg_and_die("cannot seek");
+                                                bb_simple_perror_msg_and_die("cannot seek");
                                         write_zeros(ofs - cur);
                                 }
                                 cur = ofs;
@@ -229,11 +229,8 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
 {
         char buf[80];
         dumper_t *dumper;
-#if !ENABLE_PLATFORM_MINGW32
-        char *opt_l, *opt_s, *opt_o;
-#else
-        char *opt_l, *opt_s = NULL, *opt_o;
-#endif
+        char *opt_l, *opt_o;
+        char *opt_s = NULL;
         unsigned bytes = 2;
         unsigned cols = 0;
         unsigned opt;
diff --git a/util-linux/more.c b/util-linux/more.c
index a9ea76ab4..07275131e 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -87,11 +87,12 @@ int more_main(int argc UNUSED_PARAM, char **argv)
         /* Parse options */
         /* Accepted but ignored: */
         /* -d   Display help instead of ringing bell */
+        /* -e   Exit immediately after writing the last line */
         /* -f   Count logical lines (IOW: long lines are not folded) */
         /* -l   Do not pause after any line containing a ^L (form feed) */
         /* -s   Squeeze blank lines into one */
         /* -u   Suppress underlining */
-        getopt32(argv, "dflsu");
+        getopt32(argv, "deflsu");
         argv += optind;
 
         /* Another popular pager, most, detects when stdout