Update ICU to 54.1 step 1

source/tools/toolutil/package.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 1999-2013, International Business Machines
+*   Copyright (C) 1999-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  package.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2005aug25
 *   created by: Markus W. Scherer
@@ skipping 20 matching lines @@
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 
 static const int32_t kItemsChunk = 256; /* How much to increase the filesarray by each time */
 
 // general definitions ----------------------------------------------------- ***
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 /* UDataInfo cf. udata.h */
 static const UDataInfo dataInfo={
     (uint16_t)sizeof(UDataInfo),
     0,
 
     U_IS_BIG_ENDIAN,
     U_CHARSET_FAMILY,
     (uint8_t)sizeof(UChar),
     0,
 
@@ skipping 530 matching lines @@
             // Use the first entry's prefix. Must be a new-style package.
             const char *prefixLimit=strchr(s, U_TREE_ENTRY_SEP_CHAR);
             if(prefixLimit==NULL) {
                 fprintf(stderr,
                         "icupkg: --auto_toc_prefix[_with_type] but "
                         "the first entry \"%s\" does not contain a '%c'\n",
                         s, U_TREE_ENTRY_SEP_CHAR);
                 exit(U_INVALID_FORMAT_ERROR);
             }
             prefixLength=(int32_t)(prefixLimit-s);
-            if(prefixLength==0 || prefixLength>=LENGTHOF(pkgPrefix)) {
+            if(prefixLength==0 || prefixLength>=UPRV_LENGTHOF(pkgPrefix)) {
                 fprintf(stderr,
                         "icupkg: --auto_toc_prefix[_with_type] but "
                         "the prefix of the first entry \"%s\" is empty or too long\n",
                         s);
                 exit(U_INVALID_FORMAT_ERROR);
             }
             if(prefixEndsWithType && s[prefixLength-1]!=type) {
                 fprintf(stderr,
                         "icupkg: --auto_toc_prefix_with_type but "
                         "the prefix of the first entry \"%s\" does not end with '%c'\n",
                         s, type);
                 exit(U_INVALID_FORMAT_ERROR);
             }
             memcpy(pkgPrefix, s, prefixLength);
+            pkgPrefix[prefixLength]=0;
             memcpy(prefix, s, ++prefixLength);  // include the /
         } else {
             // Use the package basename as prefix.
             int32_t inPkgNameLength=strlen(inPkgName);
             memcpy(prefix, inPkgName, inPkgNameLength);
             prefixLength=inPkgNameLength;
 
             if( (int32_t)strlen(s)>=(inPkgNameLength+2) &&
                 0==memcmp(s, inPkgName, inPkgNameLength) &&
                 s[inPkgNameLength]=='_'
@@ skipping 682 matching lines @@
 }
 
 void Package::ensureItemCapacity()
 {
   if((itemCount+1)>itemMax) {
     setItemCapacity(itemCount+kItemsChunk);
   }
 }
 
 U_NAMESPACE_END