Update ICU to 54.1 step 1

source/io/ufile.c

 /*
 ******************************************************************************
 *
-*   Copyright (C) 1998-2013, International Business Machines
+*   Copyright (C) 1998-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
 * File ufile.c
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   11/19/98    stephen     Creation.
 *   03/12/99    stephen     Modified for new C API.
 *   06/16/99    stephen     Changed T_LocaleBundle to u_locbund
 *   07/19/99    stephen     Fixed to use ucnv's default codepage.
 ******************************************************************************
 */
 
 /*
  * fileno is not declared when building with GCC in strict mode.
  */
 #if defined(__GNUC__) && defined(__STRICT_ANSI__)
 #undef __STRICT_ANSI__
 #endif
 
 #include "locmap.h"
 #include "unicode/ustdio.h"
+
+#if !UCONFIG_NO_CONVERSION
+
 #include "ufile.h"
 #include "unicode/uloc.h"
 #include "unicode/ures.h"
 #include "unicode/ucnv.h"
+#include "unicode/ustring.h"
 #include "cstring.h"
 #include "cmemory.h"
 
 #if U_PLATFORM_USES_ONLY_WIN32_API && !defined(fileno)
 /* Windows likes to rename Unix-like functions */
 #define fileno _fileno
 #endif
 
 static UFILE*
 finit_owner(FILE         *f,
@@ skipping 97 matching lines @@
     if (!result) {
         /* Something bad happened.
            Maybe the converter couldn't be opened. */
         fclose(systemFile);
     }
 
     return result; /* not a file leak */
 }
 
 U_CAPI UFILE* U_EXPORT2
+u_fopen_u(const UChar   *filename,
+        const char    *perm,
+        const char    *locale,
+        const char    *codepage)
+{
+    UFILE     *result;
+    char buffer[256];
+
+    u_austrcpy(buffer, filename);
+
+    result = u_fopen(buffer, perm, locale, codepage);
+#if U_PLATFORM_USES_ONLY_WIN32_API
+    /* Try Windows API _wfopen if the above fails. */
+    if (!result) {
+        FILE *systemFile = _wfopen(filename, (UChar*)perm);
+        if (systemFile) {
+            result = finit_owner(systemFile, locale, codepage, TRUE);
+        }
+        if (!result) {
+            /* Something bad happened.
+               Maybe the converter couldn't be opened. */
+            fclose(systemFile);
+        }
+    }
+#endif
+    return result; /* not a file leak */
+}
+
+U_CAPI UFILE* U_EXPORT2
 u_fstropen(UChar *stringBuf,
            int32_t      capacity,
            const char  *locale)
 {
     UFILE *result;
 
     if (capacity < 0) {
         return NULL;
     }
 
@@ skipping 144 matching lines @@
 {
     return file->fConverter;
 }
 #if !UCONFIG_NO_FORMATTING
 U_CAPI const UNumberFormat* U_EXPORT2 u_fgetNumberFormat(UFILE *file)
 {
     return u_locbund_getNumberFormat(&file->str.fBundle, UNUM_DECIMAL);
 }
 #endif
 
+#endif