X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..24b030c3fe7824941e953c6e22101547cd4fb55d:/icuSources/tools/genbrk/genbrk.cpp?ds=sidebyside

diff --git a/icuSources/tools/genbrk/genbrk.cpp b/icuSources/tools/genbrk/genbrk.cpp
index d9942f03..2ca7a4df 100644
--- a/icuSources/tools/genbrk/genbrk.cpp
+++ b/icuSources/tools/genbrk/genbrk.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2002-2003, International Business Machines
+*   Copyright (C) 2002-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
@@ -26,13 +26,13 @@
 //
 //--------------------------------------------------------------------
 
-#include <stdio.h>
 #include "unicode/utypes.h"
 #include "unicode/ucnv.h"
 #include "unicode/unistr.h"
 #include "unicode/rbbi.h"
 #include "unicode/uclean.h"
 #include "unicode/udata.h"
+#include "unicode/putil.h"
 
 #include "uoptions.h"
 #include "unewdata.h"
@@ -52,11 +52,22 @@ static UOption options[]={
     { "rules", NULL, NULL, NULL, 'r', UOPT_REQUIRES_ARG, 0 },   /* 3 */
     { "out",   NULL, NULL, NULL, 'o', UOPT_REQUIRES_ARG, 0 },   /* 4 */
     UOPTION_ICUDATADIR,         /* 5 */
-    UOPTION_DESTDIR             /* 6 */
+    UOPTION_DESTDIR,            /* 6 */
+    UOPTION_COPYRIGHT,          /* 7 */
 };
 
 void usageAndDie(int retCode) {
-        printf("Usage: %s [-v] -r rule-file -o output-file\n", progName);
+        printf("Usage: %s [-v] [-options] -r rule-file -o output-file\n", progName);
+        printf("\tRead in break iteration rules text and write out the binary data\n"
+            "options:\n"
+            "\t-h or -? or --help  this usage text\n"
+            "\t-V or --version     show a version message\n"
+            "\t-c or --copyright   include a copyright notice\n"
+            "\t-v or --verbose     turn on verbose output\n"
+            "\t-i or --icudatadir  directory for locating any needed intermediate data files,\n"
+            "\t                    followed by path, defaults to %s\n"
+            "\t-d or --destdir     destination directory, followed by the path\n",
+            u_getDataDirectory());
         exit (retCode);
 }
 
@@ -97,8 +108,8 @@ DataHeader dh ={
         0,                          //     reserved
 
     { 0x42, 0x72, 0x6b, 0x20 },     //     dataFormat="Brk "
-    { 2, 1, 0, 0 },                 //     formatVersion
-        { 3, 1, 0, 0 }                //   dataVersion (Unicode version)
+    { 3, 0, 0, 0 },                 //     formatVersion
+        { 4, 0, 0, 0 }                //   dataVersion (Unicode version)
     }};
 
 #endif
@@ -113,8 +124,7 @@ int  main(int argc, char **argv) {
     const char *ruleFileName;
     const char *outFileName;
     const char *outDir = NULL;
-    char *outFullFileName;
-    int32_t outFullFileNameLen;
+    const char *copyright = NULL;
 
     //
     // Pick up and check the command line arguments,
@@ -140,24 +150,27 @@ int  main(int argc, char **argv) {
     }
     ruleFileName = options[3].value;
     outFileName  = options[4].value;
-    outFullFileNameLen = strlen(outFileName);
 
     if (options[5].doesOccur) {
         u_setDataDirectory(options[5].value);
     }
 
+    /* Initialize ICU */
+    u_init(&status);
+    if (U_FAILURE(status)) {
+        fprintf(stderr, "%s: can not initialize ICU.  status = %s\n",
+            argv[0], u_errorName(status));
+        exit(1);
+    }
+    status = U_ZERO_ERROR;
+
     /* Combine the directory with the file name */
     if(options[6].doesOccur) {
         outDir = options[6].value;
-        outFullFileNameLen += strlen(outDir);
     }
-    outFullFileName = (char*)malloc(outFullFileNameLen + 2);
-    outFullFileName[0] = 0;
-    if (outDir) {
-        strcpy(outFullFileName, outDir);
-        strcat(outFullFileName, U_FILE_SEP_STRING);
+    if (options[7].doesOccur) {
+        copyright = U_COPYRIGHT_STRING;
     }
-    strcat(outFullFileName, outFileName);
 
 #if UCONFIG_NO_BREAK_ITERATION
 
@@ -200,7 +213,7 @@ int  main(int argc, char **argv) {
     //
     //  Read in the rule source file
     //
-    int         result;
+    long        result;
     long        ruleFileSize;
     FILE        *file;
     char        *ruleBufferC;
@@ -215,7 +228,7 @@ int  main(int argc, char **argv) {
     fseek(file, 0, SEEK_SET);
     ruleBufferC = new char[ruleFileSize+10];
 
-    result = fread(ruleBufferC, 1, ruleFileSize, file);
+    result = (long)fread(ruleBufferC, 1, ruleFileSize, file);
     if (result != ruleFileSize)  {
         fprintf(stderr, "Error reading file \"%s\"\n", ruleFileName);
         exit (-1);
@@ -288,12 +301,12 @@ int  main(int argc, char **argv) {
     //     This will compile the rules.
     //
     UParseError parseError;
-	parseError.line = 0;
-	parseError.offset = 0;
+    parseError.line = 0;
+    parseError.offset = 0;
     RuleBasedBreakIterator *bi = new RuleBasedBreakIterator(ruleSourceS, parseError, status);
     if (U_FAILURE(status)) {
         fprintf(stderr, "createRuleBasedBreakIterator: ICU Error \"%s\"  at line %d, column %d\n",
-                u_errorName(status), parseError.line, parseError.offset);
+                u_errorName(status), (int)parseError.line, (int)parseError.offset);
         exit(status);
     };
 
@@ -310,28 +323,30 @@ int  main(int argc, char **argv) {
     //  Create the output file
     //
     size_t bytesWritten;
-    file = fopen(outFullFileName, "wb");
-    if (file == 0) {
-        fprintf(stderr, "Could not open output file \"%s\"\n", outFullFileName);
-        exit(-1);
+    UNewDataMemory *pData;
+    pData = udata_create(outDir, NULL, outFileName, &(dh.info), copyright, &status);
+    if(U_FAILURE(status)) {
+        fprintf(stderr, "genbrk: Could not open output file \"%s\", \"%s\"\n", 
+                         outFileName, u_errorName(status));
+        exit(status);
     }
-
-    bytesWritten = fwrite(&dh, 1, sizeof(DataHeader), file);
-
-    //
     //  Write the data itself.
-    //
-    bytesWritten = fwrite(outData, 1, outDataSize, file);
+    udata_writeBlock(pData, outData, outDataSize);
+    // finish up 
+    bytesWritten = udata_finish(pData, &status);
+    if(U_FAILURE(status)) {
+        fprintf(stderr, "genbrk: error %d writing the output file\n", status);
+        exit(status);
+    }
+    
     if (bytesWritten != outDataSize) {
-        fprintf(stderr, "Error writing to output file \"%s\"\n", outFullFileName);
+        fprintf(stderr, "Error writing to output file \"%s\"\n", outFileName);
         exit(-1);
     }
 
-    fclose(file);
     delete bi;
     delete[] ruleSourceU;
     delete[] ruleBufferC;
-    free(outFullFileName);
     u_cleanup();
 
 
@@ -340,3 +355,4 @@ int  main(int argc, char **argv) {
 
 #endif /* #if !UCONFIG_NO_BREAK_ITERATION */
 }
+