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

ICU-2596 don't treat .dat files on the data path as directories

Browse source 
X-SVN-Rev: 11581
This commit is contained in:
Steven R. Loomis 2003-04-18 00:15:33 +00:00
parent 1cc442b42d
commit 711de2113a
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -471,7 +471,8 @@ static const char *udata_pathiter_next(UDataPathIterator *iter, int32_t *outPath
/* check for .dat files */
pathBasename = findBasename(iter->pathBuffer);
if(iter->checkLastFour == TRUE &&
if(iter->checkLastFour == TRUE &&
(pathLen>=4) &&
uprv_strncmp(iter->pathBuffer +(pathLen-4),iter->suffix,4)==0 && /* suffix matches */
uprv_strncmp(findBasename(iter->pathBuffer),iter->basename,iter->basenameLen)==0 && /* base matches */
uprv_strlen(pathBasename)==(iter->basenameLen+4)) { /* base+suffix = full len */
@ -485,8 +486,17 @@ static const char *udata_pathiter_next(UDataPathIterator *iter, int32_t *outPath
{ /* regular dir path */
if(iter->pathBuffer[pathLen-1] != U_FILE_SEP_CHAR) /* trailing sep */
{
if((pathLen>=4) &&
uprv_strncmp(iter->pathBuffer+(pathLen-4), ".dat", 4) == 0)
{
#ifdef UDATA_DEBUG
fprintf(stderr, "skipping non-directory .dat file %s\n", iter->pathBuffer);
continue;
#endif
}
iter->pathBuffer[pathLen++] = U_FILE_SEP_CHAR;
}
}
uprv_strncpy(iter->pathBuffer + pathLen, /* + basename */
iter->basename,