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

ICU-2487 path changes

Browse source 
X-SVN-Rev: 15359
This commit is contained in:
Steven R. Loomis 2004-05-18 02:02:39 +00:00
parent 68d8397b89
commit 1fcde5856d
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
icu4c/source/common/udata.c
View file

@ -1081,12 +1081,18 @@ doOpenChoice(const char *path, const char *type, const char *name,
const DataHeader *pHeader;
const char *inBasename;
UErrorCode errorCode=U_ZERO_ERROR;
UBool isICUData;
const char *treeChar;
isICUData= (UBool)(path==NULL ? TRUE : (!uprv_strncmp(path,U_ICUDATA_NAME U_TREE_SEPARATOR_STRING, uprv_strlen(U_ICUDATA_NAME U_TREE_SEPARATOR_STRING))));
UBool isICUData = FALSE;
if(path == NULL ||
!strcmp(path, U_ICUDATA_ALIAS) ||
!uprv_strncmp(path, U_ICUDATA_NAME U_TREE_SEPARATOR_STRING,
uprv_strlen(U_ICUDATA_NAME U_TREE_SEPARATOR_STRING)) ||
!uprv_strncmp(path, U_ICUDATA_ALIAS U_TREE_SEPARATOR_STRING,
uprv_strlen(U_ICUDATA_ALIAS U_TREE_SEPARATOR_STRING))) {
isICUData = TRUE;
}
#if (U_FILE_SEP_CHAR != U_FILE_ALT_SEP_CHAR)
/* remap from alternate path char to the main one */
@ -1134,10 +1140,18 @@ doOpenChoice(const char *path, const char *type, const char *name,
} else {
treeChar = uprv_strchr(path, U_TREE_SEPARATOR);
if(treeChar) {
TinyString_append(&treeName, treeChar+1); /* following '/' */
TinyString_appendn(&pkgName, path, treeChar-path);
} else {
TinyString_append(&pkgName, path);
TinyString_append(&treeName, treeChar+1); /* following '-' */
if(!isICUData) {
TinyString_appendn(&pkgName, path, treeChar-path);
} else {
TinyString_append(&pkgName, U_ICUDATA_NAME);
}
} else {
if(!isICUData) {
TinyString_append(&pkgName, path);
} else {
TinyString_append(&pkgName, U_ICUDATA_NAME);
}
}
}
}