Merge branch 'busybox' into merge

10 files changed, 167 insertions, 174 deletions

diff --git a/coreutils/catv.c b/coreutils/catv.c
index 214b4311a..e3499c597 100644
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -25,14 +25,23 @@ int catv_main(int argc UNUSED_PARAM, char **argv)
 {
         int retval = EXIT_SUCCESS;
         int fd;
-        unsigned flags;
-
-        flags = getopt32(argv, "etv");
+        unsigned opts;
 #define CATV_OPT_e (1<<0)
 #define CATV_OPT_t (1<<1)
 #define CATV_OPT_v (1<<2)
-        flags ^= CATV_OPT_v;
+        typedef char BUG_const_mismatch[
+                CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS
+                ? 1 : -1
+        ];
+
+        opts = getopt32(argv, "etv");
         argv += optind;
+#if 0 /* These consts match, we can just pass "opts" to visible() */
+        if (opts & CATV_OPT_e)
+                flags |= VISIBLE_ENDLINE;
+        if (opts & CATV_OPT_t)
+                flags |= VISIBLE_SHOW_TABS;
+#endif
 
         /* Read from stdin if there's nothing else to do. */
         if (!argv[0])
@@ -50,29 +59,17 @@ int catv_main(int argc UNUSED_PARAM, char **argv)
                         res = read(fd, read_buf, COMMON_BUFSIZE);
                         if (res < 0)
                                 retval = EXIT_FAILURE;
-                        if (res < 1)
+                        if (res <= 0)
                                 break;
                         for (i = 0; i < res; i++) {
                                 unsigned char c = read_buf[i];
-
-                                if (c > 126 && (flags & CATV_OPT_v)) {
-                                        if (c == 127) {
-                                                printf("^?");
-                                                continue;
-                                        }
-                                        printf("M-");
-                                        c -= 128;
-                                }
-                                if (c < 32) {
-                                        if (c == 10) {
-                                                if (flags & CATV_OPT_e)
-                                                        bb_putchar('$');
-                                        } else if (flags & (c==9 ? CATV_OPT_t : CATV_OPT_v)) {
-                                                printf("^%c", c+'@');
-                                                continue;
-                                        }
+                                if (opts & CATV_OPT_v) {
+                                        putchar(c);
+                                } else {
+                                        char buf[sizeof("M-^c")];
+                                        visible(c, buf, opts);
+                                        fputs(buf, stdout);
                                 }
-                                bb_putchar(c);
                         }
                 }
                 if (ENABLE_FEATURE_CLEAN_UP && fd)
diff --git a/coreutils/dd.c b/coreutils/dd.c
index f6869cb26..db61f665e 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -30,10 +30,10 @@
 //usage:     "\n        conv=noerror    Continue after read errors"
 //usage:     "\n        conv=sync       Pad blocks with zeros"
 //usage:     "\n        conv=fsync      Physically write data out before finishing"
+//usage:     "\n        conv=swab       Swap every pair of bytes"
 //usage:        )
 //usage:     "\n"
-//usage:     "\nNumbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),"
-//usage:     "\nMD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)"
+//usage:     "\nN may be suffixed by c (1), w (2), b (512), kD (1000), k (1024), MD, M, GD, G"
 //usage:
 //usage:#define dd_example_usage
 //usage:       "$ dd if=/dev/zero of=/dev/ram1 bs=1M count=4\n"
@@ -151,13 +151,14 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         enum {
                 /* Must be in the same order as OP_conv_XXX! */
                 /* (see "flags |= (1 << what)" below) */
-                FLAG_NOTRUNC = 1 << 0,
-                FLAG_SYNC    = 1 << 1,
-                FLAG_NOERROR = 1 << 2,
-                FLAG_FSYNC   = 1 << 3,
+                FLAG_NOTRUNC = (1 << 0) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_SYNC    = (1 << 1) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_NOERROR = (1 << 2) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_FSYNC   = (1 << 3) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_SWAB    = (1 << 4) * ENABLE_FEATURE_DD_IBS_OBS,
                 /* end of conv flags */
-                FLAG_TWOBUFS = 1 << 4,
-                FLAG_COUNT   = 1 << 5,
+                FLAG_TWOBUFS = (1 << 5) * ENABLE_FEATURE_DD_IBS_OBS,
+                FLAG_COUNT   = 1 << 6,
         };
         static const char keywords[] ALIGN1 =
                 "bs\0""count\0""seek\0""skip\0""if\0""of\0"
@@ -167,7 +168,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 ;
 #if ENABLE_FEATURE_DD_IBS_OBS
         static const char conv_words[] ALIGN1 =
-                "notrunc\0""sync\0""noerror\0""fsync\0";
+                "notrunc\0""sync\0""noerror\0""fsync\0""swab\0";
 #endif
         enum {
                 OP_bs = 0,
@@ -185,11 +186,11 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 OP_conv_sync,
                 OP_conv_noerror,
                 OP_conv_fsync,
+                OP_conv_swab,
         /* Unimplemented conv=XXX: */
         //nocreat       do not create the output file
         //excl          fail if the output file already exists
         //fdatasync     physically write output file data before finishing
-        //swab          swap every pair of input bytes
         //lcase         change upper case to lower case
         //ucase         change lower case to upper case
         //block         pad newline-terminated records with spaces to cbs-size
@@ -197,23 +198,34 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         //ascii         from EBCDIC to ASCII
         //ebcdic        from ASCII to EBCDIC
         //ibm           from ASCII to alternate EBCDIC
+        /* Partially implemented: */
+        //swab          swap every pair of input bytes: will abort on non-even reads
 #endif
         };
-        int exitcode = EXIT_FAILURE;
+        smallint exitcode = EXIT_FAILURE;
         int devzero = 0;
-        size_t ibs = 512, obs = 512;
-        ssize_t n, w;
-        char *ibuf, *obuf;
-        /* And these are all zeroed at once! */
+        int i;
+        size_t ibs = 512;
+        char *ibuf;
+#if ENABLE_FEATURE_DD_IBS_OBS
+        size_t obs = 512;
+        char *obuf;
+#else
+# define obs  ibs
+# define obuf ibuf
+#endif
+        /* These are all zeroed at once! */
         struct {
                 int flags;
                 size_t oc;
+                ssize_t prev_read_size; /* for detecting swab failure */
                 off_t count;
                 off_t seek, skip;
                 const char *infile, *outfile;
         } Z;
 #define flags   (Z.flags  )
 #define oc      (Z.oc     )
+#define prev_read_size (Z.prev_read_size)
 #define count   (Z.count  )
 #define seek    (Z.seek   )
 #define skip    (Z.skip   )
@@ -224,10 +236,10 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
         //fflush_all(); - is this needed because of NOEXEC?
 
-        for (n = 1; argv[n]; n++) {
+        for (i = 1; argv[i]; i++) {
                 int what;
                 char *val;
-                char *arg = argv[n];
+                char *arg = argv[i];
 
 #if ENABLE_DESKTOP
                 /* "dd --". NB: coreutils 6.9 will complain if they see
@@ -256,6 +268,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 }
                 if (what == OP_conv) {
                         while (1) {
+                                int n;
                                 /* find ',', replace them with NUL so we can use val for
                                  * index_in_strings() without copying.
                                  * We rely on val being non-null, else strchr would fault.
@@ -263,20 +276,21 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                                 arg = strchr(val, ',');
                                 if (arg)
                                         *arg = '\0';
-                                what = index_in_strings(conv_words, val);
-                                if (what < 0)
+                                n = index_in_strings(conv_words, val);
+                                if (n < 0)
                                         bb_error_msg_and_die(bb_msg_invalid_arg, val, "conv");
-                                flags |= (1 << what);
+                                flags |= (1 << n);
                                 if (!arg) /* no ',' left, so this was the last specifier */
                                         break;
                                 /* *arg = ','; - to preserve ps listing? */
                                 val = arg + 1; /* skip this keyword and ',' */
                         }
-                        continue; /* we trashed 'what', can't fall through */
+                        /*continue;*/
                 }
 #endif
                 if (what == OP_bs) {
-                        ibs = obs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes);
+                        ibs = xatoul_range_sfx(val, 1, ((size_t)-1L)/2, dd_suffixes);
+                        obs = ibs;
                         /*continue;*/
                 }
                 /* These can be large: */
@@ -301,14 +315,17 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                         outfile = val;
                         /*continue;*/
                 }
-        } /* end of "for (argv[n])" */
+        } /* end of "for (argv[i])" */
 
 //XXX:FIXME for huge ibs or obs, malloc'ing them isn't the brightest idea ever
-        ibuf = obuf = xmalloc(ibs);
+        ibuf = xmalloc(ibs);
+        obuf = ibuf;
+#if ENABLE_FEATURE_DD_IBS_OBS
         if (ibs != obs) {
                 flags |= FLAG_TWOBUFS;
                 obuf = xmalloc(obs);
         }
+#endif
 
 #if ENABLE_FEATURE_DD_SIGNAL_HANDLING
         signal_SA_RESTART_empty_mask(SIGUSR1, dd_output_status);
@@ -317,17 +334,17 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         G.begin_time_us = monotonic_us();
 #endif
 
-        if (infile != NULL)
+        if (infile) {
                 if (ENABLE_PLATFORM_MINGW32 && !strcmp(infile, "/dev/zero")) {
                         flags |= FLAG_NOERROR;
                         devzero = 1;
-                }
-                else
+                } else {
                         xmove_fd(xopen(infile, O_RDONLY), ifd);
-        else {
+                }
+        } else {
                 infile = bb_msg_standard_input;
         }
-        if (outfile != NULL) {
+        if (outfile) {
                 int oflag = O_WRONLY | O_CREAT;
 
                 if (!seek && !(flags & FLAG_NOTRUNC))
@@ -352,13 +369,13 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
         if (skip && !devzero) {
                 if (lseek(ifd, skip * ibs, SEEK_CUR) < 0) {
-                        while (skip-- > 0) {
-                                n = safe_read(ifd, ibuf, ibs);
+                        do {
+                                ssize_t n = safe_read(ifd, ibuf, ibs);
                                 if (n < 0)
                                         goto die_infile;
                                 if (n == 0)
                                         break;
-                        }
+                        } while (--skip != 0);
                 }
         }
         if (seek) {
@@ -367,6 +384,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         while (!(flags & FLAG_COUNT) || (G.in_full + G.in_part != count)) {
+                ssize_t n;
+
                 if (devzero) {
                         memset(ibuf, 0, ibs);
                         n = ibs;
@@ -386,6 +405,27 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                          * conv=noerror just ignores input bad blocks */
                         n = 0;
                 }
+                if (flags & FLAG_SWAB) {
+                        uint16_t *p16;
+                        ssize_t n2;
+
+                        /* Our code allows only last read to be odd-sized */
+                        if (prev_read_size & 1)
+                                bb_error_msg_and_die("can't swab %lu byte buffer",
+                                                (unsigned long)prev_read_size);
+                        prev_read_size = n;
+
+                        /* If n is odd, last byte is not swapped:
+                         *  echo -n "qwe" | dd conv=swab
+                         * prints "wqe".
+                         */
+                        p16 = (void*) ibuf;
+                        n2 = (n >> 1);
+                        while (--n2 >= 0) {
+                                *p16 = bswap_16(*p16);
+                                p16++;
+                        }
+                }
                 if ((size_t)n == ibs)
                         G.in_full++;
                 else {
@@ -412,8 +452,10 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                                         oc = 0;
                                 }
                         }
-                } else if (write_and_stats(ibuf, n, obs, outfile))
-                        goto out_status;
+                } else {
+                        if (write_and_stats(ibuf, n, obs, outfile))
+                                goto out_status;
+                }
 
                 if (flags & FLAG_FSYNC) {
                         if (fsync(ofd) < 0)
@@ -422,9 +464,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         }
 
         if (ENABLE_FEATURE_DD_IBS_OBS && oc) {
-                w = full_write_or_warn(obuf, oc, outfile);
-                if (w < 0) goto out_status;
-                if (w > 0) G.out_part++;
+                if (write_and_stats(obuf, oc, obs, outfile))
+                        goto out_status;
         }
 
         if (!devzero && close(ifd) < 0) {
diff --git a/coreutils/head.c b/coreutils/head.c
index 291e1ce37..9388b026a 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -12,7 +12,6 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */
 
 //kbuild:lib-$(CONFIG_HEAD) += head.o
-//kbuild:lib-$(CONFIG_HEAD) += head_tail.o
 
 //usage:#define head_trivial_usage
 //usage:       "[OPTIONS] [FILE]..."
@@ -35,7 +34,6 @@
 //usage:       "daemon:x:1:1:daemon:/usr/sbin:/bin/sh\n"
 
 #include "libbb.h"
-#include "head_tail.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
@@ -140,7 +138,7 @@ eat_num(bool *negative_N, const char *p)
                 p++;
         }
 #endif
-        return xatoul_sfx(p, head_tail_suffixes);
+        return xatoul_sfx(p, bkm_suffixes);
 }
 
 static const char head_opts[] ALIGN1 =
diff --git a/coreutils/head_tail.c b/coreutils/head_tail.c
deleted file mode 100644
index 1658c0d1b..000000000
--- a/coreutils/head_tail.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2013 Denys Vlasenko
- *
- * Licensed under GPLv2, see file LICENSE in this source tree.
- */
-#include "libbb.h"
-#include "head_tail.h"
-
-const struct suffix_mult head_tail_suffixes[] = {
-        { "b", 512 },
-        { "k", 1024 },
-        { "m", 1024*1024 },
-        { "", 0 }
-};
diff --git a/coreutils/head_tail.h b/coreutils/head_tail.h
deleted file mode 100644
index df19e41e0..000000000
--- a/coreutils/head_tail.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Copyright (C) 2013 Denys Vlasenko
- *
- * Licensed under GPLv2, see file LICENSE in this source tree.
- */
-extern const struct suffix_mult head_tail_suffixes[];
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 92a4d4462..1a5342e87 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -151,7 +151,9 @@ static uint8_t *hash_file(const char *filename)
                         update(&context, in_buf, count);
                 }
                 hash_value = NULL;
-                if (count == 0) {
+                if (count < 0)
+                        bb_perror_msg("can't read '%s'", filename);
+                else /* count == 0 */ {
                         final(&context, in_buf);
                         hash_value = hash_bin_to_hex(in_buf, hash_len);
                 }
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index ee4f72ca1..c4d11601f 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -1173,12 +1173,6 @@ parse_old_offset(const char *s, off_t *offset)
 int od_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int od_main(int argc UNUSED_PARAM, char **argv)
 {
-        static const struct suffix_mult bkm[] = {
-                { "b", 512 },
-                { "k", 1024 },
-                { "m", 1024*1024 },
-                { "", 0 }
-        };
 #if ENABLE_LONG_OPTS
         static const char od_longopts[] ALIGN1 =
                 "skip-bytes\0"        Required_argument "j"
@@ -1237,7 +1231,7 @@ int od_main(int argc UNUSED_PARAM, char **argv)
                 address_pad_len_char = doxn_address_pad_len_char[pos];
         }
         if (opt & OPT_N) {
-                max_bytes_to_format = xstrtooff_sfx(str_N, 0, bkm);
+                max_bytes_to_format = xstrtooff_sfx(str_N, 0, bkm_suffixes);
         }
         if (opt & OPT_a) decode_format_string("a");
         if (opt & OPT_b) decode_format_string("oC");
@@ -1246,7 +1240,7 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         if (opt & OPT_f) decode_format_string("fF");
         if (opt & OPT_h) decode_format_string("x2");
         if (opt & OPT_i) decode_format_string("d2");
-        if (opt & OPT_j) n_bytes_to_skip = xstrtooff_sfx(str_j, 0, bkm);
+        if (opt & OPT_j) n_bytes_to_skip = xstrtooff_sfx(str_j, 0, bkm_suffixes);
         if (opt & OPT_l) decode_format_string("d4");
         if (opt & OPT_o) decode_format_string("o2");
         while (lst_t) {
@@ -1255,7 +1249,7 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         if (opt & OPT_x) decode_format_string("x2");
         if (opt & OPT_s) decode_format_string("d2");
         if (opt & OPT_S) {
-                string_min = xstrtou_sfx(str_S, 0, bkm);
+                string_min = xstrtou_sfx(str_S, 0, bkm_suffixes);
         }
 
         // Bloat:
diff --git a/coreutils/split.c b/coreutils/split.c
index 11e640442..1e1673efb 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -23,17 +23,15 @@
 
 #include "libbb.h"
 
-static const struct suffix_mult split_suffices[] = {
 #if ENABLE_FEATURE_SPLIT_FANCY
+static const struct suffix_mult split_suffixes[] = {
         { "b", 512 },
-#endif
         { "k", 1024 },
         { "m", 1024*1024 },
-#if ENABLE_FEATURE_SPLIT_FANCY
         { "g", 1024*1024*1024 },
-#endif
         { "", 0 }
 };
+#endif
 
 /* Increment the suffix part of the filename.
  * Returns NULL if we are out of filenames.
@@ -86,7 +84,10 @@ int split_main(int argc UNUSED_PARAM, char **argv)
         if (opt & SPLIT_OPT_l)
                 cnt = XATOOFF(count_p);
         if (opt & SPLIT_OPT_b) // FIXME: also needs XATOOFF
-                cnt = xatoull_sfx(count_p, split_suffices);
+                cnt = xatoull_sfx(count_p,
+                                IF_FEATURE_SPLIT_FANCY(split_suffixes)
+                                IF_NOT_FEATURE_SPLIT_FANCY(km_suffixes)
+                );
         sfx = "x";
 
         argv += optind;
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 96754dd84..378a848e7 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -246,10 +246,21 @@ enum speed_setting {
 
 /* Which member(s) of 'struct termios' a mode uses */
 enum {
-        /* Do NOT change the order or values, as mode_type_flag()
-         * depends on them */
         control, input, output, local, combination
 };
+static tcflag_t *get_ptr_to_tcflag(unsigned type, const struct termios *mode)
+{
+        static const uint8_t tcflag_offsets[] ALIGN1 = {
+                offsetof(struct termios, c_cflag), /* control */
+                offsetof(struct termios, c_iflag), /* input */
+                offsetof(struct termios, c_oflag), /* output */
+                offsetof(struct termios, c_lflag)  /* local */
+        };
+        if (type <= local) {
+                return (tcflag_t*) (((char*)mode) + tcflag_offsets[type]);
+        }
+        return NULL;
+}
 
 /* Flags for 'struct mode_info' */
 #define SANE_SET 1              /* Set in 'sane' mode                  */
@@ -770,51 +781,6 @@ struct globals {
         G.max_col = 80; \
 } while (0)
 
-
-/* Return a string that is the printable representation of character CH */
-/* Adapted from 'cat' by Torbjorn Granlund */
-static const char *visible(unsigned ch)
-{
-        char *bpout = G.buf;
-
-        if (ch == _POSIX_VDISABLE)
-                return "<undef>";
-
-        if (ch >= 128) {
-                ch -= 128;
-                *bpout++ = 'M';
-                *bpout++ = '-';
-        }
-
-        if (ch < 32) {
-                *bpout++ = '^';
-                *bpout++ = ch + 64;
-        } else if (ch < 127) {
-                *bpout++ = ch;
-        } else {
-                *bpout++ = '^';
-                *bpout++ = '?';
-        }
-
-        *bpout = '\0';
-        return G.buf;
-}
-
-static tcflag_t *mode_type_flag(unsigned type, const struct termios *mode)
-{
-        static const uint8_t tcflag_offsets[] ALIGN1 = {
-                offsetof(struct termios, c_cflag), /* control */
-                offsetof(struct termios, c_iflag), /* input */
-                offsetof(struct termios, c_oflag), /* output */
-                offsetof(struct termios, c_lflag)  /* local */
-        };
-
-        if (type <= local) {
-                return (tcflag_t*) (((char*)mode) + tcflag_offsets[type]);
-        }
-        return NULL;
-}
-
 static void set_speed_or_die(enum speed_setting type, const char *arg,
                                         struct termios *mode)
 {
@@ -1042,6 +1008,7 @@ static void do_display(const struct termios *mode, int all)
 #endif
 
         for (i = 0; i != CIDX_min; ++i) {
+                char ch;
                 /* If swtch is the same as susp, don't print both */
 #if VSWTCH == VSUSP
                 if (i == CIDX_swtch)
@@ -1055,8 +1022,12 @@ static void do_display(const struct termios *mode, int all)
                         continue;
                 }
 #endif
-                wrapf("%s = %s;", nth_string(control_name, i),
-                                visible(mode->c_cc[control_info[i].offset]));
+                ch = mode->c_cc[control_info[i].offset];
+                if (ch == _POSIX_VDISABLE)
+                        strcpy(G.buf, "<undef>");
+                else
+                        visible(ch, G.buf, 0);
+                wrapf("%s = %s;", nth_string(control_name, i), G.buf);
         }
 #if VEOF == VMIN
         if ((mode->c_lflag & ICANON) == 0)
@@ -1072,7 +1043,7 @@ static void do_display(const struct termios *mode, int all)
                         prev_type = mode_info[i].type;
                 }
 
-                bitsp = mode_type_flag(mode_info[i].type, mode);
+                bitsp = get_ptr_to_tcflag(mode_info[i].type, mode);
                 mask = mode_info[i].mask ? mode_info[i].mask : mode_info[i].bits;
                 if ((*bitsp & mask) == mode_info[i].bits) {
                         if (all || (mode_info[i].flags & SANE_UNSET))
@@ -1091,7 +1062,6 @@ static void do_display(const struct termios *mode, int all)
 static void sane_mode(struct termios *mode)
 {
         int i;
-        tcflag_t *bitsp;
 
         for (i = 0; i < NUM_control_info; ++i) {
 #if VMIN == VEOF
@@ -1102,14 +1072,17 @@ static void sane_mode(struct termios *mode)
         }
 
         for (i = 0; i < NUM_mode_info; ++i) {
+                tcflag_t val;
+                tcflag_t *bitsp = get_ptr_to_tcflag(mode_info[i].type, mode);
+
+                if (!bitsp)
+                        continue;
+                val = *bitsp & ~((unsigned long)mode_info[i].mask);
                 if (mode_info[i].flags & SANE_SET) {
-                        bitsp = mode_type_flag(mode_info[i].type, mode);
-                        *bitsp = (*bitsp & ~((unsigned long)mode_info[i].mask))
-                                | mode_info[i].bits;
-                } else if (mode_info[i].flags & SANE_UNSET) {
-                        bitsp = mode_type_flag(mode_info[i].type, mode);
-                        *bitsp = *bitsp & ~((unsigned long)mode_info[i].mask)
-                                & ~mode_info[i].bits;
+                        *bitsp = val | mode_info[i].bits;
+                } else
+                if (mode_info[i].flags & SANE_UNSET) {
+                        *bitsp = val & ~mode_info[i].bits;
                 }
         }
 }
@@ -1119,17 +1092,18 @@ static void set_mode(const struct mode_info *info, int reversed,
 {
         tcflag_t *bitsp;
 
-        bitsp = mode_type_flag(info->type, mode);
+        bitsp = get_ptr_to_tcflag(info->type, mode);
 
         if (bitsp) {
+                tcflag_t val = *bitsp & ~info->mask;
                 if (reversed)
-                        *bitsp = *bitsp & ~info->mask & ~info->bits;
+                        *bitsp = val & ~info->bits;
                 else
-                        *bitsp = (*bitsp & ~info->mask) | info->bits;
+                        *bitsp = val | info->bits;
                 return;
         }
 
-        /* Combination mode */
+        /* !bitsp - it's a "combination" mode */
         if (info == &mode_info[IDX_evenp] || info == &mode_info[IDX_parity]) {
                 if (reversed)
                         mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
@@ -1534,7 +1508,12 @@ int stty_main(int argc UNUSED_PARAM, char **argv)
                         perror_on_device_and_die("%s");
 
                 if (memcmp(&mode, &new_mode, sizeof(mode)) != 0) {
-#if CIBAUD
+/*
+ * I think the below chunk is not necessary on Linux.
+ * If you are deleting it, also delete STTY_speed_was_set bit -
+ * it is only ever checked here.
+ */
+#if 0 /* was "if CIBAUD" */
                         /* SunOS 4.1.3 (at least) has the problem that after this sequence,
                            tcgetattr (&m1); tcsetattr (&m1); tcgetattr (&m2);
                            sometimes (m1 != m2).  The only difference is in the four bits
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 19fd8f695..07c71ca4b 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -25,7 +25,6 @@
  */
 
 //kbuild:lib-$(CONFIG_TAIL) += tail.o
-//kbuild:lib-$(CONFIG_TAIL) += head_tail.o
 
 //usage:#define tail_trivial_usage
 //usage:       "[OPTIONS] [FILE]..."
@@ -51,7 +50,6 @@
 //usage:       "nameserver 10.0.0.1\n"
 
 #include "libbb.h"
-#include "head_tail.h"
 
 struct globals {
         bool from_top;
@@ -69,15 +67,6 @@ static void tail_xprint_header(const char *fmt, const char *filename)
 static ssize_t tail_read(int fd, char *buf, size_t count)
 {
         ssize_t r;
-        off_t current;
-        struct stat sbuf;
-
-        /* /proc files report zero st_size, don't lseek them. */
-        if (fstat(fd, &sbuf) == 0 && sbuf.st_size > 0) {
-                current = lseek(fd, 0, SEEK_CUR);
-                if (sbuf.st_size < current)
-                        xlseek(fd, 0, SEEK_SET);
-        }
 
         r = full_read(fd, buf, count);
         if (r < 0) {
@@ -98,7 +87,7 @@ static unsigned eat_num(const char *p)
                 p++;
                 G.from_top = 1;
         }
-        return xatou_sfx(p, head_tail_suffixes);
+        return xatou_sfx(p, bkm_suffixes);
 }
 
 int tail_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -363,7 +352,19 @@ int tail_main(int argc, char **argv)
                         if (nfiles > header_threshhold) {
                                 fmt = header_fmt_str;
                         }
-                        while ((nread = tail_read(fd, tailbuf, BUFSIZ)) > 0) {
+                        for (;;) {
+                                /* tail -f keeps following files even if they are truncated */
+                                struct stat sbuf;
+                                /* /proc files report zero st_size, don't lseek them */
+                                if (fstat(fd, &sbuf) == 0 && sbuf.st_size > 0) {
+                                        off_t current = lseek(fd, 0, SEEK_CUR);
+                                        if (sbuf.st_size < current)
+                                                xlseek(fd, 0, SEEK_SET);
+                                }
+
+                                nread = tail_read(fd, tailbuf, BUFSIZ);
+                                if (nread <= 0)
+                                        break;
                                 if (fmt) {
                                         tail_xprint_header(fmt, filename);
                                         fmt = NULL;