Changeset: 967528656691 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=967528656691
Modified Files:
MonetDB5/src/mal/mal_import.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (23 lines):
diff -r ff4f8c3a851c -r 967528656691 MonetDB5/src/mal/mal_import.mx
--- a/MonetDB5/src/mal/mal_import.mx Fri May 14 12:31:30 2010 +0200
+++ b/MonetDB5/src/mal/mal_import.mx Fri May 14 12:42:40 2010 +0200
@@ -65,10 +65,18 @@
malResolveFile(str fname)
{
char path[PATHLENGTH];
+ str script;
snprintf(path, PATHLENGTH, "%s", fname);
slash_2_dir_sep(path);
- return MSP_locate_script(path);
+ if ((script = MSP_locate_script(path)) == NULL) {
+ /* this function is also called for scripts that are not located
+ * in the modpath, so if we can't find it, just default to
+ * whatever was given, as it can be in current dir, or an
+ * absolute location to somewhere */
+ script = GDKstrdup(fname);
+ }
+ return script;
}
static stream *
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
