cvsuser 04/05/31 12:26:22
Modified: src string.c
Log:
Allow setting ICU data dir via $ENV{ICU_DATA_DIR}
Revision Changes Path
1.203 +13 -4 parrot/src/string.c
Index: string.c
===================================================================
RCS file: /cvs/public/parrot/src/string.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -w -r1.202 -r1.203
--- string.c 25 May 2004 08:34:24 -0000 1.202
+++ string.c 31 May 2004 19:26:22 -0000 1.203
@@ -1,6 +1,6 @@
/*
Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-$Id: string.c,v 1.202 2004/05/25 08:34:24 leo Exp $
+$Id: string.c,v 1.203 2004/05/31 19:26:22 sfink Exp $
=head1 NAME
@@ -243,9 +243,18 @@
string_init(Parrot_Interp interpreter)
{
size_t i;
-/* DEFAULT_ICU_DATA_DIR is configured at build time. Need a way to
- specify this at runtime as well. */
- string_set_data_directory(DEFAULT_ICU_DATA_DIR);
+ char *data_dir;
+ int free_data_dir = 0;
+
+ /* DEFAULT_ICU_DATA_DIR is configured at build time, or it may be
+ set through the $ICU_DATA_DIR environment variable. Need a way
+ to specify this via the command line as well. */
+ data_dir = Parrot_getenv("ICU_DATA_DIR", &free_data_dir);
+ if (data_dir == NULL)
+ data_dir = DEFAULT_ICU_DATA_DIR;
+ string_set_data_directory(data_dir);
+ if (free_data_dir)
+ mem_sys_free(data_dir);
/*
encoding_init();
chartype_init();
