zawz/lxsh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reorganize secondary option processing to run before first parse

Browse source
This commit is contained in:
zawwz 2021-01-06 10:06:04 +01:00
parent 2622103cf7
commit 46047f2a88
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main.cpp
View file

@ -98,21 +98,16 @@ int main(int argc, char* argv[])
// do parsing // do parsing
for(uint32_t i=0 ; i<args.size() ; i++) for(uint32_t i=0 ; i<args.size() ; i++)
{ {
bool shebang_is_bin=false;
std::string file = args[i]; std::string file = args[i];
std::string filecontents=import_file(file); std::string filecontents=import_file(file);
// parse std::string shebang=filecontents.substr(0,filecontents.find('\n'));
g_origin=file; // resolve shebang and parse leftover options
if(!add_include(file))
continue;
tsh = parse_text(filecontents, file);
// resolve shebang
if(first_run) if(first_run)
{ {
first_run=false; first_run=false;
// resolve shebang // resolve shebang
bool shebang_is_bin = ( basename(argv[0]) == basename(tsh->shebang) ); shebang_is_bin = ( basename(argv[0]) == basename(shebang) );
if(shebang_is_bin)
tsh->shebang="#!/bin/sh";
// detect if need execution // detect if need execution
if(options['e']) if(options['e'])
@ -130,6 +125,13 @@ int main(int argc, char* argv[])
oneshot_opt_process(argv[0]); oneshot_opt_process(argv[0]);
get_opts(); get_opts();
} }
// parse
g_origin=file;
if(!add_include(file))
continue;
tsh = parse_text(filecontents, file);
if(shebang_is_bin) // resolve lxsh shebang to sh
tsh->shebang="#!/bin/sh";
/* mid processing */ /* mid processing */
// resolve/include // resolve/include
@ -146,7 +148,7 @@ int main(int argc, char* argv[])
// is exec: break and exec // is exec: break and exec
if(is_exec) if(is_exec)
break; break;
} } // end of argument parse
// processing before output // processing before output
// minimize // minimize
@ -162,6 +164,7 @@ int main(int argc, char* argv[])
if(options["unset-var"]) if(options["unset-var"])
add_unset_variables( sh, re_var_exclude ); add_unset_variables( sh, re_var_exclude );
// list outputs
if(options["list-var"]) if(options["list-var"])
list_vars(sh, re_var_exclude); list_vars(sh, re_var_exclude);
else if(options["list-var-def"]) else if(options["list-var-def"])
@ -172,10 +175,12 @@ int main(int argc, char* argv[])
list_fcts(sh, re_fct_exclude); list_fcts(sh, re_fct_exclude);
else if(options["list-cmd"]) else if(options["list-cmd"])
list_cmds(sh, regex_null); list_cmds(sh, regex_null);
// execute
else if(is_exec) else if(is_exec)
{ {
ret = execute(sh, args); ret = execute(sh, args);
} }
// output
else if(options['o']) // file output else if(options['o']) // file output
{ {
std::string destfile=options['o']; std::string destfile=options['o'];