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

ICU-13199 use std::getline(istream, string) to avoid line length limit

Browse Source 
X-SVN-Rev: 40365
This commit is contained in:
Markus Scherer 2017-09-01 16:21:47 +00:00
parent 3c9447aaea
commit 3a02afc3bf
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
icu4c/source/tools/gennorm2/gennorm2.cpp
View File

@ -22,8 +22,10 @@
#include "unicode/utypes.h" #include "unicode/utypes.h"
#include "n2builder.h" #include "n2builder.h"
#include <fstream>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string>
#include <string.h> #include <string.h>
#include "unicode/errorcode.h" #include "unicode/errorcode.h"
#include "unicode/localpointer.h" #include "unicode/localpointer.h"
@ -44,10 +46,8 @@ U_NAMESPACE_BEGIN
UBool beVerbose=FALSE, haveCopyright=TRUE; UBool beVerbose=FALSE, haveCopyright=TRUE;
U_DEFINE_LOCAL_OPEN_POINTER(LocalStdioFilePointer, FILE, fclose);
#if !UCONFIG_NO_NORMALIZATION #if !UCONFIG_NO_NORMALIZATION
void parseFile(FILE *f, Normalizer2DataBuilder &builder); void parseFile(std::ifstream &f, Normalizer2DataBuilder &builder);
#endif #endif
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
@ -202,13 +202,13 @@ main(int argc, char* argv[]) {
continue; continue;
} }
filename.append(argv[i], errorCode); filename.append(argv[i], errorCode);
LocalStdioFilePointer f(fopen(filename.data(), "r")); std::ifstream f(filename.data());
if(f==NULL) { if(f.fail()) {
fprintf(stderr, "gennorm2 error: unable to open %s\n", filename.data()); fprintf(stderr, "gennorm2 error: unable to open %s\n", filename.data());
exit(U_FILE_ACCESS_ERROR); exit(U_FILE_ACCESS_ERROR);
} }
builder->setOverrideHandling(Normalizer2DataBuilder::OVERRIDE_PREVIOUS); builder->setOverrideHandling(Normalizer2DataBuilder::OVERRIDE_PREVIOUS);
parseFile(f.getAlias(), *builder); parseFile(f, *builder);
filename.truncate(pathLength); filename.truncate(pathLength);
} }
@ -230,11 +230,12 @@ main(int argc, char* argv[]) {
#if !UCONFIG_NO_NORMALIZATION #if !UCONFIG_NO_NORMALIZATION
void parseFile(FILE *f, Normalizer2DataBuilder &builder) { void parseFile(std::ifstream &f, Normalizer2DataBuilder &builder) {
IcuToolErrorCode errorCode("gennorm2/parseFile()"); IcuToolErrorCode errorCode("gennorm2/parseFile()");
char line[300]; std::string lineString;
uint32_t startCP, endCP; uint32_t startCP, endCP;
while(NULL!=fgets(line, (int)sizeof(line), f)) { while(std::getline(f, lineString)) {
char *line = &lineString.front();
char *comment=(char *)strchr(line, '#'); char *comment=(char *)strchr(line, '#');
if(comment!=NULL) { if(comment!=NULL) {
*comment=0; *comment=0;