From cd6ec98ed9a1df894dd5c8a11b7f1b15be724ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Mon, 18 Aug 1997 17:47:43 +0200 Subject: [PATCH] Added _master_file_name. Rev: lib/master.pike:1.48 --- lib/master.pike | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/master.pike b/lib/master.pike index fe48219945..a7c6b39a06 100644 --- a/lib/master.pike +++ b/lib/master.pike @@ -1,4 +1,4 @@ -/* $Id: master.pike,v 1.47 1997/07/19 21:33:47 hubbe Exp $ +/* $Id: master.pike,v 1.48 1997/08/18 15:47:43 grubba Exp $ * * Master-file for Pike. */ @@ -9,6 +9,7 @@ string describe_backtrace(mixed *trace); object low_cast_to_object(string oname, string current_file); +string _master_file_name; string pike_library_path; string *pike_include_path=({}); string *pike_module_path=({}); @@ -369,8 +370,8 @@ void _main(string *argv, string *env) add_constant("write",_static_modules.files()->file("stdout")->write); - a=backtrace()[-1][0]; - q=a/"/"; + _master_file_name=backtrace()[-1][0]; + q=_master_file_name/"/"; pike_library_path = q[0..sizeof(q)-2] * "/"; add_include_path(pike_library_path+"/include"); @@ -378,6 +379,8 @@ void _main(string *argv, string *env) add_program_path(getcwd()); add_module_path(getcwd()); + _master_file_name=combine_path(getcwd(), _master_file_name); + q=(getenv("PIKE_INCLUDE_PATH")||"")/":"-({""}); for(i=sizeof(q)-1;i>=0;i--) add_include_path(q[i]); @@ -447,7 +450,7 @@ void _main(string *argv, string *env) " -t -t# : Increase trace level\n" ); exit(0); - + case "execute": compile_string("#include <simulate.h>\nmixed create(){"+opts[1]+";}")(); exit(0); -- GitLab