cvsuser 05/04/04 12:16:53
Modified: src string.c
Log:
Not all lib paths contain "blib". (from autrijus)
Revision Changes Path
1.245 +5 -6 parrot/src/string.c
Index: string.c
===================================================================
RCS file: /cvs/public/parrot/src/string.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- string.c 2 Mar 2005 17:00:51 -0000 1.244
+++ string.c 4 Apr 2005 19:16:52 -0000 1.245
@@ -302,10 +302,9 @@
if (!*data_dir)
goto no_set;
prefix = Parrot_get_runtime_prefix(interpreter, NULL);
- if (prefix) {
- p = strstr(build_path, "blib"); /* .../blib/lib/... */
- assert(p);
- --p; /* slash or backslash */
+ if (prefix && (p = strstr(build_path, "blib"))) {
+ /* .../blib/lib/... */
+ --p; /* slash or backslash - XXX FIXME - assumes
single char */
data_dir = mem_sys_allocate(strlen(prefix) + strlen(p) + 1);
strcpy(data_dir, prefix);
strcat(data_dir, p);
@@ -315,7 +314,7 @@
string_set_data_directory(data_dir);
no_set:
if (free_data_dir)
- mem_sys_free((void*)data_dir); /* cast away the constness */
+ mem_sys_free(const_cast(data_dir));
}
/*
