Merge branch 'busybox' into merge

47 files changed, 202 insertions, 178 deletions

diff --git a/applets/individual.c b/applets/individual.c
index 4c468df06..e94f26c93 100644
--- a/applets/individual.c
+++ b/applets/individual.c
@@ -19,6 +19,6 @@ int main(int argc, char **argv)
 
 void bb_show_usage(void)
 {
-        fputs(APPLET_full_usage "\n", stdout);
+        fputs_stdout(APPLET_full_usage "\n");
         exit(EXIT_FAILURE);
 }
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 65f0648f9..4b3414941 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -152,7 +152,7 @@ static int catv(unsigned opts, char **argv)
                                 eol_seen = (c == eol_char);
 #endif
                                 visible(c, buf, opts);
-                                fputs(buf, stdout);
+                                fputs_stdout(buf);
                         }
                 }
                 if (ENABLE_FEATURE_CLEAN_UP && fd)
@@ -201,7 +201,7 @@ int cat_main(int argc UNUSED_PARAM, char **argv)
                 ns.start = 1;
                 ns.inc = 1;
                 ns.sep = "\t";
-                ns.empty_str = "\n";
+                ns.empty_str = NULL;
                 ns.all = !(opts & CAT_OPT_b); /* -n without -b */
                 ns.nonempty = (opts & CAT_OPT_b); /* -b (with or without -n) */
                 exitcode = EXIT_SUCCESS;
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 1acbb513e..16418ff33 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -167,7 +167,7 @@ static void cut_file(FILE *file, char delim, const struct cut_list *cut_lists, u
                                                  * printed */
                                                 if (nfields_printed > 0)
                                                         putchar(delim);
-                                                fputs(field, stdout);
+                                                fputs_stdout(field);
                                                 printed[ndelim] = 'X';
                                                 nfields_printed++;      /* shouldn't overflow.. */
                                         }
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 5f5993921..c5e1de6f5 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -123,7 +123,7 @@ static void expand(FILE *file, unsigned tab_size, unsigned opt)
                         }
                         ptr++;
                 }
-                fputs(ptr_strbeg, stdout);
+                fputs_stdout(ptr_strbeg);
                 free(line);
         }
 }
diff --git a/coreutils/head.c b/coreutils/head.c
index 1219dfe8b..b6efabbe0 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -117,7 +117,7 @@ print_except_N_last_lines(FILE *fp, unsigned count)
                 char *c;
                 if (head == count)
                         head = 0;
-                fputs(circle[head], stdout);
+                fputs_stdout(circle[head]);
                 c = xmalloc_fgets(fp);
                 if (!c)
                         goto ret;
diff --git a/coreutils/id.c b/coreutils/id.c
index 78d5f2a50..f453a87ae 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -258,7 +258,7 @@ int id_main(int argc UNUSED_PARAM, char **argv)
                         bb_error_msg_and_die("can't get process context%s",
                                 username ? " for a different user" : "");
                 }
-                fputs(scontext, stdout);
+                fputs_stdout(scontext);
         }
         /* freecon(NULL) seems to be harmless */
         if (ENABLE_FEATURE_CLEAN_UP)
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 2f9338f19..e891a67ce 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -456,7 +456,7 @@ static unsigned print_name(const char *name)
         name = printable_string2(&uni_stat, name);
 
         if (!(option_mask32 & OPT_Q)) {
-                fputs(name, stdout);
+                fputs_stdout(name);
                 return uni_stat.unicode_width;
         }
 
diff --git a/coreutils/nl.c b/coreutils/nl.c
index 800b73c26..d06673881 100644
--- a/coreutils/nl.c
+++ b/coreutils/nl.c
@@ -68,7 +68,7 @@ int nl_main(int argc UNUSED_PARAM, char **argv)
                         &ns.width, &ns.sep, &ns.start, &ns.inc, &opt_b);
         ns.all = (opt_b[0] == 'a');
         ns.nonempty = (opt_b[0] == 't');
-        ns.empty_str = xasprintf("%*s\n", ns.width + (int)strlen(ns.sep), "");
+        ns.empty_str = xasprintf("%*s", ns.width + (int)strlen(ns.sep), "");
 
         argv += optind;
         if (!*argv)
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 76ee5137a..1830aca83 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -429,19 +429,19 @@ print_named_ascii(size_t n_bytes, const char *block,
 
                 masked_c &= 0x7f;
                 if (masked_c == 0x7f) {
-                        fputs(" del", stdout);
+                        fputs_stdout(" del");
                         continue;
                 }
                 if (masked_c > ' ') {
                         buf[3] = masked_c;
-                        fputs(buf, stdout);
+                        fputs_stdout(buf);
                         continue;
                 }
                 /* Why? Because printf(" %3.3s") is much slower... */
                 buf[6] = charname[masked_c][0];
                 buf[7] = charname[masked_c][1];
                 buf[8] = charname[masked_c][2];
-                fputs(buf+5, stdout);
+                fputs_stdout(buf+5);
         }
 }
 
@@ -458,7 +458,7 @@ print_ascii(size_t n_bytes, const char *block,
 
                 if (ISPRINT(c)) {
                         buf[3] = c;
-                        fputs(buf, stdout);
+                        fputs_stdout(buf);
                         continue;
                 }
                 switch (c) {
@@ -492,7 +492,7 @@ print_ascii(size_t n_bytes, const char *block,
                         buf[8] = (c & 7) + '0';
                         s = buf + 5;
                 }
-                fputs(s, stdout);
+                fputs_stdout(s);
         }
 }
 
@@ -888,7 +888,7 @@ format_address_label(off_t address, char c)
 static void
 dump_hexl_mode_trailer(size_t n_bytes, const char *block)
 {
-        fputs("  >", stdout);
+        fputs_stdout("  >");
         while (n_bytes--) {
                 unsigned c = *(unsigned char *) block++;
                 c = (ISPRINT(c) ? c : '.');
@@ -1128,13 +1128,13 @@ dump_strings(off_t address, off_t end_offset)
 
                 for (i = 0; (c = buf[i]); i++) {
                         switch (c) {
-                        case '\007': fputs("\\a", stdout); break;
-                        case '\b': fputs("\\b", stdout); break;
-                        case '\f': fputs("\\f", stdout); break;
-                        case '\n': fputs("\\n", stdout); break;
-                        case '\r': fputs("\\r", stdout); break;
-                        case '\t': fputs("\\t", stdout); break;
-                        case '\v': fputs("\\v", stdout); break;
+                        case '\007': fputs_stdout("\\a"); break;
+                        case '\b': fputs_stdout("\\b"); break;
+                        case '\f': fputs_stdout("\\f"); break;
+                        case '\n': fputs_stdout("\\n"); break;
+                        case '\r': fputs_stdout("\\r"); break;
+                        case '\t': fputs_stdout("\\t"); break;
+                        case '\v': fputs_stdout("\\v"); break;
                         default: putchar(c);
                         }
                 }
diff --git a/coreutils/paste.c b/coreutils/paste.c
index fd2aa5027..7def4de11 100644
--- a/coreutils/paste.c
+++ b/coreutils/paste.c
@@ -53,7 +53,7 @@ static void paste_files(FILE** files, int file_cnt, char* delims, int del_cnt)
                                 --active_files;
                                 continue;
                         }
-                        fputs(line, stdout);
+                        fputs_stdout(line);
                         free(line);
                         delim = '\n';
                         if (i != file_cnt - 1) {
@@ -79,7 +79,7 @@ static void paste_files_separate(FILE** files, char* delims, int del_cnt)
                 line = NULL;
                 while ((next_line = xmalloc_fgetline(files[i])) != NULL) {
                         if (line) {
-                                fputs(line, stdout);
+                                fputs_stdout(line);
                                 free(line);
                                 delim = delims[del_idx++];
                                 if (del_idx == del_cnt)
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 1267df450..1e93dce80 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -445,7 +445,7 @@ static void print_it(const char *masterformat,
 
                 /* print preceding string */
                 *p = '\0';
-                fputs(b, stdout);
+                fputs_stdout(b);
 
                 p += len;
                 b = p + 1;
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 19253964c..ba2b78317 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -855,7 +855,7 @@ static void wrapf(const char *message, ...)
                         }
                 }
         }
-        fputs(buf, stdout);
+        fputs_stdout(buf);
         G.current_col += buflen;
         if (buf[buflen-1] == '\n')
                 G.current_col = 0;
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 164b208ea..02b037276 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -319,7 +319,7 @@ int baseNUM_main(int argc UNUSED_PARAM, char **argv)
                         }
 
                         if (col == 0) {
-                                fputs(dst_buf, stdout);
+                                fputs_stdout(dst_buf);
                         } else {
                                 char *result = dst_buf;
                                 if (rem == 0)
diff --git a/coreutils/yes.c b/coreutils/yes.c
index a51b1ad8e..38ffff46c 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -47,7 +47,7 @@ int yes_main(int argc UNUSED_PARAM, char **argv)
 #endif
                 pp = argv;
                 while (1) {
-                        fputs(*pp, stdout);
+                        fputs_stdout(*pp);
                         if (!*++pp)
                                 break;
                         putchar(' ');
diff --git a/editors/awk.c b/editors/awk.c
index 4799091ec..41a57ea0c 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2174,7 +2174,10 @@ static int fmt_num(char *b, int size, const char *format, double n, int int_as_i
 }
 
 /* formatted output into an allocated buffer, return ptr to buffer */
-static char *awk_printf(node *n)
+#if !ENABLE_FEATURE_AWK_GNU_EXTENSIONS
+# define awk_printf(a, b) awk_printf(a)
+#endif
+static char *awk_printf(node *n, int *len)
 {
         char *b = NULL;
         char *fmt, *s, *f;
@@ -2228,6 +2231,10 @@ static char *awk_printf(node *n)
         nvfree(v);
         b = xrealloc(b, i + 1);
         b[i] = '\0';
+#if ENABLE_FEATURE_AWK_GNU_EXTENSIONS
+        if (len)
+                *len = i;
+#endif
         return b;
 }
 
@@ -2685,6 +2692,7 @@ static var *evaluate(node *op, var *res)
                 case XC( OC_PRINT ):
                 case XC( OC_PRINTF ): {
                         FILE *F = stdout;
+                        IF_FEATURE_AWK_GNU_EXTENSIONS(int len;)
 
                         if (op->r.n) {
                                 rstream *rsm = newfile(R.s);
@@ -2722,8 +2730,12 @@ static var *evaluate(node *op, var *res)
                                 fputs(getvar_s(intvar[ORS]), F);
 
                         } else {        /* OC_PRINTF */
-                                char *s = awk_printf(op1);
+                                char *s = awk_printf(op1, &len);
+#if ENABLE_FEATURE_AWK_GNU_EXTENSIONS
+                                fwrite(s, len, 1, F);
+#else
                                 fputs(s, F);
+#endif
                                 free(s);
                         }
                         fflush(F);
@@ -2997,7 +3009,7 @@ static var *evaluate(node *op, var *res)
                         break;
 
                 case XC( OC_SPRINTF ):
-                        setvar_p(res, awk_printf(op1));
+                        setvar_p(res, awk_printf(op1, NULL));
                         break;
 
                 case XC( OC_UNARY ): {
diff --git a/editors/ed.c b/editors/ed.c
index d3ae8da92..c50faeefa 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -553,7 +553,7 @@ static int printLines(int num1, int num2, int expandFlag)
                         fputc_printable(ch | PRINTABLE_META, stdout);
                 }
 
-                fputs("$\n", stdout);
+                fputs_stdout("$\n");
 
                 setCurNum(num1++);
                 lp = lp->next;
diff --git a/editors/vi.c b/editors/vi.c
index bfe05d613..8181a5384 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -524,7 +524,7 @@ static void show_help(void)
 
 static void write1(const char *out)
 {
-        fputs(out, stdout);
+        fputs_stdout(out);
 }
 
 #if ENABLE_FEATURE_VI_WIN_RESIZE
@@ -3113,12 +3113,15 @@ static int find_range(char **start, char **stop, char c)
                 do_cmd(c);              // execute movement cmd
                 dot_end();              // find NL
                 q = dot;
-        } else {
-                // nothing -- this causes any other values of c to
-                // represent the one-character range under the
-                // cursor.  this is correct for ' ' and 'l', but
-                // perhaps no others.
-                //
+        } else /* if (c == ' ' || c == 'l') */ {
+                // forward motion by character
+                int tmpcnt = (cmdcnt ?: 1);
+                do_cmd(c);              // execute movement cmd
+                // exclude last char unless range isn't what we expected
+                // this indicates we've hit EOL
+                if (tmpcnt == dot - p)
+                        dot--;
+                q = dot;
         }
         if (q < p) {
                 t = q;
diff --git a/include/libbb.h b/include/libbb.h
index a7f32e21e..c4734e86d 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -916,6 +916,7 @@ char *xmalloc_substitute_string(const char *src, int count, const char *sub, con
 int bb_putchar(int ch) FAST_FUNC;
 /* Note: does not use stdio, writes to fd 2 directly */
 int bb_putchar_stderr(char ch) FAST_FUNC;
+int fputs_stdout(const char *s) FAST_FUNC;
 char *xasprintf(const char *format, ...) __attribute__ ((format(printf, 1, 2))) FAST_FUNC RETURNS_MALLOC;
 char *auto_string(char *str) FAST_FUNC;
 // gcc-4.1.1 still isn't good enough at optimizing it
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index ecee45ae2..320cb5b13 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -191,7 +191,7 @@ void FAST_FUNC bb_show_usage(void)
 
 int FAST_FUNC find_applet_by_name(const char *name)
 {
-        unsigned i, max;
+        unsigned i;
         int j;
         const char *p;
 
@@ -215,105 +215,43 @@ int FAST_FUNC find_applet_by_name(const char *name)
 #endif
 
         p = applet_names;
-        i = 0;
 #if KNOWN_APPNAME_OFFSETS <= 0
-        max = NUM_APPLETS;
+        i = 0;
 #else
-        max = NUM_APPLETS * KNOWN_APPNAME_OFFSETS;
+        i = NUM_APPLETS * (KNOWN_APPNAME_OFFSETS - 1);
         for (j = ARRAY_SIZE(applet_nameofs)-1; j >= 0; j--) {
                 const char *pp = applet_names + applet_nameofs[j];
                 if (strcmp(name, pp) >= 0) {
                         //bb_error_msg("name:'%s' >= pp:'%s'", name, pp);
                         p = pp;
-                        i = max - NUM_APPLETS;
                         break;
                 }
-                max -= NUM_APPLETS;
+                i -= NUM_APPLETS;
         }
-        max /= (unsigned)KNOWN_APPNAME_OFFSETS;
         i /= (unsigned)KNOWN_APPNAME_OFFSETS;
-        //bb_error_msg("name:'%s' starting from:'%s' i:%u max:%u", name, p, i, max);
+        //bb_error_msg("name:'%s' starting from:'%s' i:%u", name, p, i);
 #endif
 
         /* Open-coded linear search without strcmp/strlen calls for speed */
-
-#if 0 /*BB_UNALIGNED_MEMACCESS_OK && BB_LITTLE_ENDIAN*/
-        /* skip "[\0" name, it's surely not it */
-        if (ENABLE_TEST && LONE_CHAR(p, '['))
-                i++, p += 2;
-        /* All remaining applet names in p[] are at least 2 chars long */
-        /* name[] is also at least 2 chars long */
-
-        n32 = (name[0] << 0) | (name[1] << 8) | (name[2] << 16);
-        while (i < max) {
-                uint32_t p32;
-                char ch;
-
-                /* Quickly check match of the first 3 bytes */
-                move_from_unaligned32(p32, p);
-                p += 3;
-                if ((p32 & 0x00ffffff) != n32) {
-                        /* Most likely case: 3 first bytes do not match */
-                        i++;
-                        if ((p32 & 0x00ff0000) == '\0')
-                                continue; // p[2] was NUL
-                        p++;
-                        if ((p32 & 0xff000000) == '\0')
-                                continue; // p[3] was NUL
-                        /* p[0..3] aren't matching and none is NUL, check the rest */
-                        while (*p++ != '\0')
-                                continue;
-                        continue;
-                }
-
-                /* Unlikely branch: first 3 bytes ([0..2]) match */
-                if ((p32 & 0x00ff0000) == '\0') {
-                        /* name is 2-byte long, it is full match */
-                        //bb_error_msg("found:'%s' i:%u", name, i);
-                        return i;
-                }
-                /* Check remaining bytes [3..NUL] */
-                ch = (p32 >> 24);
-                j = 3;
-                while (ch == name[j]) {
-                        if (ch == '\0') {
-                                //bb_error_msg("found:'%s' i:%u", name, i);
-                                return i;
-                        }
-                        ch = *++p;
-                        j++;
-                }
-                /* Not a match. Skip it, including NUL */
-                while (ch != '\0')
-                        ch = *++p;
-                p++;
-                i++;
-        }
-        return -1;
-#else
-        while (i < max) {
-                char ch;
-                j = 0;
-                /* Do we see "name\0" in applet_names[p] position? */
-                while ((ch = *p) == name[j]) {
-                        if (ch == '\0') {
+        while (*p) {
+                /* Do we see "name\0" at current position in applet_names? */
+                for (j = 0; *p == name[j]; ++j) {
+                        if (*p++ == '\0') {
                                 //bb_error_msg("found:'%s' i:%u", name, i);
                                 return i; /* yes */
                         }
-                        p++;
-                        j++;
                 }
-                /* No.
-                 * p => 1st non-matching char in applet_names[],
-                 * skip to and including NUL.
-                 */
-                while (ch != '\0')
-                        ch = *++p;
-                p++;
+                /* No. Have we gone too far, alphabetically? */
+                if (*p > name[j]) {
+                        //bb_error_msg("break:'%s' i:%u", name, i);
+                        break;
+                }
+                /* No. Move to the start of the next applet name. */
+                while (*p++ != '\0')
+                        continue;
                 i++;
         }
         return -1;
-#endif
 }
 
 
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index 2dcead35a..66d6a479e 100644
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -25,7 +25,7 @@ char* FAST_FUNC bb_ask_noecho(int fd, int timeout, const char *prompt)
         /* Was buggy: was printing prompt *before* flushing input,
          * which was upsetting "expect" based scripts of some users.
          */
-        fputs(prompt, stdout);
+        fputs_stdout(prompt);
         fflush_all();
 
         tcgetattr(fd, &oldtio);
diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c
index ede5a97e3..70a4c29cf 100644
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.c
@@ -104,13 +104,19 @@ int FAST_FUNC index_in_str_array(const char *const string_array[], const char *k
 
 int FAST_FUNC index_in_strings(const char *strings, const char *key)
 {
-        int idx = 0;
+        int j, idx = 0;
 
         while (*strings) {
-                if (strcmp(strings, key) == 0) {
-                        return idx;
+                /* Do we see "key\0" at current position in strings? */
+                for (j = 0; *strings == key[j]; ++j) {
+                        if (*strings++ == '\0') {
+                                //bb_error_msg("found:'%s' i:%u", key, idx);
+                                return idx; /* yes */
+                        }
                 }
-                strings += strlen(strings) + 1; /* skip NUL */
+                /* No.  Move to the start of the next string. */
+                while (*strings++ != '\0')
+                        continue;
                 idx++;
         }
         return -1;
diff --git a/libbb/dump.c b/libbb/dump.c
index 1ba1132b3..fb7849e7d 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -560,7 +560,7 @@ static void display(priv_dumper_t* dumper)
                                                 ) {
                                                         if (dumper->pub.eofstring) {
                                                                 /* xxd support: requested to not pad incomplete blocks */
-                                                                fputs(dumper->pub.eofstring, stdout);
+                                                                fputs_stdout(dumper->pub.eofstring);
                                                                 return;
                                                         }
                                                         if (!(pr->flags & (F_TEXT | F_BPAD)))
diff --git a/libbb/fgets_str.c b/libbb/fgets_str.c
index 1a7f2e9e0..c884ef8af 100644
--- a/libbb/fgets_str.c
+++ b/libbb/fgets_str.c
@@ -17,7 +17,7 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string,
         int linebufsz = 0;
         int idx = 0;
         int ch;
-        size_t maxsz = *maxsz_p;
+        size_t maxsz = maxsz_p ? *maxsz_p : INT_MAX - 4095;
 
         while (1) {
                 ch = fgetc(file);
@@ -53,7 +53,8 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string,
         /* Grow/shrink *first*, then store NUL */
         linebuf = xrealloc(linebuf, idx + 1);
         linebuf[idx] = '\0';
-        *maxsz_p = idx;
+        if (maxsz_p)
+                *maxsz_p = idx;
         return linebuf;
 }
 
@@ -63,23 +64,15 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string,
  * Return NULL if EOF is reached immediately.  */
 char* FAST_FUNC xmalloc_fgets_str(FILE *file, const char *terminating_string)
 {
-        size_t maxsz = INT_MAX - 4095;
-        return xmalloc_fgets_internal(file, terminating_string, 0, &maxsz);
+        return xmalloc_fgets_internal(file, terminating_string, 0, NULL);
 }
 
 char* FAST_FUNC xmalloc_fgets_str_len(FILE *file, const char *terminating_string, size_t *maxsz_p)
 {
-        size_t maxsz;
-
-        if (!maxsz_p) {
-                maxsz = INT_MAX - 4095;
-                maxsz_p = &maxsz;
-        }
         return xmalloc_fgets_internal(file, terminating_string, 0, maxsz_p);
 }
 
 char* FAST_FUNC xmalloc_fgetline_str(FILE *file, const char *terminating_string)
 {
-        size_t maxsz = INT_MAX - 4095;
-        return xmalloc_fgets_internal(file, terminating_string, 1, &maxsz);
+        return xmalloc_fgets_internal(file, terminating_string, 1, NULL);
 }
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index f3cbc512c..27c1f3a74 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -312,7 +312,7 @@ static void BB_PUTCHAR(wchar_t c)
                 ssize_t len = wcrtomb(buf, c, &mbst);
                 if (len > 0) {
                         buf[len] = '\0';
-                        fputs(buf, stdout);
+                        fputs_stdout(buf);
                 }
         } else {
                 /* In this case, c is always one byte */
@@ -496,7 +496,7 @@ static void beep(void)
  */
 static void put_prompt_custom(bool is_full)
 {
-        fputs((is_full ? cmdedit_prompt : prompt_last_line), stdout);
+        fputs_stdout((is_full ? cmdedit_prompt : prompt_last_line));
         cursor = 0;
         cmdedit_y = cmdedit_prmt_len / cmdedit_termw; /* new quasireal y */
         cmdedit_x = cmdedit_prmt_len % cmdedit_termw;
@@ -1955,7 +1955,7 @@ static void ask_terminal(void)
         pfd.events = POLLIN;
         if (safe_poll(&pfd, 1, 0) == 0) {
                 S.sent_ESC_br6n = 1;
-                fputs(ESC"[6n", stdout);
+                fputs_stdout(ESC"[6n");
                 fflush_all(); /* make terminal see it ASAP! */
         }
 }
@@ -3085,7 +3085,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 #undef read_line_input
 int FAST_FUNC read_line_input(const char* prompt, char* command, int maxsize)
 {
-        fputs(prompt, stdout);
+        fputs_stdout(prompt);
         fflush_all();
         if (!fgets(command, maxsize, stdin))
                 return -1;
diff --git a/libbb/login.c b/libbb/login.c
index 7f593d80d..af860c277 100644
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -120,7 +120,7 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
                                 buf[0] = c;
                         }
                 }
-                fputs(outbuf, stdout);
+                fputs_stdout(outbuf);
         }
         fclose(fp);
         fflush_all();
@@ -130,8 +130,8 @@ void FAST_FUNC print_login_prompt(void)
 {
         char *hostname = safe_gethostname();
 
-        fputs(hostname, stdout);
-        fputs(LOGIN, stdout);
+        fputs_stdout(hostname);
+        fputs_stdout(LOGIN);
         fflush_all();
         free(hostname);
 }
diff --git a/libbb/print_numbered_lines.c b/libbb/print_numbered_lines.c
index d6459d7c3..b64f85597 100644
--- a/libbb/print_numbered_lines.c
+++ b/libbb/print_numbered_lines.c
@@ -22,10 +22,11 @@ int FAST_FUNC print_numbered_lines(struct number_state *ns, const char *filename
                 if (ns->all
                  || (ns->nonempty && line[0])
                 ) {
-                        printf("%*u%s%s\n", ns->width, N, ns->sep, line);
+                        printf("%*u%s", ns->width, N, ns->sep);
                         N += ns->inc;
                 } else if (ns->empty_str)
-                        fputs(ns->empty_str, stdout);
+                        fputs_stdout(ns->empty_str);
+                puts(line);
                 free(line);
         }
         ns->start = N;
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index 7b67f30cd..a228075cc 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -48,7 +48,7 @@ static void check_selinux_update_passwd(const char *username)
                         bb_simple_error_msg_and_die("SELinux: access denied");
         }
         if (ENABLE_FEATURE_CLEAN_UP)
-                freecon(context);
+                freecon(seuser);
 }
 #else
 # define check_selinux_update_passwd(username) ((void)0)
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 4bd19d471..d672e43e5 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -320,6 +320,11 @@ int FAST_FUNC bb_putchar(int ch)
         return putchar(ch);
 }
 
+int FAST_FUNC fputs_stdout(const char *s)
+{
+        return fputs(s, stdout);
+}
+
 /* Die with an error message if we can't copy an entire FILE* to stdout,
  * then close that file. */
 void FAST_FUNC xprint_and_close_file(FILE *file)
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 645f1bb09..2109e2eb5 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -32,7 +32,7 @@
 //kbuild:lib-$(CONFIG_MKPASSWD) += cryptpw.o
 
 //usage:#define cryptpw_trivial_usage
-//usage:       "[-s] [-p N] [-m TYPE] [-S SALT] [PASSWORD] [SALT]"
+//usage:       "[-P FD] [-m TYPE] [-S SALT] [PASSWORD] [SALT]"
 /* We do support -s, we just don't mention it */
 //usage:#define cryptpw_full_usage "\n\n"
 //usage:       "Print crypt(3) hashed PASSWORD\n"
@@ -72,8 +72,8 @@ ENVIRONMENT
     A list of options which will be evaluated before the ones
     specified on the command line.
 BUGS
-    This programs suffers of a bad case of featuritis.
-    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    This program suffers of a bad case of featuritis.
+    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Very true...
 
diff --git a/miscutils/bc.c b/miscutils/bc.c
index 53eb5c799..02a61ac49 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -6448,7 +6448,7 @@ static BC_STATUS zdc_program_printStream(void)
                 char *str;
                 idx = (r->t == XC_RESULT_STR) ? r->d.id.idx : n->rdx;
                 str = *xc_program_str(idx);
-                fputs(str, stdout);
+                fputs_stdout(str);
         }
 
         RETURN_STATUS(s);
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index fac11d339..21a498d0f 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -107,8 +107,8 @@ enum {
 
 static void putcsi(const char *s)
 {
-        fputs(ESC"[", stdout);
-        fputs(s, stdout);
+        fputs_stdout(ESC"[");
+        fputs_stdout(s);
 }
 
 static void clrscr(void)
diff --git a/miscutils/strings.c b/miscutils/strings.c
index 51412f401..e4a68227e 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -92,7 +92,7 @@ int strings_main(int argc UNUSED_PARAM, char **argv)
                                                 if (option_mask32 & (PRINT_OFFSET | PRINT_RADIX)) {
                                                         printf(radix_fmt, offset - n);
                                                 }
-                                                fputs(string, stdout);
+                                                fputs_stdout(string);
                                         }
                                         count++;
                                 }
diff --git a/networking/brctl.c b/networking/brctl.c
index f057f9b60..e1f3e6445 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -156,7 +156,7 @@ static int show_bridge(const char *name, int need_hdr)
         else
         if (LONE_CHAR(filedata, '1'))
                 strcpy(filedata, "yes");
-        fputs(filedata, stdout);
+        fputs_stdout(filedata);
 
         /* sfx points past "BR/bridge/", turn it into "BR/brif": */
         sfx[-4] = 'f'; sfx[-3] = '\0';
diff --git a/networking/httpd.c b/networking/httpd.c
index 02f544593..08313bbc7 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2923,12 +2923,12 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
                         , &verbose
                 );
         if (opt & OPT_DECODE_URL) {
-                fputs(percent_decode_in_place(url_for_decode, /*strict:*/ 0), stdout);
+                fputs_stdout(percent_decode_in_place(url_for_decode, /*strict:*/ 0));
                 return 0;
         }
 #if ENABLE_FEATURE_HTTPD_ENCODE_URL_STR
         if (opt & OPT_ENCODE_URL) {
-                fputs(encodeString(url_for_encode), stdout);
+                fputs_stdout(encodeString(url_for_encode));
                 return 0;
         }
 #endif
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index dfd84c000..17a838411 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -192,20 +192,20 @@ static NOINLINE int print_linkinfo(const struct nlmsghdr *n)
                 printf("%c    link/%s ", _SL_, ll_type_n2a(ifi->ifi_type, b1));
 
                 if (tb[IFLA_ADDRESS]) {
-                        fputs(ll_addr_n2a(RTA_DATA(tb[IFLA_ADDRESS]),
+                        fputs_stdout(ll_addr_n2a(RTA_DATA(tb[IFLA_ADDRESS]),
                                                       RTA_PAYLOAD(tb[IFLA_ADDRESS]),
                                                       ifi->ifi_type,
-                                                      b1, sizeof(b1)), stdout);
+                                                      b1, sizeof(b1)));
                 }
                 if (tb[IFLA_BROADCAST]) {
                         if (ifi->ifi_flags & IFF_POINTOPOINT)
                                 printf(" peer ");
                         else
                                 printf(" brd ");
-                        fputs(ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]),
+                        fputs_stdout(ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]),
                                                       RTA_PAYLOAD(tb[IFLA_BROADCAST]),
                                                       ifi->ifi_type,
-                                                      b1, sizeof(b1)), stdout);
+                                                      b1, sizeof(b1)));
                 }
         }
         bb_putchar('\n');
@@ -307,9 +307,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
                 printf("    family %d ", ifa->ifa_family);
 
         if (rta_tb[IFA_LOCAL]) {
-                fputs(rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_LOCAL])),
-                        stdout
-                );
+                fputs_stdout(rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_LOCAL])));
 
                 if (rta_tb[IFA_ADDRESS] == NULL
                  || memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0
@@ -363,7 +361,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
         if (ifa_flags)
                 printf("flags %02x ", ifa_flags);
         if (rta_tb[IFA_LABEL])
-                fputs((char*)RTA_DATA(rta_tb[IFA_LABEL]), stdout);
+                fputs_stdout((char*)RTA_DATA(rta_tb[IFA_LABEL]));
         if (rta_tb[IFA_CACHEINFO]) {
                 struct ifa_cacheinfo *ci = RTA_DATA(rta_tb[IFA_CACHEINFO]);
                 char buf[128];
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 50acfe4e7..a23a00d87 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -88,10 +88,9 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
                                 r->rtm_src_len
                         );
                 } else {
-                        fputs(format_host(r->rtm_family,
+                        fputs_stdout(format_host(r->rtm_family,
                                                 RTA_PAYLOAD(tb[RTA_SRC]),
-                                                RTA_DATA(tb[RTA_SRC])),
-                                stdout
+                                                RTA_DATA(tb[RTA_SRC]))
                         );
                 }
         } else if (r->rtm_src_len) {
@@ -178,7 +177,7 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
                 } else
                         printf("masquerade");
         } else if (r->rtm_type != RTN_UNICAST)
-                fputs(rtnl_rtntype_n2a(r->rtm_type), stdout);
+                fputs_stdout(rtnl_rtntype_n2a(r->rtm_type));
 
         bb_putchar('\n');
         /*fflush_all();*/
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 8f5cd0bf2..057f8591a 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -896,7 +896,7 @@ traceroute_init(int op, char **argv)
 
         op |= getopt32(argv, "^"
                 OPT_STRING
-                "\0" "-1:x-x" /* minimum 1 arg */
+                "\0" "-1" /* minimum 1 arg */
                 , &tos_str, &device, &max_ttl_str, &port_str, &nprobes_str
                 , &source, &waittime_str, &pausemsecs_str, &first_ttl_str
         );
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 1e9405205..19606c58e 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -112,7 +112,7 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
                         printf("%02u:%02u:%02u\n", h, m, (unsigned)expires);
                 } else { /* -a */
                         time_t t = expires_abs;
-                        fputs(ctime(&t), stdout);
+                        fputs_stdout(ctime(&t));
                 }
         }
         /* close(fd); */
diff --git a/procps/powertop.c b/procps/powertop.c
index d508b5f78..fc6018b7a 100644
--- a/procps/powertop.c
+++ b/procps/powertop.c
@@ -818,7 +818,7 @@ int powertop_main(int argc UNUSED_PARAM, char UNUSED_PARAM **argv)
 
                 for (i = 0; i < MAX_CSTATE_COUNT + 2; i++)
                         if (cstate_lines[i][0])
-                                fputs(cstate_lines[i], stdout);
+                                fputs_stdout(cstate_lines[i]);
 
                 i = process_timer_stats();
 #if ENABLE_FEATURE_POWERTOP_PROCIRQ
diff --git a/procps/top.c b/procps/top.c
index 8d39526ff..cadc4ecec 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -712,7 +712,7 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width)
                 );
                 if ((int)(scr_width - col) > 1)
                         read_cmdline(line_buf + col, scr_width - col, s->pid, s->comm);
-                fputs(line_buf, stdout);
+                fputs_stdout(line_buf);
                 /* printf(" %d/%d %lld/%lld", s->pcpu, total_pcpu,
                         cur_jif.busy - prev_jif.busy, cur_jif.total - prev_jif.total); */
                 s++;
diff --git a/shell/hush.c b/shell/hush.c
index 77f90f82f..5eb6fa396 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2692,7 +2692,7 @@ static int get_user_input(struct in_str *i)
                          * Without check_and_run_traps, handler never runs.
                          */
                         check_and_run_traps();
-                        fputs(prompt_str, stdout);
+                        fputs_stdout(prompt_str);
                         fflush_all();
                 }
                 r = hfgetc(i->file);
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index b52dc9cac..d5f8ca0a2 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -205,7 +205,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
                 cur = shbuf_tail;
 #else
                 while (cur != shbuf_tail) {
-                        fputs(shbuf_data + cur, stdout);
+                        fputs_stdout(shbuf_data + cur);
                         cur += strlen(shbuf_data + cur) + 1;
                         if (cur >= shbuf_size)
                                 cur = 0;
@@ -217,7 +217,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
 
 #if ENABLE_FEATURE_LOGREAD_REDUCED_LOCKING
                 for (i = 0; i < len_total; i += strlen(copy + i) + 1) {
-                        fputs(copy + i, stdout);
+                        fputs_stdout(copy + i);
                 }
                 free(copy);
 #endif
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 92c83d719..cf9b722dc 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -383,6 +383,11 @@ testing "awk errors on missing delete arg" \
         "awk -e '{delete}' 2>&1" "awk: cmd. line:1: Too few arguments\n" "" ""
 SKIP=
 
+optional FEATURE_AWK_GNU_EXTENSIONS
+testing "awk printf('%c') can output NUL" \
+        "awk '{printf(\"hello%c null\n\", 0)}'" "hello\0 null\n" "" "\n"
+SKIP=
+
 # testing "description" "command" "result" "infile" "stdin"
 testing 'awk negative field access' \
         'awk 2>&1 -- '\''{ $(-1) }'\' \
diff --git a/testsuite/cat.tests b/testsuite/cat.tests
index 10970dc90..cf924ab5b 100755
--- a/testsuite/cat.tests
+++ b/testsuite/cat.tests
@@ -22,4 +22,28 @@ testing 'cat -v' \
         'foo\n'
 SKIP=
 
+optional FEATURE_CATN
+testing 'cat -n' \
+        'cat -n' \
+"\
+     1  line 1
+     2  
+     3  line 3
+" \
+        '' \
+        'line 1\n\nline 3\n'
+SKIP=
+
+optional FEATURE_CATN
+testing 'cat -b' \
+        'cat -b' \
+"\
+     1  line 1
+
+     2  line 3
+" \
+        '' \
+        'line 1\n\nline 3\n'
+SKIP=
+
 exit $FAILCOUNT
diff --git a/testsuite/nl.tests b/testsuite/nl.tests
new file mode 100755
index 000000000..95e7abb58
--- /dev/null
+++ b/testsuite/nl.tests
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Copyright 2021 by Ron Yorston
+# Licensed under GPLv2, see file LICENSE in this source tree.
+
+. ./testing.sh
+
+# testing "test name" "commands" "expected result" "file input" "stdin"
+
+testing "nl numbers all lines" \
+        "nl -b a input" \
+"\
+     1  line 1
+     2  
+     3  line 3
+" \
+        "line 1\n\nline 3\n" \
+        ""
+
+testing "nl numbers non-empty lines" \
+        "nl -b t input" \
+"\
+     1  line 1
+       
+     2  line 3
+" \
+        "line 1\n\nline 3\n" \
+        ""
+
+testing "nl numbers no lines" \
+        "nl -b n input" \
+"\
+       line 1
+       
+       line 3
+" \
+        "line 1\n\nline 3\n" \
+        ""
+
+exit $FAILCOUNT
diff --git a/util-linux/fdisk_gpt.c b/util-linux/fdisk_gpt.c
index e884e3dc1..4c30f31f8 100644
--- a/util-linux/fdisk_gpt.c
+++ b/util-linux/fdisk_gpt.c
@@ -87,7 +87,7 @@ gpt_print_wide36(uint16_t *s)
         }
         wc[i] = 0;
         if (wcstombs(buf, wc, sizeof(buf)) <= sizeof(buf)-1)
-                fputs(printable_string(buf), stdout);
+                fputs_stdout(printable_string(buf));
 #else
         char buf[37];
         int i = 0;
@@ -98,7 +98,7 @@ gpt_print_wide36(uint16_t *s)
                 i++;
         }
         buf[i] = '\0';
-        fputs(buf, stdout);
+        fputs_stdout(buf);
 #endif
 }
 
diff --git a/util-linux/rev.c b/util-linux/rev.c
index 31800fa51..cfcd12392 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -112,7 +112,7 @@ int rev_main(int argc UNUSED_PARAM, char **argv)
 #else
                         strrev(buf, strlen(buf));
 #endif
-                        fputs(buf, stdout);
+                        fputs_stdout(buf);
                 }
                 fclose(fp);
         } while (*argv);