# HG changeset patch # User Bruno Haible # Date 1275594401 -7200 # Node ID 36af21ca41f73a613867bb3d4ef3e7514b4abf32 # Parent 5d87ca7c823faa9dcf929f79b4a5a56a9d4979b0 Reduce dependencies. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2010-06-03 Bruno Haible + + Reduce dependencies. + * tests/test-quotearg.h: New file, extracted from + tests/test-quotearg.c. + * tests/test-quotearg-simple.c: New file, extracted from + tests/test-quotearg.c. + * tests/test-quotearg.c: Don't include . + (struct result_strings, struct result_groups, LQ, RQ, LQ_ENC, RQ_ENC, + RQ_ESC, inputs, compare, use_quotearg_buffer, use_quotearg, + use_quote_double_quotes, use_quotearg_colon): Moved to + tests/test-quotearg.h. + (results_g, flag_results, custom_quotes, custom_results): Moved + to tests/test-quotearg-simple.c. + (main): Moved the part that does not depend on gettext to + tests/test-quotearg-simple.c. Return 77 if the test cannot be + performed. + * modules/quotearg-simple: New file. + * modules/quotearg-simple-tests: New file. + * modules/quotearg (Depends-on): Add quotearg-simple. + * modules/quotearg-tests (Status): Mark as gettext-dependent-test. + (Files): Add tests/test-quotearg.h. + Reported by Paolo Bonzini. + 2010-06-03 Bruno Haible Reduce dependencies. diff --git a/modules/quotearg b/modules/quotearg --- a/modules/quotearg +++ b/modules/quotearg @@ -14,6 +14,7 @@ mbrtowc mbsinit memcmp +quotearg-simple stdbool wchar wctype diff --git a/modules/quotearg-simple b/modules/quotearg-simple new file mode 100644 --- /dev/null +++ b/modules/quotearg-simple @@ -0,0 +1,19 @@ +Description: +A dummy module whose tests are simple 'quotearg' tests. + +Files: + +Depends-on: +quotearg + +configure.ac: + +Makefile.am: + +Include: + +License: +GPL + +Maintainer: +Bruno Haible diff --git a/modules/quotearg-simple-tests b/modules/quotearg-simple-tests new file mode 100644 --- /dev/null +++ b/modules/quotearg-simple-tests @@ -0,0 +1,15 @@ +Files: +tests/test-quotearg-simple.c +tests/test-quotearg.h +tests/macros.h + +Depends-on: +progname +stdint + +configure.ac: + +Makefile.am: +TESTS += test-quotearg-simple +check_PROGRAMS += test-quotearg-simple +test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@ diff --git a/modules/quotearg-tests b/modules/quotearg-tests --- a/modules/quotearg-tests +++ b/modules/quotearg-tests @@ -1,6 +1,10 @@ +Status: +gettext-dependent-test + Files: tests/test-quotearg.sh tests/test-quotearg.c +tests/test-quotearg.h tests/macros.h tests/locale/fr/LC_MESSAGES/test-quotearg.po tests/locale/fr/LC_MESSAGES/test-quotearg.mo diff --git a/tests/test-quotearg-simple.c b/tests/test-quotearg-simple.c new file mode 100644 --- /dev/null +++ b/tests/test-quotearg-simple.c @@ -0,0 +1,294 @@ +/* Test of quotearg family of functions. + Copyright (C) 2008-2010 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Eric Blake , 2008. */ + +#include + +#include "quotearg.h" + +#include +#include +#include +#include +#include + +#include "progname.h" +#include "macros.h" + +#include "test-quotearg.h" + +static struct result_groups results_g[] = { + /* literal_quoting_style */ + { { "", "\0""1\0", 3, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", + LQ RQ, LQ RQ }, + { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", + LQ RQ, LQ RQ }, + { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", + LQ RQ, LQ RQ } }, + + /* shell_quoting_style */ + { { "''", "\0""1\0", 3, "simple", "' \t\n'\\''\"\033?""?/\\'", "a:b", + "'a\\b'", LQ RQ, LQ RQ }, + { "''", "1", 1, "simple", "' \t\n'\\''\"\033?""?/\\'", "a:b", + "'a\\b'", LQ RQ, LQ RQ }, + { "''", "1", 1, "simple", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", + "'a\\b'", LQ RQ, LQ RQ } }, + + /* shell_always_quoting_style */ + { { "''", "'\0""1\0'", 5, "'simple'", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", + "'a\\b'", "'" LQ RQ "'", "'" LQ RQ "'" }, + { "''", "'1'", 3, "'simple'", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", + "'a\\b'", "'" LQ RQ "'", "'" LQ RQ "'" }, + { "''", "'1'", 3, "'simple'", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", + "'a\\b'", "'" LQ RQ "'", "'" LQ RQ "'" } }, + + /* c_quoting_style */ + { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", + "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", + "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", + "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", + "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", + "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a\\:b\"", "\"a\\\\b\"", + "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } }, + + /* c_maybe_quoting_style */ + { { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", + "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, + { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", + "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, + { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", + "\"a:b\"", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ } }, + + /* escape_quoting_style */ + { { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a:b", + "a\\\\b", LQ_ENC RQ_ENC, LQ RQ }, + { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a:b", + "a\\\\b", LQ_ENC RQ_ENC, LQ RQ }, + { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a\\:b", + "a\\\\b", LQ_ENC RQ_ENC, LQ RQ } }, + + /* locale_quoting_style */ + { { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'", + "`a:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" }, + { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'", + "`a:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" }, + { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'", + "`a\\:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" } }, + + /* clocale_quoting_style */ + { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", + "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", + "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", + "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", + "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", + "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a\\:b\"", "\"a\\\\b\"", + "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } } +}; + +static struct result_groups flag_results[] = { + /* literal_quoting_style and QA_ELIDE_NULL_BYTES */ + { { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", LQ RQ, + LQ RQ }, + { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", LQ RQ, + LQ RQ }, + { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", LQ RQ, + LQ RQ } }, + + /* c_quoting_style and QA_ELIDE_OUTER_QUOTES */ + { { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", + "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, + { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", + "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, + { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", + "\"a:b\"", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ } }, + + /* c_quoting_style and QA_SPLIT_TRIGRAPHS */ + { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", + "\" \\t\\n'\\\"\\033?\"\"?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", + "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", + "\" \\t\\n'\\\"\\033?\"\"?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", + "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", + "\" \\t\\n'\\\"\\033?\"\"?/\\\\\"", "\"a\\:b\"", "\"a\\\\b\"", + "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } } +}; + +static char const *custom_quotes[][2] = { + { "", "" }, + { "'", "'" }, + { "(", ")" }, + { ":", " " }, + { " ", ":" }, + { "# ", "\n" }, + { "\"'", "'\"" } +}; + +static struct result_groups custom_results[] = { + /* left_quote = right_quote = "" */ + { { "", "\\0001\\0", 7, "simple", + " \\t\\n'\"\\033?""?/\\\\", "a:b", "a\\\\b", + LQ_ENC RQ_ENC, LQ RQ }, + { "", "\\0001\\0", 7, "simple", + " \\t\\n'\"\\033?""?/\\\\", "a:b", "a\\\\b", + LQ_ENC RQ_ENC, LQ RQ }, + { "", "\\0001\\0", 7, "simple", + " \\t\\n'\"\\033?""?/\\\\", "a\\:b", "a\\\\b", + LQ_ENC RQ_ENC, LQ RQ } }, + + /* left_quote = right_quote = "'" */ + { { "''", "'\\0001\\0'", 9, "'simple'", + "' \\t\\n\\'\"\\033?""?/\\\\'", "'a:b'", "'a\\\\b'", + "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + { "''", "'\\0001\\0'", 9, "'simple'", + "' \\t\\n\\'\"\\033?""?/\\\\'", "'a:b'", "'a\\\\b'", + "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + { "''", "'\\0001\\0'", 9, "'simple'", + "' \\t\\n\\'\"\\033?""?/\\\\'", "'a\\:b'", "'a\\\\b'", + "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } }, + + /* left_quote = "(" and right_quote = ")" */ + { { "()", "(\\0001\\0)", 9, "(simple)", + "( \\t\\n'\"\\033?""?/\\\\)", "(a:b)", "(a\\\\b)", + "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" }, + { "()", "(\\0001\\0)", 9, "(simple)", + "( \\t\\n'\"\\033?""?/\\\\)", "(a:b)", "(a\\\\b)", + "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" }, + { "()", "(\\0001\\0)", 9, "(simple)", + "( \\t\\n'\"\\033?""?/\\\\)", "(a\\:b)", "(a\\\\b)", + "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" } }, + + /* left_quote = ":" and right_quote = " " */ + { { ": ", ":\\0001\\0 ", 9, ":simple ", + ":\\ \\t\\n'\"\\033?""?/\\\\ ", ":a:b ", ":a\\\\b ", + ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " }, + { ": ", ":\\0001\\0 ", 9, ":simple ", + ":\\ \\t\\n'\"\\033?""?/\\\\ ", ":a:b ", ":a\\\\b ", + ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " }, + { ": ", ":\\0001\\0 ", 9, ":simple ", + ":\\ \\t\\n'\"\\033?""?/\\\\ ", ":a\\:b ", ":a\\\\b ", + ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " } }, + + /* left_quote = " " and right_quote = ":" */ + { { " :", " \\0001\\0:", 9, " simple:", + " \\t\\n'\"\\033?""?/\\\\:", " a\\:b:", " a\\\\b:", + " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" }, + { " :", " \\0001\\0:", 9, " simple:", + " \\t\\n'\"\\033?""?/\\\\:", " a\\:b:", " a\\\\b:", + " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" }, + { " :", " \\0001\\0:", 9, " simple:", + " \\t\\n'\"\\033?""?/\\\\:", " a\\:b:", " a\\\\b:", + " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" } }, + + /* left_quote = "# " and right_quote = "\n" */ + { { "# \n", "# \\0001\\0\n", 10, "# simple\n", + "# \\t\\n'\"\\033?""?/\\\\\n", "# a:b\n", "# a\\\\b\n", + "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" }, + { "# \n", "# \\0001\\0\n", 10, "# simple\n", + "# \\t\\n'\"\\033?""?/\\\\\n", "# a:b\n", "# a\\\\b\n", + "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" }, + { "# \n", "# \\0001\\0\n", 10, "# simple\n", + "# \\t\\n'\"\\033?""?/\\\\\n", "# a\\:b\n", "# a\\\\b\n", + "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" } }, + + /* left_quote = "\"'" and right_quote = "'\"" */ + { { "\"''\"", "\"'\\0001\\0'\"", 11, "\"'simple'\"", + "\"' \\t\\n\\'\"\\033?""?/\\\\'\"", "\"'a:b'\"", "\"'a\\\\b'\"", + "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" }, + { "\"''\"", "\"'\\0001\\0'\"", 11, "\"'simple'\"", + "\"' \\t\\n\\'\"\\033?""?/\\\\'\"", "\"'a:b'\"", "\"'a\\\\b'\"", + "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" }, + { "\"''\"", "\"'\\0001\\0'\"", 11, "\"'simple'\"", + "\"' \\t\\n\\'\"\\033?""?/\\\\'\"", "\"'a\\:b'\"", "\"'a\\\\b'\"", + "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" } } +}; + +int +main (int argc _GL_UNUSED, char *argv[]) +{ + int i; + bool ascii_only = MB_CUR_MAX == 1 && !isprint ((unsigned char) LQ[0]); + + set_program_name (argv[0]); + + /* This part of the program is hard-wired to the C locale since it + does not call setlocale. However, according to POSIX, the use of + 8-bit bytes in a character context in the C locale gives + unspecified results (that is, the C locale charset is allowed to + be unibyte with 8-bit bytes rejected [ASCII], unibyte with 8-bit + bytes being characters [often ISO-8859-1], or multibyte [often + UTF-8]). We assume that the latter two cases will be + indistinguishable in this test - that is, the LQ and RQ sequences + will pass through unchanged in either type of charset. So when + testing for quoting of str7, use the ascii_only flag to decide + what to expect for the 8-bit data being quoted. */ + ASSERT (!isprint ('\033')); + for (i = literal_quoting_style; i <= clocale_quoting_style; i++) + { + set_quoting_style (NULL, i); + compare_strings (use_quotearg_buffer, &results_g[i].group1, ascii_only); + compare_strings (use_quotearg, &results_g[i].group2, ascii_only); + if (i == c_quoting_style) + compare_strings (use_quote_double_quotes, &results_g[i].group2, + ascii_only); + compare_strings (use_quotearg_colon, &results_g[i].group3, ascii_only); + } + + set_quoting_style (NULL, literal_quoting_style); + ASSERT (set_quoting_flags (NULL, QA_ELIDE_NULL_BYTES) == 0); + compare_strings (use_quotearg_buffer, &flag_results[0].group1, ascii_only); + compare_strings (use_quotearg, &flag_results[0].group2, ascii_only); + compare_strings (use_quotearg_colon, &flag_results[0].group3, ascii_only); + + set_quoting_style (NULL, c_quoting_style); + ASSERT (set_quoting_flags (NULL, QA_ELIDE_OUTER_QUOTES) + == QA_ELIDE_NULL_BYTES); + compare_strings (use_quotearg_buffer, &flag_results[1].group1, ascii_only); + compare_strings (use_quotearg, &flag_results[1].group2, ascii_only); + compare_strings (use_quote_double_quotes, &flag_results[1].group2, + ascii_only); + compare_strings (use_quotearg_colon, &flag_results[1].group3, ascii_only); + + ASSERT (set_quoting_flags (NULL, QA_SPLIT_TRIGRAPHS) + == QA_ELIDE_OUTER_QUOTES); + compare_strings (use_quotearg_buffer, &flag_results[2].group1, ascii_only); + compare_strings (use_quotearg, &flag_results[2].group2, ascii_only); + compare_strings (use_quote_double_quotes, &flag_results[2].group2, + ascii_only); + compare_strings (use_quotearg_colon, &flag_results[2].group3, ascii_only); + + ASSERT (set_quoting_flags (NULL, 0) == QA_SPLIT_TRIGRAPHS); + + for (i = 0; i < sizeof custom_quotes / sizeof *custom_quotes; ++i) + { + set_custom_quoting (NULL, + custom_quotes[i][0], custom_quotes[i][1]); + compare_strings (use_quotearg_buffer, &custom_results[i].group1, + ascii_only); + compare_strings (use_quotearg, &custom_results[i].group2, ascii_only); + compare_strings (use_quotearg_colon, &custom_results[i].group3, + ascii_only); + } + + quotearg_free (); + return 0; +} diff --git a/tests/test-quotearg.c b/tests/test-quotearg.c --- a/tests/test-quotearg.c +++ b/tests/test-quotearg.c @@ -21,7 +21,6 @@ #include "quotearg.h" -#include #include #include #include @@ -32,136 +31,7 @@ #include "gettext.h" #include "macros.h" -struct result_strings { - char const *str1; /* Translation of "". */ - char const *str2; /* Translation of "\0""1\0". */ - size_t len2; /* Length of str2. */ - char const *str3; /* Translation of "simple". */ - char const *str4; /* Translation of " \t\n'\"\033?""?/\\". */ - char const *str5; /* Translation of "a:b". */ - char const *str6; /* Translation of "a\\b". */ - char const *str7a; /* Translation of LQ RQ, in ASCII charset. */ - char const *str7b; /* Translation of LQ RQ, in Latin1 or UTF-8 charset. */ -}; - -struct result_groups { - struct result_strings group1; /* Via quotearg_buffer. */ - struct result_strings group2; /* Via quotearg{,_mem}. */ - struct result_strings group3; /* Via quotearg_colon{,_mem}. */ -}; - -/* These quotes are borrowed from a pt_PT.utf8 translation. */ -# define LQ "\302\253" -# define RQ "\302\273" -# define LQ_ENC "\\302\\253" -# define RQ_ENC "\\302\\273" -# define RQ_ESC "\\\302\273" - -static struct result_strings inputs = { - "", "\0001\0", 3, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", - LQ RQ, NULL -}; - -static struct result_groups results_g[] = { - /* literal_quoting_style */ - { { "", "\0""1\0", 3, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", - LQ RQ, LQ RQ }, - { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", - LQ RQ, LQ RQ }, - { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", - LQ RQ, LQ RQ } }, - - /* shell_quoting_style */ - { { "''", "\0""1\0", 3, "simple", "' \t\n'\\''\"\033?""?/\\'", "a:b", - "'a\\b'", LQ RQ, LQ RQ }, - { "''", "1", 1, "simple", "' \t\n'\\''\"\033?""?/\\'", "a:b", - "'a\\b'", LQ RQ, LQ RQ }, - { "''", "1", 1, "simple", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", - "'a\\b'", LQ RQ, LQ RQ } }, - - /* shell_always_quoting_style */ - { { "''", "'\0""1\0'", 5, "'simple'", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", - "'a\\b'", "'" LQ RQ "'", "'" LQ RQ "'" }, - { "''", "'1'", 3, "'simple'", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", - "'a\\b'", "'" LQ RQ "'", "'" LQ RQ "'" }, - { "''", "'1'", 3, "'simple'", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", - "'a\\b'", "'" LQ RQ "'", "'" LQ RQ "'" } }, - - /* c_quoting_style */ - { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", - "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, - { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", - "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, - { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", - "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a\\:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } }, - - /* c_maybe_quoting_style */ - { { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, - { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, - { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "\"a:b\"", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ } }, - - /* escape_quoting_style */ - { { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a:b", - "a\\\\b", LQ_ENC RQ_ENC, LQ RQ }, - { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a:b", - "a\\\\b", LQ_ENC RQ_ENC, LQ RQ }, - { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a\\:b", - "a\\\\b", LQ_ENC RQ_ENC, LQ RQ } }, - - /* locale_quoting_style */ - { { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'", - "`a:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" }, - { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'", - "`a:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" }, - { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'", - "`a\\:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" } }, - - /* clocale_quoting_style */ - { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", - "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, - { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", - "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, - { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", - "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a\\:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } } -}; - -static struct result_groups flag_results[] = { - /* literal_quoting_style and QA_ELIDE_NULL_BYTES */ - { { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", LQ RQ, - LQ RQ }, - { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", LQ RQ, - LQ RQ }, - { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", LQ RQ, - LQ RQ } }, - - /* c_quoting_style and QA_ELIDE_OUTER_QUOTES */ - { { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, - { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, - { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "\"a:b\"", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ } }, - - /* c_quoting_style and QA_SPLIT_TRIGRAPHS */ - { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", - "\" \\t\\n'\\\"\\033?\"\"?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, - { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", - "\" \\t\\n'\\\"\\033?\"\"?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, - { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", - "\" \\t\\n'\\\"\\033?\"\"?/\\\\\"", "\"a\\:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } } -}; +#include "test-quotearg.h" #if ENABLE_NLS @@ -191,247 +61,11 @@ #endif /* ENABLE_NLS */ -static char const *custom_quotes[][2] = { - { "", "" }, - { "'", "'" }, - { "(", ")" }, - { ":", " " }, - { " ", ":" }, - { "# ", "\n" }, - { "\"'", "'\"" } -}; - -static struct result_groups custom_results[] = { - /* left_quote = right_quote = "" */ - { { "", "\\0001\\0", 7, "simple", - " \\t\\n'\"\\033?""?/\\\\", "a:b", "a\\\\b", - LQ_ENC RQ_ENC, LQ RQ }, - { "", "\\0001\\0", 7, "simple", - " \\t\\n'\"\\033?""?/\\\\", "a:b", "a\\\\b", - LQ_ENC RQ_ENC, LQ RQ }, - { "", "\\0001\\0", 7, "simple", - " \\t\\n'\"\\033?""?/\\\\", "a\\:b", "a\\\\b", - LQ_ENC RQ_ENC, LQ RQ } }, - - /* left_quote = right_quote = "'" */ - { { "''", "'\\0001\\0'", 9, "'simple'", - "' \\t\\n\\'\"\\033?""?/\\\\'", "'a:b'", "'a\\\\b'", - "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, - { "''", "'\\0001\\0'", 9, "'simple'", - "' \\t\\n\\'\"\\033?""?/\\\\'", "'a:b'", "'a\\\\b'", - "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, - { "''", "'\\0001\\0'", 9, "'simple'", - "' \\t\\n\\'\"\\033?""?/\\\\'", "'a\\:b'", "'a\\\\b'", - "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } }, - - /* left_quote = "(" and right_quote = ")" */ - { { "()", "(\\0001\\0)", 9, "(simple)", - "( \\t\\n'\"\\033?""?/\\\\)", "(a:b)", "(a\\\\b)", - "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" }, - { "()", "(\\0001\\0)", 9, "(simple)", - "( \\t\\n'\"\\033?""?/\\\\)", "(a:b)", "(a\\\\b)", - "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" }, - { "()", "(\\0001\\0)", 9, "(simple)", - "( \\t\\n'\"\\033?""?/\\\\)", "(a\\:b)", "(a\\\\b)", - "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" } }, - - /* left_quote = ":" and right_quote = " " */ - { { ": ", ":\\0001\\0 ", 9, ":simple ", - ":\\ \\t\\n'\"\\033?""?/\\\\ ", ":a:b ", ":a\\\\b ", - ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " }, - { ": ", ":\\0001\\0 ", 9, ":simple ", - ":\\ \\t\\n'\"\\033?""?/\\\\ ", ":a:b ", ":a\\\\b ", - ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " }, - { ": ", ":\\0001\\0 ", 9, ":simple ", - ":\\ \\t\\n'\"\\033?""?/\\\\ ", ":a\\:b ", ":a\\\\b ", - ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " } }, - - /* left_quote = " " and right_quote = ":" */ - { { " :", " \\0001\\0:", 9, " simple:", - " \\t\\n'\"\\033?""?/\\\\:", " a\\:b:", " a\\\\b:", - " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" }, - { " :", " \\0001\\0:", 9, " simple:", - " \\t\\n'\"\\033?""?/\\\\:", " a\\:b:", " a\\\\b:", - " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" }, - { " :", " \\0001\\0:", 9, " simple:", - " \\t\\n'\"\\033?""?/\\\\:", " a\\:b:", " a\\\\b:", - " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" } }, - - /* left_quote = "# " and right_quote = "\n" */ - { { "# \n", "# \\0001\\0\n", 10, "# simple\n", - "# \\t\\n'\"\\033?""?/\\\\\n", "# a:b\n", "# a\\\\b\n", - "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" }, - { "# \n", "# \\0001\\0\n", 10, "# simple\n", - "# \\t\\n'\"\\033?""?/\\\\\n", "# a:b\n", "# a\\\\b\n", - "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" }, - { "# \n", "# \\0001\\0\n", 10, "# simple\n", - "# \\t\\n'\"\\033?""?/\\\\\n", "# a\\:b\n", "# a\\\\b\n", - "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" } }, - - /* left_quote = "\"'" and right_quote = "'\"" */ - { { "\"''\"", "\"'\\0001\\0'\"", 11, "\"'simple'\"", - "\"' \\t\\n\\'\"\\033?""?/\\\\'\"", "\"'a:b'\"", "\"'a\\\\b'\"", - "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" }, - { "\"''\"", "\"'\\0001\\0'\"", 11, "\"'simple'\"", - "\"' \\t\\n\\'\"\\033?""?/\\\\'\"", "\"'a:b'\"", "\"'a\\\\b'\"", - "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" }, - { "\"''\"", "\"'\\0001\\0'\"", 11, "\"'simple'\"", - "\"' \\t\\n\\'\"\\033?""?/\\\\'\"", "\"'a\\:b'\"", "\"'a\\\\b'\"", - "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" } } -}; - -static void -compare (char const *a, size_t la, char const *b, size_t lb) -{ - ASSERT (la == lb); - ASSERT (memcmp (a, b, la) == 0); - ASSERT (b[lb] == '\0'); -} - -static void -compare_strings (char *(func) (char const *, size_t *), - struct result_strings *results, bool ascii_only) -{ - size_t len; - char *p; - - len = 0; - p = func (inputs.str1, &len); - compare (results->str1, strlen (results->str1), p, len); - - len = inputs.len2; - p = func (inputs.str2, &len); - compare (results->str2, results->len2, p, len); - - len = SIZE_MAX; - p = func (inputs.str3, &len); - compare (results->str3, strlen (results->str3), p, len); - - len = strlen (inputs.str4); - p = func (inputs.str4, &len); - compare (results->str4, strlen (results->str4), p, len); - - len = SIZE_MAX; - p = func (inputs.str5, &len); - compare (results->str5, strlen (results->str5), p, len); - - len = strlen (inputs.str6); - p = func (inputs.str6, &len); - compare (results->str6, strlen (results->str6), p, len); - - len = strlen (inputs.str7a); - p = func (inputs.str7a, &len); - if (ascii_only) - compare (results->str7a, strlen (results->str7a), p, len); - else - compare (results->str7b, strlen (results->str7b), p, len); -} - -static char * -use_quotearg_buffer (const char *str, size_t *len) -{ - static char buf[100]; - size_t size; - memset (buf, 0xa5, 100); - size = quotearg_buffer (buf, 100, str, *len, NULL); - *len = size; - ASSERT ((unsigned char) buf[size + 1] == 0xa5); - return buf; -} - -static char * -use_quotearg (const char *str, size_t *len) -{ - char *p = *len == SIZE_MAX ? quotearg (str) : quotearg_mem (str, *len); - *len = strlen (p); - return p; -} - -static char * -use_quote_double_quotes (const char *str, size_t *len) -{ - char *p = *len == SIZE_MAX ? quotearg_char (str, '"') - : quotearg_char_mem (str, *len, '"'); - *len = strlen (p); - return p; -} - -static char * -use_quotearg_colon (const char *str, size_t *len) -{ - char *p = (*len == SIZE_MAX ? quotearg_colon (str) - : quotearg_colon_mem (str, *len)); - *len = strlen (p); - return p; -} - int main (int argc _GL_UNUSED, char *argv[]) { - int i; - bool ascii_only = MB_CUR_MAX == 1 && !isprint ((unsigned char) LQ[0]); - set_program_name (argv[0]); - /* This part of the program is hard-wired to the C locale since it - does not call setlocale. However, according to POSIX, the use of - 8-bit bytes in a character context in the C locale gives - unspecified results (that is, the C locale charset is allowed to - be unibyte with 8-bit bytes rejected [ASCII], unibyte with 8-bit - bytes being characters [often ISO-8859-1], or multibyte [often - UTF-8]). We assume that the latter two cases will be - indistinguishable in this test - that is, the LQ and RQ sequences - will pass through unchanged in either type of charset. So when - testing for quoting of str7, use the ascii_only flag to decide - what to expect for the 8-bit data being quoted. */ - ASSERT (!isprint ('\033')); - for (i = literal_quoting_style; i <= clocale_quoting_style; i++) - { - set_quoting_style (NULL, i); - compare_strings (use_quotearg_buffer, &results_g[i].group1, ascii_only); - compare_strings (use_quotearg, &results_g[i].group2, ascii_only); - if (i == c_quoting_style) - compare_strings (use_quote_double_quotes, &results_g[i].group2, - ascii_only); - compare_strings (use_quotearg_colon, &results_g[i].group3, ascii_only); - } - - set_quoting_style (NULL, literal_quoting_style); - ASSERT (set_quoting_flags (NULL, QA_ELIDE_NULL_BYTES) == 0); - compare_strings (use_quotearg_buffer, &flag_results[0].group1, ascii_only); - compare_strings (use_quotearg, &flag_results[0].group2, ascii_only); - compare_strings (use_quotearg_colon, &flag_results[0].group3, ascii_only); - - set_quoting_style (NULL, c_quoting_style); - ASSERT (set_quoting_flags (NULL, QA_ELIDE_OUTER_QUOTES) - == QA_ELIDE_NULL_BYTES); - compare_strings (use_quotearg_buffer, &flag_results[1].group1, ascii_only); - compare_strings (use_quotearg, &flag_results[1].group2, ascii_only); - compare_strings (use_quote_double_quotes, &flag_results[1].group2, - ascii_only); - compare_strings (use_quotearg_colon, &flag_results[1].group3, ascii_only); - - ASSERT (set_quoting_flags (NULL, QA_SPLIT_TRIGRAPHS) - == QA_ELIDE_OUTER_QUOTES); - compare_strings (use_quotearg_buffer, &flag_results[2].group1, ascii_only); - compare_strings (use_quotearg, &flag_results[2].group2, ascii_only); - compare_strings (use_quote_double_quotes, &flag_results[2].group2, - ascii_only); - compare_strings (use_quotearg_colon, &flag_results[2].group3, ascii_only); - - ASSERT (set_quoting_flags (NULL, 0) == QA_SPLIT_TRIGRAPHS); - - for (i = 0; i < sizeof custom_quotes / sizeof *custom_quotes; ++i) - { - set_custom_quoting (NULL, - custom_quotes[i][0], custom_quotes[i][1]); - compare_strings (use_quotearg_buffer, &custom_results[i].group1, - ascii_only); - compare_strings (use_quotearg, &custom_results[i].group2, ascii_only); - compare_strings (use_quotearg_colon, &custom_results[i].group3, - ascii_only); - } - #if ENABLE_NLS /* Clean up environment. */ unsetenv ("LANGUAGE"); @@ -462,10 +96,16 @@ compare_strings (use_quotearg_buffer, &locale_results[1].group1, false); compare_strings (use_quotearg, &locale_results[1].group2, false); compare_strings (use_quotearg_colon, &locale_results[1].group3, false); + + quotearg_free (); + return 0; } } + + fputs ("Skipping test: no french Unicode locale is installed\n", stderr); + return 77; +#else + fputs ("Skipping test: internationalization is disabled\n", stderr); + return 77; #endif /* ENABLE_NLS */ - - quotearg_free (); - return 0; } diff --git a/tests/test-quotearg.h b/tests/test-quotearg.h new file mode 100644 --- /dev/null +++ b/tests/test-quotearg.h @@ -0,0 +1,133 @@ +/* Test of quotearg family of functions. + Copyright (C) 2008-2010 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Eric Blake , 2008. */ + +struct result_strings { + char const *str1; /* Translation of "". */ + char const *str2; /* Translation of "\0""1\0". */ + size_t len2; /* Length of str2. */ + char const *str3; /* Translation of "simple". */ + char const *str4; /* Translation of " \t\n'\"\033?""?/\\". */ + char const *str5; /* Translation of "a:b". */ + char const *str6; /* Translation of "a\\b". */ + char const *str7a; /* Translation of LQ RQ, in ASCII charset. */ + char const *str7b; /* Translation of LQ RQ, in Latin1 or UTF-8 charset. */ +}; + +struct result_groups { + struct result_strings group1; /* Via quotearg_buffer. */ + struct result_strings group2; /* Via quotearg{,_mem}. */ + struct result_strings group3; /* Via quotearg_colon{,_mem}. */ +}; + +/* These quotes are borrowed from a pt_PT.utf8 translation. */ +# define LQ "\302\253" +# define RQ "\302\273" +# define LQ_ENC "\\302\\253" +# define RQ_ENC "\\302\\273" +# define RQ_ESC "\\\302\273" + +static struct result_strings inputs = { + "", "\0001\0", 3, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", + LQ RQ, NULL +}; + +static void +compare (char const *a, size_t la, char const *b, size_t lb) +{ + ASSERT (la == lb); + ASSERT (memcmp (a, b, la) == 0); + ASSERT (b[lb] == '\0'); +} + +static void +compare_strings (char *(func) (char const *, size_t *), + struct result_strings *results, bool ascii_only) +{ + size_t len; + char *p; + + len = 0; + p = func (inputs.str1, &len); + compare (results->str1, strlen (results->str1), p, len); + + len = inputs.len2; + p = func (inputs.str2, &len); + compare (results->str2, results->len2, p, len); + + len = SIZE_MAX; + p = func (inputs.str3, &len); + compare (results->str3, strlen (results->str3), p, len); + + len = strlen (inputs.str4); + p = func (inputs.str4, &len); + compare (results->str4, strlen (results->str4), p, len); + + len = SIZE_MAX; + p = func (inputs.str5, &len); + compare (results->str5, strlen (results->str5), p, len); + + len = strlen (inputs.str6); + p = func (inputs.str6, &len); + compare (results->str6, strlen (results->str6), p, len); + + len = strlen (inputs.str7a); + p = func (inputs.str7a, &len); + if (ascii_only) + compare (results->str7a, strlen (results->str7a), p, len); + else + compare (results->str7b, strlen (results->str7b), p, len); +} + +static char * +use_quotearg_buffer (const char *str, size_t *len) +{ + static char buf[100]; + size_t size; + memset (buf, 0xa5, 100); + size = quotearg_buffer (buf, 100, str, *len, NULL); + *len = size; + ASSERT ((unsigned char) buf[size + 1] == 0xa5); + return buf; +} + +static char * +use_quotearg (const char *str, size_t *len) +{ + char *p = *len == SIZE_MAX ? quotearg (str) : quotearg_mem (str, *len); + *len = strlen (p); + return p; +} + +static char * +use_quote_double_quotes (const char *str, size_t *len) +{ + char *p = *len == SIZE_MAX ? quotearg_char (str, '"') + : quotearg_char_mem (str, *len, '"'); + *len = strlen (p); + return p; +} + +static char * +use_quotearg_colon (const char *str, size_t *len) +{ + char *p = (*len == SIZE_MAX ? quotearg_colon (str) + : quotearg_colon_mem (str, *len)); + *len = strlen (p); + return p; +}