ICU 56 update step 1

source/tools/icuinfo/icuinfo.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 1999-2012, International Business Machines
+*   Copyright (C) 1999-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  icuinfo.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2009-2010
 *   created by: Steven R. Loomis
@@ skipping 18 matching lines @@
 #include "unicode/ucal.h"
 #include <unicode/ulocdata.h>
 #include "putilimp.h"
 #include "unicode/uchar.h"
 
 static UOption options[]={
   /*0*/ UOPTION_HELP_H,
   /*1*/ UOPTION_HELP_QUESTION_MARK,
   /*2*/ UOPTION_ICUDATADIR,
   /*3*/ UOPTION_VERBOSE,
-  /*4*/ UOPTION_DEF("list-plugins", 'L', UOPT_NO_ARG),
+  /*4*/ UOPTION_DEF("list-plugins", 'L', UOPT_NO_ARG), // may be a no-op if disabled
   /*5*/ UOPTION_DEF("milisecond-time", 'm', UOPT_NO_ARG),
   /*6*/ UOPTION_DEF("cleanup", 'K', UOPT_NO_ARG),
   /*7*/ UOPTION_DEF("xml", 'x', UOPT_REQUIRES_ARG),
 };
 
 static UErrorCode initStatus = U_ZERO_ERROR;
 static UBool icuInitted = FALSE;
 
 static void do_init() {
     if(!icuInitted) {
@@ skipping 47 matching lines @@
     if(U_CHARSET_FAMILY==charsetFamily) {
       //printf("U_CHARSET_FAMILY: %d\n", U_CHARSET_FAMILY);
     } else {
         fprintf(stderr, "  error: U_CHARSET_FAMILY=%d != %d=actual charset family\n",
                 U_CHARSET_FAMILY, charsetFamily);
         errorCode=U_INTERNAL_PROGRAM_ERROR;
     }
 
     printf("\n\nICU Initialization returned: %s\n", u_errorName(initStatus));
     
-    
+
+#if UCONFIG_ENABLE_PLUGINS    
 #if U_ENABLE_DYLOAD
     const char *pluginFile = uplug_getPluginFile();
     printf("Plugin file is: %s\n", (pluginFile&&*pluginFile)?pluginFile:"(not set. try setting ICU_PLUGINS to a directory.)");
 #else
     fprintf(stderr, "Dynamic Loading: is disabled. No plugins will be loaded at start-up.\n");
 #endif
+#else
+    fprintf(stderr, "Plugins are disabled.\n");
+#endif    
 }
 
 void cmd_cleanup()
 {
     u_cleanup();
     fprintf(stdout, "ICU u_cleanup() called.\n");
 }
 
 
 void cmd_listplugins() {
+#if UCONFIG_ENABLE_PLUGINS
     int32_t i;
     UPlugData *plug;
 
     do_init();
     printf("ICU Initialized: u_init() returned %s\n", u_errorName(initStatus));
     
     printf("Plugins: \n");
     printf(    "# %6s   %s \n",
                        "Level",
                        "Name" );
@@ skipping 56 matching lines @@
         
         if(message!=NULL) {
             printf("\\\\\\ status| %s\n"
                    "/// %s\n", u_errorName(loadStatus), message);
         }
         
     }
         if(i==0) {
                 printf("No plugins loaded.\n");
         }
-
+#endif
 }
 
 
 
 extern int
 main(int argc, char* argv[]) {
     UErrorCode errorCode = U_ZERO_ERROR;
     UBool didSomething = FALSE;
     
     /* preset then read command line options */
     argc=u_parseArgs(argc, argv, sizeof(options)/sizeof(options[0]), options);
 
     /* error handling, printing usage message */
     if(argc<0) {
         fprintf(stderr,
             "error in command line argument \"%s\"\n",
             argv[-argc]);
     }
     if( options[0].doesOccur || options[1].doesOccur) {
       fprintf(stderr, "%s: Output information about the current ICU\n", argv[0]);
       fprintf(stderr, "Options:\n"
               " -h     or  --help                 - Print this help message.\n"
               " -m     or  --millisecond-time     - Print the current UTC time in milliseconds.\n"
               " -d <dir>   or  --icudatadir <dir> - Set the ICU Data Directory\n"
               " -v                                - Print version and configuration information about ICU\n"
+#if UCONFIG_ENABLE_PLUGINS
               " -L         or  --list-plugins     - List and diagnose issues with ICU Plugins\n"
+#endif
               " -K         or  --cleanup          - Call u_cleanup() before exitting (will attempt to unload plugins)\n"
               "\n"
               "If no arguments are given, the tool will print ICU version and configuration information.\n"
               );
       fprintf(stderr, "International Components for Unicode %s\n%s\n", U_ICU_VERSION, U_COPYRIGHT_STRING );
       return argc<0 ? U_ILLEGAL_ARGUMENT_ERROR : U_ZERO_ERROR;
     }
     
     if(options[2].doesOccur) {
       u_setDataDirectory(options[2].value);
@@ skipping 30 matching lines @@
       cmd_cleanup();
       didSomething = TRUE;
     }
 
     if(!didSomething) {
       cmd_version(FALSE, errorCode);  /* at least print the version # */
     }
 
     return U_FAILURE(errorCode);
 }