Overview
Comment: | Support for wide C strings for OFXMLFactory. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
cd99b982ac8fe06536c9caf58a0e8476 |
User & Date: | js on 2008-11-26 14:40:18 |
Other Links: | manifest | tags |
Context
2008-11-26
| ||
21:12 | mbstowcs/wcstombs returns the size of bytes exluding \0, thus add 1. check-in: baeaca9124 user: js tags: trunk | |
14:40 | Support for wide C strings for OFXMLFactory. check-in: cd99b982ac user: js tags: trunk | |
2008-11-23
| ||
06:11 |
New string API, string class completely rewritten. One class for all string types now. check-in: bf02f0ef25 user: js tags: trunk | |
Changes
Modified src/OFXMLFactory.h from [f58903a5cd] to [56a8d83d1c].
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 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" /** * The OFXMLFactory class provides an easy way to create XML stanzas. */ @interface OFXMLFactory: OFObject {} /** * XML-escapes a C string. * * \param s The C string to escape * \return The escaped C string. * You need to free it manually! */ + (char*)escapeCString: (const char*)s; /** * Creates an XML stanza. * * \param name The name of the tag as a C string * \param close A boolean whether the tag should be closed | > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > | 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 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "wchar.h" #import "OFObject.h" /** * The OFXMLFactory class provides an easy way to create XML stanzas. */ @interface OFXMLFactory: OFObject {} /** * XML-escapes a C string. * * \param s The C string to escape * \return The escaped C string. * You need to free it manually! */ + (char*)escapeCString: (const char*)s; /** * XML-escapes a wide C string. * * \param s The wide C string to escape * \return The escaped wide C string. * You need to free it manually! */ + (wchar_t*)escapeWideCString: (const wchar_t*)s; /** * Creates an XML stanza. * * \param name The name of the tag as a C string * \param close A boolean whether the tag should be closed * \param data Data that should be inside the tag as a C string. * It will NOT be escaped, so you can also include other stanzas. * \param ... Field / value pairs for the tag in the form "field", "value" as * C strings. * Last element must be NULL. * Example: "field1", "value1", "field2", "value2", NULL * \return The created XML stanza as a C string. * You need to free it manually! */ + (char*)createStanza: (const char*)name withCloseTag: (BOOL)close andData: (const char*)data, ...; /** * Creates an XML stanza as a wide C string. * * \param name The name of the tag as a wide C string * \param close A boolean whether the tag should be closed * \param data Data that should be inside the tag as a wide C string. * It will NOT be escaped, so you can also include other stanzas. * \param ... Field / value pairs for the tag in the form "field", "value" as * wide C strings. * Last element must be NULL. * Example: L"field1", L"value1", L"field2", L"value2", NULL * \return The created XML stanza as a wide C string. * You need to free it manually! */ + (wchar_t*)createWideStanza: (const wchar_t*)name withCloseTag: (BOOL)close andData: (const wchar_t*)data, ...; /** * Concats an array of C strings into one C string and frees the array of C * strings. * * \param strs An array of C strings * \return The concatenated C strings. * You need to free it manually! */ + (char*)concatAndFreeCStrings: (char**)strs; /** * Concats an array of wide C strings into one wide C string and frees the * array of wide C strings. * * \param strs An array of wide C strings * \return The concatenated wide C strings. * You need to free it manually! */ + (wchar_t*)concatAndFreeWideCStrings: (wchar_t**)strs; @end |
Modified src/OFXMLFactory.m from [fb863141bc] to [5ac96ead53].
︙ | ︙ | |||
22 23 24 25 26 27 28 | * * We already have a clue about how big the resulting string will get, so we * can prealloc and only resize when really necessary - OFString would always * resize when we append, which would be slow here. */ static inline BOOL | | > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | * * We already have a clue about how big the resulting string will get, so we * can prealloc and only resize when really necessary - OFString would always * resize when we append, which would be slow here. */ static inline BOOL xf_resize_chars(char **str, size_t *len, size_t add) { char *str2; size_t len2; /* FIXME: Check for overflows on add */ len2 = *len + add; if ((str2 = realloc(*str, len2)) == NULL) { if (*str) free(*str); *str = NULL; return NO; } *str = str2; *len = len2; return YES; } static inline BOOL xf_resize_wchars(wchar_t **str, size_t *len, size_t add) { wchar_t *str2; size_t len2; /* FIXME: Check for overflows on add and multiply */ len2 = *len + add; if ((str2 = realloc(*str, len2 * sizeof(wchar_t))) == NULL) { if (*str) free(*str); *str = NULL; return NO; } *str = str2; *len = len2; return YES; } static inline BOOL xf_add2chars(char **str, size_t *len, size_t *pos, const char *add) { size_t add_len; add_len = strlen(add); if (!xf_resize_chars(str, len, add_len)) return NO; memcpy(*str + *pos, add, add_len); *pos += add_len; return YES; } static inline BOOL xf_add2wchars(wchar_t **str, size_t *len, size_t *pos, const wchar_t *add) { size_t add_len; add_len = wcslen(add); if (!xf_resize_wchars(str, len, add_len)) return NO; wmemcpy(*str + *pos, add, add_len); *pos += add_len; return YES; } @implementation OFXMLFactory + (char*)escapeCString: (const char*)s { char *ret; size_t i, j, len, nlen; len = nlen = strlen(s); if ((ret = malloc(len + 1)) == NULL) [[OFNoMemException newWithObject: nil andSize: len + 1] raise]; for (i = j = 0; i < len; i++) { switch (s[i]) { case '<': if (!xf_add2chars(&ret, &nlen, &j, "<")) [[OFNoMemException newWithObject: nil andSize: nlen + 4] raise]; break; case '>': if (!xf_add2chars(&ret, &nlen, &j, ">")) [[OFNoMemException newWithObject: nil andSize: nlen + 4] raise]; break; case '"': if (!xf_add2chars(&ret, &nlen, &j, """)) [[OFNoMemException newWithObject: nil andSize: nlen + 6] raise]; break; case '\'': if (!xf_add2chars(&ret, &nlen, &j, "'")) [[OFNoMemException newWithObject: nil andSize: nlen + 6] raise]; break; case '&': if (!xf_add2chars(&ret, &nlen, &j, "&")) [[OFNoMemException newWithObject: nil andSize: nlen + 5] raise]; break; default: ret[j++] = s[i]; break; } } ret[j] = 0; return ret; } + (wchar_t*)escapeWideCString: (const wchar_t*)s { wchar_t *ret; size_t i, j, len, nlen; len = nlen = wcslen(s); /* FIXME: Check for overflow in multiply */ if ((ret = malloc((len + 1) * sizeof(wchar_t))) == NULL) [[OFNoMemException newWithObject: nil andSize: (len + 1) * sizeof(wchar_t)] raise]; for (i = j = 0; i < len; i++) { switch (s[i]) { case L'<': if (!xf_add2wchars(&ret, &nlen, &j, L"<")) [[OFNoMemException newWithObject: nil andSize: (nlen + 4) * sizeof( wchar_t)] raise]; break; case L'>': if (!xf_add2wchars(&ret, &nlen, &j, L">")) [[OFNoMemException newWithObject: nil andSize: (nlen + 4) * sizeof( wchar_t)] raise]; break; case L'"': if (!xf_add2wchars(&ret, &nlen, &j, L""")) [[OFNoMemException newWithObject: nil andSize: (nlen + 6) * sizeof( wchar_t)] raise]; break; case L'\'': if (!xf_add2wchars(&ret, &nlen, &j, L"'")) [[OFNoMemException newWithObject: nil andSize: (nlen + 6) * sizeof( wchar_t)] raise]; break; case L'&': if (!xf_add2wchars(&ret, &nlen, &j, L"&")) [[OFNoMemException newWithObject: nil andSize: (nlen + 5) * sizeof( wchar_t)] raise]; break; default: ret[j++] = s[i]; break; } } ret[j] = 0; |
︙ | ︙ | |||
146 147 148 149 150 151 152 | * escapeCString already throws an exception, * no need to throw a second one here. */ free(xml); return NULL; } | | | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 | * escapeCString already throws an exception, * no need to throw a second one here. */ free(xml); return NULL; } if (!xf_resize_chars(&xml, &len, 1 + strlen(arg) + 2 + strlen(esc_val) + 1)) { free(esc_val); [[OFNoMemException newWithObject: nil andSize: len + 1 + strlen(arg) + 2 + strlen(esc_val) + 1] raise]; |
︙ | ︙ | |||
172 173 174 175 176 177 178 | free(esc_val); } va_end(args); /* End of tag */ if (close) { if (data == NULL) { | | | | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | free(esc_val); } va_end(args); /* End of tag */ if (close) { if (data == NULL) { if (!xf_resize_chars(&xml, &len, 2 - 1)) [[OFNoMemException newWithObject: nil andSize: len + 2 - 1] raise]; xml[i++] = '/'; xml[i++] = '>'; } else { if (!xf_resize_chars(&xml, &len, 1 + strlen(data) + 2 + strlen(name) + 1 - 1)) [[OFNoMemException newWithObject: nil andSize: len + 1 + strlen(data) + 2 + strlen(name) + 1 - 1] |
︙ | ︙ | |||
206 207 208 209 210 211 212 | } else xml[i++] = '>'; xml[i] = 0; return xml; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | } else xml[i++] = '>'; xml[i] = 0; return xml; } + (wchar_t*)createWideStanza: (const wchar_t*)name withCloseTag: (BOOL)close andData: (const wchar_t*)data, ... { wchar_t *arg, *val, *xml; size_t i, len; va_list args; /* Start of tag */ len = wcslen(name) + 3; /* TODO: Check for multiply overflow */ if ((xml = malloc(len * sizeof(wchar_t*))) == NULL) [[OFNoMemException newWithObject: nil andSize: len * sizeof(wchar_t)] raise]; i = 0; xml[i++] = L'<'; wmemcpy(xml + i, name, wcslen(name)); i += wcslen(name); /* Arguments */ va_start(args, data); while ((arg = va_arg(args, wchar_t*)) != NULL && (val = va_arg(args, wchar_t*)) != NULL) { wchar_t *esc_val; if ((esc_val = [OFXMLFactory escapeWideCString: val]) == NULL) { /* * escapeWideCString already throws an exception, * no need to throw a second one here. */ free(xml); return NULL; } if (!xf_resize_wchars(&xml, &len, 1 + wcslen(arg) + 2 + wcslen(esc_val) + 1)) { free(esc_val); [[OFNoMemException newWithObject: nil andSize: (len + 1 + wcslen(arg) + 2 + wcslen(esc_val) + 1) * sizeof(wchar_t)] raise]; } xml[i++] = L' '; wmemcpy(xml + i, arg, wcslen(arg)); i += wcslen(arg); xml[i++] = L'='; xml[i++] = L'\''; wmemcpy(xml + i, esc_val, wcslen(esc_val)); i += wcslen(esc_val); xml[i++] = L'\''; free(esc_val); } va_end(args); /* End of tag */ if (close) { if (data == NULL) { if (!xf_resize_wchars(&xml, &len, 2 - 1)) [[OFNoMemException newWithObject: nil andSize: (len + 2 - 1) * sizeof( wchar_t)] raise]; xml[i++] = L'/'; xml[i++] = L'>'; } else { if (!xf_resize_wchars(&xml, &len, 1 + wcslen(data) + 2 + wcslen(name) + 1 - 1)) [[OFNoMemException newWithObject: nil andSize: (len + 1 + wcslen(data) + 2 + wcslen(name) + 1 - 1) * sizeof( wchar_t)] raise]; xml[i++] = L'>'; wmemcpy(xml + i, data, wcslen(data)); i += wcslen(data); xml[i++] = L'<'; xml[i++] = L'/'; wmemcpy(xml + i, name, wcslen(name)); i += wcslen(name); xml[i++] = L'>'; } } else xml[i++] = L'>'; xml[i] = 0; return xml; } + (char*)concatAndFreeCStrings: (char**)strs { char *ret; size_t i, len, pos; if (strs[0] == NULL) return NULL; len = strlen(*strs) + 1; if ((ret = malloc(len)) == NULL) [[OFNoMemException newWithObject: nil andSize: len] raise]; memcpy(ret, strs[0], len - 1); pos = len - 1; for (i = 1; strs[i] != NULL; i++) { if (!xf_add2chars(&ret, &len, &pos, strs[i])) { free(ret); [[OFNoMemException newWithObject: nil andSize: len + strlen(strs[i])] raise]; } } for (i = 0; strs[i] != NULL; i++) free(strs[i]); ret[pos] = 0; return ret; } + (wchar_t*)concatAndFreeWideCStrings: (wchar_t**)strs { wchar_t *ret; size_t i, len, pos; if (strs[0] == NULL) return NULL; len = wcslen(*strs) + 1; /* FIXME: Check for overflow on multiply */ if ((ret = malloc(len * sizeof(wchar_t))) == NULL) [[OFNoMemException newWithObject: nil andSize: len * sizeof(wchar_t)] raise]; wmemcpy(ret, strs[0], len - 1); pos = len - 1; for (i = 1; strs[i] != NULL; i++) { if (!xf_add2wchars(&ret, &len, &pos, strs[i])) { free(ret); [[OFNoMemException newWithObject: nil andSize: (wcslen(strs[i]) + len) * sizeof( wchar_t)] raise]; } } for (i = 0; strs[i] != NULL; i++) free(strs[i]); ret[pos] = 0; return ret; } @end |
Modified tests/OFXMLFactory/OFXMLFactory.m from [f0f6816ece] to [29fddc8f27].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import <stdio.h> #import <stdlib.h> #import <string.h> #import "OFXMLFactory.h" inline void check_result(char *result, const char *should) { if (!strcmp(result, should)) printf("%s is expected result\n", result); else { | > | > > > > > > > > > > > > > | 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 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import <stdio.h> #import <stdlib.h> #import <string.h> #import <wchar.h> #import "OFXMLFactory.h" inline void check_result(char *result, const char *should) { if (!strcmp(result, should)) printf("%s is expected result\n", result); else { printf("%s is NOT expected result!\n", result); exit(1); } free(result); } inline void check_result_wide(wchar_t *result, const wchar_t *should) { if (!wcscmp(result, should)) wprintf(L"%ls is expected result\n", result); else { wprintf(L"%ls is NOT expected result!\n", result); exit(1); } free(result); } inline void |
︙ | ︙ | |||
48 49 50 51 52 53 54 55 56 57 58 59 60 61 | strs[1] = s2; strs[2] = s3; strs[3] = NULL; check_result([OFXMLFactory concatAndFreeCStrings: strs], "<foo>bar<test/>"); } inline void test_create_stanza() { check_result([OFXMLFactory createStanza: "foo" withCloseTag: NO andData: NULL, | > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | strs[1] = s2; strs[2] = s3; strs[3] = NULL; check_result([OFXMLFactory concatAndFreeCStrings: strs], "<foo>bar<test/>"); } inline void test_concat_wide() { const wchar_t *c1 = L"<foo>", *c2 = L"bar", *c3 = L"<test/>"; wchar_t *s1, *s2, *s3; wchar_t *strs[4]; if ((s1 = malloc((wcslen(c1) + 1) * sizeof(wchar_t))) == NULL || (s2 = malloc((wcslen(c2) + 1) * sizeof(wchar_t))) == NULL || (s3 = malloc((wcslen(c3) + 1) * sizeof(wchar_t))) == NULL) exit(1); wcsncpy(s1, c1, wcslen(c1) + 1); wcsncpy(s2, c2, wcslen(c2) + 1); wcsncpy(s3, c3, wcslen(c3) + 1); strs[0] = s1; strs[1] = s2; strs[2] = s3; strs[3] = NULL; check_result_wide([OFXMLFactory concatAndFreeWideCStrings: strs], L"<foo>bar<test/>"); } inline void test_create_stanza() { check_result([OFXMLFactory createStanza: "foo" withCloseTag: NO andData: NULL, |
︙ | ︙ | |||
103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | andData: "bar", "bar", "b'az", "x", "y", "a", "b", NULL], "<foo bar='b'az' x='y' a='b'>bar</foo>"); } inline void test_escape() { check_result([OFXMLFactory escapeCString: "<hallo> &welt'\"!&"], "<hallo> &welt'"!&"); } int main() { test_escape(); test_create_stanza(); test_concat(); return 0; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | andData: "bar", "bar", "b'az", "x", "y", "a", "b", NULL], "<foo bar='b'az' x='y' a='b'>bar</foo>"); } inline void test_create_stanza_wide() { check_result_wide([OFXMLFactory createWideStanza: L"foo" withCloseTag: NO andData: NULL, NULL], L"<foo>"); check_result_wide([OFXMLFactory createWideStanza: L"foo" withCloseTag: NO andData: NULL, L"bar", L"baz", L"blub", L"asd", NULL], L"<foo bar='baz' blub='asd'>"); check_result_wide([OFXMLFactory createWideStanza: L"foo" withCloseTag: YES andData: NULL, NULL], L"<foo/>"); check_result_wide([OFXMLFactory createWideStanza: L"foo" withCloseTag: YES andData: L"bar", NULL], L"<foo>bar</foo>"); check_result_wide([OFXMLFactory createWideStanza: L"foo" withCloseTag: YES andData: NULL, L"bar", L"b&az", NULL], L"<foo bar='b&az'/>"); check_result_wide([OFXMLFactory createWideStanza: L"foo" withCloseTag: YES andData: L"bar", L"bar", L"b'az", NULL], L"<foo bar='b'az'>bar</foo>"); check_result_wide([OFXMLFactory createWideStanza: L"foo" withCloseTag: YES andData: NULL, L"bar", L"b&az", L"x", L"asd\"", NULL], L"<foo bar='b&az' x='asd"'/>"); check_result_wide([OFXMLFactory createWideStanza: L"foo" withCloseTag: YES andData: L"bar", L"bar", L"b'az", L"x", L"y", L"a", L"b", NULL], L"<foo bar='b'az' x='y' a='b'>bar</foo>"); } inline void test_escape() { check_result([OFXMLFactory escapeCString: "<hallo> &welt'\"!&"], "<hallo> &welt'"!&"); } inline void test_escape_wide() { check_result_wide( [OFXMLFactory escapeWideCString: L"<hallo> &welt'\"!&"], L"<hallo> &welt'"!&"); } int main() { test_escape(); test_create_stanza(); test_concat(); puts("== Now testing with wide C strings =="); test_escape_wide(); test_create_stanza_wide(); test_concat_wide(); return 0; } |