AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11826 makeconv main() use CharString for outFileName; change from .c to .cpp; CharString add lastIndexOf(char) and ensureEndsWithFileSeparator()

Browse Source 
X-SVN-Rev: 37902
This commit is contained in:
Markus Scherer 2015-09-08 19:54:38 +00:00
parent 7e03903fd5
commit f9b98d9b6f
5 changed files with 70 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
icu4c/source/common/charstr.cpp
View File

@ -28,6 +28,15 @@ CharString &CharString::copyFrom(const CharString &s, UErrorCode &errorCode) {
return *this;
}
int32_t CharString::lastIndexOf(char c) const {
for(int32_t i=len; i>0;) {
if(buffer[--i]==c) {
return i;
}
}
return -1;
}
CharString &CharString::truncate(int32_t newLength) {
if(newLength<0) {
newLength=0;
@ -150,4 +159,13 @@ CharString &CharString::appendPathPart(const StringPiece &s, UErrorCode &errorCo
return *this;
}
CharString &CharString::ensureEndsWithFileSeparator(UErrorCode &errorCode) {
char c;
if(U_SUCCESS(errorCode) && len>0 &&
(c=buffer[len-1])!=U_FILE_SEP_CHAR && c!=U_FILE_ALT_SEP_CHAR) {
append(U_FILE_SEP_CHAR, errorCode);
}
return *this;
}
U_NAMESPACE_END

11
icu4c/source/common/charstr.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2001-2012, International Business Machines
* Copyright (c) 2001-2015, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
@ -69,6 +69,9 @@ public:
const char *data() const { return buffer.getAlias(); }
char *data() { return buffer.getAlias(); }
/** @return last index of c, or -1 if c is not in this string */
int32_t lastIndexOf(char c) const;
CharString &clear() { len=0; buffer[0]=0; return *this; }
CharString &truncate(int32_t newLength);
@ -114,6 +117,12 @@ public:
*/
CharString &appendPathPart(const StringPiece &s, UErrorCode &errorCode);
/**
* Appends a U_FILE_SEP_CHAR if this string is not empty
* and does not already end with a U_FILE_SEP_CHAR or U_FILE_ALT_SEP_CHAR.
*/
CharString &ensureEndsWithFileSeparator(UErrorCode &errorCode);
private:
MaybeStackArray<char, 40> buffer;
int32_t len;

94
icu4c/source/tools/makeconv/makeconv.c → icu4c/source/tools/makeconv/makeconv.cpp
View File

@ -7,7 +7,7 @@
********************************************************************************
*
*
* makeconv.c:
* makeconv.cpp:
* tool creating a binary (compressed) representation of the conversion mapping
* table (IBM NLTC ucmap format).
*
@ -18,6 +18,7 @@
#include <stdio.h>
#include "unicode/putil.h"
#include "unicode/ucnv_err.h"
#include "charstr.h"
#include "ucnv_bld.h"
#include "ucnv_imp.h"
#include "ucnv_cnv.h"
@ -195,21 +196,12 @@ static UOption options[]={
int main(int argc, char* argv[])
{
ConvData data;
UErrorCode err = U_ZERO_ERROR, localError;
char outFileName[UCNV_MAX_FULL_FILE_NAME_LENGTH];
const char* destdir, *arg;
size_t destdirlen;
char* dot = NULL, *outBasename;
char cnvName[UCNV_MAX_FULL_FILE_NAME_LENGTH];
char cnvNameWithPkg[UCNV_MAX_FULL_FILE_NAME_LENGTH];
UVersionInfo icuVersion;
UBool printFilename;
err = U_ZERO_ERROR;
U_MAIN_INIT_ARGS(argc, argv);
/* Set up the ICU version number */
UVersionInfo icuVersion;
u_getVersion(icuVersion);
uprv_memcpy(&dataInfo.dataVersion, &icuVersion, sizeof(UVersionInfo));
@ -256,7 +248,7 @@ int main(int argc, char* argv[])
/* get the options values */
haveCopyright = options[OPT_COPYRIGHT].doesOccur;
destdir = options[OPT_DESTDIR].value;
const char *destdir = options[OPT_DESTDIR].value;
VERBOSE = options[OPT_VERBOSE].doesOccur;
QUIET = options[OPT_QUIET].doesOccur;
SMALL = options[OPT_SMALL].doesOccur;
@ -265,18 +257,15 @@ int main(int argc, char* argv[])
IGNORE_SISO_CHECK = TRUE;
}
icu::CharString outFileName;
UErrorCode err = U_ZERO_ERROR;
if (destdir != NULL && *destdir != 0) {
uprv_strcpy(outFileName, destdir);
destdirlen = uprv_strlen(destdir);
outBasename = outFileName + destdirlen;
if (*(outBasename - 1) != U_FILE_SEP_CHAR) {
*outBasename++ = U_FILE_SEP_CHAR;
++destdirlen;
outFileName.append(destdir, err).ensureEndsWithFileSeparator(err);
if (U_FAILURE(err)) {
return err;
}
} else {
destdirlen = 0;
outBasename = outFileName;
}
int32_t outBasenameStart = outFileName.length();
#if DEBUG
{
@ -290,59 +279,59 @@ int main(int argc, char* argv[])
}
#endif
err = U_ZERO_ERROR;
printFilename = (UBool) (argc > 2 || VERBOSE);
UBool printFilename = (UBool) (argc > 2 || VERBOSE);
for (++argv; --argc; ++argv)
{
arg = getLongPathname(*argv);
/* Check for potential buffer overflow */
if(strlen(arg) >= UCNV_MAX_FULL_FILE_NAME_LENGTH)
{
fprintf(stderr, "%s\n", u_errorName(U_BUFFER_OVERFLOW_ERROR));
return U_BUFFER_OVERFLOW_ERROR;
}
UErrorCode localError = U_ZERO_ERROR;
const char *arg = getLongPathname(*argv);
/*produces the right destination path for display*/
if (destdirlen != 0)
outFileName.truncate(outBasenameStart);
if (outBasenameStart != 0)
{
const char *basename;
/* find the last file sepator */
basename = findBasename(arg);
uprv_strcpy(outBasename, basename);
const char *basename = findBasename(arg);
outFileName.append(basename, localError);
}
else
{
uprv_strcpy(outFileName, arg);
outFileName.append(arg, localError);
}
if (U_FAILURE(localError)) {
return localError;
}
/*removes the extension if any is found*/
dot = uprv_strrchr(outBasename, '.');
if (dot)
{
*dot = '\0';
int32_t lastDotIndex = outFileName.lastIndexOf('.');
if (lastDotIndex >= outBasenameStart) {
outFileName.truncate(lastDotIndex);
}
/* the basename without extension is the converter name */
uprv_strcpy(cnvName, outBasename);
if ((outFileName.length() - outBasenameStart) >= UPRV_LENGTHOF(cnvName)) {
fprintf(stderr, "converter name %s too long\n", outFileName.data() + outBasenameStart);
return U_BUFFER_OVERFLOW_ERROR;
}
uprv_strcpy(cnvName, outFileName.data() + outBasenameStart);
/*Adds the target extension*/
uprv_strcat(outBasename, CONVERTER_FILE_EXTENSION);
outFileName.append(CONVERTER_FILE_EXTENSION, localError);
if (U_FAILURE(localError)) {
return localError;
}
#if DEBUG
printf("makeconv: processing %s ...\n", arg);
fflush(stdout);
#endif
localError = U_ZERO_ERROR;
initConvData(&data);
createConverter(&data, arg, &localError);
if (U_FAILURE(localError))
{
/* if an error is found, print out an error msg and keep going */
fprintf(stderr, "Error creating converter for \"%s\" file for \"%s\" (%s)\n", outFileName, arg,
u_errorName(localError));
fprintf(stderr, "Error creating converter for \"%s\" file for \"%s\" (%s)\n",
outFileName.data(), arg, u_errorName(localError));
if(U_SUCCESS(err)) {
err = localError;
}
@ -365,7 +354,7 @@ int main(int argc, char* argv[])
}
else
{
p++; /* If found separtor, don't include it in compare */
p++; /* If found separator, don't include it in compare */
}
if(uprv_stricmp(p,data.staticData.name) && !QUIET)
{
@ -386,15 +375,13 @@ int main(int argc, char* argv[])
}
}
uprv_strcpy(cnvNameWithPkg, cnvName);
localError = U_ZERO_ERROR;
writeConverterData(&data, cnvNameWithPkg, destdir, &localError);
writeConverterData(&data, cnvName, destdir, &localError);
if(U_FAILURE(localError))
{
/* if an error is found, print out an error msg and keep going*/
fprintf(stderr, "Error writing \"%s\" file for \"%s\" (%s)\n", outFileName, arg,
fprintf(stderr, "Error writing \"%s\" file for \"%s\" (%s)\n", outFileName.data(), arg,
u_errorName(localError));
if(U_SUCCESS(err)) {
err = localError;
@ -402,7 +389,7 @@ int main(int argc, char* argv[])
}
else if (printFilename)
{
puts(outBasename);
puts(outFileName.data() + outBasenameStart);
}
}
fflush(stdout);
@ -435,7 +422,6 @@ getPlatformAndCCSIDFromName(const char *name, int8_t *pPlatform, int32_t *pCCSID
static void
readHeader(ConvData *data,
FileStream* convFile,
const char* converterName,
UErrorCode *pErrorCode) {
char line[1024];
char *s, *key, *value;
@ -583,7 +569,7 @@ readFile(ConvData *data, const char* converterName,
return FALSE;
}
readHeader(data, convFile, converterName, pErrorCode);
readHeader(data, convFile, pErrorCode);
if(U_FAILURE(*pErrorCode)) {
return FALSE;
}

2
icu4c/source/tools/makeconv/makeconv.vcxproj
View File

@ -240,7 +240,7 @@
<ItemGroup>
<ClCompile Include="gencnvex.c" />
<ClCompile Include="genmbcs.cpp" />
<ClCompile Include="makeconv.c" />
<ClCompile Include="makeconv.cpp" />
<ClCompile Include="ucnvstat.c" />
</ItemGroup>
<ItemGroup>

2
icu4c/source/tools/makeconv/makeconv.vcxproj.filters
View File

@ -21,7 +21,7 @@
<ClCompile Include="genmbcs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="makeconv.c">
<ClCompile Include="makeconv.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="ucnvstat.c">