From 1ffaaca2a33e068501a14c4b635c0948cdba79e0 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 14 Sep 1998 15:22:40 +0000 Subject: Update. 1998-09-14 22:46 Tim Waugh * posix/wordexp-test.c: Chet Ramey confirmed that bash's behaviour for field-splitting :abc: is correct, and that two fields should result. Revert tests to reflect this. * posix/wordexp.c (w_emptyword): Remove function. (exec_comm): Don't use w_emptyword. (parse_param): Likewise. --- posix/wordexp-test.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'posix/wordexp-test.c') diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c index 1815241fca..be81c4babf 100644 --- a/posix/wordexp-test.c +++ b/posix/wordexp-test.c @@ -51,11 +51,15 @@ struct test_case_struct { 0, "two three", "one $var", 0, 3, { "one", "two", "three", }, IFS }, { 0, "two three", "one \"$var\"", 0, 2, { "one", "two three", }, "" }, { 0, "two three", "one $var", 0, 2, { "one", "two three", }, "" }, - { 0, ":abc:", "$var", 0, 3, { "", "abc", "", }, ":" }, - { 0, NULL, "$(echo :abc:)", 0, 3, { "", "abc", "", }, ":" }, - { 0, NULL, "$(echo :abc:\\ )", 0, 3, { "", "abc", "", }, ": " }, + + /* The non-whitespace IFS char at the end delimits the second field + * but does NOT start a new field. */ + { 0, ":abc:", "$var", 0, 2, { "", "abc", }, ":" }, + + { 0, NULL, "$(echo :abc:)", 0, 2, { "", "abc", }, ":" }, + { 0, NULL, "$(echo :abc:\\ )", 0, 2, { "", "abc", }, ": " }, { 0, NULL, "$(echo :abc\\ )", 0, 2, { "", "abc", }, ": " }, - { 0, ":abc:", "$(echo $var)", 0, 3, { "", "abc", "", }, ":" }, + { 0, ":abc:", "$(echo $var)", 0, 2, { "", "abc", }, ":" }, { 0, NULL, ":abc:", 0, 1, { " abc ", }, ":" }, { 0, NULL, "$(echo :abc:)def", 0, 3, { "", "abc", "def", }, ":" }, { 0, NULL, "$(echo abc:de)f", 0, 2, { "abc", "def", }, ":" }, -- cgit v1.2.3