Merge branch 'busybox' into merge

23 files changed, 185 insertions, 128 deletions

diff --git a/.gitignore b/.gitignore
index eeb5c2182..517e750c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,9 @@ cscope.files
 cscope.in.out
 cscope.out
 cscope.po.out
+
+#
+# ctags output
+#
+tags
+TAGS
diff --git a/archival/unzip.c b/archival/unzip.c
index a9b7dc10f..473cbe2ec 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -156,15 +156,15 @@ typedef union {
 #define FIX_ENDIANNESS_CDF(cdf) \
 do { if (BB_BIG_ENDIAN) { \
         (cdf).fmt.version_made_by = SWAP_LE16((cdf).fmt.version_made_by); \
-        (cdf).fmt.version_needed = SWAP_LE16((cdf).fmt.version_needed); \
-        (cdf).fmt.method        = SWAP_LE16((cdf).fmt.method      ); \
-        (cdf).fmt.modtime       = SWAP_LE16((cdf).fmt.modtime     ); \
-        (cdf).fmt.moddate       = SWAP_LE16((cdf).fmt.moddate     ); \
-        (cdf).fmt.crc32         = SWAP_LE32((cdf).fmt.crc32       ); \
-        (cdf).fmt.cmpsize       = SWAP_LE32((cdf).fmt.cmpsize     ); \
-        (cdf).fmt.ucmpsize      = SWAP_LE32((cdf).fmt.ucmpsize    ); \
-        (cdf).fmt.filename_len  = SWAP_LE16((cdf).fmt.filename_len); \
-        (cdf).fmt.extra_len     = SWAP_LE16((cdf).fmt.extra_len   ); \
+        (cdf).fmt.version_needed  = SWAP_LE16((cdf).fmt.version_needed ); \
+        (cdf).fmt.method          = SWAP_LE16((cdf).fmt.method         ); \
+        (cdf).fmt.modtime         = SWAP_LE16((cdf).fmt.modtime        ); \
+        (cdf).fmt.moddate         = SWAP_LE16((cdf).fmt.moddate        ); \
+        (cdf).fmt.crc32           = SWAP_LE32((cdf).fmt.crc32          ); \
+        (cdf).fmt.cmpsize         = SWAP_LE32((cdf).fmt.cmpsize        ); \
+        (cdf).fmt.ucmpsize        = SWAP_LE32((cdf).fmt.ucmpsize       ); \
+        (cdf).fmt.filename_len    = SWAP_LE16((cdf).fmt.filename_len   ); \
+        (cdf).fmt.extra_len       = SWAP_LE16((cdf).fmt.extra_len      ); \
         (cdf).fmt.file_comment_length = SWAP_LE16((cdf).fmt.file_comment_length); \
         (cdf).fmt.external_attributes = SWAP_LE32((cdf).fmt.external_attributes); \
 }} while (0)
@@ -459,7 +459,9 @@ static int get_lstat_mode(const char *dst_fn)
         struct stat stat_buf;
         if (lstat(dst_fn, &stat_buf) == -1) {
                 if (errno != ENOENT) {
-                        bb_perror_msg_and_die("can't stat '%s'", dst_fn);
+                        bb_perror_msg_and_die("can't stat '%s'",
+                                dst_fn
+                        );
                 }
                 /* File does not exist */
                 return -1;
@@ -637,7 +639,9 @@ int unzip_main(int argc, char **argv)
                                 break;
                         if (++i > 2) {
                                 *ext = '\0';
-                                bb_error_msg_and_die("can't open %s[.zip]", src_fn);
+                                bb_error_msg_and_die("can't open %s[.zip]",
+                                        src_fn
+                                );
                         }
                         strcpy(ext, extn[i - 1]);
                 }
@@ -649,8 +653,11 @@ int unzip_main(int argc, char **argv)
                 xchdir(base_dir);
 
         if (quiet <= 1) { /* not -qq */
-                if (quiet == 0)
-                        printf("Archive:  %s\n", src_fn);
+                if (quiet == 0) {
+                        printf("Archive:  %s\n",
+                                printable_string(src_fn)
+                        );
+                }
                 if (opts & OPT_l) {
                         puts(verbose ?
                                 " Length   Method    Size  Cmpr    Date    Time   CRC-32   Name\n"
@@ -834,7 +841,8 @@ int unzip_main(int argc, char **argv)
                                 printf(       "%9u  " "%s   "         "%s\n",
                                         (unsigned)zip.fmt.ucmpsize,
                                         dtbuf,
-                                        dst_fn);
+                                        printable_string(dst_fn)
+                                );
                         } else {
                                 char method6[7];
                                 unsigned long percents;
@@ -863,7 +871,8 @@ int unzip_main(int argc, char **argv)
                                         (unsigned)percents,
                                         dtbuf,
                                         zip.fmt.crc32,
-                                        dst_fn);
+                                        printable_string(dst_fn)
+                                );
                                 total_size += zip.fmt.cmpsize;
                         }
                         total_usize += zip.fmt.ucmpsize;
@@ -889,7 +898,7 @@ int unzip_main(int argc, char **argv)
                         mode = get_lstat_mode(dst_fn);
                         if (mode == -1) { /* ENOENT */
                                 if (!quiet) {
-                                        printf("   creating: %s\n", dst_fn);
+                                        printf("   creating: %s\n", printable_string(dst_fn));
                                 }
                                 unzip_create_leading_dirs(dst_fn);
                                 if (bb_make_directory(dst_fn, dir_mode, FILEUTILS_IGNORE_CHMOD_ERR)) {
@@ -898,7 +907,9 @@ int unzip_main(int argc, char **argv)
                         } else {
                                 if (!S_ISDIR(mode)) {
                                         bb_error_msg_and_die("'%s' exists but is not a %s",
-                                                dst_fn, "directory");
+                                                printable_string(dst_fn),
+                                                "directory"
+                                        );
                                 }
                         }
                         goto skip_cmpsize;
@@ -917,12 +928,16 @@ int unzip_main(int argc, char **argv)
                         if (!S_ISREG(mode)) {
  fishy:
                                 bb_error_msg_and_die("'%s' exists but is not a %s",
-                                        dst_fn, "regular file");
+                                        printable_string(dst_fn),
+                                        "regular file"
+                                );
                         }
                         if (overwrite == O_ALWAYS) {
                                 goto do_open_and_extract;
                         }
-                        printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn);
+                        printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ",
+                                printable_string(dst_fn)
+                        );
                         my_fgets80(key_buf);
                         /* User input could take a long time. Is it still a regular file? */
                         mode = get_lstat_mode(dst_fn);
@@ -952,7 +967,9 @@ int unzip_main(int argc, char **argv)
                         if (!quiet) {
                                 printf(/* zip.fmt.method == 0
                                         ? " extracting: %s\n"
-                                        : */ "  inflating: %s\n", dst_fn);
+                                        : */ "  inflating: %s\n",
+                                        printable_string(dst_fn)
+                                );
                         }
 #if ENABLE_FEATURE_UNZIP_CDF
                         if (S_ISLNK(file_mode)) {
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 9daa15470..fb4f998be 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -421,7 +421,7 @@ static unsigned calc_name_len(const char *name)
         uni_stat_t uni_stat;
 
         // TODO: quote tab as \t, etc, if -Q
-        name = printable_string(&uni_stat, name);
+        name = printable_string2(&uni_stat, name);
 
         if (!(option_mask32 & OPT_Q)) {
                 return uni_stat.unicode_width;
@@ -450,7 +450,7 @@ static unsigned print_name(const char *name)
         uni_stat_t uni_stat;
 
         // TODO: quote tab as \t, etc, if -Q
-        name = printable_string(&uni_stat, name);
+        name = printable_string2(&uni_stat, name);
 
         if (!(option_mask32 & OPT_Q)) {
                 fputs(name, stdout);
diff --git a/docs/mdev.txt b/docs/mdev.txt
index b24025f7b..b13a0bb93 100644
--- a/docs/mdev.txt
+++ b/docs/mdev.txt
@@ -60,9 +60,9 @@ or
 For example:
         hd[a-z][0-9]* 0:3 660
 
-The config file parsing stops at the first matching line.  If no line is
-matched, then the default of 0:0 660 is used.  To set your own default, simply
-create your own total match like so:
+The config file parsing stops at the first matching line unless this line
+starts with "-". If no line is matched, then the default of 0:0 660 is used.
+To set your own default, simply create your own total match like so:
 
         .* 1:1 777
 
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index a1caf011c..f7fcd88bf 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -39,23 +39,6 @@
 #include <linux/fs.h>
 #include "bb_e2fs_defs.h"
 
-// storage helpers
-char BUG_wrong_field_size(void);
-#define STORE_LE(field, value) \
-do { \
-        if (sizeof(field) == 4) \
-                field = SWAP_LE32(value); \
-        else if (sizeof(field) == 2) \
-                field = SWAP_LE16(value); \
-        else if (sizeof(field) == 1) \
-                field = (value); \
-        else \
-                BUG_wrong_field_size(); \
-} while (0)
-
-#define FETCH_LE32(field) \
-        (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size())
-
 enum {
         OPT_L = 1 << 0, // label
         OPT_c = 1 << 1, // max mount count
diff --git a/editors/sed.c b/editors/sed.c
index bf8a11613..fd56e0e7f 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -186,18 +186,23 @@ static void sed_free_and_close_stuff(void)
                 if (sed_cmd->sw_file)
                         fclose(sed_cmd->sw_file);
 
-                if (sed_cmd->beg_match) {
-                        regfree(sed_cmd->beg_match);
-                        free(sed_cmd->beg_match);
-                }
-                if (sed_cmd->end_match) {
-                        regfree(sed_cmd->end_match);
-                        free(sed_cmd->end_match);
-                }
-                if (sed_cmd->sub_match) {
-                        regfree(sed_cmd->sub_match);
-                        free(sed_cmd->sub_match);
-                }
+                /* Used to free regexps, but now there is code
+                 * in get_address() which can reuse a regexp
+                 * for constructs as /regexp/cmd1;//cmd2
+                 * leading to double-frees here:
+                 */
+                //if (sed_cmd->beg_match) {
+                //      regfree(sed_cmd->beg_match);
+                //      free(sed_cmd->beg_match);
+                //}
+                //if (sed_cmd->end_match) {
+                //      regfree(sed_cmd->end_match);
+                //      free(sed_cmd->end_match);
+                //}
+                //if (sed_cmd->sub_match) {
+                //      regfree(sed_cmd->sub_match);
+                //      free(sed_cmd->sub_match);
+                //}
                 free(sed_cmd->string);
                 free(sed_cmd);
                 sed_cmd = sed_cmd_next;
diff --git a/include/libbb.h b/include/libbb.h
index 0d09fef66..0a333dca8 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -874,7 +874,8 @@ typedef struct uni_stat_t {
 } uni_stat_t;
 /* Returns a string with unprintable chars replaced by '?' or
  * SUBST_WCHAR. This function is unicode-aware. */
-const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str);
+const char* FAST_FUNC printable_string(const char *str);
+const char* FAST_FUNC printable_string2(uni_stat_t *stats, const char *str);
 /* Prints unprintable char ch as ^C or M-c to file
  * (M-c is used only if ch is ORed with PRINTABLE_META),
  * else it is printed as-is (except for ch = 0x9b) */
@@ -2194,6 +2195,23 @@ extern const char bb_default_login_shell[] ALIGN1;
 # define FB_0 "/dev/fb0"
 #endif
 
+// storage helpers for mk*fs utilities
+char BUG_wrong_field_size(void);
+#define STORE_LE(field, value) \
+do { \
+        if (sizeof(field) == 4) \
+                field = SWAP_LE32((uint32_t)(value)); \
+        else if (sizeof(field) == 2) \
+                field = SWAP_LE16((uint16_t)(value)); \
+        else if (sizeof(field) == 1) \
+                field = (uint8_t)(value); \
+        else \
+                BUG_wrong_field_size(); \
+} while (0)
+
+#define FETCH_LE32(field) \
+        (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size())
+
 
 #define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0])))
 #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
diff --git a/init/init.c b/init/init.c
index 6439e2bcd..fde35f6b6 100644
--- a/init/init.c
+++ b/init/init.c
@@ -752,8 +752,13 @@ static void pause_and_low_level_reboot(unsigned magic)
                 reboot(magic);
                 _exit(EXIT_SUCCESS);
         }
-        while (1)
-                sleep(1);
+        /* Used to have "while (1) sleep(1)" here.
+         * However, in containers reboot() call is ignored, and with that loop
+         * we would eternally sleep here - not what we want.
+         */
+        waitpid(pid, NULL, 0);
+        sleep(1); /* paranoia */
+        _exit(EXIT_SUCCESS);
 }
 
 static void run_shutdown_and_kill_processes(void)
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 6ecf01765..19b579782 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1139,7 +1139,7 @@ static void showfiles(void)
                         );
                 }
                 if (ENABLE_UNICODE_SUPPORT)
-                        puts(printable_string(NULL, matches[n]));
+                        puts(printable_string(matches[n]));
                 else
                         puts(matches[n]);
         }
diff --git a/libbb/printable_string.c b/libbb/printable_string.c
index e638a178e..2e8895a4f 100644
--- a/libbb/printable_string.c
+++ b/libbb/printable_string.c
@@ -9,7 +9,7 @@
 #include "libbb.h"
 #include "unicode.h"
 
-const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
+const char* FAST_FUNC printable_string2(uni_stat_t *stats, const char *str)
 {
         char *dst;
         const char *s;
@@ -55,3 +55,8 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
 #endif
         return auto_string(dst);
 }
+
+const char* FAST_FUNC printable_string(const char *str)
+{
+        return printable_string2(NULL, str);
+}
diff --git a/libbb/time.c b/libbb/time.c
index 82e6cb172..f9b8da0b3 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -184,6 +184,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                         ptm->tm_year -= 1900; /* Adjust years */
                         ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
                 } else {
+ err:
                         bb_error_msg_and_die(bb_msg_invalid_date, date_str);
                 }
                 ptm->tm_sec = 0; /* assume zero if [.SS] is not given */
@@ -194,6 +195,19 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
                                 end = '\0';
                         /* else end != NUL and we error out */
                 }
+                /* Users were confused by "date -s 20180923"
+                 * working (not in the way they were expecting).
+                 * It was interpreted as MMDDhhmm, and not bothered by
+                 * "month #20" in the least. Prevent such cases:
+                 */
+                if (ptm->tm_sec > 60 /* allow "23:60" leap second */
+                 || ptm->tm_min > 59
+                 || ptm->tm_hour > 23
+                 || ptm->tm_mday > 31
+                 || ptm->tm_mon > 11 /* month# is 0..11, not 1..12 */
+                ) {
+                        goto err;
+                }
         }
         if (end != '\0') {
                 bb_error_msg_and_die(bb_msg_invalid_date, date_str);
diff --git a/libbb/unicode.c b/libbb/unicode.c
index d378175a4..89d42179b 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -996,7 +996,7 @@ size_t FAST_FUNC unicode_strlen(const char *string)
 size_t FAST_FUNC unicode_strwidth(const char *string)
 {
         uni_stat_t uni_stat;
-        printable_string(&uni_stat, string);
+        printable_string2(&uni_stat, string);
         return uni_stat.unicode_width;
 }
 
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5481134e5..80fce87a6 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -1022,6 +1022,22 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in
                         currently_processing = NONE;
                 } else if (strcmp(first_word, "source") == 0) {
                         read_interfaces(next_word(&rest_of_line), defn);
+                } else if (is_prefixed_with(first_word, "source-dir")) {
+                        const char *dirpath;
+                        DIR *dir;
+                        struct dirent *entry;
+
+                        dirpath = next_word(&rest_of_line);
+                        dir = xopendir(dirpath);
+                        while ((entry = readdir(dir)) != NULL) {
+                                char *path;
+                                if (entry->d_name[0] == '.')
+                                        continue;
+                                path = concat_path_file(dirpath, entry->d_name);
+                                read_interfaces(path, defn);
+                                free(path);
+                        }
+                        closedir(dir);
                 } else {
                         switch (currently_processing) {
                         case IFACE:
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 991c518f6..1ebdc34c3 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1116,20 +1116,25 @@ fit(peer_t *p, double rd)
 {
         if ((p->reachable_bits & (p->reachable_bits-1)) == 0) {
                 /* One or zero bits in reachable_bits */
-                VERB4 bb_error_msg("peer %s unfit for selection: unreachable", p->p_dotted);
+                VERB4 bb_error_msg("peer %s unfit for selection: "
+                                "unreachable", p->p_dotted);
                 return 0;
         }
 #if 0 /* we filter out such packets earlier */
         if ((p->lastpkt_status & LI_ALARM) == LI_ALARM
          || p->lastpkt_stratum >= MAXSTRAT
         ) {
-                VERB4 bb_error_msg("peer %s unfit for selection: bad status/stratum", p->p_dotted);
+                VERB4 bb_error_msg("peer %s unfit for selection: "
+                                "bad status/stratum", p->p_dotted);
                 return 0;
         }
 #endif
         /* rd is root_distance(p) */
         if (rd > MAXDIST + FREQ_TOLERANCE * (1 << G.poll_exp)) {
-                VERB4 bb_error_msg("peer %s unfit for selection: root distance too high", p->p_dotted);
+                VERB3 bb_error_msg("peer %s unfit for selection: "
+                        "root distance %f too high, jitter:%f",
+                        p->p_dotted, rd, p->filter_jitter
+                );
                 return 0;
         }
 //TODO
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index ed2255ef3..66e4b6c6a 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -1405,7 +1405,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                         case RENEW_REQUESTED: /* manual (SIGUSR1) renew */
                         case_RENEW_REQUESTED:
                         case RENEWING:
-                                if (timeout > 60) {
+                                if (timeout >= 60) {
                                         /* send an unicast renew request */
                         /* Sometimes observed to fail (EADDRNOTAVAIL) to bind
                          * a new UDP socket for sending inside send_renew.
@@ -1465,11 +1465,9 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                  * For the second case, must make sure timeout
                                  * is not too big, or else we can send
                                  * futile renew requests for hours.
-                                 * (Ab)use -A TIMEOUT value (usually 20 sec)
-                                 * as a cap on the timeout.
                                  */
-                                if (timeout > tryagain_timeout)
-                                        timeout = tryagain_timeout;
+                                if (timeout > 60)
+                                        timeout = 60;
                                 goto case_RENEW_REQUESTED;
                         }
                         /* Start things over */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 0310663e0..ab3e5a463 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1519,7 +1519,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                         case RENEW_REQUESTED: /* manual (SIGUSR1) renew */
                         case_RENEW_REQUESTED:
                         case RENEWING:
-                                if (timeout > 60) {
+                                if (timeout >= 60) {
                                         /* send an unicast renew request */
                         /* Sometimes observed to fail (EADDRNOTAVAIL) to bind
                          * a new UDP socket for sending inside send_renew.
@@ -1592,11 +1592,9 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                  * For the second case, must make sure timeout
                                  * is not too big, or else we can send
                                  * futile renew requests for hours.
-                                 * (Ab)use -A TIMEOUT value (usually 20 sec)
-                                 * as a cap on the timeout.
                                  */
-                                if (timeout > tryagain_timeout)
-                                        timeout = tryagain_timeout;
+                                if (timeout > 60)
+                                        timeout = 60;
                                 goto case_RENEW_REQUESTED;
                         }
                         /* Start things over */
diff --git a/testsuite/head.tests b/testsuite/head.tests
new file mode 100755
index 000000000..50660d267
--- /dev/null
+++ b/testsuite/head.tests
@@ -0,0 +1,41 @@
+#!/bin/sh
+# Copyright 2018 Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
+
+. ./testing.sh
+
+# testing "test name" "command" "expected result" "file input" "stdin"
+
+cat <<EOF > head.input
+line 1
+line 2
+line 3
+line 4
+line 5
+line 6
+line 7
+line 8
+line 9
+line 10
+line 11
+line 12
+EOF
+
+testing "head (without args)" \
+        "head head.input" \
+        "line 1\nline 2\nline 3\nline 4\nline 5\nline 6\nline 7\nline 8\nline 9\nline 10\n" \
+        "" ""
+
+testing "head -n <positive number>" \
+        "head -n 2 head.input" \
+        "line 1\nline 2\n" \
+        "" ""
+
+testing "head -n <negative number>" \
+        "head -n -9 head.input" \
+        "line 1\nline 2\nline 3\n" \
+        "" ""
+
+rm head.input
+
+exit $FAILCOUNT
diff --git a/testsuite/head/head-n-works b/testsuite/head/head-n-works
deleted file mode 100644
index db4325556..000000000
--- a/testsuite/head/head-n-works
+++ /dev/null
@@ -1,4 +0,0 @@
-[ -n "$d" ] || d=..
-head -n 2 "$d/README" > logfile.gnu
-busybox head -n 2 "$d/README" > logfile.bb
-cmp logfile.gnu logfile.bb
diff --git a/testsuite/head/head-works b/testsuite/head/head-works
deleted file mode 100644
index 56ad3e36b..000000000
--- a/testsuite/head/head-works
+++ /dev/null
@@ -1,4 +0,0 @@
-[ -n "$d" ] || d=..
-head "$d/README" > logfile.gnu
-busybox head "$d/README" > logfile.bb
-cmp logfile.gnu logfile.bb
diff --git a/util-linux/fdisk_gpt.c b/util-linux/fdisk_gpt.c
index cdb90627d..dbe889f7c 100644
--- a/util-linux/fdisk_gpt.c
+++ b/util-linux/fdisk_gpt.c
@@ -87,7 +87,7 @@ gpt_print_wide36(uint16_t *s)
         }
         wc[i] = 0;
         if (wcstombs(buf, wc, sizeof(buf)) <= sizeof(buf)-1)
-                fputs(printable_string(NULL, buf), stdout);
+                fputs(printable_string(buf), stdout);
 #else
         char buf[37];
         int i = 0;
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index f524bc239..bda168f1e 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -78,23 +78,6 @@
 #define EXT2_FLAGS_SIGNED_HASH   0x0001
 #define EXT2_FLAGS_UNSIGNED_HASH 0x0002
 
-// storage helpers
-char BUG_wrong_field_size(void);
-#define STORE_LE(field, value) \
-do { \
-        if (sizeof(field) == 4) \
-                field = SWAP_LE32((uint32_t)(value)); \
-        else if (sizeof(field) == 2) \
-                field = SWAP_LE16((uint16_t)(value)); \
-        else if (sizeof(field) == 1) \
-                field = (uint8_t)(value); \
-        else \
-                BUG_wrong_field_size(); \
-} while (0)
-
-#define FETCH_LE32(field) \
-        (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size())
-
 // All fields are little-endian
 struct ext2_dir {
         uint32_t inode1;
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c
index 390aef86c..b4c8dda6f 100644
--- a/util-linux/mkfs_reiser.c
+++ b/util-linux/mkfs_reiser.c
@@ -28,22 +28,6 @@
 #include "libbb.h"
 #include <linux/fs.h>
 
-char BUG_wrong_field_size(void);
-#define STORE_LE(field, value) \
-do { \
-        if (sizeof(field) == 4) \
-                field = SWAP_LE32(value); \
-        else if (sizeof(field) == 2) \
-                field = SWAP_LE16(value); \
-        else if (sizeof(field) == 1) \
-                field = (value); \
-        else \
-                BUG_wrong_field_size(); \
-} while (0)
-
-#define FETCH_LE32(field) \
-        (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size())
-
 struct journal_params {
         uint32_t jp_journal_1st_block;      /* where does journal start from on its device */
         uint32_t jp_journal_dev;            /* journal device st_rdev */
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 92f0e3b1a..6a6dc652f 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -206,19 +206,6 @@ static const char boot_code[] ALIGN1 =
 #define MARK_CLUSTER(cluster, value) \
         ((uint32_t *)fat)[cluster] = SWAP_LE32(value)
 
-void BUG_unsupported_field_size(void);
-#define STORE_LE(field, value) \
-do { \
-        if (sizeof(field) == 4) \
-                field = SWAP_LE32((uint32_t)(value)); \
-        else if (sizeof(field) == 2) \
-                field = SWAP_LE16((uint16_t)(value)); \
-        else if (sizeof(field) == 1) \
-                field = (uint8_t)(value); \
-        else \
-                BUG_unsupported_field_size(); \
-} while (0)
-
 /* compat:
  * mkdosfs 2.11 (12 Mar 2005)
  * Usage: mkdosfs [-A] [-c] [-C] [-v] [-I] [-l bad-block-file]