1996-11-20
1996-11-20 01:11:50 by Per Hedbor <ph@opera.com>
-
a52cc65b94c772c2c6250ab610e90c8718fb9d10
(8 lines)
(+6/-2)
[
Show
| Annotate
]
Branch: 5.2
Fixar så att man kan ladda in moduler
Rev: server/base_server/disk_cache.pike:1.6
Rev: server/base_server/mainconfig.pike:1.4
Rev: server/base_server/module_support.pike:1.4
Rev: server/base_server/roxen.pike:1.7
Rev: server/etc/include/stat.h:1.2
Rev: server/modules/proxies/proxy.pike:1.2
1517: Inside #if defined(MODULE_LEVEL_SECURITY)
program last_loaded() { return __p; }
object load(string s) // Should perhaps be renamed to 'reload'.
{
+ #if defined(MODULE_DEBUG) && (DEBUG_LEVEL>20)
+ perror(s+" ");
+ #endif
if(file_size(s+".pike")>0)
if(__p=compile_file(s+".pike")) return __p();
if(file_size(s+".lpc")>0)
2823:
else
{
#ifdef MODULE_DEBUG
- perror("Loading module: "+file+" - ");
+ perror("Loading module: "+(file-("."+extension(file)))+" - ");
#endif
string *module_info;
if (!(err=catch( module_info = lambda ( string file ) {
2848: Inside #if defined(MODULE_DEBUG)
#ifdef MODULE_DEBUG
// perror("MODULES: "+module_info[0]+ "\n"+module_info[1]+"\n");
#endif
- allmodules[ file ] = module_info;
+ allmodules[ file-("."+extension(file)) ] = module_info;
} else {
#ifdef MODULE_DEBUG
perror("\n"+err[0]+_master->set_inhibit_compile_errors( 1 ));