7 files changed, 31 insertions, 18 deletions

diff --git a/coreutils/cal.c b/coreutils/cal.c
index ef5dbeadb..f18c16120 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -138,7 +138,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                         if (julian)
                                 *hp++ = ' ';
                         {
-                                char *two_wchars = unicode_conv_to_printable_fixedwidth(NULL, buf, 2);
+                                char *two_wchars = unicode_conv_to_printable_fixedwidth(/*NULL,*/ buf, 2);
                                 strcpy(hp, two_wchars);
                                 free(two_wchars);
                         }
diff --git a/coreutils/date.c b/coreutils/date.c
index 22d0a5327..d36ed83fd 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -19,7 +19,7 @@
 /* Input parsing code is always bulky - used heavy duty libc stuff as
    much as possible, missed out a lot of bounds checking */
 
-//applet:IF_DATE(APPLET(date, _BB_DIR_BIN, _BB_SUID_DROP))
+//applet:IF_DATE(APPLET(date, BB_DIR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_DATE) += date.o
 
diff --git a/coreutils/stty.c b/coreutils/stty.c
index e28e15c97..1dd01c4dd 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -59,6 +59,10 @@
 #if defined(VEOL2) && !defined(CEOL2)
 # define CEOL2 _POSIX_VDISABLE
 #endif
+/* glibc-2.12.1 uses only VSWTC name */
+#if defined(VSWTC) && !defined(VSWTCH)
+# define VSWTCH VSWTC
+#endif
 /* ISC renamed swtch to susp for termios, but we'll accept either name */
 #if defined(VSUSP) && !defined(VSWTCH)
 # define VSWTCH VSUSP
@@ -221,6 +225,9 @@
 #ifndef XCASE
 # define XCASE 0
 #endif
+#ifndef IUTF8
+# define IUTF8 0
+#endif
 
 /* Which speeds to set */
 enum speed_setting {
@@ -348,6 +355,9 @@ static const char mode_name[] =
 #if IMAXBEL
         MI_ENTRY("imaxbel",  input,       SANE_SET   | REV,  IMAXBEL,    0 )
 #endif
+#if IUTF8
+        MI_ENTRY("iutf8",    input,       SANE_UNSET | REV,  IUTF8,      0 )
+#endif
         MI_ENTRY("opost",    output,      SANE_SET   | REV,  OPOST,      0 )
 #if OLCUC
         MI_ENTRY("olcuc",    output,      SANE_UNSET | REV,  OLCUC,      0 )
@@ -502,6 +512,9 @@ static const struct mode_info mode_info[] = {
 #if IMAXBEL
         MI_ENTRY("imaxbel",  input,       SANE_SET   | REV,  IMAXBEL,    0 )
 #endif
+#if IUTF8
+        MI_ENTRY("iutf8",    input,       SANE_UNSET | REV,  IUTF8,      0 )
+#endif
         MI_ENTRY("opost",    output,      SANE_SET   | REV,  OPOST,      0 )
 #if OLCUC
         MI_ENTRY("olcuc",    output,      SANE_UNSET | REV,  OLCUC,      0 )
@@ -991,8 +1004,9 @@ static void display_speed(const struct termios *mode, int fancy)
         const char *fmt_str = "%lu %lu\n\0ispeed %lu baud; ospeed %lu baud;";
         unsigned long ispeed, ospeed;
 
-        ospeed = ispeed = cfgetispeed(mode);
-        if (ispeed == 0 || ispeed == (ospeed = cfgetospeed(mode))) {
+        ispeed = cfgetispeed(mode);
+        ospeed = cfgetospeed(mode);
+        if (ispeed == 0 || ispeed == ospeed) {
                 ispeed = ospeed;                /* in case ispeed was 0 */
                 //________ 0123 4 5 6 7 8 9
                 fmt_str = "%lu\n\0\0\0\0\0speed %lu baud;";
@@ -1011,7 +1025,7 @@ static void do_display(const struct termios *mode, int all)
         display_speed(mode, 1);
         if (all)
                 display_window_size(1);
-#ifdef HAVE_C_LINE
+#ifdef __linux__
         wrapf("line = %u;\n", mode->c_line);
 #else
         newline();
@@ -1344,7 +1358,7 @@ int stty_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 switch (param) {
-#ifdef HAVE_C_LINE
+#ifdef __linux__
                 case param_line:
 # ifndef TIOCGWINSZ
                         xatoul_range_sfx(argnext, 1, INT_MAX, stty_suffixes);
@@ -1448,7 +1462,7 @@ int stty_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 switch (param) {
-#ifdef HAVE_C_LINE
+#ifdef __linux__
                 case param_line:
                         mode.c_line = xatoul_sfx(argnext, stty_suffixes);
                         stty_state |= STTY_require_set_attr;
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 6c2b948e6..c51fb70ca 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -26,7 +26,7 @@
 //config:         touch is used to create or change the access and/or
 //config:         modification timestamp of specified files.
 
-//applet:IF_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_DROP, touch))
+//applet:IF_TOUCH(APPLET_NOFORK(touch, touch, BB_DIR_BIN, BB_SUID_DROP, touch))
 
 //kbuild:lib-$(CONFIG_TOUCH) += touch.o
 
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 0c4311f24..56ed254e5 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -132,7 +132,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 }
 #endif
 
-//applet:IF_BASE64(APPLET(base64, _BB_DIR_BIN, _BB_SUID_DROP))
+//applet:IF_BASE64(APPLET(base64, BB_DIR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_BASE64) += uudecode.o
 
diff --git a/coreutils/wc.c b/coreutils/wc.c
index fe3f274f8..6e22c66c8 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -81,11 +81,11 @@
  * column order in "wc -cmlwL" output:
  */
 enum {
-        WC_LINES    = 0,
-        WC_WORDS    = 1,
-        WC_UNICHARS = 2,
-        WC_CHARS    = 3,
-        WC_LENGTH   = 4,
+        WC_LINES    = 0, /* -l */
+        WC_WORDS    = 1, /* -w */
+        WC_UNICHARS = 2, /* -m */
+        WC_BYTES    = 3, /* -c */
+        WC_LENGTH   = 4, /* -L */
         NUM_WCS     = 5,
 };
 
@@ -104,10 +104,10 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
 
         init_unicode();
 
-        print_type = getopt32(argv, "lwcmL");
+        print_type = getopt32(argv, "lwmcL");
 
         if (print_type == 0) {
-                print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS);
+                print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_BYTES);
         }
 
         argv += optind;
@@ -157,7 +157,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
                         }
 
                         /* Cater for -c and -m */
-                        ++counts[WC_CHARS];
+                        ++counts[WC_BYTES];
                         if (unicode_status != UNICODE_ON /* every byte is a new char */
                          || (c & 0xc0) != 0x80 /* it isn't a 2nd+ byte of a Unicode char */
                         ) {
diff --git a/coreutils/who.c b/coreutils/who.c
index 8384d9534..ab1e30fc8 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -19,7 +19,6 @@
 /* BB_AUDIT SUSv3 _NOT_ compliant -- missing options -b, -d, -l, -m, -p, -q, -r, -s, -t, -T, -u; Missing argument 'file'.  */
 
 #include "libbb.h"
-#include <utmp.h>
 
 static void idle_string(char *str6, time_t t)
 {