ICU 56 update step 1

source/tools/gencfu/gencfu.cpp

 /*
 **********************************************************************
-*   Copyright (C) 2009-2011, International Business Machines
+*   Copyright (C) 2009-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
 * File gencfu.c
 */
 
 //--------------------------------------------------------------------
 //
 //   Tool for generating Unicode Confusable data files (.cfu files).
 //   .cfu files contain the compiled of the confusable data
@@ skipping 35 matching lines @@
 static UOption options[]={
     UOPTION_HELP_H,             /* 0 */
     UOPTION_HELP_QUESTION_MARK, /* 1 */
     UOPTION_VERBOSE,            /* 2 */
     { "rules", NULL, NULL, NULL, 'r', UOPT_REQUIRES_ARG, 0 },   /* 3 */
     { "wsrules", NULL, NULL, NULL, 'w', UOPT_REQUIRES_ARG, 0},  /* 4 */
     { "out",   NULL, NULL, NULL, 'o', UOPT_REQUIRES_ARG, 0 },   /* 5 */
     UOPTION_ICUDATADIR,         /* 6 */
     UOPTION_DESTDIR,            /* 7 */
     UOPTION_COPYRIGHT,          /* 8 */
+    UOPTION_QUIET,              /* 9 */
 };
 
 void usageAndDie(int retCode) {
         printf("Usage: %s [-v] [-options] -r confusablesRules.txt -w wholeScriptConfusables.txt -o output-file\n", progName);
         printf("\tRead in Unicode confusable character definitions 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-q or --quiet       do not display warnings and progress\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);
 }
 
 
 #if UCONFIG_NO_REGULAR_EXPRESSIONS || UCONFIG_NO_NORMALIZATION || UCONFIG_NO_FILE_IO
 
@@ skipping 88 matching lines @@
     status = U_ZERO_ERROR;
 
     /* Combine the directory with the file name */
     if(options[7].doesOccur) {
         outDir = options[7].value;
     }
     if (options[8].doesOccur) {
         copyright = U_COPYRIGHT_STRING;
     }
 
+    UBool quiet = FALSE;
+    if (options[9].doesOccur) {
+      quiet = TRUE;
+    }
+
 #if UCONFIG_NO_REGULAR_EXPRESSIONS || UCONFIG_NO_NORMALIZATION || UCONFIG_NO_FILE_IO
     // spoof detection data file parsing is dependent on regular expressions.
     // TODO: have the tool return an error status.  Requires fixing the ICU data build
     //       so that it doesn't abort entirely on that error.
 
     UNewDataMemory *pData;
     char msg[1024];
 
     /* write message with just the name */
     sprintf(msg, "gencfu writes dummy %s because of UCONFIG_NO_REGULAR_EXPRESSIONS and/or UCONFIG_NO_NORMALIZATION and/or UCONFIG_NO_FILE_IO, see uconfig.h", outFileName);
@@ skipping 96 matching lines @@
     if (bytesWritten != outDataSize) {
         fprintf(stderr, "gencfu: Error writing to output file \"%s\"\n", outFileName);
         exit(-1);
     }
 
     uspoof_close(sc);
     delete [] outData;
     delete [] confusables;
     delete [] wsConfsables;
     u_cleanup();
-    printf("gencfu: tool completed successfully.\n");
+    if (!quiet) {
+        printf("gencfu: tool completed successfully.\n");
+    }
     return 0;
 #endif   // UCONFIG_NO_REGULAR_EXPRESSIONS
 }
 
 
  //
  //  Read in a confusables source file
  //
  static const char *readFile(const char *fileName, int32_t *len) {
     char       *result;
@@ skipping 17 matching lines @@
     if (t != fileSize)  {
         delete [] result;
         fclose(file);
         return NULL;
     }
     result[fileSize]=0;
     *len = static_cast<int32_t>(fileSize);
     fclose(file);
     return result;
  }