Skip to content
Snippets Groups Projects
Commit d62d4e34 authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

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
parent 7c8292ad
No related branches found
No related tags found
No related merge requests found
...@@ -106,10 +106,11 @@ static program findprog(string pname, string ext) ...@@ -106,10 +106,11 @@ static program findprog(string pname, string ext)
program cast_to_program(string pname, string current_file) program cast_to_program(string pname, string current_file)
{ {
string ext; 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); ext="."+reverse(ext);
pname=reverse(pname); pname=reverse(nname);
}else{ }else{
ext=""; ext="";
} }
...@@ -130,7 +131,6 @@ program cast_to_program(string pname, string current_file) ...@@ -130,7 +131,6 @@ program cast_to_program(string pname, string current_file)
if(program ret=findprog(combine_path(cwd,pname),ext)) if(program ret=findprog(combine_path(cwd,pname),ext))
return ret; return ret;
foreach(pike_include_path, string path) foreach(pike_include_path, string path)
if(program ret=findprog(combine_path(path,pname),ext)) if(program ret=findprog(combine_path(path,pname),ext))
return ret; return ret;
...@@ -331,6 +331,8 @@ void _main(string *argv, string *env) ...@@ -331,6 +331,8 @@ void _main(string *argv, string *env)
add_include_path(pike_library_path+"/include"); add_include_path(pike_library_path+"/include");
add_module_path(pike_library_path+"/modules"); add_module_path(pike_library_path+"/modules");
add_include_path(getcwd());
add_module_path(getcwd());
q=(getenv("PIKE_INCLUDE_PATH")||"")/":"-({""}); q=(getenv("PIKE_INCLUDE_PATH")||"")/":"-({""});
for(i=sizeof(q)-1;i>=0;i--) add_include_path(q[i]); for(i=sizeof(q)-1;i>=0;i--) add_include_path(q[i]);
...@@ -420,7 +422,8 @@ void _main(string *argv, string *env) ...@@ -420,7 +422,8 @@ void _main(string *argv, string *env)
argv=argv[1..]; argv=argv[1..];
} }
program tmp=compile_file(argv[0]); program tmp=(program)argv[0];
if(!tmp) if(!tmp)
{ {
werror("Pike: Couldn't find script to execute.\n"); werror("Pike: Couldn't find script to execute.\n");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment