/*****************************************************************************
*
-* Copyright (C) 1999-2004, International Business Machines
+* Copyright (C) 1999-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************/
/*
* uconv(1): an iconv(1)-like converter using ICU.
*
- * Original code by Jonas Utterstrรถm <jonas.utterstrom@vittran.norrnod.se>
+ * Original code by Jonas Utterström <jonas.utterstrom@vittran.norrnod.se>
* contributed in 1999.
*
* Conversion to the C conversion API and many improvements by
#include <unicode/translit.h>
#include <unicode/uset.h>
#include <unicode/uclean.h>
+#include <unicode/utf16.h>
#include <stdio.h>
#include <errno.h>
#include "unicode/uwmsg.h"
-#if (defined(WIN32) || defined(U_CYGWIN)) && !defined(__STRICT_ANSI__)
+U_NAMESPACE_USE
+
+#if U_PLATFORM_USES_ONLY_WIN32_API && !defined(__STRICT_ANSI__)
#include <io.h>
#include <fcntl.h>
+#if U_PLATFORM_USES_ONLY_WIN32_API
#define USE_FILENO_BINARY_MODE 1
+/* Windows likes to rename Unix-like functions */
+#ifndef fileno
+#define fileno _fileno
+#endif
+#ifndef setmode
+#define setmode _setmode
+#endif
+#ifndef O_BINARY
+#define O_BINARY _O_BINARY
+#endif
+#endif
#endif
#ifdef UCONVMSG_LINK
U_CFUNC char uconvmsg_dat[];
#endif
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
#define DEFAULT_BUFSZ 4096
#define UCONVMSG "uconvmsg"
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",
}
if (U_FAILURE(err)) {
u_wmsg(stderr, "cantGetTag", u_wmsg_errorName(err));
- return -1;
+ goto error_cleanup;
}
}
if (canon) {
putchar('\t');
u_wmsg(stderr, "cantGetAliases", str.getTerminatedBuffer(),
u_wmsg_errorName(err));
- return -1;
+ goto error_cleanup;
} else {
uint16_t a, s, t;
putchar('\t');
u_wmsg(stderr, "cantGetAliases", str.getTerminatedBuffer(),
u_wmsg_errorName(err));
- return -1;
+ goto error_cleanup;
}
/* Print the current alias so that it looks right. */
/* Success. */
return 0;
+error_cleanup:
+ uprv_free(stds);
+ return -1;
}
/* Print all available transliterators. If canon is non zero, print
printf("no transliterators available because of UCONFIG_NO_TRANSLITERATION, see uconfig.h\n");
return 1;
#else
- int32_t numtrans = utrans_countAvailableIDs(), i;
- int buflen = 512;
- char *buf = (char *) uprv_malloc(buflen);
- char staticbuf[512];
+ UErrorCode status = U_ZERO_ERROR;
+ UEnumeration *ids = utrans_openIDs(&status);
+ int32_t i, numtrans = uenum_count(ids, &status);
char sepchar = canon ? '\n' : ' ';
- if (!buf) {
- buf = staticbuf;
- buflen = sizeof(staticbuf);
- }
+ for (i = 0; U_SUCCESS(status)&& (i < numtrans); ++i) {
+ int32_t len;
+ const char *nextTrans = uenum_next(ids, &len, &status);
- for (i = 0; i < numtrans; ++i) {
- int32_t len = utrans_getAvailableID(i, buf, buflen);
- if (len >= buflen - 1) {
- if (buf != staticbuf) {
- buflen <<= 1;
- if (buflen < len) {
- buflen = len + 64;
- }
- buf = (char *) uprv_realloc(buf, buflen);
- if (!buf) {
- buf = staticbuf;
- buflen = sizeof(staticbuf);
- }
- }
- utrans_getAvailableID(i, buf, buflen);
- if (len >= buflen) {
- uprv_strcpy(buf + buflen - 4, "..."); /* Truncate the name. */
- }
- }
-
- printf("%s", buf);
+ printf("%s", nextTrans);
if (i < numtrans - 1) {
putchar(sepchar);
}
}
+ uenum_close(ids);
+
/* Add a terminating newline if needed. */
if (sepchar != '\n') {
putchar('\n');
}
- /* Free temporary data. */
-
- if (buf != staticbuf) {
- uprv_free(buf);
- }
-
/* Success. */
return 0;
UConverter *convto = 0;
UErrorCode err = U_ZERO_ERROR;
UBool flush;
+ UBool closeFile = FALSE;
const char *cbufp, *prevbufp;
char *bufp;
u_wmsg(stderr, "cantOpenInputF", str1.getBuffer(), str2.getBuffer());
return FALSE;
}
+ closeFile = TRUE;
} else {
infilestr = "-";
infile = stdin;
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 {
- t = Transliterator::createInstance(translit, UTRANS_FORWARD, err);
+ t = Transliterator::createInstance(UnicodeString(translit, -1, US_INV), UTRANS_FORWARD, err);
}
if (U_FAILURE(err)) {
buf + rd, useOffsets ? fromoffsets : NULL, flush, &err);
ulen = (int32_t)(unibufp - unibuf);
- u.releaseBuffer(ulen);
+ u.releaseBuffer(U_SUCCESS(err) ? ulen : 0);
// fromSawEndOfBytes indicates that ucnv_toUnicode() is done
// converting all of the input bytes.
int8_t i, length, errorLength;
UErrorCode localError = U_ZERO_ERROR;
- errorLength = (int8_t)LENGTHOF(errorUChars);
+ errorLength = (int8_t)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[]
delete t;
#endif
- if (infile != stdin) {
+ if (closeFile) {
fclose(infile);
}
// Get and prettify pname.
pname = uprv_strrchr(*argv, U_FILE_SEP_CHAR);
-#ifdef WIN32
+#if U_PLATFORM_USES_ONLY_WIN32_API
if (!pname) {
pname = uprv_strrchr(*argv, '/');
}
goto normal_exit;
error_exit:
+#if !UCONFIG_NO_LEGACY_CONVERSION
ret = 1;
+#else
+ fprintf(stderr, "uconv error: UCONFIG_NO_LEGACY_CONVERSION is on. See uconfig.h\n");
+#endif
normal_exit:
if (outfile != stdout) {
fclose(outfile);
}
+ u_cleanup();
+
return ret;
}
projects / apple / icu.git / blobdiff