ICU-57166.0.1.tar.gz

[apple/icu.git] / icuSources / extra / uconv / uconv.cpp

diff --git a/icuSources/extra/uconv/uconv.cpp b/icuSources/extra/uconv/uconv.cpp
index 0bba48eafe1a732dc62e770d90ad2fc4634c2e5d..6729b3b21e3ab074701c5615cdd6c7877e7b2f59 100644 (file)
--- a/icuSources/extra/uconv/uconv.cpp
+++ b/icuSources/extra/uconv/uconv.cpp
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
 /*****************************************************************************
 *

-*   Copyright (C) 1999-2011, International Business Machines
+*   Copyright (C) 1999-2016, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************/
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************/


@@ -26,6 +26,7 @@
 #include <unicode/translit.h>
 #include <unicode/uset.h>
 #include <unicode/uclean.h>
 #include <unicode/translit.h>
 #include <unicode/uset.h>
 #include <unicode/uclean.h>

+#include <unicode/utf16.h>

 
 #include <stdio.h>
 #include <errno.h>
 
 #include <stdio.h>
 #include <errno.h>


@@ -65,8 +66,6 @@ U_NAMESPACE_USE
 U_CFUNC char uconvmsg_dat[];
 #endif
 
 U_CFUNC char uconvmsg_dat[];
 #endif
 

-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-

 #define DEFAULT_BUFSZ   4096
 #define UCONVMSG "uconvmsg"
 
 #define DEFAULT_BUFSZ   4096
 #define UCONVMSG "uconvmsg"
 


@@ -88,7 +87,7 @@ static void initMsg(const char *pname) {
         ps = 1;
 
         /* Set up our static data - if any */
         ps = 1;
 
         /* Set up our static data - if any */

-#ifdef UCONVMSG_LINK
+#if defined(UCONVMSG_LINK) && U_PLATFORM != U_PF_OS390 /* On z/OS, this is failing. */

         udata_setAppData(UCONVMSG, (const void*) uconvmsg_dat, &err);
         if (U_FAILURE(err)) {
           fprintf(stderr, "%s: warning, problem installing our static resource bundle data uconvmsg: %s - trying anyways.\n",
         udata_setAppData(UCONVMSG, (const void*) uconvmsg_dat, &err);
         if (U_FAILURE(err)) {
           fprintf(stderr, "%s: warning, problem installing our static resource bundle data uconvmsg: %s - trying anyways.\n",


@@ -174,7 +173,7 @@ static struct callback_ent {
 
 static const struct callback_ent *findCallback(const char *name) {
     int i, count =
 
 static const struct callback_ent *findCallback(const char *name) {
     int i, count =

-        sizeof(transcode_callbacks) / sizeof(*transcode_callbacks);
+        UPRV_LENGTHOF(transcode_callbacks);

 
     /* We'll do a linear search, there aren't many of them and bsearch()
        may not be that portable. */
 
     /* We'll do a linear search, there aren't many of them and bsearch()
        may not be that portable. */


@@ -593,6 +592,7 @@ ConvertFile::convertFile(const char *pname,
     UConverter *convto = 0;
     UErrorCode err = U_ZERO_ERROR;
     UBool flush;
     UConverter *convto = 0;
     UErrorCode err = U_ZERO_ERROR;
     UBool flush;

+    UBool closeFile = FALSE;

     const char *cbufp, *prevbufp;
     char *bufp;
 
     const char *cbufp, *prevbufp;
     char *bufp;
 


@@ -628,6 +628,7 @@ ConvertFile::convertFile(const char *pname,
             u_wmsg(stderr, "cantOpenInputF", str1.getBuffer(), str2.getBuffer());
             return FALSE;
         }
             u_wmsg(stderr, "cantOpenInputF", str1.getBuffer(), str2.getBuffer());
             return FALSE;
         }

+        closeFile = TRUE;

     } else {
         infilestr = "-";
         infile = stdin;
     } else {
         infilestr = "-";
         infile = stdin;


@@ -656,9 +657,9 @@ ConvertFile::convertFile(const char *pname,
         parse.line = -1;
 
         if (uprv_strchr(translit, ':') || uprv_strchr(translit, '>') || uprv_strchr(translit, '<') || uprv_strchr(translit, '>')) {
         parse.line = -1;
 
         if (uprv_strchr(translit, ':') || uprv_strchr(translit, '>') || uprv_strchr(translit, '<') || uprv_strchr(translit, '>')) {

-            t = Transliterator::createFromRules("Uconv", str, UTRANS_FORWARD, parse, err);
+            t = Transliterator::createFromRules(UNICODE_STRING_SIMPLE("Uconv"), str, UTRANS_FORWARD, parse, err);

         } else {
         } else {

-            t = Transliterator::createInstance(translit, UTRANS_FORWARD, err);
+            t = Transliterator::createInstance(UnicodeString(translit, -1, US_INV), UTRANS_FORWARD, err);

         }
 
         if (U_FAILURE(err)) {
         }
 
         if (U_FAILURE(err)) {


@@ -943,7 +944,7 @@ ConvertFile::convertFile(const char *pname,
                     int8_t i, length, errorLength;
 
                     UErrorCode localError = U_ZERO_ERROR;
                     int8_t i, length, errorLength;
 
                     UErrorCode localError = U_ZERO_ERROR;

-                    errorLength = (int8_t)LENGTHOF(errorUChars);
+                    errorLength = UPRV_LENGTHOF(errorUChars);

                     ucnv_getInvalidUChars(convto, errorUChars, &errorLength, &localError);
                     if (U_FAILURE(localError) || errorLength == 0) {
                         // need at least 1 so that we don't access beyond the length of fromoffsets[]
                     ucnv_getInvalidUChars(convto, errorUChars, &errorLength, &localError);
                     if (U_FAILURE(localError) || errorLength == 0) {
                         // need at least 1 so that we don't access beyond the length of fromoffsets[]


@@ -1051,7 +1052,7 @@ normal_exit:
     delete t;
 #endif
 
     delete t;
 #endif
 

-    if (infile != stdin) {
+    if (closeFile) {

         fclose(infile);
     }
 
         fclose(infile);
     }
 


@@ -1081,7 +1082,7 @@ static void usage(const char *pname, int ecode) {
             /* Now dump callbacks and finish. */
 
             int i, count =
             /* Now dump callbacks and finish. */
 
             int i, count =

-                sizeof(transcode_callbacks) / sizeof(*transcode_callbacks);
+                UPRV_LENGTHOF(transcode_callbacks);

             for (i = 0; i < count; ++i) {
                 fprintf(fp, " %s", transcode_callbacks[i].name);
             }
             for (i = 0; i < count; ++i) {
                 fprintf(fp, " %s", transcode_callbacks[i].name);
             }


@@ -1378,6 +1379,8 @@ normal_exit:
         fclose(outfile);
     }
 
         fclose(outfile);
     }
 

+    u_cleanup();
+

     return ret;
 }
 
     return ret;
 }