Roxen.git/ server/ base_server/ roxen.pike

1997-08-06

1997-08-06 16:39:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 8c6222c8c39c6704ddf1b12eede3344da47a5745 (15 lines) (+8/-7) ^{[ Show | Annotate ]}
  Branch: 5.2

create() in modules now gets the current configuration as the first argument.

Rev: server/base_server/configuration.pike:1.45
Rev: server/base_server/roxen.pike:1.90

1: - constant cvs_version = "$Id: roxen.pike,v 1.89 1997/08/05 03:32:25 mast Exp $"; + constant cvs_version = "$Id: roxen.pike,v 1.90 1997/08/06 16:39:03 grubba Exp $";   #define IN_ROXEN   #include <roxen.h>   #include <config.h>
908:      // ([ filename:stat_array ])   mapping(string:array) module_stat_cache = ([]); - object load(string s) // Should perhaps be renamed to 'reload'. + object load(string s, object conf) // Should perhaps be renamed to 'reload'.   {    string cvs;    array st;
924:   // perror("Yes.");    my_loaded[__p]=s+".pike";    module_stat_cache[s-dirname(s)]=st; -  return __p(); +  return __p(conf);    } else    perror(s+".pike exists, but compilation failed.\n");    }
934:    {    my_loaded[__p]=s+".lpc";    module_stat_cache[s-dirname(s)]=st; -  return __p(); +  return __p(conf);    } else    perror(s+".lpc exists, but compilation failed.\n");    if(st=file_stat(s+".module"))
942:    {    my_loaded[__p]=s+".so";    module_stat_cache[s-dirname(s)]=st; -  return __p(); +  return __p(conf);    } else    perror(s+".so exists, but compilation failed.\n");    return 0; // FAILED..
965:   array(string) last_dirs=0,last_dirs_expand;       - object load_from_dirs(array dirs, string f) + object load_from_dirs(array dirs, string f, object conf)   {    string dir;    object o;
978:    }       foreach (last_dirs_expand,dir) -  if ( (o=load(dir+f)) ) return o; +  if ( (o=load(dir+f, conf)) ) return o;       return 0;   }