Merge branch 'busybox' into merge

13 files changed, 631 insertions, 87 deletions

diff --git a/miscutils/beep.c b/miscutils/beep.c
index b9b62f79b..0c8a8225e 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2009 Bernhard Reutner-Fischer
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *
  */
 //config:config BEEP
 //config:       bool "beep (3 kb)"
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 1446a040c..2dfe52c4f 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -238,10 +238,18 @@ int chat_main(int argc UNUSED_PARAM, char **argv)
                         , *argv
                 );
                 if (key >= 0) {
+                        bool onoff;
                         // cache directive value
                         char *arg = *++argv;
+
+                        if (!arg) {
+#if ENABLE_FEATURE_CHAT_TTY_HIFI
+                                tcsetattr(STDIN_FILENO, TCSAFLUSH, &tio0);
+#endif
+                                bb_show_usage();
+                        }
                         // OFF -> 0, anything else -> 1
-                        bool onoff = (0 != strcmp("OFF", arg));
+                        onoff = (0 != strcmp("OFF", arg));
                         // process directive
                         if (DIR_HANGUP == key) {
                                 // turn SIGHUP on/off
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 9ac91e01e..5b2e5ac56 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -65,6 +65,8 @@
 /* If you want logging messages on /tmp/fbsplash.log... */
 #define DEBUG 0
 
+#define ESC "\033"
+
 struct globals {
 #if DEBUG
         bool bdebug_messages;   // enable/disable logging
@@ -514,7 +516,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
 
         if (fifo_filename && bCursorOff) {
                 // hide cursor (BEFORE any fb ops)
-                full_write(STDOUT_FILENO, "\033[?25l", 6);
+                full_write(STDOUT_FILENO, ESC"[?25l", 6);
         }
 
         fb_drawimage();
@@ -559,7 +561,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
         }
 
         if (bCursorOff) // restore cursor
-                full_write(STDOUT_FILENO, "\033[?25h", 6);
+                full_write(STDOUT_FILENO, ESC"[?25h", 6);
 
         return EXIT_SUCCESS;
 }
diff --git a/miscutils/hexedit.c b/miscutils/hexedit.c
new file mode 100644
index 000000000..bafb834b5
--- /dev/null
+++ b/miscutils/hexedit.c
@@ -0,0 +1,465 @@
+/*
+ * Copyright (C) 2017 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config HEXEDIT
+//config:       bool "hexedit"
+//config:       default y
+//config:       help
+//config:       Edit file in hexadecimal.
+
+//applet:IF_HEXEDIT(APPLET(hexedit, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_HEXEDIT) += hexedit.o
+
+#include "libbb.h"
+
+#define ESC             "\033"
+#define HOME            ESC"[H"
+#define CLEAR           ESC"[J"
+#define CLEAR_TILL_EOL  ESC"[K"
+#define SET_ALT_SCR     ESC"[?1049h"
+#define POP_ALT_SCR     ESC"[?1049l"
+
+#undef CTRL
+#define CTRL(c)  ((c) & (uint8_t)~0x60)
+
+struct globals {
+        smallint half;
+        smallint in_read_key;
+        int fd;
+        unsigned height;
+        unsigned row;
+        unsigned pagesize;
+        uint8_t *baseaddr;
+        uint8_t *current_byte;
+        uint8_t *eof_byte;
+        off_t size;
+        off_t offset;
+        /* needs to be zero-inited, thus keeping it in G: */
+        char read_key_buffer[KEYCODE_BUFFER_SIZE];
+        struct termios orig_termios;
+};
+#define G (*ptr_to_globals)
+#define INIT_G() do { \
+        SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
+
+//TODO: move to libbb
+#if defined(__x86_64__) || defined(i386)
+# define G_pagesize 4096
+# define INIT_PAGESIZE() ((void)0)
+#else
+# define G_pagesize (G.pagesize)
+# define INIT_PAGESIZE() ((void)(G.pagesize = getpagesize()))
+#endif
+
+/* hopefully there aren't arches with PAGE_SIZE > 64k */
+#define G_mapsize  (64*1024)
+
+/* "12ef5670 (xx )*16 _1_3_5_7_9abcdef\n"NUL */
+#define LINEBUF_SIZE (8 + 1 + 3*16 + 16 + 1 + 1 /*paranoia:*/ + 13)
+
+static void restore_term(void)
+{
+        tcsetattr_stdin_TCSANOW(&G.orig_termios);
+        printf(POP_ALT_SCR);
+        fflush_all();
+}
+
+static void sig_catcher(int sig)
+{
+        if (!G.in_read_key) {
+                /* now it's not safe to do I/O, just inform the main loop */
+                bb_got_signal = sig;
+                return;
+        }
+        restore_term();
+        kill_myself_with_sig(sig);
+}
+
+static int format_line(char *hex, uint8_t *data, off_t offset)
+{
+        int ofs_pos;
+        char *text;
+        uint8_t *end, *end1;
+
+#if 1
+        /* Can be more than 4Gb, thus >8 chars, thus use a variable - don't assume 8! */
+        ofs_pos = sprintf(hex, "%08"OFF_FMT"x ", offset);
+#else
+        if (offset <= 0xffff)
+                ofs_pos = sprintf(hex, "%04"OFF_FMT"x ", offset);
+        else
+                ofs_pos = sprintf(hex, "%08"OFF_FMT"x ", offset);
+#endif
+        hex += ofs_pos;
+
+        text = hex + 16 * 3;
+        end1 = data + 15;
+        if ((G.size - offset) > 0) {
+                end = end1;
+                if ((G.size - offset) <= 15)
+                        end = data + (G.size - offset) - 1;
+                while (data <= end) {
+                        uint8_t c = *data++;
+                        *hex++ = bb_hexdigits_upcase[c >> 4];
+                        *hex++ = bb_hexdigits_upcase[c & 0xf];
+                        *hex++ = ' ';
+                        if (c < ' ' || c > 0x7e)
+                                c = '.';
+                        *text++ = c;
+                }
+        }
+        while (data <= end1) {
+                *hex++ = ' ';
+                *hex++ = ' ';
+                *hex++ = ' ';
+                *text++ = ' ';
+                data++;
+        }
+        *text = '\0';
+
+        return ofs_pos;
+}
+
+static void redraw(unsigned cursor)
+{
+        uint8_t *data;
+        off_t offset;
+        unsigned i, pos;
+
+        printf(HOME CLEAR);
+
+        /* if cursor is past end of screen, how many lines to move down? */
+        i = (cursor / 16) - G.height + 1;
+        if ((int)i < 0)
+                i = 0;
+
+        data = G.baseaddr + i * 16;
+        offset = G.offset + i * 16;
+        cursor -= i * 16;
+        pos = i = 0;
+        while (i < G.height) {
+                char buf[LINEBUF_SIZE];
+                pos = format_line(buf, data, offset);
+                printf(
+                        "\r\n%s" + (!i) * 2, /* print \r\n only on 2nd line and later */
+                        buf
+                );
+                data += 16;
+                offset += 16;
+                i++;
+        }
+
+        printf(ESC"[%u;%uH", 1 + cursor / 16, 1 + pos + (cursor & 0xf) * 3);
+}
+
+static void redraw_cur_line(void)
+{
+        char buf[LINEBUF_SIZE];
+        uint8_t *data;
+        off_t offset;
+        int column;
+
+        column = (0xf & (uintptr_t)G.current_byte);
+        data = G.current_byte - column;
+        offset = G.offset + (data - G.baseaddr);
+
+        column = column*3 + G.half;
+        column += format_line(buf, data, offset);
+        printf("%s"
+                "\r"
+                "%.*s",
+                buf + column,
+                column, buf
+        );
+}
+
+/* if remappers return 0, no change was done */
+static int remap(unsigned cur_pos)
+{
+        if (G.baseaddr)
+                munmap(G.baseaddr, G_mapsize);
+
+        G.baseaddr = mmap(NULL,
+                G_mapsize,
+                PROT_READ | PROT_WRITE,
+                MAP_SHARED,
+                G.fd,
+                G.offset
+        );
+        if (G.baseaddr == MAP_FAILED) {
+                restore_term();
+                bb_perror_msg_and_die("mmap");
+        }
+
+        G.current_byte = G.baseaddr + cur_pos;
+
+        G.eof_byte = G.baseaddr + G_mapsize;
+        if ((G.size - G.offset) < G_mapsize) {
+                /* mapping covers tail of the file */
+                /* we do have a mapped byte which is past eof */
+                G.eof_byte = G.baseaddr + (G.size - G.offset);
+        }
+        return 1;
+}
+static int move_mapping_further(void)
+{
+        unsigned pos;
+        unsigned pagesize;
+
+        if ((G.size - G.offset) < G_mapsize)
+                return 0; /* can't move mapping even further, it's at the end already */
+
+        pagesize = G_pagesize; /* constant on most arches */
+        pos = G.current_byte - G.baseaddr;
+        if (pos >= pagesize) {
+                /* move offset up until current position is in 1st page */
+                do {
+                        G.offset += pagesize;
+                        if (G.offset == 0) { /* whoops */
+                                G.offset -= pagesize;
+                                break;
+                        }
+                        pos -= pagesize;
+                } while (pos >= pagesize);
+                return remap(pos);
+        }
+        return 0;
+}
+static int move_mapping_lower(void)
+{
+        unsigned pos;
+        unsigned pagesize;
+
+        if (G.offset == 0)
+                return 0; /* we are at 0 already */
+
+        pagesize = G_pagesize; /* constant on most arches */
+        pos = G.current_byte - G.baseaddr;
+
+        /* move offset down until current position is in last page */
+        pos += pagesize;
+        while (pos < G_mapsize) {
+                pos += pagesize;
+                G.offset -= pagesize;
+                if (G.offset == 0)
+                        break;
+        }
+        pos -= pagesize;
+
+        return remap(pos);
+}
+
+//usage:#define hexedit_trivial_usage
+//usage:        "FILE"
+//usage:#define hexedit_full_usage "\n\n"
+//usage:        "Edit FILE in hexadecimal"
+int hexedit_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int hexedit_main(int argc UNUSED_PARAM, char **argv)
+{
+        INIT_G();
+        INIT_PAGESIZE();
+
+        get_terminal_width_height(-1, NULL, &G.height);
+        if (1) {
+                /* reduce number of write() syscalls while PgUp/Down: fully buffered output */
+                unsigned sz = (G.height | 0xf) * LINEBUF_SIZE;
+                setvbuf(stdout, xmalloc(sz), _IOFBF, sz);
+        }
+
+        getopt32(argv, "^" "" "\0" "=1"/*one arg*/);
+        argv += optind;
+
+        G.fd = xopen(*argv, O_RDWR);
+        G.size = xlseek(G.fd, 0, SEEK_END);
+
+        /* TERMIOS_RAW_CRNL suppresses \n -> \r\n translation, helps with down-arrow */
+        printf(SET_ALT_SCR);
+        set_termios_to_raw(STDIN_FILENO, &G.orig_termios, TERMIOS_RAW_CRNL);
+        bb_signals(BB_FATAL_SIGS, sig_catcher);
+
+        remap(0);
+        redraw(0);
+
+//TODO: //Home/End: start/end of line; '<'/'>': start/end of file
+        //Backspace: undo
+        //Ctrl-L: redraw
+        //Ctrl-Z: suspend
+        //'/', Ctrl-S: search
+//TODO: detect window resize
+
+        for (;;) {
+                unsigned cnt;
+                int32_t key = key; /* for compiler */
+                uint8_t byte;
+
+                fflush_all();
+                G.in_read_key = 1;
+                if (!bb_got_signal)
+                        key = read_key(STDIN_FILENO, G.read_key_buffer, -1);
+                G.in_read_key = 0;
+                if (bb_got_signal)
+                        key = CTRL('X');
+
+                cnt = 1;
+                if ((unsigned)(key - 'A') <= 'Z' - 'A')
+                        key |= 0x20; /* convert A-Z to a-z */
+                switch (key) {
+                case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+                        /* convert to '0'+10...15 */
+                        key = key - ('a' - '0' - 10);
+                        /* fall through */
+                case '0': case '1': case '2': case '3': case '4':
+                case '5': case '6': case '7': case '8': case '9':
+                        if (G.current_byte == G.eof_byte) {
+                                if (!move_mapping_further()) {
+                                        /* already at EOF; extend the file */
+                                        if (++G.size <= 0 /* overflow? */
+                                         || ftruncate(G.fd, G.size) != 0 /* error extending? (e.g. block dev) */
+                                        ) {
+                                                G.size--;
+                                                break;
+                                        }
+                                        G.eof_byte++;
+                                }
+                        }
+                        key -= '0';
+                        byte = *G.current_byte & 0xf0;
+                        if (!G.half) {
+                                byte = *G.current_byte & 0x0f;
+                                key <<= 4;
+                        }
+                        *G.current_byte = byte + key;
+                        /* can't just print one updated hex char: need to update right-hand ASCII too */
+                        redraw_cur_line();
+                        /* fall through */
+                case KEYCODE_RIGHT:
+                        if (G.current_byte == G.eof_byte)
+                                break; /* eof - don't allow going past it */
+                        byte = *G.current_byte;
+                        if (!G.half) {
+                                G.half = 1;
+                                putchar(bb_hexdigits_upcase[byte >> 4]);
+                        } else {
+                                G.half = 0;
+                                G.current_byte++;
+                                if ((0xf & (uintptr_t)G.current_byte) == 0) {
+                                        /* rightmost pos, wrap to next line */
+                                        if (G.current_byte == G.eof_byte)
+                                                move_mapping_further();
+                                        printf(ESC"[46D"); /* cursor left 3*15 + 1 chars */
+                                        goto down;
+                                }
+                                putchar(bb_hexdigits_upcase[byte & 0xf]);
+                                putchar(' ');
+                        }
+                        break;
+                case KEYCODE_PAGEDOWN:
+                        cnt = G.height;
+                case KEYCODE_DOWN:
+ k_down:
+                        G.current_byte += 16;
+                        if (G.current_byte >= G.eof_byte) {
+                                move_mapping_further();
+                                if (G.current_byte > G.eof_byte) {
+                                        /* _after_ eof - don't allow this */
+                                        G.current_byte -= 16;
+                                        break;
+                                }
+                        }
+ down:
+                        putchar('\n'); /* down one line, possibly scroll screen */
+                        G.row++;
+                        if (G.row >= G.height) {
+                                G.row--;
+                                redraw_cur_line();
+                        }
+                        if (--cnt)
+                                goto k_down;
+                        break;
+
+                case KEYCODE_LEFT:
+                        if (G.half) {
+                                G.half = 0;
+                                printf(ESC"[D");
+                                break;
+                        }
+                        if ((0xf & (uintptr_t)G.current_byte) == 0) {
+                                /* leftmost pos, wrap to prev line */
+                                if (G.current_byte == G.baseaddr) {
+                                        if (!move_mapping_lower())
+                                                break; /* first line, don't do anything */
+                                }
+                                G.half = 1;
+                                G.current_byte--;
+                                printf(ESC"[46C"); /* cursor right 3*15 + 1 chars */
+                                goto up;
+                        }
+                        G.half = 1;
+                        G.current_byte--;
+                        printf(ESC"[2D");
+                        break;
+                case KEYCODE_PAGEUP:
+                        cnt = G.height;
+                case KEYCODE_UP:
+ k_up:
+                        if ((G.current_byte - G.baseaddr) < 16) {
+                                if (!move_mapping_lower())
+                                        break; /* already at 0, stop */
+                        }
+                        G.current_byte -= 16;
+ up:
+                        if (G.row != 0) {
+                                G.row--;
+                                printf(ESC"[A"); /* up (won't scroll) */
+                        } else {
+                                //printf(ESC"[T"); /* scroll up */ - not implemented on Linux VT!
+                                printf(ESC"M"); /* scroll up */
+                                redraw_cur_line();
+                        }
+                        if (--cnt)
+                                goto k_up;
+                        break;
+
+                case '\n':
+                case '\r':
+                        /* [Enter]: goto specified position */
+                        {
+                                char buf[sizeof(G.offset)*3 + 4];
+                                printf(ESC"[999;1H" CLEAR_TILL_EOL); /* go to last line */
+                                if (read_line_input(NULL, "Go to (dec,0Xhex,0oct): ", buf, sizeof(buf)) > 0) {
+                                        off_t t;
+                                        unsigned cursor;
+
+                                        t = bb_strtoull(buf, NULL, 0);
+                                        if (t >= G.size)
+                                                t = G.size - 1;
+                                        cursor = t & (G_pagesize - 1);
+                                        t -= cursor;
+                                        if (t < 0)
+                                                cursor = t = 0;
+                                        if (t != 0 && cursor < 0x1ff) {
+                                                /* very close to end of page, possibly to EOF */
+                                                /* move one page lower */
+                                                t -= G_pagesize;
+                                                cursor += G_pagesize;
+                                        }
+                                        G.offset = t;
+                                        remap(cursor);
+                                        redraw(cursor);
+                                        break;
+                                }
+                                /* ^C/EOF/error: fall through to exiting */
+                        }
+                case CTRL('X'):
+                        restore_term();
+                        return EXIT_SUCCESS;
+                } /* switch */
+        } /* for (;;) */
+
+        /* not reached */
+        return EXIT_SUCCESS;
+}
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 30f606e8e..fc392d9dc 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -8,7 +8,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config I2CGET
 //config:       bool "i2cget (5.6 kb)"
 //config:       default y
@@ -61,10 +60,8 @@
  */
 
 #include "libbb.h"
-#include "common_bufsiz.h"
 
 #include <linux/i2c.h>
-#include <linux/i2c-dev.h>
 
 #define I2CDUMP_NUM_REGS                256
 
@@ -72,6 +69,25 @@
 #define I2CDETECT_MODE_QUICK            1
 #define I2CDETECT_MODE_READ             2
 
+/* linux/i2c-dev.h from i2c-tools overwrites the one from linux uapi
+ * and defines symbols already defined by linux/i2c.h.
+ * Also, it defines a bunch of static inlines which we would rather NOT
+ * inline. What a mess.
+ * We need only these definitions from linux/i2c-dev.h:
+ */
+#define I2C_SLAVE                       0x0703
+#define I2C_SLAVE_FORCE                 0x0706
+#define I2C_FUNCS                       0x0705
+#define I2C_PEC                         0x0708
+#define I2C_SMBUS                       0x0720
+struct i2c_smbus_ioctl_data {
+        __u8 read_write;
+        __u8 command;
+        __u32 size;
+        union i2c_smbus_data *data;
+};
+/* end linux/i2c-dev.h */
+
 /*
  * This is needed for ioctl_or_perror_and_die() since it only accepts pointers.
  */
@@ -438,19 +454,20 @@ static void confirm_action(int bus_addr, int mode, int data_addr, int pec)
 
 #if ENABLE_I2CGET
 //usage:#define i2cget_trivial_usage
-//usage:       "[-f] [-y] BUS CHIP-ADDRESS [DATA-ADDRESS [MODE]]"
+//usage:       "[-fy] BUS CHIP-ADDRESS [DATA-ADDRESS [MODE]]"
 //usage:#define i2cget_full_usage "\n\n"
-//usage:       "Read from I2C/SMBus chip registers\n"
-//usage:     "\n        I2CBUS  i2c bus number"
-//usage:     "\n        ADDRESS 0x03 - 0x77"
+//usage:       "Read from I2C/SMBus chip registers"
+//usage:     "\n"
+//usage:     "\n        I2CBUS  I2C bus number"
+//usage:     "\n        ADDRESS 0x03-0x77"
 //usage:     "\nMODE is:"
-//usage:     "\n        b       read byte data (default)"
-//usage:     "\n        w       read word data"
-//usage:     "\n        c       write byte/read byte"
+//usage:     "\n        b       Read byte data (default)"
+//usage:     "\n        w       Read word data"
+//usage:     "\n        c       Write byte/read byte"
 //usage:     "\n        Append p for SMBus PEC"
 //usage:     "\n"
-//usage:     "\n        -f      force access"
-//usage:     "\n        -y      disable interactive mode"
+//usage:     "\n        -f      Force access"
+//usage:     "\n        -y      Disable interactive mode"
 int i2cget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int i2cget_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -520,23 +537,24 @@ int i2cget_main(int argc UNUSED_PARAM, char **argv)
 
 #if ENABLE_I2CSET
 //usage:#define i2cset_trivial_usage
-//usage:       "[-f] [-y] [-m MASK] BUS CHIP-ADDR DATA-ADDR [VALUE] ... [MODE]"
+//usage:       "[-fy] [-m MASK] BUS CHIP-ADDRESS DATA-ADDRESS [VALUE] ... [MODE]"
 //usage:#define i2cset_full_usage "\n\n"
-//usage:       "Set I2C registers\n"
-//usage:     "\n        I2CBUS  i2c bus number"
-//usage:     "\n        ADDRESS 0x03 - 0x77"
+//usage:       "Set I2C registers"
+//usage:     "\n"
+//usage:     "\n        I2CBUS  I2C bus number"
+//usage:     "\n        ADDRESS 0x03-0x77"
 //usage:     "\nMODE is:"
-//usage:     "\n        c       byte, no value"
-//usage:     "\n        b       byte data (default)"
-//usage:     "\n        w       word data"
+//usage:     "\n        c       Byte, no value"
+//usage:     "\n        b       Byte data (default)"
+//usage:     "\n        w       Word data"
 //usage:     "\n        i       I2C block data"
 //usage:     "\n        s       SMBus block data"
 //usage:     "\n        Append p for SMBus PEC"
 //usage:     "\n"
-//usage:     "\n        -f      force access"
-//usage:     "\n        -y      disable interactive mode"
-//usage:     "\n        -r      read back and compare the result"
-//usage:     "\n        -m MASK mask specifying which bits to write"
+//usage:     "\n        -f      Force access"
+//usage:     "\n        -y      Disable interactive mode"
+//usage:     "\n        -r      Read back and compare the result"
+//usage:     "\n        -m MASK Mask specifying which bits to write"
 int i2cset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int i2cset_main(int argc, char **argv)
 {
@@ -879,23 +897,24 @@ static void dump_word_data(int bus_fd, unsigned first, unsigned last)
 }
 
 //usage:#define i2cdump_trivial_usage
-//usage:       "[-f] [-r FIRST-LAST] [-y] BUS ADDR [MODE]"
+//usage:       "[-fy] [-r FIRST-LAST] BUS ADDR [MODE]"
 //usage:#define i2cdump_full_usage "\n\n"
-//usage:       "Examine I2C registers\n"
-//usage:     "\n        I2CBUS  i2c bus number"
-//usage:     "\n        ADDRESS 0x03 - 0x77"
+//usage:       "Examine I2C registers"
+//usage:     "\n"
+//usage:     "\n        I2CBUS  I2C bus number"
+//usage:     "\n        ADDRESS 0x03-0x77"
 //usage:     "\nMODE is:"
-//usage:     "\n        b       byte (default)"
-//usage:     "\n        w       word"
-//usage:     "\n        W       word on even register addresses"
+//usage:     "\n        b       Byte (default)"
+//usage:     "\n        w       Word"
+//usage:     "\n        W       Word on even register addresses"
 //usage:     "\n        i       I2C block"
 //usage:     "\n        s       SMBus block"
-//usage:     "\n        c       consecutive byte"
+//usage:     "\n        c       Consecutive byte"
 //usage:     "\n        Append p for SMBus PEC"
 //usage:     "\n"
-//usage:     "\n        -f      force access"
-//usage:     "\n        -y      disable interactive mode"
-//usage:     "\n        -r      limit the number of registers being accessed"
+//usage:     "\n        -f      Force access"
+//usage:     "\n        -y      Disable interactive mode"
+//usage:     "\n        -r      Limit the number of registers being accessed"
 int i2cdump_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int i2cdump_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -1188,18 +1207,17 @@ static void will_skip(const char *cmd)
 }
 
 //usage:#define i2cdetect_trivial_usage
-//usage:       "[-F I2CBUS] [-l] [-y] [-a] [-q|-r] I2CBUS [FIRST LAST]"
+//usage:       "-l | -F I2CBUS | [-ya] [-q|-r] I2CBUS [FIRST LAST]"
 //usage:#define i2cdetect_full_usage "\n\n"
-//usage:       "Detect I2C chips.\n"
-//usage:     "\n        I2CBUS  i2c bus number"
-//usage:     "\n        FIRST and LAST limit the probing range"
+//usage:       "Detect I2C chips"
 //usage:     "\n"
-//usage:     "\n        -l      output list of installed busses"
-//usage:     "\n        -y      disable interactive mode"
-//usage:     "\n        -a      force scanning of non-regular addresses"
-//usage:     "\n        -q      use smbus quick write commands for probing (default)"
-//usage:     "\n        -r      use smbus read byte commands for probing"
-//usage:     "\n        -F      display list of functionalities"
+//usage:     "\n        -l      List installed buses"
+//usage:     "\n        -F BUS# List functionalities on this bus"
+//usage:     "\n        -y      Disable interactive mode"
+//usage:     "\n        -a      Force scanning of non-regular addresses"
+//usage:     "\n        -q      Use smbus quick write commands for probing (default)"
+//usage:     "\n        -r      Use smbus read byte commands for probing"
+//usage:     "\n        FIRST and LAST limit probing range"
 int i2cdetect_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int i2cdetect_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -1214,7 +1232,8 @@ int i2cdetect_main(int argc UNUSED_PARAM, char **argv)
         opts = getopt32(argv, "^"
                         "yaqrFl"
                         "\0"
-                        "q--r:r--q:"/*mutually exclusive*/ "?3"/*up to 3 args*/
+                        "q--r:r--q:"/*mutually exclusive*/
+                        "?3"/*up to 3 args*/
         );
         argv += optind;
 
diff --git a/miscutils/less.c b/miscutils/less.c
index 8a5b9ff0b..4ab0e17da 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /*
  * TODO:
  * - Add more regular expression support - search modifiers, certain matches, etc.
@@ -20,7 +19,6 @@
  * - the inp file pointer is used so that keyboard input works after
  *   redirected input has been read from stdin
  */
-
 //config:config LESS
 //config:       bool "less (15 kb)"
 //config:       default y
@@ -141,9 +139,9 @@
 #define ESC "\033"
 /* The escape codes for highlighted and normal text */
 #define HIGHLIGHT   ESC"[7m"
-#define NORMAL      ESC"[0m"
+#define NORMAL      ESC"[m"
 /* The escape code to home and clear to the end of screen */
-#define CLEAR       ESC"[H\033[J"
+#define CLEAR       ESC"[H"ESC"[J"
 /* The escape code to clear to the end of line */
 #define CLEAR_2_EOL ESC"[K"
 
@@ -285,9 +283,9 @@ static void set_tty_cooked(void)
 
 /* Move the cursor to a position (x,y), where (0,0) is the
    top-left corner of the console */
-static void move_cursor(int line, int row)
+static void move_cursor(int line, int col)
 {
-        printf(ESC"[%u;%uH", line, row);
+        printf(ESC"[%u;%uH", line, col);
 }
 
 static void clear_line(void)
@@ -1070,7 +1068,7 @@ static void reinitialize(void)
         open_file_and_read_lines();
 #if ENABLE_FEATURE_LESS_ASK_TERMINAL
         if (G.winsize_err)
-                printf("\033[999;999H" "\033[6n");
+                printf(ESC"[999;999H" ESC"[6n");
 #endif
 #if ENABLE_PLATFORM_MINGW32
         reset_screen();
@@ -1135,7 +1133,7 @@ static int64_t getch_nowait(void)
                         goto again;
                 }
                 /* EOF/error (ssh session got killed etc) */
-                less_exit(0);
+                less_exit(EXIT_SUCCESS);
         }
         set_tty_cooked();
         return key64;
@@ -1839,8 +1837,8 @@ int less_main(int argc, char **argv)
 {
 #if !ENABLE_PLATFORM_MINGW32
         char *tty_name;
-        int tty_fd;
 #endif
+        int tty_fd;
 
         INIT_G();
 
@@ -1901,18 +1899,12 @@ int less_main(int argc, char **argv)
         G.kbd_fd_orig_flags = ndelay_on(tty_fd);
         kbd_fd = tty_fd; /* save in a global */
 #else
-        kbd_fd = 0;
+        kbd_fd = tty_fd = 0;
 #endif
 
-        tcgetattr(kbd_fd, &term_orig);
-        term_less = term_orig;
-        term_less.c_lflag &= ~(ICANON | ECHO);
-        term_less.c_iflag &= ~(IXON | ICRNL);
-        /*term_less.c_oflag &= ~ONLCR;*/
-        term_less.c_cc[VMIN] = 1;
-        term_less.c_cc[VTIME] = 0;
+        get_termios_and_make_raw(tty_fd, &term_less, &term_orig, TERMIOS_RAW_CRNL);
 
-        IF_FEATURE_LESS_ASK_TERMINAL(G.winsize_err =) get_terminal_width_height(kbd_fd, &width, &max_displayed_line);
+        IF_FEATURE_LESS_ASK_TERMINAL(G.winsize_err =) get_terminal_width_height(tty_fd, &width, &max_displayed_line);
         /* 20: two tabstops + 4 */
         if (width < 20 || max_displayed_line < 3)
                 return bb_cat(argv);
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index b87f3273f..fa090057e 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -33,15 +33,11 @@
 // set raw tty mode
 static void xget1(int fd, struct termios *t, struct termios *oldt)
 {
-//TODO: use set_termios_to_raw()
-        tcgetattr(fd, oldt);
-        *t = *oldt;
-        cfmakeraw(t);
-//      t->c_lflag &= ~(ISIG|ICANON|ECHO|IEXTEN);
-//      t->c_iflag &= ~(BRKINT|IXON|ICRNL);
-//      t->c_oflag &= ~(ONLCR);
-//      t->c_cc[VMIN]  = 1;
-//      t->c_cc[VTIME] = 0;
+        get_termios_and_make_raw(fd, t, oldt, 0
+                | TERMIOS_CLEAR_ISIG /* ^C is ASCII char 3, not "interrupt me!" */
+                | TERMIOS_RAW_INPUT /* pass all chars verbatim, no special handling or translating CR->NL */
+                | TERMIOS_RAW_CRNL  /* dont convert NL<->CR on output too */
+        );
 }
 
 static int xset1(int fd, struct termios *tio, const char *device)
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 80a005821..72f028ed3 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -7,7 +7,6 @@
  *
  * TODO: add support for large (>4GB) MTD devices
  */
-
 //config:config NANDWRITE
 //config:       bool "nandwrite (5.9 kb)"
 //config:       default y
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c
index caf6e0821..d315c2734 100644
--- a/miscutils/raidautorun.c
+++ b/miscutils/raidautorun.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2006 Bernhard Reutner-Fischer
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *
  */
 //config:config RAIDAUTORUN
 //config:       bool "raidautorun (1.4 kb)"
diff --git a/miscutils/rfkill.c b/miscutils/rfkill.c
index 546928402..ae38c182d 100644
--- a/miscutils/rfkill.c
+++ b/miscutils/rfkill.c
@@ -1,12 +1,11 @@
 /* vi: set sw=4 ts=4: */
 /*
-* rfkill implementation for busybox
-*
-* Copyright (C) 2010  Malek Degachi <malek-degachi@laposte.net>
-*
-* Licensed under GPLv2 or later, see file LICENSE in this source tree.
-*/
-
+ * rfkill implementation for busybox
+ *
+ * Copyright (C) 2010  Malek Degachi <malek-degachi@laposte.net>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
 //config:config RFKILL
 //config:       bool "rfkill (5.3 kb)"
 //config:       default n # doesn't build on Ubuntu 9.04
diff --git a/miscutils/setfattr.c b/miscutils/setfattr.c
new file mode 100644
index 000000000..f0ef227cb
--- /dev/null
+++ b/miscutils/setfattr.c
@@ -0,0 +1,68 @@
+/*
+ * setfattr - set extended attributes of filesystem objects.
+ *
+ * Copyright (C) 2017 by Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config SETFATTR
+//config:       bool "setfattr"
+//config:       default y
+//config:       help
+//config:       Set/delete extended attributes on files
+
+//applet:IF_SETFATTR(APPLET_NOEXEC(setfattr, setfattr, BB_DIR_USR_BIN, BB_SUID_DROP, setfattr))
+
+//kbuild:lib-$(CONFIG_SETFATTR) += setfattr.o
+
+#include <sys/xattr.h>
+#include "libbb.h"
+
+//usage:#define setfattr_trivial_usage
+//usage:       "[-h] -n|-x ATTR [-v VALUE] FILE..."
+//usage:#define setfattr_full_usage "\n\n"
+//usage:       "Set extended attributes"
+//usage:     "\n"
+//usage:     "\n        -h              Do not follow symlinks"
+//usage:     "\n        -x ATTR         Remove attribute ATTR"
+//usage:     "\n        -n ATTR         Set attribute ATTR to VALUE"
+//usage:     "\n        -v VALUE        (default: empty)"
+int setfattr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int setfattr_main(int argc UNUSED_PARAM, char **argv)
+{
+        const char *name;
+        const char *value = "";
+        int status;
+        int opt;
+        enum {
+                OPT_h = (1 << 0),
+                OPT_x = (1 << 1),
+        };
+
+        opt = getopt32(argv, "^"
+                "hx:n:v:"
+                /* Min one arg, either -x or -n is a must, -x does not allow -v */
+                "\0" "-1:x:n:n--x:x--nv:v--x"
+                , &name, &name, &value
+        );
+        argv += optind;
+
+        status = EXIT_SUCCESS;
+        do {
+                int r;
+                if (opt & OPT_x)
+                        r = ((opt & OPT_h) ? lremovexattr : removexattr)(*argv, name);
+                else {
+                        r = ((opt & OPT_h) ? lsetxattr : setxattr)(
+                                        *argv, name,
+                                        value, strlen(value), /*flags:*/ 0
+                        );
+                }
+                if (r) {
+                        bb_simple_perror_msg(*argv);
+                        status = EXIT_FAILURE;
+                }
+        } while (*++argv);
+
+        return status;
+}
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index f217c3beb..fd88ed106 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -7,7 +7,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config SETSERIAL
 //config:       bool "setserial (6.6 kb)"
 //config:       default y
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index d142d1144..1ef8fd90e 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -2,7 +2,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config UBIATTACH
 //config:       bool "ubiattach (4.7 kb)"
 //config:       default y