ICU-551.51.4.tar.gz

[apple/icu.git] / icuSources / tools / toolutil / pkg_icu.cpp

diff --git a/icuSources/tools/toolutil/pkg_icu.cpp b/icuSources/tools/toolutil/pkg_icu.cpp
index 87ed0914f13096bf29f81f7afd618f29c4c7e783..c2f3904878dc3a4c690de991fe9d3ec5ed754fd7 100644 (file)
--- a/icuSources/tools/toolutil/pkg_icu.cpp
+++ b/icuSources/tools/toolutil/pkg_icu.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- *   Copyright (C) 2008-2012, International Business Machines
+ *   Copyright (C) 2008-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *******************************************************************************
  */
@@ -16,9 +16,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 // read a file list -------------------------------------------------------- ***
 
 U_NAMESPACE_USE
@@ -38,7 +35,7 @@ isListTextFile(const char *listname) {
     const char *listNameEnd=strchr(listname, 0);
     const char *suffix;
     int32_t i, length;
-    for(i=0; i<LENGTHOF(listFileSuffixes); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(listFileSuffixes); ++i) {
         suffix=listFileSuffixes[i].suffix;
         length=listFileSuffixes[i].length;
         if((listNameEnd-listname)>length && 0==memcmp(listNameEnd-length, suffix, length)) {
@@ -135,6 +132,8 @@ readList(const char *filesPath, const char *listname, UBool readContents, Packag
         fclose(file);
     } else if((listNameEnd-listname)>4 && 0==memcmp(listNameEnd-4, ".dat", 4)) {
         // read the ICU .dat package
+        // Accept a .dat file whose name differs from the ToC prefixes.
+        listPkg->setAutoPrefix();
         listPkg->readPackage(listname);
     } else {
         // list the single file itself