summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2008-11-19 21:12:27 (GMT)
committer John Mark Bell <jmb@netsurf-browser.org>2008-11-19 21:12:27 (GMT)
commit395a92683590c3f72674471675781afd01d9f7c7 (patch)
treebdf1cd937d92ac06065e9aeb6c4ad38f4109bddb
parentf36e60202981eaccbeda479cb50ebe13dc028b5e (diff)
downloadiconv-395a92683590c3f72674471675781afd01d9f7c7.tar.gz
iconv-395a92683590c3f72674471675781afd01d9f7c7.tar.bz2
On RISC OS, use Unicode:, rather than attempting to getenv("Unicode$Path") and concatenating the leafname on the end.
svn path=/trunk/iconv/; revision=5744
-rw-r--r--module/module.c4
-rw-r--r--src/eightbit.c4
-rw-r--r--test/GNU/table-from.c4
-rw-r--r--test/GNU/table-to.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/module/module.c b/module/module.c
index 417418c..6f5a3f7 100644
--- a/module/module.c
+++ b/module/module.c
@@ -409,7 +409,7 @@ int errno_to_iconv_error(int num)
const char *get_aliases_path(void)
{
- char *ucpath;
+ const char *ucpath;
int alen;
static char aliases[4096];
@@ -421,7 +421,7 @@ const char *get_aliases_path(void)
/* Get !Unicode resource path */
#ifdef __riscos__
- ucpath = getenv("Unicode$Path");
+ ucpath = "Unicode:";
#else
ucpath = getenv("UNICODE_DIR");
#endif
diff --git a/src/eightbit.c b/src/eightbit.c
index c75337c..da1cd4b 100644
--- a/src/eightbit.c
+++ b/src/eightbit.c
@@ -301,13 +301,13 @@ void iconv_eightbit_delete(struct encoding_context *e)
const char *get_table_path(const char *table)
{
- char *ucpath;
+ const char *ucpath;
int plen;
static char path[4096];
/* Get !Unicode resource path */
#ifdef __riscos__
- ucpath = getenv("Unicode$Path");
+ ucpath = "Unicode:";
#else
ucpath = getenv("UNICODE_DIR");
#endif
diff --git a/test/GNU/table-from.c b/test/GNU/table-from.c
index f4ec661..56a0dab 100644
--- a/test/GNU/table-from.c
+++ b/test/GNU/table-from.c
@@ -104,7 +104,7 @@ int main (int argc, char* argv[])
const char* charset;
iconv_t cd;
int search_depth;
- char *ucpath;
+ const char *ucpath;
int alen;
char aliases[4096];
@@ -116,7 +116,7 @@ int main (int argc, char* argv[])
/* ensure the !Unicode resource exists */
#ifdef __riscos__
- ucpath = getenv("Unicode$Path");
+ ucpath = "Unicode:");
#else
ucpath = getenv("UNICODE_DIR");
#endif
diff --git a/test/GNU/table-to.c b/test/GNU/table-to.c
index 4ababb8..e8d11ad 100644
--- a/test/GNU/table-to.c
+++ b/test/GNU/table-to.c
@@ -37,7 +37,7 @@ int main (int argc, char* argv[])
const char* charset;
iconv_t cd;
int bmp_only;
- char *ucpath;
+ const char *ucpath;
int alen;
char aliases[4096];
@@ -49,7 +49,7 @@ int main (int argc, char* argv[])
/* ensure the !Unicode resource exists */
#ifdef __riscos__
- ucpath = getenv("Unicode$Path");
+ ucpath = "Unicode:");
#else
ucpath = getenv("UNICODE_DIR");
#endif