Hash :
9a26e704
Author :
Date :
2025-01-02T13:54:54
string-desc, xstring-desc, string-desc-quotearg: Rename functions. * lib/string-desc.h (sd_equals): Renamed from string_desc_equals. (sd_startswith): Renamed from string_desc_startswith. (sd_endswith): Renamed from string_desc_endswith. (sd_cmp): Renamed from string_desc_cmp. (sd_c_casecmp): Renamed from string_desc_c_casecmp. (sd_index): Renamed from string_desc_index. (sd_last_index): Renamed from string_desc_last_index. (sd_contains): Renamed from string_desc_contains. (sd_new_empty): Renamed from string_desc_new_empty. (sd_new_addr): Renamed from string_desc_new_addr. (sd_from_c): Renamed from string_desc_from_c. (sd_substring): Renamed from string_desc_substring. (sd_write): Renamed from string_desc_write. (sd_fwrite): Renamed from string_desc_fwrite. (sd_new): Renamed from string_desc_new. (sd_new_filled): Renamed from string_desc_new_filled. (sd_copy): Renamed from string_desc_copy. (sd_concat): Renamed from string_desc_concat. (sd_c): Renamed from string_desc_c. (sd_set_char_at): Renamed from string_desc_set_char_at. (sd_fill): Renamed from string_desc_fill. (sd_overwrite): Renamed from string_desc_overwrite. (sd_free): Renamed from string_desc_free. (sd_length): Renamed from string_desc_length. (sd_char_at): Renamed from string_desc_char_at. (sd_data): Renamed from string_desc_data. (sd_is_empty): Renamed from string_desc_is_empty. * lib/string-desc.c (sd_equals): Renamed from string_desc_equals. (sd_startswith): Renamed from string_desc_startswith. (sd_endswith): Renamed from string_desc_endswith. (sd_cmp): Renamed from string_desc_cmp. (sd_c_casecmp): Renamed from string_desc_c_casecmp. (sd_index): Renamed from string_desc_index. (sd_last_index): Renamed from string_desc_last_index. (sd_new_empty): Renamed from string_desc_new_empty. (sd_new_addr): Renamed from string_desc_new_addr. (sd_from_c): Renamed from string_desc_from_c. (sd_substring): Renamed from string_desc_substring. (sd_write): Renamed from string_desc_write. (sd_fwrite): Renamed from string_desc_fwrite. (sd_new): Renamed from string_desc_new. (sd_new_filled): Renamed from string_desc_new_filled. (sd_copy): Renamed from string_desc_copy. (sd_concat): Renamed from string_desc_concat. (sd_c): Renamed from string_desc_c. (sd_set_char_at): Renamed from string_desc_set_char_at. (sd_fill): Renamed from string_desc_fill. (sd_overwrite): Renamed from string_desc_overwrite. (sd_free): Renamed from string_desc_free. * lib/xstring-desc.h (xsd_concat): Renamed from xstring_desc_concat. (xsd_new): Renamed from xstring_desc_new. (xsd_new_filled): Renamed from xstring_desc_new_filled. (xsd_copy): Renamed from xstring_desc_copy. (xsd_c): Renamed from xstring_desc_c. * lib/xstring-desc.c (xsd_concat): Renamed from xstring_desc_concat. * lib/string-desc-quotearg.h (sd_quotearg_buffer): Renamed from string_desc_quotearg_buffer. (sd_quotearg_alloc): Renamed from string_desc_quotearg_alloc. (sd_quotearg_n): Renamed from string_desc_quotearg_n. (sd_quotearg): Renamed from string_desc_quotearg. (sd_quotearg_n_style): Renamed from string_desc_quotearg_n_style. (sd_quotearg_style): Renamed from string_desc_quotearg_style. (sd_quotearg_char): Renamed from string_desc_quotearg_char. (sd_quotearg_colon): Renamed from string_desc_quotearg_colon. (sd_quotearg_n_custom): Renamed from string_desc_quotearg_n_custom. (sd_quotearg_custom): Renamed from sd_quotearg_n_custom. * lib/string-desc-contains.c (sd_contains): Renamed from string_desc_contains. * lib/string-buffer.h: Update. * lib/string-buffer.c (sb_append_desc, sb_contents, sb_dupfree): Update. * lib/xstring-buffer.c (sb_xdupfree): Update. * lib/sf-istream.c (sf_istream_init_from_string_desc): Update. * tests/test-string-desc.c (main): Update. * tests/test-string-desc.sh: Update. * tests/test-xstring-desc.c (main): Update. * tests/test-string-desc-quotearg.c (main): Update. * tests/test-string-buffer.c (main): Update. * tests/test-sf-istream.c (main): Update. * tests/test-sfl-istream.c (main): Update. * doc/string-desc.texi: Update. * doc/strings.texi: Update. * NEWS: Mention the change.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181
/* Test of buffer that accumulates a string by piecewise concatenation.
Copyright (C) 2021-2025 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 2, 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, see <https://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2021. */
#include <config.h>
#include "string-buffer.h"
#include <errno.h>
#include <string.h>
#include <wchar.h>
#include "macros.h"
static int
my_appendf (struct string_buffer *buffer, const char *formatstring, ...)
{
va_list args;
va_start (args, formatstring);
int ret = sb_appendvf (buffer, formatstring, args);
va_end (args);
return ret;
}
char invalid_format_string_1[] = "%&";
char invalid_format_string_2[] = "%^";
int
main ()
{
/* Test accumulation. */
{
struct string_buffer buffer;
sb_init (&buffer);
sb_append1 (&buffer, 'x');
sb_append1 (&buffer, '\377');
char *s = sb_dupfree_c (&buffer);
ASSERT (s != NULL && strcmp (s, "x\377") == 0);
free (s);
}
{
struct string_buffer buffer;
sb_init (&buffer);
sb_append1 (&buffer, 'x');
sb_append1 (&buffer, '\377');
{
string_desc_t sd = sb_contents (&buffer);
ASSERT (sd_length (sd) == 2);
ASSERT (sd_char_at (sd, 0) == 'x');
ASSERT (sd_char_at (sd, 1) == '\377');
}
sb_append1 (&buffer, '\0');
sb_append1 (&buffer, 'z');
{
string_desc_t sd = sb_contents (&buffer);
ASSERT (sd_length (sd) == 4);
ASSERT (sd_char_at (sd, 0) == 'x');
ASSERT (sd_char_at (sd, 1) == '\377');
ASSERT (sd_char_at (sd, 2) == '\0');
ASSERT (sd_char_at (sd, 3) == 'z');
}
char *s = sb_dupfree_c (&buffer);
ASSERT (s != NULL && memcmp (s, "x\377\0z\0", 5) == 0);
free (s);
}
/* Test simple string concatenation. */
{
struct string_buffer buffer;
sb_init (&buffer);
char *s = sb_dupfree_c (&buffer);
ASSERT (s != NULL && strcmp (s, "") == 0);
free (s);
}
{
struct string_buffer buffer;
sb_init (&buffer);
sb_append_c (&buffer, "abc");
sb_append_c (&buffer, "");
sb_append_c (&buffer, "defg");
char *s = sb_dupfree_c (&buffer);
ASSERT (s != NULL && strcmp (s, "abcdefg") == 0);
free (s);
}
{
struct string_buffer buffer;
sb_init (&buffer);
sb_append_c (&buffer, "abc");
sb_append_desc (&buffer, sd_new_addr (5, "de\0fg"));
sb_append_c (&buffer, "hij");
char *s = sb_dupfree_c (&buffer);
ASSERT (s != NULL && memcmp (s, "abcde\0fghij", 12) == 0);
free (s);
}
/* Test printf-like formatting. */
{
struct string_buffer buffer;
sb_init (&buffer);
sb_append_c (&buffer, "<");
sb_appendf (&buffer, "%x", 3735928559U);
sb_append_c (&buffer, ">");
char *s = sb_dupfree_c (&buffer);
ASSERT (s != NULL && strcmp (s, "<deadbeef>") == 0);
free (s);
}
/* Test vprintf-like formatting. */
{
struct string_buffer buffer;
sb_init (&buffer);
sb_append_c (&buffer, "<");
my_appendf (&buffer, "%x", 3735928559U);
sb_append_c (&buffer, ">");
char *s = sb_dupfree_c (&buffer);
ASSERT (s != NULL && strcmp (s, "<deadbeef>") == 0);
free (s);
}
/* Test printf-like formatting failure.
On all systems except AIX, trying to convert the wide-character 0x76543210
to a multibyte string (in the "C" locale) fails.
On all systems, invalid format directives make the vsnzprintf() call
fail. */
{
struct string_buffer buffer;
int ret;
sb_init (&buffer);
sb_append_c (&buffer, "<");
ret = sb_appendf (&buffer, "%lc", (wint_t) 0x76543210);
#if !(defined _AIX || (defined _WIN32 && !defined __CYGWIN__))
ASSERT (ret < 0);
ASSERT (errno == EILSEQ);
#endif
sb_append_c (&buffer, "|");
ret = sb_appendf (&buffer, invalid_format_string_1, 1);
ASSERT (ret < 0);
ASSERT (errno == EINVAL);
sb_append_c (&buffer, "|");
ret = sb_appendf (&buffer, invalid_format_string_2, 2);
ASSERT (ret < 0);
ASSERT (errno == EINVAL);
sb_append_c (&buffer, ">");
char *s = sb_dupfree_c (&buffer);
ASSERT (s == NULL);
}
return test_exit_status;
}