cvs commit: xml-xerces/c/src/xercesc/util/MsgLoaders/ICU ICUMsgLoader.cpp

[peiyongz]

peiyongz    2002/12/04 10:11:23

  Modified:    c/src/xercesc/util/MsgLoaders/ICU ICUMsgLoader.cpp
  Log:
  use $XERCESCROOT to search for icu resource bundle if XERCESC_NLS_HOME
  undefined
  
  Revision  Changes    Path
  1.9       +18 -4     xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
  
  Index: ICUMsgLoader.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ICUMsgLoader.cpp  20 Nov 2002 20:28:17 -0000      1.8
  +++ ICUMsgLoader.cpp  4 Dec 2002 18:11:23 -0000       1.9
  @@ -56,6 +56,10 @@
   
   /*
    * $Log$
  + * Revision 1.9  2002/12/04 18:11:23  peiyongz
  + * use $XERCESCROOT to search for icu resource bundle if XERCESC_NLS_HOME
  + * undefined
  + *
    * Revision 1.8  2002/11/20 20:28:17  peiyongz
    * fix to warning C4018: '>' : signed/unsigned mismatch
    *
  @@ -169,13 +173,24 @@
       ***/
       char locationBuf[1024];
       memset(locationBuf, 0, sizeof locationBuf);
  -     char *nlsHome = getenv("XERCESC_NLS_HOME");
  +    char *nlsHome = getenv("XERCESC_NLS_HOME");
   
       if (nlsHome)
  -     {
  -             strcpy(locationBuf, nlsHome);
  +    {
  +     strcpy(locationBuf, nlsHome);
           strcat(locationBuf, U_FILE_SEP_STRING);
  -     }
  +    }
  +    else
  +    {
  +        char *altHome = getenv("XERCESCROOT");
  +        if (altHome)
  +        {
  +            strcpy(locationBuf, altHome);
  +            strcat(locationBuf, U_FILE_SEP_STRING);
  +            strcat(locationBuf, "lib");
  +            strcat(locationBuf, U_FILE_SEP_STRING);                    
  +        }
  +    }    
   
       strcat(locationBuf, "XercescErrMsg");
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]