aboutsummaryrefslogtreecommitdiff
path: root/posix/wordexp-test.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-09-12 08:42:05 +0000
committerUlrich Drepper <drepper@redhat.com>1998-09-12 08:42:05 +0000
commitc06cc21c043b02d0d7c078730695be370c66571c (patch)
tree1f290126701a3134dba291910ec5a26deff48952 /posix/wordexp-test.c
parent514d9bca72ee648d89ccce020124d11ac0a09ccb (diff)
downloadglibc-c06cc21c043b02d0d7c078730695be370c66571c.tar
glibc-c06cc21c043b02d0d7c078730695be370c66571c.tar.gz
glibc-c06cc21c043b02d0d7c078730695be370c66571c.tar.bz2
glibc-c06cc21c043b02d0d7c078730695be370c66571c.zip
Update.
1998-09-12 01:09 Tim Waugh <tim@cyberelk.demon.co.uk> * posix/wordexp-test.c: Fix wrong tests. Add new tests. * posix/wordexp.c (wordexp): Perform word-splitting instead of field-splitting here. (wordexp): If out of memory mid-word, free the word (but still leave pwordexp alone for caller to see). (parse_param): Allow for zero-length fields (smarter checking of memory allocation failure). (w_addword): Convert NULL words to "". (wordexp): Convert left-over IFS characters to blanks (like bash).
Diffstat (limited to 'posix/wordexp-test.c')
-rw-r--r--posix/wordexp-test.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c
index d73021cc2e..19048dca88 100644
--- a/posix/wordexp-test.c
+++ b/posix/wordexp-test.c
@@ -38,12 +38,21 @@ struct test_case_struct
const char *ifs;
} test_case[] =
{
- /* Simple field-splitting */
+ /* Simple word- and field-splitting */
{ 0, NULL, "one", 0, 1, { "one", }, IFS },
{ 0, NULL, "one two", 0, 2, { "one", "two", }, IFS },
{ 0, NULL, "one two three", 0, 3, { "one", "two", "three", }, IFS },
{ 0, NULL, " \tfoo\t\tbar ", 0, 2, { "foo", "bar", }, IFS },
- { 0, NULL, " red , white blue", 0, 3, { "red", "white", "blue", }, ", \n\t" },
+ { 0, NULL, "red , white blue", 0, 4, { "red", " ", "white", "blue", }, " ," },
+ { 0, NULL, "one two three", 0, 3, { "one", "two", "three", }, "" },
+ { 0, NULL, "one \"two three\"", 0, 2, { "one", "two three", }, IFS },
+ { 0, NULL, "one \"two three\"", 0, 2, { "one", "two three", }, "" },
+ { 0, "two three", "one \"$var\"", 0, 2, { "one", "two three", }, IFS },
+ { 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, 2, { "", "abc", }, ":" }, /* cf. bash */
+ { 0, NULL, ":abc:", 0, 1, { " abc ", }, ":" },
/* Simple parameter expansion */
{ 0, "foo", "${var}", 0, 1, { "foo", }, IFS },
@@ -120,9 +129,9 @@ struct test_case_struct
{ 0, "o thr", "*$var*", 0, 2, { "two", "three" }, IFS },
/* Different IFS values */
- { 0, NULL, "a b\tc\nd ", 0, 4, { "a", "b", "c", "d" }, NULL /* unset */ },
- { 0, NULL, "a b\tc d ", 0, 1, { "a b\tc d " }, "" /* `null' */ },
- { 0, NULL, "a,b c\n, d", 0, 3, { "a", "b c", " d" }, "\t\n," },
+ { 0, "a b\tc\nd ", "$var", 0, 4, { "a", "b", "c", "d" }, NULL /* unset */ },
+ { 0, "a b\tc d ", "$var", 0, 1, { "a b\tc d " }, "" /* `null' */ },
+ { 0, "a,b c\n, d", "$var", 0, 3, { "a", "b c", " d" }, "\t\n," },
/* Other things that should succeed */
{ 0, NULL, "\\*\"|&;<>\"\\(\\)\\{\\}", 0, 1, { "*|&;<>(){}", }, IFS },