From 3632cb15f16a7596a68dccfd66a2ad9496bf9fd9 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 10 Apr 2018 15:25:41 +0200 Subject: shell: add comments about [[, no code changes Signed-off-by: Denys Vlasenko --- coreutils/test.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'coreutils') 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" -- cgit v1.2.3-55-g6feb From d80eecb86812c1fbda652f9b995060c26ba0b155 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 29 Apr 2018 14:05:43 +0200 Subject: cat: fix cat -e and cat -v erroneously numbering 1st line function old new delta cat_main 418 421 +3 Signed-off-by: Denys Vlasenko --- coreutils/cat.c | 6 +++--- testsuite/cat.tests | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100755 testsuite/cat.tests (limited to 'coreutils') 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/testsuite/cat.tests b/testsuite/cat.tests new file mode 100755 index 000000000..404ebedeb --- /dev/null +++ b/testsuite/cat.tests @@ -0,0 +1,21 @@ +#!/bin/sh + +# Copyright 2018 by Denys Vlasenko +# Licensed under GPLv2, see file LICENSE in this source tree. + +. ./testing.sh + +# testing "description" "command" "result" "infile" "stdin" +testing 'cat -e' \ + 'cat -e' \ + 'foo$\n' \ + '' \ + 'foo\n' + +testing 'cat -v' \ + 'cat -v' \ + 'foo\n' \ + '' \ + 'foo\n' + +exit $FAILCOUNT -- cgit v1.2.3-55-g6feb