Mercurial > hg > nnchat
annotate th_string.c @ 378:afbc3bfd3e03
Sync th-libs.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 03 Oct 2011 00:31:46 +0300 |
| parents | 9ad157feb99a |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * Miscellaneous string-handling related utility-functions | |
| 3 * Programmed and designed by Matti 'ccr' Hamalainen | |
| 4 * (C) Copyright 2002-2008 Tecnic Software productions (TNSP) | |
| 5 * | |
| 6 * Please read file 'COPYING' for information on license and distribution. | |
| 7 */ | |
| 8 #ifdef HAVE_CONFIG_H | |
| 2 | 9 #include "config.h" |
| 0 | 10 #endif |
| 11 #include "th_string.h" | |
| 12 | |
| 79 | 13 /* strdup with a NULL check |
| 14 */ | |
| 15 char *th_strdup(const char *s) | |
| 16 { | |
| 81 | 17 char *res; |
| 18 if (s == NULL) | |
| 19 return NULL; | |
| 378 | 20 |
| 81 | 21 if ((res = th_malloc(strlen(s) + 1)) == NULL) |
| 22 return NULL; | |
| 378 | 23 |
| 81 | 24 strcpy(res, s); |
| 25 return res; | |
| 79 | 26 } |
| 27 | |
| 28 | |
| 378 | 29 char *th_strncpy(char *dst, const char *src, const size_t n) |
| 0 | 30 { |
| 81 | 31 const char *s = src; |
| 32 char *d = dst; | |
| 33 size_t i; | |
| 34 assert(src != NULL); | |
| 35 assert(dst != NULL); | |
| 0 | 36 |
| 81 | 37 /* Copy to the destination */ |
| 38 i = n; | |
| 377 | 39 while (*s && i > 0) |
| 40 { | |
| 81 | 41 *(d++) = *(s++); |
| 42 i--; | |
| 43 } | |
| 0 | 44 |
| 81 | 45 /* Fill rest of space with zeros */ |
| 377 | 46 while (i > 0) |
| 47 { | |
| 81 | 48 *(d++) = 0; |
| 49 i--; | |
| 50 } | |
| 0 | 51 |
| 81 | 52 /* Ensure that last is always zero */ |
| 53 dst[n - 1] = 0; | |
| 0 | 54 |
| 81 | 55 return dst; |
| 0 | 56 } |
| 57 | |
| 58 | |
| 126 | 59 /* Simulate a sprintf() that allocates memory |
| 124 | 60 */ |
| 378 | 61 char *th_strdup_vprintf(const char *fmt, va_list args) |
| 124 | 62 { |
| 361 | 63 int size = 64; |
| 126 | 64 char *buf, *nbuf = NULL; |
| 124 | 65 |
| 126 | 66 if ((buf = th_malloc(size)) == NULL) |
| 67 return NULL; | |
| 378 | 68 |
| 377 | 69 while (1) |
| 70 { | |
| 361 | 71 int n; |
| 72 va_list ap; | |
| 73 va_copy(ap, args); | |
| 74 n = vsnprintf(buf, size, fmt, ap); | |
| 75 va_end(ap); | |
| 76 | |
| 126 | 77 if (n > -1 && n < size) |
| 78 return buf; | |
| 79 if (n > -1) | |
| 80 size = n + 1; | |
| 81 else | |
| 82 size *= 2; | |
| 361 | 83 |
| 377 | 84 if ((nbuf = th_realloc(nbuf, size)) == NULL) |
| 85 { | |
| 126 | 86 th_free(buf); |
| 87 return NULL; | |
| 124 | 88 } |
| 378 | 89 |
| 126 | 90 buf = nbuf; |
| 124 | 91 } |
| 92 } | |
| 93 | |
| 94 | |
| 378 | 95 char *th_strdup_printf(const char *fmt, ...) |
| 124 | 96 { |
| 97 char *res; | |
| 98 va_list ap; | |
| 99 | |
| 100 va_start(ap, fmt); | |
| 101 res = th_strdup_vprintf(fmt, ap); | |
| 102 va_end(ap); | |
| 103 | |
| 104 return res; | |
| 105 } | |
| 126 | 106 |
| 124 | 107 |
|
282
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
108 void th_pstr_vprintf(char **buf, const char *fmt, va_list ap) |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
109 { |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
110 char *tmp = th_strdup_vprintf(fmt, ap); |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
111 th_free(*buf); |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
112 *buf = tmp; |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
113 } |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
114 |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
115 |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
116 void th_pstr_printf(char **buf, const char *fmt, ...) |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
117 { |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
118 char *tmp; |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
119 va_list ap; |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
120 |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
121 va_start(ap, fmt); |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
122 tmp = th_strdup_vprintf(fmt, ap); |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
123 va_end(ap); |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
124 |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
125 th_free(*buf); |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
126 *buf = tmp; |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
127 } |
|
3dc86d8eb0a9
Added helper functions for easier string manipulation.
Matti Hamalainen <ccr@tnsp.org>
parents:
244
diff
changeset
|
128 |
| 124 | 129 /* Compare two strings ignoring case [strcasecmp, strncasecmp] |
| 130 */ | |
| 378 | 131 int th_strcasecmp(const char *str1, const char *str2) |
| 124 | 132 { |
| 133 const char *s1 = str1, *s2 = str2; | |
| 81 | 134 assert(str1 != NULL); |
| 135 assert(str2 != NULL); | |
| 0 | 136 |
| 81 | 137 if (str1 == str2) |
| 138 return 0; | |
| 0 | 139 |
| 377 | 140 while (*s1 && *s2 && th_tolower(*s1) == th_tolower(*s2)) |
| 141 { | |
| 81 | 142 s1++; |
| 143 s2++; | |
| 144 } | |
| 0 | 145 |
| 81 | 146 return (th_tolower(*s1) - th_tolower(*s2)); |
| 0 | 147 } |
| 148 | |
| 149 | |
| 378 | 150 int th_strncasecmp(const char *str1, const char *str2, size_t n) |
| 0 | 151 { |
| 124 | 152 const char *s1 = str1, *s2 = str2; |
| 81 | 153 assert(str1 != NULL); |
| 154 assert(str2 != NULL); | |
| 0 | 155 |
| 81 | 156 if (str1 == str2) |
| 157 return 0; | |
| 0 | 158 |
| 377 | 159 while (n > 0 && *s1 && *s2 && th_tolower(*s1) == th_tolower(*s2)) |
| 160 { | |
| 81 | 161 s1++; |
| 162 s2++; | |
| 163 n--; | |
| 164 } | |
| 0 | 165 |
| 124 | 166 return n > 0 ? (th_tolower(*s1) - th_tolower(*s2)) : 0; |
| 0 | 167 } |
| 168 | |
| 169 | |
| 170 /* Remove all occurences of control characters, in-place. | |
| 171 * Resulting string is always shorter or same length than original. | |
| 172 */ | |
| 378 | 173 void th_strip_ctrlchars(char *str) |
| 0 | 174 { |
| 81 | 175 char *i, *j; |
| 176 assert(str != NULL); | |
| 0 | 177 |
| 81 | 178 i = str; |
| 179 j = str; | |
| 377 | 180 while (*i) |
| 181 { | |
| 81 | 182 if (!th_iscntrl(*i)) |
| 183 *(j++) = *i; | |
| 184 i++; | |
| 185 } | |
| 0 | 186 |
| 81 | 187 *j = 0; |
| 0 | 188 } |
| 189 | |
| 190 | |
| 11 | 191 /* Copy a given string over in *result. |
| 0 | 192 */ |
| 378 | 193 int th_pstrcpy(char **result, const char *str) |
| 0 | 194 { |
| 81 | 195 assert(result != NULL); |
| 0 | 196 |
| 81 | 197 if (str == NULL) |
| 198 return -1; | |
| 0 | 199 |
| 81 | 200 th_free(*result); |
| 124 | 201 if ((*result = th_malloc(strlen(str) + 1)) == NULL) |
| 81 | 202 return -2; |
| 0 | 203 |
| 81 | 204 strcpy(*result, str); |
| 205 return 0; | |
| 0 | 206 } |
| 207 | |
| 208 | |
| 11 | 209 /* Concatenates a given string into string pointed by *result. |
| 0 | 210 */ |
| 378 | 211 int th_pstrcat(char **result, const char *str) |
| 0 | 212 { |
| 81 | 213 assert(result != NULL); |
| 0 | 214 |
| 81 | 215 if (str == NULL) |
| 216 return -1; | |
| 0 | 217 |
| 377 | 218 if (*result != NULL) |
| 219 { | |
| 124 | 220 *result = th_realloc(*result, strlen(*result) + strlen(str) + 1); |
| 81 | 221 if (*result == NULL) |
| 222 return -1; | |
| 0 | 223 |
| 81 | 224 strcat(*result, str); |
| 377 | 225 } |
| 226 else | |
| 227 { | |
| 124 | 228 *result = th_malloc(strlen(str) + 1); |
| 81 | 229 if (*result == NULL) |
| 230 return -1; | |
| 0 | 231 |
| 81 | 232 strcpy(*result, str); |
| 233 } | |
| 0 | 234 |
| 81 | 235 return 0; |
| 0 | 236 } |
| 237 | |
| 238 | |
| 239 /* Find next non-whitespace character in string. | |
| 240 * Updates iPos into the position of such character and | |
| 241 * returns pointer to the string. | |
| 242 */ | |
| 378 | 243 const char *th_findnext(const char *str, size_t *pos) |
| 0 | 244 { |
| 81 | 245 assert(str != NULL); |
| 0 | 246 |
| 81 | 247 /* Terminating NULL-character is not whitespace! */ |
| 124 | 248 while (th_isspace(str[*pos])) |
| 249 (*pos)++; | |
| 377 | 250 |
| 124 | 251 return &str[*pos]; |
| 0 | 252 } |
| 253 | |
| 254 | |
| 124 | 255 /* Find next sep-character from string |
| 0 | 256 */ |
| 378 | 257 const char *th_findsep(const char *str, size_t *pos, char sep) |
| 0 | 258 { |
| 81 | 259 assert(str != NULL); |
| 0 | 260 |
| 124 | 261 while (str[*pos] && str[*pos] != sep) |
| 262 (*pos)++; | |
| 263 | |
| 264 return &str[*pos]; | |
| 0 | 265 } |
| 266 | |
| 267 | |
| 124 | 268 /* Find next sep- or whitespace from string |
| 0 | 269 */ |
| 378 | 270 const char *th_findseporspace(const char *str, size_t *pos, char sep) |
| 0 | 271 { |
| 81 | 272 assert(str != NULL); |
| 0 | 273 |
| 124 | 274 while (!th_isspace(str[*pos]) && str[*pos] != sep) |
| 275 (*pos)++; | |
| 276 | |
| 277 return &str[*pos]; | |
| 0 | 278 } |
| 279 | |
| 280 | |
| 281 /* Compare a string to a pattern. Case-SENSITIVE version. | |
| 282 * The matching pattern can consist of any normal characters plus | |
| 283 * wildcards ? and *. "?" matches any character and "*" matches | |
| 284 * any number of characters. | |
| 285 */ | |
| 378 | 286 BOOL th_strmatch(const char *str, const char *pattern) |
| 0 | 287 { |
| 81 | 288 BOOL didMatch = TRUE, isAnyMode = FALSE, isEnd = FALSE; |
| 124 | 289 const char *tmpPattern = NULL; |
| 0 | 290 |
| 81 | 291 /* Check given pattern and string */ |
| 292 if (str == NULL || pattern == NULL) | |
| 293 return FALSE; | |
| 0 | 294 |
| 81 | 295 /* Start comparision */ |
| 378 | 296 do |
| 297 { | |
| 81 | 298 didMatch = FALSE; |
| 377 | 299 switch (*pattern) |
| 300 { | |
| 81 | 301 case '?': |
| 302 /* Any single character matches */ | |
| 377 | 303 if (*str) |
| 304 { | |
| 81 | 305 didMatch = TRUE; |
| 306 pattern++; | |
| 307 str++; | |
| 308 } | |
| 309 break; | |
| 0 | 310 |
| 81 | 311 case '*': |
| 312 didMatch = TRUE; | |
| 313 pattern++; | |
| 314 if (!*pattern) | |
| 315 isEnd = TRUE; | |
| 316 isAnyMode = TRUE; | |
| 317 tmpPattern = pattern; | |
| 318 break; | |
| 0 | 319 |
| 81 | 320 case 0: |
| 377 | 321 if (isAnyMode) |
| 322 { | |
| 81 | 323 if (*str) |
| 324 str++; | |
| 325 else | |
| 326 isEnd = TRUE; | |
| 377 | 327 } |
| 328 else | |
| 329 { | |
| 330 if (*str) | |
| 331 { | |
| 332 if (tmpPattern) | |
| 333 { | |
| 81 | 334 isAnyMode = TRUE; |
| 335 pattern = tmpPattern; | |
| 377 | 336 } |
| 337 else | |
| 81 | 338 didMatch = FALSE; |
| 378 | 339 } |
| 340 else | |
| 81 | 341 isEnd = TRUE; |
| 342 } | |
| 343 break; | |
| 344 default: | |
| 377 | 345 if (isAnyMode) |
| 346 { | |
| 347 if (*pattern == *str) | |
| 348 { | |
| 81 | 349 isAnyMode = FALSE; |
| 350 didMatch = TRUE; | |
| 377 | 351 } |
| 352 else | |
| 353 { | |
| 354 if (*str) | |
| 355 { | |
| 81 | 356 didMatch = TRUE; |
| 357 str++; | |
| 358 } | |
| 359 } | |
| 377 | 360 } |
| 361 else | |
| 362 { | |
| 363 if (*pattern == *str) | |
| 364 { | |
| 81 | 365 didMatch = TRUE; |
| 366 if (*pattern) | |
| 367 pattern++; | |
| 368 if (*str) | |
| 369 str++; | |
| 377 | 370 } |
| 371 else | |
| 372 { | |
| 373 if (tmpPattern) | |
| 374 { | |
| 81 | 375 didMatch = TRUE; |
| 376 isAnyMode = TRUE; | |
| 377 pattern = tmpPattern; | |
| 378 } | |
| 379 } | |
| 380 } | |
| 0 | 381 |
| 81 | 382 if (!*str && !*pattern) |
| 383 isEnd = TRUE; | |
| 384 break; | |
| 0 | 385 |
| 378 | 386 } /* switch */ |
| 0 | 387 |
| 378 | 388 } |
| 389 while (didMatch && !isEnd); | |
| 0 | 390 |
| 81 | 391 return didMatch; |
| 0 | 392 } |
| 393 | |
| 394 | |
| 395 /* Compare a string to a pattern. Case-INSENSITIVE version. | |
| 396 */ | |
| 378 | 397 BOOL th_strcasematch(const char *str, const char *pattern) |
| 0 | 398 { |
| 81 | 399 BOOL didMatch = TRUE, isAnyMode = FALSE, isEnd = FALSE; |
| 124 | 400 const char *tmpPattern = NULL; |
| 0 | 401 |
| 81 | 402 /* Check given pattern and string */ |
| 403 if (str == NULL || pattern == NULL) | |
| 404 return FALSE; | |
| 0 | 405 |
| 81 | 406 /* Start comparision */ |
| 378 | 407 do |
| 408 { | |
| 409 switch (*pattern) | |
| 410 { | |
| 81 | 411 case '?': |
| 412 /* Any single character matches */ | |
| 377 | 413 if (*str) |
| 414 { | |
| 81 | 415 pattern++; |
| 416 str++; | |
| 378 | 417 } |
| 418 else | |
| 81 | 419 didMatch = FALSE; |
| 420 break; | |
| 0 | 421 |
| 81 | 422 case '*': |
| 423 pattern++; | |
| 424 if (!*pattern || *pattern == '?') | |
| 425 isEnd = TRUE; | |
| 426 isAnyMode = TRUE; | |
| 427 tmpPattern = pattern; | |
| 428 break; | |
| 0 | 429 |
| 81 | 430 case 0: |
| 377 | 431 if (isAnyMode) |
| 432 { | |
| 81 | 433 if (*str) |
| 434 str++; | |
| 435 else | |
| 436 isEnd = TRUE; | |
| 377 | 437 } |
| 438 else | |
| 439 { | |
| 440 if (*str) | |
| 441 { | |
| 442 if (tmpPattern) | |
| 443 { | |
| 81 | 444 isAnyMode = TRUE; |
| 445 pattern = tmpPattern; | |
| 377 | 446 } |
| 447 else | |
| 81 | 448 didMatch = FALSE; |
| 378 | 449 } |
| 450 else | |
| 81 | 451 isEnd = TRUE; |
| 452 } | |
| 453 break; | |
| 0 | 454 |
| 81 | 455 default: |
| 377 | 456 if (isAnyMode) |
| 457 { | |
| 458 if (th_tolower(*pattern) == th_tolower(*str)) | |
| 459 { | |
| 81 | 460 isAnyMode = FALSE; |
| 377 | 461 } |
| 462 else | |
| 463 { | |
| 81 | 464 if (*str) |
| 465 str++; | |
| 466 else | |
| 467 didMatch = FALSE; | |
| 468 } | |
| 377 | 469 } |
| 470 else | |
| 471 { | |
| 472 if (th_tolower(*pattern) == th_tolower(*str)) | |
| 473 { | |
| 81 | 474 if (*pattern) |
| 475 pattern++; | |
| 476 if (*str) | |
| 477 str++; | |
| 377 | 478 } |
| 479 else | |
| 480 { | |
| 481 if (tmpPattern) | |
| 482 { | |
| 81 | 483 isAnyMode = TRUE; |
| 484 pattern = tmpPattern; | |
| 377 | 485 } |
| 486 else | |
| 81 | 487 didMatch = FALSE; |
| 488 } | |
| 489 } | |
| 0 | 490 |
| 81 | 491 if (!*str && !*pattern) |
| 492 isEnd = TRUE; | |
| 377 | 493 |
| 81 | 494 break; |
| 0 | 495 |
| 378 | 496 } /* switch */ |
| 0 | 497 |
| 378 | 498 } |
| 499 while (didMatch && !isEnd); | |
| 0 | 500 |
| 81 | 501 return didMatch; |
| 0 | 502 } |
| 503 | |
|
131
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
504 |
|
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
505 int th_get_hex_triplet(const char *str) |
|
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
506 { |
|
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
507 const char *p = str; |
|
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
508 int len, val = 0; |
| 378 | 509 |
| 377 | 510 for (len = 0; *p && len < 6; p++, len++) |
| 511 { | |
| 512 if (*p >= '0' && *p <= '9') | |
| 513 { | |
| 514 val *= 16; | |
| 515 val += (*p - '0'); | |
| 516 } | |
| 517 else if (*p >= 'A' && *p <= 'F') | |
| 518 { | |
| 519 val *= 16; | |
| 520 val += (*p - 'A') + 10; | |
| 521 } | |
| 522 else if (*p >= 'a' && *p <= 'f') | |
| 523 { | |
| 524 val *= 16; | |
| 525 val += (*p - 'a') + 10; | |
| 526 } | |
| 527 else | |
|
131
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
528 return -1; |
|
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
529 } |
| 378 | 530 |
|
131
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
531 return (len == 6) ? val : -1; |
|
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
532 } |
|
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
533 |
|
3896861974ac
Added th_get_hex_triplet().
Matti Hamalainen <ccr@tnsp.org>
parents:
127
diff
changeset
|
534 |
| 327 | 535 BOOL th_growbuf(char **buf, size_t *bufsize, size_t *len, size_t grow) |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
536 { |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
537 if (*buf == NULL) |
|
287
eb74097b73f5
Make th_vputch() and th_vputs() return a boolean value for success and failure respectively. Also fix a grave bug in th_growbuf().
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
538 *bufsize = *len = 0; |
| 378 | 539 |
| 377 | 540 if (*buf == NULL || *len + grow >= *bufsize) |
| 541 { | |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
542 *bufsize += grow + TH_BUFGROW; |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
543 *buf = (char *) th_realloc(*buf, *bufsize); |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
544 if (*buf == NULL) |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
545 return FALSE; |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
546 } |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
547 return TRUE; |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
548 } |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
549 |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
550 |
|
287
eb74097b73f5
Make th_vputch() and th_vputs() return a boolean value for success and failure respectively. Also fix a grave bug in th_growbuf().
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
551 BOOL th_vputch(char **buf, size_t *bufsize, size_t *len, const char ch) |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
552 { |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
553 if (!th_growbuf(buf, bufsize, len, 1)) |
|
287
eb74097b73f5
Make th_vputch() and th_vputs() return a boolean value for success and failure respectively. Also fix a grave bug in th_growbuf().
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
554 return FALSE; |
| 378 | 555 |
|
244
517c7b22b3c9
Buffer pointer handling was wrong in th_vaddch(), fixed.
Matti Hamalainen <ccr@tnsp.org>
parents:
243
diff
changeset
|
556 (*buf)[*len] = ch; |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
557 (*len)++; |
|
287
eb74097b73f5
Make th_vputch() and th_vputs() return a boolean value for success and failure respectively. Also fix a grave bug in th_growbuf().
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
558 |
|
eb74097b73f5
Make th_vputch() and th_vputs() return a boolean value for success and failure respectively. Also fix a grave bug in th_growbuf().
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
559 return TRUE; |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
560 } |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
561 |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
562 |
|
287
eb74097b73f5
Make th_vputch() and th_vputs() return a boolean value for success and failure respectively. Also fix a grave bug in th_growbuf().
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
563 BOOL th_vputs(char **buf, size_t *bufsize, size_t *len, const char *str) |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
564 { |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
565 size_t slen; |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
566 if (str == NULL) |
|
287
eb74097b73f5
Make th_vputch() and th_vputs() return a boolean value for success and failure respectively. Also fix a grave bug in th_growbuf().
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
567 return FALSE; |
| 378 | 568 |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
569 slen = strlen(str); |
|
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
570 if (!th_growbuf(buf, bufsize, len, slen)) |
|
287
eb74097b73f5
Make th_vputch() and th_vputs() return a boolean value for success and failure respectively. Also fix a grave bug in th_growbuf().
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
571 return FALSE; |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
572 |
|
290
f1049f487987
Use strcpy() instead of strcat().
Matti Hamalainen <ccr@tnsp.org>
parents:
287
diff
changeset
|
573 strcpy(*buf + *len, str); |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
574 (*len) += slen; |
| 378 | 575 |
|
287
eb74097b73f5
Make th_vputch() and th_vputs() return a boolean value for success and failure respectively. Also fix a grave bug in th_growbuf().
Matti Hamalainen <ccr@tnsp.org>
parents:
282
diff
changeset
|
576 return TRUE; |
|
241
a1ee6c76ca1c
Functions for growing a string buffer when needed.
Matti Hamalainen <ccr@tnsp.org>
parents:
131
diff
changeset
|
577 } |