Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20659
Modified Files:
mal_linker.mx mal_parser.mx
Log Message:
Don't hide inaccessability of library files.
Index: mal_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_parser.mx,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- mal_parser.mx 23 May 2007 17:17:45 -0000 1.196
+++ mal_parser.mx 24 May 2007 20:14:14 -0000 1.197
@@ -847,7 +847,7 @@
return parseError(cntxt, "<library path> expected\n");
}
libnme = putName(nxt, l);
- s = loadLibrary(libnme);
+ s = loadLibrary(libnme,TRUE);
libnme = putName(nxt, l);
if (s)
stream_printf(cntxt->fdout, "#WARNING: %s\n", s);
@@ -926,7 +926,7 @@
}
skipToEnd(cntxt);
- s = loadLibrary(modnme);
+ s = loadLibrary(modnme,FALSE);
if (s)
stream_printf(cntxt->fdout, "#WARNING: %s\n", s);
malInclude(cntxt, modnme, 0);
Index: mal_linker.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_linker.mx,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- mal_linker.mx 21 May 2007 07:32:41 -0000 1.97
+++ mal_linker.mx 24 May 2007 20:14:14 -0000 1.98
@@ -64,7 +64,7 @@
mal_export MALfcn getAddress(str filename, str modnme, str fcnname,int silent);
mal_export char *MSP_locate_script(const char *mod_name);
mal_export char *MSP_locate_file(const char *mod_name);
-mal_export str loadLibrary(str modulename);
+mal_export str loadLibrary(str modulename, int flag);
mal_export void unloadLibraries(void);
mal_export void initLibraries(void);
mal_export int isPreloaded(str nme);
@@ -257,7 +257,7 @@
#define MAXPATHLEN 1024
#endif
str
-loadLibrary(str filename)
+loadLibrary(str filename, int flag)
{
int mode = RTLD_NOW | RTLD_GLOBAL;
char nme[MAXPATHLEN];
@@ -286,6 +286,8 @@
#ifdef DEBUG_MAL_LINKER2
stream_printf(GDKout, "file not found %s\n", filename);
#endif
+ if( flag)
+ throw(LOADER, "loadLibrary", "%s: file not found",
filename);
return MAL_SUCCEED;
}
@@ -393,7 +395,7 @@
#ifdef DEBUG_MAL_LINKER
stream_printf(GDKout,"loading %s\n",preloaded[i]);
#endif
- loadLibrary(preloaded[i]);
+ loadLibrary(preloaded[i],FALSE);
}
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
