organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 06:25:30 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-22520 Add a ulocimp_setKeywordValue() that writes to icu::ByteSink.

Browse source
This commit is contained in:
Fredrik Roubert 2024-01-15 10:29:53 +09:00 • committed by Fredrik Roubert
parent e1415d1282
commit 340806bf9a
3 changed files with 85 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
icu4c/source/common/uloc.cpp
View file

@ -848,20 +848,62 @@ uloc_setKeywordValue(const char* keywordName,
const char* keywordValue,
char* buffer, int32_t bufferCapacity,
UErrorCode* status)
{
if (U_FAILURE(*status)) {
return -1;
}
if (bufferCapacity <= 1) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
int32_t bufLen = (int32_t)uprv_strlen(buffer);
if(bufferCapacity<bufLen) {
/* The capacity is less than the length?! Is this NUL terminated? */
*status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
char* keywords = const_cast<char*>(locale_getKeywordsStart(buffer));
int32_t baseLen = keywords == nullptr ? bufLen : keywords - buffer;
// Remove -1 from the capacity so that this function can guarantee NUL termination.
CheckedArrayByteSink sink(keywords == nullptr ? buffer + bufLen : keywords,
bufferCapacity - baseLen - 1);
int32_t reslen = ulocimp_setKeywordValue(
keywords, keywordName, keywordValue, sink, status);
if (U_FAILURE(*status)) {
// A positive return value is a length, otherwise it's an error code.
return reslen > 0 ? reslen + baseLen : reslen;
}
// See the documentation for this function, it's guaranteed to never
// overflow the buffer but instead abort with BUFFER_OVERFLOW_ERROR.
// In this case, nothing has been written to the sink, so it cannot have Overflowed().
U_ASSERT(!sink.Overflowed());
U_ASSERT(reslen >= 0);
return u_terminateChars(buffer, bufferCapacity, reslen + baseLen, status);
}
U_EXPORT int32_t U_EXPORT2
ulocimp_setKeywordValue(const char* keywords,
const char* keywordName,
const char* keywordValue,
ByteSink& sink,
UErrorCode* status)
{
/* TODO: sorting. removal. */
int32_t keywordNameLen;
int32_t keywordValueLen;
int32_t bufLen;
int32_t needLen = 0;
char keywordNameBuffer[ULOC_KEYWORD_BUFFER_LEN];
char keywordValueBuffer[ULOC_KEYWORDS_CAPACITY+1];
char localeKeywordNameBuffer[ULOC_KEYWORD_BUFFER_LEN];
int32_t rc;
char* nextSeparator = nullptr;
char* nextEqualsign = nullptr;
char* startSearchHere = nullptr;
char* keywordStart = nullptr;
const char* nextSeparator = nullptr;
const char* nextEqualsign = nullptr;
const char* keywordStart = nullptr;
CharString updatedKeysAndValues;
UBool handledInputKeyAndValue = false;
char keyValuePrefix = '@';
@ -872,13 +914,7 @@ uloc_setKeywordValue(const char* keywordName,
if (*status == U_STRING_NOT_TERMINATED_WARNING) {
*status = U_ZERO_ERROR;
}
if (keywordName == nullptr || keywordName[0] == 0 || bufferCapacity <= 1) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
bufLen = (int32_t)uprv_strlen(buffer);
if(bufferCapacity<bufLen) {
/* The capacity is less than the length?! Is this NUL terminated? */
if (keywordName == nullptr || keywordName[0] == 0) {
*status = U_ILLEGAL_ARGUMENT_ERROR;
return 0;
}
@ -906,34 +942,33 @@ uloc_setKeywordValue(const char* keywordName,
}
keywordValueBuffer[keywordValueLen] = 0; /* terminate */
startSearchHere = (char*)locale_getKeywordsStart(buffer);
if(startSearchHere == nullptr || (startSearchHere[1]==0)) {
if (keywords == nullptr || keywords[1] == '\0') {
if(keywordValueLen == 0) { /* no keywords = nothing to remove */
U_ASSERT(*status != U_STRING_NOT_TERMINATED_WARNING);
return bufLen;
return 0;
}
needLen = bufLen+1+keywordNameLen+1+keywordValueLen;
if(startSearchHere) { /* had a single @ */
needLen--; /* already had the @ */
/* startSearchHere points at the @ */
} else {
startSearchHere=buffer+bufLen;
}
if(needLen >= bufferCapacity) {
needLen = 1+keywordNameLen+1+keywordValueLen;
int32_t capacity = 0;
char* buffer = sink.GetAppendBuffer(
needLen, needLen, nullptr, needLen, &capacity);
if (capacity < needLen || buffer == nullptr) {
*status = U_BUFFER_OVERFLOW_ERROR;
return needLen; /* no change */
}
*startSearchHere++ = '@';
uprv_strcpy(startSearchHere, keywordNameBuffer);
startSearchHere += keywordNameLen;
*startSearchHere++ = '=';
uprv_strcpy(startSearchHere, keywordValueBuffer);
char* it = buffer;
*it++ = '@';
uprv_memcpy(it, keywordNameBuffer, keywordNameLen);
it += keywordNameLen;
*it++ = '=';
uprv_memcpy(it, keywordValueBuffer, keywordValueLen);
sink.Append(buffer, needLen);
U_ASSERT(*status != U_STRING_NOT_TERMINATED_WARNING);
return needLen;
} /* end shortcut - no @ */
keywordStart = startSearchHere;
keywordStart = keywords;
/* search for keyword */
while(keywordStart) {
const char* keyValueTail;
@ -1045,24 +1080,27 @@ uloc_setKeywordValue(const char* keywordName,
/* if input key/value specified removal of a keyword not present in locale, or
* there was an error in CharString.append, leave original locale alone. */
U_ASSERT(*status != U_STRING_NOT_TERMINATED_WARNING);
return bufLen;
return (int32_t)uprv_strlen(keywords);
}
// needLen = length of the part before '@'
needLen = (int32_t)(startSearchHere - buffer);
// Check to see can we fit the startSearchHere, if not, return
needLen = updatedKeysAndValues.length();
// Check to see can we fit the updatedKeysAndValues, if not, return
// U_BUFFER_OVERFLOW_ERROR without copy updatedKeysAndValues into it.
// We do this because this API function does not behave like most others:
// It promises never to set a U_STRING_NOT_TERMINATED_WARNING.
// When the contents fits but without the terminating NUL, in this case we need to not change
// the buffer contents and return with a buffer overflow error.
int32_t appendLength = updatedKeysAndValues.length();
if (appendLength >= bufferCapacity - needLen) {
*status = U_BUFFER_OVERFLOW_ERROR;
return needLen + appendLength;
if (needLen > 0) {
int32_t capacity = 0;
char* buffer = sink.GetAppendBuffer(
needLen, needLen, nullptr, needLen, &capacity);
if (capacity < needLen || buffer == nullptr) {
*status = U_BUFFER_OVERFLOW_ERROR;
return needLen;
}
uprv_memcpy(buffer, updatedKeysAndValues.data(), needLen);
sink.Append(buffer, needLen);
}
needLen += updatedKeysAndValues.extract(
startSearchHere, bufferCapacity - needLen, *status);
U_ASSERT(*status != U_STRING_NOT_TERMINATED_WARNING);
return needLen;
}

7
icu4c/source/common/ulocimp.h
View file

@ -92,6 +92,13 @@ ulocimp_getKeywordValue(const char* localeID,
icu::ByteSink& sink,
UErrorCode* status);
U_EXPORT int32_t U_EXPORT2
ulocimp_setKeywordValue(const char* keywords,
const char* keywordName,
const char* keywordValue,
icu::ByteSink& sink,
UErrorCode* status);
U_CAPI void U_EXPORT2
ulocimp_getParent(const char* localeID,
icu::ByteSink& sink,

1
icu4c/source/common/unicode/urename.h
View file

@ -1203,6 +1203,7 @@
#define ulocimp_getScript U_ICU_ENTRY_POINT_RENAME(ulocimp_getScript)
#define ulocimp_isCanonicalizedLocaleForTest U_ICU_ENTRY_POINT_RENAME(ulocimp_isCanonicalizedLocaleForTest)
#define ulocimp_minimizeSubtags U_ICU_ENTRY_POINT_RENAME(ulocimp_minimizeSubtags)
#define ulocimp_setKeywordValue U_ICU_ENTRY_POINT_RENAME(ulocimp_setKeywordValue)
#define ulocimp_toBcpKey U_ICU_ENTRY_POINT_RENAME(ulocimp_toBcpKey)
#define ulocimp_toBcpType U_ICU_ENTRY_POINT_RENAME(ulocimp_toBcpType)
#define ulocimp_toLanguageTag U_ICU_ENTRY_POINT_RENAME(ulocimp_toLanguageTag)