Merge branch 'busybox' into merge

13 files changed, 234 insertions, 90 deletions

diff --git a/editors/awk.c b/editors/awk.c
index d1fedb572..76385f33b 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -272,7 +272,8 @@ typedef struct tsplitter_s {
 /* if previous token class is CONCAT1 and next is CONCAT2, concatenation */
 /* operator is inserted between them */
 #define TC_CONCAT1 (TC_VARIABLE | TC_ARRTERM | TC_SEQTERM \
-                   | TC_STRING | TC_NUMBER | TC_UOPPOST)
+                   | TC_STRING | TC_NUMBER | TC_UOPPOST \
+                   | TC_LENGTH)
 #define TC_CONCAT2 (TC_OPERAND | TC_UOPPRE)
 
 #define OF_RES1     0x010000
@@ -1074,8 +1075,10 @@ static uint32_t next_token(uint32_t expected)
         const uint32_t *ti;
 
         if (t_rollback) {
+                debug_printf_parse("%s: using rolled-back token\n", __func__);
                 t_rollback = FALSE;
         } else if (concat_inserted) {
+                debug_printf_parse("%s: using concat-inserted token\n", __func__);
                 concat_inserted = FALSE;
                 t_tclass = save_tclass;
                 t_info = save_info;
@@ -1204,7 +1207,11 @@ static uint32_t next_token(uint32_t expected)
                         goto readnext;
 
                 /* insert concatenation operator when needed */
-                if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected & TC_BINOP)) {
+                debug_printf_parse("%s: %x %x %x concat_inserted?\n", __func__,
+                        (ltclass & TC_CONCAT1), (tc & TC_CONCAT2), (expected & TC_BINOP));
+                if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected & TC_BINOP)
+                 && !(ltclass == TC_LENGTH && tc == TC_SEQSTART) /* but not for "length(..." */
+                ) {
                         concat_inserted = TRUE;
                         save_tclass = tc;
                         save_info = t_info;
@@ -1212,6 +1219,7 @@ static uint32_t next_token(uint32_t expected)
                         t_info = OC_CONCAT | SS | P(35);
                 }
 
+                debug_printf_parse("%s: t_tclass=tc=%x\n", __func__, t_tclass);
                 t_tclass = tc;
         }
         ltclass = t_tclass;
@@ -1222,6 +1230,7 @@ static uint32_t next_token(uint32_t expected)
                                 EMSG_UNEXP_EOS : EMSG_UNEXP_TOKEN);
         }
 
+        debug_printf_parse("%s: returning, ltclass:%x t_double:%f\n", __func__, ltclass, t_double);
         return ltclass;
 #undef concat_inserted
 #undef save_tclass
@@ -1286,7 +1295,7 @@ static node *parse_expr(uint32_t iexp)
                         glptr = NULL;
 
                 } else if (tc & (TC_BINOP | TC_UOPPOST)) {
-                        debug_printf_parse("%s: TC_BINOP | TC_UOPPOST\n", __func__);
+                        debug_printf_parse("%s: TC_BINOP | TC_UOPPOST tc:%x\n", __func__, tc);
                         /* for binary and postfix-unary operators, jump back over
                          * previous operators with higher priority */
                         vn = cn;
@@ -1391,7 +1400,12 @@ static node *parse_expr(uint32_t iexp)
 
                                 case TC_LENGTH:
                                         debug_printf_parse("%s: TC_LENGTH\n", __func__);
-                                        next_token(TC_SEQSTART | TC_OPTERM | TC_GRPTERM);
+                                        next_token(TC_SEQSTART /* length(...) */
+                                                | TC_OPTERM    /* length; (or newline)*/
+                                                | TC_GRPTERM   /* length } */
+                                                | TC_BINOPX    /* length <op> NUM */
+                                                | TC_COMMA     /* print length, 1 */
+                                        );
                                         rollback_token();
                                         if (t_tclass & TC_SEQSTART) {
                                                 /* It was a "(" token. Handle just like TC_BUILTIN */
diff --git a/editors/vi.c b/editors/vi.c
index 948b95ae6..131c018a2 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2317,7 +2317,6 @@ static char *get_one_address(char *p, int *addr)	// get colon addr, if present
         int st;
         char *q;
         IF_FEATURE_VI_YANKMARK(char c;)
-        IF_FEATURE_VI_SEARCH(char *pat;)
 
         *addr = -1;                     // assume no addr
         if (*p == '.') {        // the current line
@@ -2342,16 +2341,20 @@ static char *get_one_address(char *p, int *addr)	// get colon addr, if present
 #endif
 #if ENABLE_FEATURE_VI_SEARCH
         else if (*p == '/') {   // a search pattern
-                q = strchrnul(++p, '/');
-                pat = xstrndup(p, q - p); // save copy of pattern
+                q = strchrnul(p + 1, '/');
+                if (p + 1 != q) {
+                        // save copy of new pattern
+                        free(last_search_pattern);
+                        last_search_pattern = xstrndup(p, q - p);
+                }
                 p = q;
                 if (*p == '/')
                         p++;
-                q = char_search(dot, pat, (FORWARD << 1) | FULL);
+                q = char_search(next_line(dot), last_search_pattern + 1,
+                                                (FORWARD << 1) | FULL);
                 if (q != NULL) {
                         *addr = count_lines(text, q);
                 }
-                free(pat);
         }
 #endif
         else if (*p == '$') {   // the last line in file
diff --git a/findutils/xargs.c b/findutils/xargs.c
index e0dbcbc7a..8d3a0027c 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -120,18 +120,29 @@ struct globals {
 #endif
 #endif
         smalluint xargs_exitcode;
+#if ENABLE_FEATURE_XARGS_SUPPORT_QUOTES
+#define NORM      0
+#define QUOTE     1
+#define BACKSLASH 2
+#define SPACE     4
+        smalluint process_stdin__state;
+        char process_stdin__q;
+#endif
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
         setup_common_bufsiz(); \
-        G.eof_str = NULL; /* need to clear by hand because we are NOEXEC applet */ \
+        IF_FEATURE_XARGS_SUPPORT_REPL_STR(G.repl_str = "{}";) \
+        IF_FEATURE_XARGS_SUPPORT_REPL_STR(G.eol_ch = '\n';) \
+        /* Even zero values are set because we are NOEXEC applet */ \
+        G.eof_str = NULL; \
         G.idx = 0; \
         IF_FEATURE_XARGS_SUPPORT_PARALLEL(G.running_procs = 0;) \
         IF_FEATURE_XARGS_SUPPORT_PARALLEL(G.max_procs = 1;) \
         IF_FEATURE_XARGS_SUPPORT_PARALLEL(IF_PLATFORM_MINGW32(G.procs = NULL;)) \
         G.xargs_exitcode = 0; \
-        IF_FEATURE_XARGS_SUPPORT_REPL_STR(G.repl_str = "{}";) \
-        IF_FEATURE_XARGS_SUPPORT_REPL_STR(G.eol_ch = '\n';) \
+        IF_FEATURE_XARGS_SUPPORT_QUOTES(G.process_stdin__state = NORM;) \
+        IF_FEATURE_XARGS_SUPPORT_QUOTES(G.process_stdin__q = '\0';) \
 } while (0)
 
 
@@ -330,12 +341,8 @@ static void store_param(char *s)
 #if ENABLE_FEATURE_XARGS_SUPPORT_QUOTES
 static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
 {
-#define NORM      0
-#define QUOTE     1
-#define BACKSLASH 2
-#define SPACE     4
-        char q = '\0';             /* quote char */
-        char state = NORM;
+#define q     G.process_stdin__q
+#define state G.process_stdin__state
         char *s = buf;             /* start of the word */
         char *p = s + strlen(buf); /* end of the word */
 
@@ -412,6 +419,8 @@ static char* FAST_FUNC process_stdin(int n_max_chars, int n_max_arg, char *buf)
         /* store_param(NULL) - caller will do it */
         dbg_msg("return:'%s'", s);
         return s;
+#undef q
+#undef state
 }
 #else
 /* The variant does not support single quotes, double quotes or backslash */
diff --git a/include/libbb.h b/include/libbb.h
index 0aa44eb37..cbb178c0b 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1867,10 +1867,19 @@ unsigned size_from_HISTFILESIZE(const char *hp) FAST_FUNC;
 # else
 #  define MAX_HISTORY 0
 # endif
+typedef const char *get_exe_name_t(int i) FAST_FUNC;
 typedef struct line_input_t {
         int flags;
         int timeout;
         const char *path_lookup;
+# if ENABLE_FEATURE_TAB_COMPLETION \
+&& (ENABLE_ASH  || ENABLE_SH_IS_ASH  || ENABLE_BASH_IS_ASH \
+||  ENABLE_HUSH || ENABLE_SH_IS_HUSH || ENABLE_BASH_IS_HUSH \
+)
+        /* function to fetch additional application-specific names to match */
+        get_exe_name_t *get_exe_name;
+#  define EDITING_HAS_get_exe_name 1
+# endif
 # if MAX_HISTORY
         int cnt_history;
         int cur_history;
@@ -1917,6 +1926,10 @@ int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC;
         read_line_input(prompt, command, maxsize)
 #endif
 
+#ifndef EDITING_HAS_get_exe_name
+# define EDITING_HAS_get_exe_name 0
+#endif
+
 
 #ifndef COMM_LEN
 # ifdef TASK_COMM_LEN
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 9bb3ea98b..14eb16873 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -884,18 +884,29 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
         }
         pf_len = strlen(pfind);
 
-# if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
         if (type == FIND_EXE_ONLY && !dirbuf) {
+# if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
                 const char *p = applet_names;
-
                 while (*p) {
                         if (strncmp(pfind, p, pf_len) == 0)
                                 add_match(xstrdup(p));
                         while (*p++ != '\0')
                                 continue;
                 }
-        }
 # endif
+# if EDITING_HAS_get_exe_name
+                if (state->get_exe_name) {
+                        i = 0;
+                        for (;;) {
+                                const char *b = state->get_exe_name(i++);
+                                if (!b)
+                                        break;
+                                if (strncmp(pfind, b, pf_len) == 0)
+                                        add_match(xstrdup(b));
+                        }
+                }
+# endif
+        }
 
         for (i = 0; i < npaths; i++) {
                 DIR *dir;
diff --git a/networking/tftp.c b/networking/tftp.c
index 04bfe844f..60fdff232 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -319,7 +319,7 @@ static int tftp_protocol(
         uint16_t opcode;
         uint16_t block_nr;
         uint16_t recv_blk;
-        int open_mode, local_fd;
+        int local_fd = -1;
         int retries, waittime_ms;
         int io_bufsize = blksize + 4;
         char *cp;
@@ -354,19 +354,6 @@ static int tftp_protocol(
                 }
         }
 
-        /* Prepare open mode */
-        if (CMD_PUT(option_mask32)) {
-                open_mode = O_RDONLY;
-        } else {
-                open_mode = O_WRONLY | O_TRUNC | O_CREAT;
-#if ENABLE_TFTPD
-                if ((option_mask32 & (TFTPD_OPT+TFTPD_OPT_c)) == TFTPD_OPT) {
-                        /* tftpd without -c */
-                        open_mode = O_WRONLY | O_TRUNC;
-                }
-#endif
-        }
-
         /* Examples of network traffic.
          * Note two cases when ACKs with block# of 0 are sent.
          *
@@ -400,12 +387,29 @@ static int tftp_protocol(
 
         if (!ENABLE_TFTP || our_lsa) { /* tftpd */
                 /* Open file (must be after changing user) */
+                int open_mode = O_RDONLY;
+                if (CMD_GET(option_mask32)) {
+                        open_mode = O_WRONLY | O_TRUNC | O_CREAT;
+                        if ((option_mask32 & (TFTPD_OPT+TFTPD_OPT_c)) == TFTPD_OPT) {
+                                /* tftpd without -c */
+                                open_mode = O_WRONLY | O_TRUNC;
+                        }
+                }
                 local_fd = open(local_file, open_mode, 0666);
                 if (local_fd < 0) {
+                        /* sanitize name, it came from untrusted remote side */
+                        unsigned char *p = (void *) local_file;
+                        while (*p) {
+                                if (*p < ' ')
+                                        *p = '?';
+                                p++;
+                        }
+                        bb_perror_msg("can't open '%s'", local_file);
                         G_error_pkt_reason = ERR_NOFILE;
                         strcpy(G_error_pkt_str, "can't open file");
-                        goto send_err_pkt;
+                        goto send_err_pkt_nomsg;
                 }
+
 /* gcc 4.3.1 would NOT optimize it out as it should! */
 #if ENABLE_FEATURE_TFTP_BLOCKSIZE
                 if (blksize != TFTP_BLKSIZE_DEFAULT || want_transfer_size) {
@@ -424,10 +428,11 @@ static int tftp_protocol(
                         block_nr = 0;
                 }
         } else { /* tftp */
-                /* Open file (must be after changing user) */
-                local_fd = CMD_GET(option_mask32) ? STDOUT_FILENO : STDIN_FILENO;
-                if (NOT_LONE_DASH(local_file))
-                        local_fd = xopen(local_file, open_mode);
+                if (CMD_PUT(option_mask32)) {
+                        local_fd = STDIN_FILENO;
+                        if (local_file)
+                                local_fd = xopen(local_file, O_RDONLY);
+                }
 /* Removing #if, or using if() statement instead of #if may lead to
  * "warning: null argument where non-null required": */
 #if ENABLE_TFTP
@@ -451,16 +456,14 @@ static int tftp_protocol(
                 }
                 /* add filename and mode */
                 /* fill in packet if the filename fits into xbuf */
-                len = strlen(remote_file) + 1;
-                if (2 + len + sizeof("octet") >= io_bufsize) {
+                len = strlen(remote_file);
+                if (len + 3 + sizeof("octet") >= io_bufsize) {
                         bb_simple_error_msg("remote filename is too long");
                         goto ret;
                 }
-                strcpy(cp, remote_file);
-                cp += len;
+                cp = stpcpy(cp, remote_file) + 1;
                 /* add "mode" part of the packet */
-                strcpy(cp, "octet");
-                cp += sizeof("octet");
+                cp = stpcpy(cp, "octet") + 1;
 
 # if ENABLE_FEATURE_TFTP_BLOCKSIZE
                 if (blksize == TFTP_BLKSIZE_DEFAULT && !want_transfer_size)
@@ -485,7 +488,7 @@ static int tftp_protocol(
                 }
                 if (want_transfer_size) {
                         /* add "tsize", <nul>, size, <nul> (see RFC2349) */
-                        /* if tftp and downloading, we send "0" (since we opened local_fd with O_TRUNC)
+                        /* if tftp and downloading, we send "0" (local_fd is not open yet)
                          * and this makes server to send "tsize" option with the size */
                         /* if tftp and uploading, we send file size (maybe dont, to not confuse old servers???) */
                         /* if tftpd and downloading, we are answering to client's request */
@@ -494,7 +497,8 @@ static int tftp_protocol(
                         strcpy(cp, "tsize");
                         cp += sizeof("tsize");
                         st.st_size = 0;
-                        fstat(local_fd, &st);
+                        if (local_fd >= 0)
+                                fstat(local_fd, &st);
                         cp += sprintf(cp, "%"OFF_FMT"u", (off_t)st.st_size) + 1;
 # if ENABLE_FEATURE_TFTP_PROGRESS_BAR
                         /* Save for progress bar. If 0 (tftp downloading),
@@ -684,7 +688,13 @@ static int tftp_protocol(
 
                 if (CMD_GET(option_mask32) && (opcode == TFTP_DATA)) {
                         if (recv_blk == block_nr) {
-                                int sz = full_write(local_fd, &rbuf[4], len - 4);
+                                int sz;
+                                if (local_fd == -1) {
+                                        local_fd = STDOUT_FILENO;
+                                        if (local_file)
+                                                local_fd = xopen(local_file, O_WRONLY | O_TRUNC | O_CREAT);
+                                }
+                                sz = full_write(local_fd, &rbuf[4], len - 4);
                                 if (sz != len - 4) {
                                         strcpy(G_error_pkt_str, bb_msg_write_error);
                                         G_error_pkt_reason = ERR_WRITE;
@@ -721,7 +731,7 @@ static int tftp_protocol(
                  *  must never resend the current DATA packet on receipt
                  *  of a duplicate ACK".
                  * DATA pkts are resent ONLY on timeout.
-                 * Thus "goto send_again" will ba a bad mistake above.
+                 * Thus "goto send_again" will be a bad mistake above.
                  * See:
                  * http://en.wikipedia.org/wiki/Sorcerer's_Apprentice_Syndrome
                  */
@@ -733,22 +743,27 @@ static int tftp_protocol(
                 free(xbuf);
                 free(rbuf);
         }
-        return finished == 0; /* returns 1 on failure */
+        if (!finished)
+                goto err;
+        return EXIT_SUCCESS;
 
  send_read_err_pkt:
         strcpy(G_error_pkt_str, bb_msg_read_error);
  send_err_pkt:
         if (G_error_pkt_str[0])
                 bb_simple_error_msg(G_error_pkt_str);
+ send_err_pkt_nomsg:
         G.error_pkt[1] = TFTP_ERROR;
         xsendto(socket_fd, G.error_pkt, 4 + 1 + strlen(G_error_pkt_str),
                         &peer_lsa->u.sa, peer_lsa->len);
+ err:
+        if (local_fd >= 0 && CMD_GET(option_mask32) && local_file)
+                unlink(local_file);
         return EXIT_FAILURE;
 #undef remote_file
 }
 
 #if ENABLE_TFTP
-
 int tftp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int tftp_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -761,7 +776,6 @@ int tftp_main(int argc UNUSED_PARAM, char **argv)
 # endif
         int result;
         int port;
-        IF_GETPUT(int opt;)
 
         INIT_G();
 
@@ -802,7 +816,7 @@ int tftp_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 
-        IF_GETPUT(opt =) getopt32(argv, "^"
+        getopt32(argv, "^"
                         IF_FEATURE_TFTP_GET("g") IF_FEATURE_TFTP_PUT("p")
                         "l:r:" IF_FEATURE_TFTP_BLOCKSIZE("b:")
                         IF_FEATURE_TFTP_HPA_COMPAT("m:")
@@ -853,18 +867,14 @@ int tftp_main(int argc UNUSED_PARAM, char **argv)
 # endif
         result = tftp_protocol(
                 NULL /*our_lsa*/, peer_lsa,
-                local_file, remote_file
+                (LONE_DASH(local_file) ? NULL : local_file), remote_file
                 IF_FEATURE_TFTP_BLOCKSIZE(, 1 /* want_transfer_size */)
                 IF_FEATURE_TFTP_BLOCKSIZE(, blksize)
         );
         tftp_progress_done();
 
-        if (result != EXIT_SUCCESS && NOT_LONE_DASH(local_file) && CMD_GET(opt)) {
-                unlink(local_file);
-        }
         return result;
 }
-
 #endif /* ENABLE_TFTP */
 
 #if ENABLE_TFTPD
@@ -1001,7 +1011,6 @@ int tftpd_main(int argc UNUSED_PARAM, char **argv)
         strcpy(G_error_pkt_str, error_msg);
         goto do_proto;
 }
-
 #endif /* ENABLE_TFTPD */
 
 #endif /* ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT */
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 3e08ec011..9d6604943 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -192,6 +192,8 @@ static struct dyn_lease *add_lease(
                          * but merely make dumpleases output safe for shells to use.
                          * We accept "0-9A-Za-z._-", all other chars turn to dots.
                          */
+                        if (*p == '-')
+                                *p = '.'; /* defeat "-option" attacks too */
                         while (*p) {
                                 if (!isalnum(*p) && *p != '-' && *p != '_')
                                         *p = '.';
diff --git a/shell/ash.c b/shell/ash.c
index 1b7fa9849..29cdd38f6 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10190,6 +10190,11 @@ evalpipe(union node *n, int flags)
         return status;
 }
 
+/* setinteractive needs this forward reference */
+#if EDITING_HAS_get_exe_name
+static const char *get_builtin_name(int i) FAST_FUNC;
+#endif
+
 /*
  * Controls whether the shell is interactive or not.
  */
@@ -10221,8 +10226,12 @@ setinteractive(int on)
                 }
 #endif
 #if ENABLE_FEATURE_EDITING
-                if (!line_input_state)
+                if (!line_input_state) {
                         line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
+# if EDITING_HAS_get_exe_name
+                        line_input_state->get_exe_name = get_builtin_name;
+# endif
+                }
 #endif
         }
 }
@@ -10690,6 +10699,14 @@ find_builtin(const char *name)
         return bp;
 }
 
+#if EDITING_HAS_get_exe_name
+static const char * FAST_FUNC
+get_builtin_name(int i)
+{
+        return /*i >= 0 &&*/ i < ARRAY_SIZE(builtintab) ? builtintab[i].name + 1 : NULL;
+}
+#endif
+
 /*
  * Execute a simple command.
  */
@@ -13834,29 +13851,27 @@ expandstr(const char *ps, int syntax_type)
         volatile int saveint;
         struct jmploc *volatile savehandler = exception_handler;
         struct jmploc jmploc;
+        const char *volatile result;
+        int err;
 
         /* XXX Fix (char *) cast. */
         setinputstring((char *)ps);
 
         saveprompt = doprompt;
         doprompt = 0;
+        result = ps;
+
+        SAVE_INT(saveint);
+        err = setjmp(jmploc.loc);
+        if (err)
+                goto out;
 
         /* readtoken1() might die horribly.
          * Try a prompt with syntactically wrong command:
          * PS1='$(date "+%H:%M:%S) > '
          */
-        SAVE_INT(saveint);
-        if (setjmp(jmploc.loc) == 0) {
-                exception_handler = &jmploc;
-                readtoken1(pgetc(), syntax_type, FAKEEOFMARK, 0);
-        }
-        exception_handler = savehandler;
-        RESTORE_INT(saveint);
-
-        doprompt = saveprompt;
-
-        /* Try: PS1='`xxx(`' */
-        unwindfiles(file_stop);
+        exception_handler = &jmploc;
+        readtoken1(pgetc(), syntax_type, FAKEEOFMARK, 0);
 
         n.narg.type = NARG;
         n.narg.next = NULL;
@@ -13866,17 +13881,20 @@ expandstr(const char *ps, int syntax_type)
         /* expandarg() might fail too:
          * PS1='$((123+))'
          */
-        SAVE_INT(saveint);
-        if (setjmp(jmploc.loc) == 0) {
-                exception_handler = &jmploc;
-                expandarg(&n, NULL, EXP_QUOTED);
-        } else if (exception_type == EXEXIT) {
-                exitshell();
-        }
+        expandarg(&n, NULL, EXP_QUOTED);
+        result = stackblock();
+
+out:
         exception_handler = savehandler;
+        if (err && exception_type != EXERROR)
+                longjmp(exception_handler->loc, 1);
         RESTORE_INT(saveint);
 
-        return stackblock();
+        doprompt = saveprompt;
+        /* Try: PS1='`xxx(`' */
+        unwindfiles(file_stop);
+
+        return result;
 }
 
 static inline int
diff --git a/shell/hush.c b/shell/hush.c
index 97202b953..6e44d4e11 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7889,6 +7889,20 @@ static const struct built_in_command *find_builtin(const char *name)
         return find_builtin_helper(name, bltins2, &bltins2[ARRAY_SIZE(bltins2)]);
 }
 
+#if EDITING_HAS_get_exe_name
+static const char * FAST_FUNC get_builtin_name(int i)
+{
+        if (/*i >= 0 && */ i < ARRAY_SIZE(bltins1)) {
+                return bltins1[i].b_cmd;
+        }
+        i -= ARRAY_SIZE(bltins1);
+        if (i < ARRAY_SIZE(bltins2)) {
+                return bltins2[i].b_cmd;
+        }
+        return NULL;
+}
+#endif
+
 static void remove_nested_vars(void)
 {
         struct variable *cur;
@@ -10268,6 +10282,9 @@ int hush_main(int argc, char **argv)
 
 # if ENABLE_FEATURE_EDITING
                 G.line_input_state = new_line_input_t(FOR_SHELL);
+#  if EDITING_HAS_get_exe_name
+                G.line_input_state->get_exe_name = get_builtin_name;
+#  endif
 # endif
 # if ENABLE_HUSH_SAVEHISTORY && MAX_HISTORY > 0
                 {
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 0e226124a..ab50f4a28 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -64,6 +64,14 @@
 //config:       help
 //config:       Supports restricted syslogd config. See docs/syslog.conf.txt
 //config:
+//config:config FEATURE_SYSLOGD_PRECISE_TIMESTAMPS
+//config:       bool "Include milliseconds in timestamps"
+//config:       default n
+//config:       depends on SYSLOGD
+//config:       help
+//config:       Includes milliseconds (HH:MM:SS.mmm) in timestamp when
+//config:       timestamps are added.
+//config:
 //config:config FEATURE_SYSLOGD_READ_BUFFER_SIZE
 //config:       int "Read buffer size in bytes"
 //config:       default 256
@@ -276,7 +284,7 @@ struct globals {
         /* ...then copy to parsebuf, escaping control chars */
         /* (can grow x2 max) */
         char parsebuf[MAX_READ*2];
-        /* ...then sprintf into printbuf, adding timestamp (15 chars),
+        /* ...then sprintf into printbuf, adding timestamp (15 or 19 chars),
          * host (64), fac.prio (20) to the message */
         /* (growth by: 15 + 64 + 20 + delims = ~110) */
         char printbuf[MAX_READ*2 + 128];
@@ -832,12 +840,24 @@ static void timestamp_and_log(int pri, char *msg, int len)
                 msg += 16;
         }
 
+#if ENABLE_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS
+        if (!timestamp) {
+                struct timeval tv;
+                gettimeofday(&tv, NULL);
+                now = tv.tv_sec;
+                timestamp = ctime(&now) + 4; /* skip day of week */
+                /* overwrite year by milliseconds, zero terminate */
+                sprintf(timestamp + 15, ".%03u", (unsigned)tv.tv_usec / 1000u);
+        } else {
+                timestamp[15] = '\0';
+        }
+#else
         if (!timestamp) {
                 time(&now);
                 timestamp = ctime(&now) + 4; /* skip day of week */
         }
-
         timestamp[15] = '\0';
+#endif
 
         if (option_mask32 & OPT_kmsg) {
                 log_to_kmsg(pri, msg);
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index a7a533ba0..b5008290f 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -85,7 +85,8 @@ testing "awk floating const with leading zeroes" \
         "" "\n"
 
 # long field seps requiring regex
-testing "awk long field sep" "awk -F-- '{ print NF, length(\$NF), \$NF }'" \
+testing "awk long field sep" \
+        "awk -F-- '{ print NF, length(\$NF), \$NF }'" \
         "2 0 \n3 0 \n4 0 \n5 0 \n" \
         "" \
         "a--\na--b--\na--b--c--\na--b--c--d--"
@@ -317,6 +318,26 @@ testing "awk length()" \
         "3\n3\n3\n3\n" \
         "" "qwe"
 
+testing "awk print length, 1" \
+        "awk '{ print length, 1 }'" \
+        "0 1\n" \
+        "" "\n"
+
+testing "awk print length 1" \
+        "awk '{ print length 1 }'" \
+        "01\n" \
+        "" "\n"
+
+testing "awk length == 0" \
+        "awk 'length == 0 { print \"foo\" }'" \
+        "foo\n" \
+        "" "\n"
+
+testing "awk if (length == 0)" \
+        "awk '{ if (length == 0) { print \"bar\" } }'" \
+        "bar\n" \
+        "" "\n"
+
 testing "awk -f and ARGC" \
         "awk -f - input" \
         "re\n2\n" \
diff --git a/testsuite/xargs.tests b/testsuite/xargs.tests
index 2d0a201b7..855b33bc2 100755
--- a/testsuite/xargs.tests
+++ b/testsuite/xargs.tests
@@ -41,4 +41,13 @@ testing "xargs -sNUM test 2" \
         "echo 1 2 3 4 5 6 7 8 9 0\n""echo 1 2 3 4 5 6 7 8 9\n""echo 1 00\n" \
         "" "2 3 4 5 6 7 8 9 0 2 3 4 5 6 7 8 9 00\n"
 
+# see that we don't get "argument line too long",
+# but do see the last word, 99999, instead
+optional FEATURE_XARGS_SUPPORT_QUOTES
+testing "xargs argument line too long" \
+        "seq 10000 99999 | sed -e 's/^/\"/' -e 's/$/\"/' | xargs echo | grep -o 99999; echo \$?" \
+        "99999\n0\n" \
+        "" ""
+SKIP=
+
 exit $FAILCOUNT
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index e58cb0fd1..f568fe92c 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -344,6 +344,7 @@ static const char *const i386_sys_types[] = {
         "\xa8" "Darwin UFS",
         "\xa9" "NetBSD",
         "\xab" "Darwin boot",
+        "\xaf" "HFS / HFS+",
         "\xb7" "BSDI fs",
         "\xb8" "BSDI swap",
         "\xbe" "Solaris boot",
@@ -390,15 +391,12 @@ static const char *const i386_sys_types[] = {
         "\xc6" "DRDOS/sec (FAT-16)",
         "\xc7" "Syrinx",
         "\xda" "Non-FS data",
-        "\xdb" "CP/M / CTOS / ...",/* CP/M or Concurrent CP/M or
-                                      Concurrent DOS or CTOS */
+        "\xdb" "CP/M / CTOS / ...",/* CP/M or Concurrent CP/M or Concurrent DOS or CTOS */
         "\xde" "Dell Utility",     /* Dell PowerEdge Server utilities */
         "\xdf" "BootIt",           /* BootIt EMBRM */
-        "\xe1" "DOS access",       /* DOS access or SpeedStor 12-bit FAT
-                                      extended partition */
+        "\xe1" "DOS access",       /* DOS access or SpeedStor 12-bit FAT extended partition */
         "\xe3" "DOS R/O",          /* DOS R/O or SpeedStor */
-        "\xe4" "SpeedStor",        /* SpeedStor 16-bit FAT extended
-                                      partition < 1024 cyl. */
+        "\xe4" "SpeedStor",        /* SpeedStor 16-bit FAT extended partition <1024 cyl. */
         "\xf1" "SpeedStor",
         "\xf4" "SpeedStor",        /* SpeedStor large partition */
         "\xfe" "LANstep",          /* SpeedStor >1024 cyl. or LANstep */