From d62d4e34f8101307df4f33a8332e4218455c20ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sun, 2 Mar 1997 20:01:16 +0100
Subject: [PATCH] Now does a cast_to_program() instead of compile_file() to
boot-strap. Now ignores extensions with "/" in them. Now adds CWD to include-
and module-paths.
Rev: lib/master.pike:1.35
---
lib/master.pike | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/master.pike b/lib/master.pike
index 6779bcfd48..46cdeae961 100644
--- a/lib/master.pike
+++ b/lib/master.pike
@@ -106,10 +106,11 @@ static program findprog(string pname, string ext)
program cast_to_program(string pname, string current_file)
{
string ext;
- if(sscanf(reverse(pname),"%s.%s",ext,pname))
+ string nname;
+ if(sscanf(reverse(pname),"%s.%s",ext, nname) && search(ext, "/") == -1)
{
ext="."+reverse(ext);
- pname=reverse(pname);
+ pname=reverse(nname);
}else{
ext="";
}
@@ -130,7 +131,6 @@ program cast_to_program(string pname, string current_file)
if(program ret=findprog(combine_path(cwd,pname),ext))
return ret;
-
foreach(pike_include_path, string path)
if(program ret=findprog(combine_path(path,pname),ext))
return ret;
@@ -331,6 +331,8 @@ void _main(string *argv, string *env)
add_include_path(pike_library_path+"/include");
add_module_path(pike_library_path+"/modules");
+ add_include_path(getcwd());
+ add_module_path(getcwd());
q=(getenv("PIKE_INCLUDE_PATH")||"")/":"-({""});
for(i=sizeof(q)-1;i>=0;i--) add_include_path(q[i]);
@@ -420,7 +422,8 @@ void _main(string *argv, string *env)
argv=argv[1..];
}
- program tmp=compile_file(argv[0]);
+ program tmp=(program)argv[0];
+
if(!tmp)
{
werror("Pike: Couldn't find script to execute.\n");
--
GitLab