Differences From Artifact [04c9933717]:
- File src/of_asprintf.m — part of check-in [c7f0229795] at 2020-01-02 01:51:34 on branch trunk — Update copyright (user: js, size: 16189) [annotate] [blame] [check-ins using] [more...]
To Artifact [cd42320784]:
- File
src/of_asprintf.m
— part of check-in
[ecca609079]
at
2020-05-16 17:17:52
on branch trunk
— Don't use %I on Windows
Older versions only understand I64. So only use I64 where appropriate
and drop it entirely where not. (user: js, size: 16873) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
95 96 97 98 99 100 101 |
}
#endif
#ifndef HAVE_ASPRINTF
static int
vasprintf(char **string, const char *format, va_list arguments)
{
| | | > > > > > > | | | > > > > > > > > > > > > > > > > > > > > | 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 |
}
#endif
#ifndef HAVE_ASPRINTF
static int
vasprintf(char **string, const char *format, va_list arguments)
{
int expectedLength, length;
va_list argumentsCopy;
va_copy(argumentsCopy, arguments);
expectedLength = vsnprintf(NULL, 0, format, argumentsCopy);
if (expectedLength == -1)
/*
* We have no way to know how large it is. Let's try 64 KB and
* hope.
*/
expectedLength = 65535;
if ((*string = malloc((size_t)expectedLength + 1)) == NULL)
return -1;
length = vsnprintf(*string, (size_t)expectedLength + 1,
format, arguments);
if (length == -1 || length > expectedLength) {
free(*string);
*string = NULL;
return -1;
}
/*
* In case we could not determine the size, resize to the actual size
* needed, but ignore any failure to do so.
*/
if (length < expectedLength) {
char *resized;
if ((resized = realloc(*string, length + 1)) != NULL)
*string = resized;
}
return length;
}
static int
asprintf(char **string, const char *format, ...)
{
int ret;
va_list arguments;
|
| ︙ | ︙ | |||
276 277 278 279 280 281 282 | #endif ctx->lengthModifier = LENGTH_MODIFIER_J; break; case 'z': #if defined(OF_WINDOWS) | > | | > | | | 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 | #endif ctx->lengthModifier = LENGTH_MODIFIER_J; break; case 'z': #if defined(OF_WINDOWS) if (sizeof(size_t) == 8) if (!appendSubformat(ctx, "I64", 3)) return false; #elif defined(_NEWLIB_VERSION) if (!appendSubformat(ctx, "l", 1)) return false; #else if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; #endif ctx->lengthModifier = LENGTH_MODIFIER_Z; break; case 't': #if defined(OF_WINDOWS) if (sizeof(ptrdiff_t) == 8) if (!appendSubformat(ctx, "I64", 3)) return false; #elif defined(_NEWLIB_VERSION) if (!appendSubformat(ctx, "l", 1)) return false; #else if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; #endif |
| ︙ | ︙ | |||
350 351 352 353 354 355 356 357 358 359 360 361 362 363 |
}
static bool
formatConversionSpecifierState(struct context *ctx)
{
char *tmp = NULL;
int tmpLen = 0;
if (!appendSubformat(ctx, ctx->format + ctx->i, 1))
return false;
switch (ctx->format[ctx->i]) {
case '@':
if (ctx->lengthModifier != LENGTH_MODIFIER_NONE)
| > > > | 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 |
}
static bool
formatConversionSpecifierState(struct context *ctx)
{
char *tmp = NULL;
int tmpLen = 0;
#ifndef HAVE_ASPRINTF_L
OFString *point;
#endif
if (!appendSubformat(ctx, ctx->format + ctx->i, 1))
return false;
switch (ctx->format[ctx->i]) {
case '@':
if (ctx->lengthModifier != LENGTH_MODIFIER_NONE)
|
| ︙ | ︙ | |||
544 545 546 547 548 549 550 551 552 553 554 555 | va_arg(ctx->arguments, long double)); break; default: return false; } #ifndef HAVE_ASPRINTF_L /* * If there's no asprintf_l, we have no other choice than to * use this ugly hack to replace the locale's decimal point * back to ".". */ | > > > > > | < < < | | > > | 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 |
va_arg(ctx->arguments, long double));
break;
default:
return false;
}
#ifndef HAVE_ASPRINTF_L
if (tmpLen == -1)
return false;
/*
* If there's no asprintf_l, we have no other choice than to
* use this ugly hack to replace the locale's decimal point
* back to ".".
*/
point = [OFLocale decimalPoint];
if (!ctx->useLocale && point != nil && ![point isEqual: @"."]) {
void *pool = objc_autoreleasePoolPush();
char *tmp2;
@try {
OFMutableString *tmpStr = [OFMutableString
stringWithUTF8String: tmp
length: tmpLen];
[tmpStr replaceOccurrencesOfString: point
withString: @"."];
if (tmpStr.UTF8StringLength > INT_MAX)
return false;
tmpLen = (int)tmpStr.UTF8StringLength;
tmp2 = malloc(tmpLen);
memcpy(tmp2, tmpStr.UTF8String, tmpLen);
} @finally {
free(tmp);
objc_autoreleasePoolPop(pool);
}
|
| ︙ | ︙ |