Merge branch 'busybox' into merge

2 files changed, 7 insertions, 3 deletions

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 5f02233ca..fb735f994 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -112,10 +112,10 @@ static int catv(unsigned opts, char **argv)
         int retval = EXIT_SUCCESS;
         int fd;
 #if ENABLE_FEATURE_CATN
-        unsigned lineno = 0;
-        unsigned eol_char = (opts & (CAT_OPT_n|CAT_OPT_b)) ? '\n' : 0x100;
+        bool eol_seen = (opts & (CAT_OPT_n|CAT_OPT_b));
+        unsigned eol_char = (eol_seen ? '\n' : 0x100);
         unsigned skip_num_on = (opts & CAT_OPT_b) ? '\n' : 0x100;
-        bool eol_seen = 1;
+        unsigned lineno = 0;
 #endif
 
         BUILD_BUG_ON(CAT_OPT_e != VISIBLE_ENDLINE);
diff --git a/coreutils/test.c b/coreutils/test.c
index 824ce3b5a..ddb66ddce 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -313,6 +313,9 @@ static const struct operator_t ops_table[] = {
         { /* "-L" */ FILSYM  , UNOP   },
         { /* "-S" */ FILSOCK , UNOP   },
         { /* "="  */ STREQ   , BINOP  },
+        /* "==" is bashism, http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
+         * lists only "=" as comparison operator.
+         */
         { /* "==" */ STREQ   , BINOP  },
         { /* "!=" */ STRNE   , BINOP  },
         { /* "<"  */ STRLT   , BINOP  },
@@ -357,6 +360,7 @@ static const char ops_texts[] ALIGN1 =
         "-L"  "\0"
         "-S"  "\0"
         "="   "\0"
+        /* "==" is bashism */
         "=="  "\0"
         "!="  "\0"
         "<"   "\0"