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

fix segfaults and readonly debashify

Browse source
This commit is contained in:
zawz 2021-02-26 16:01:20 +01:00
parent 931590a334
commit 1ffb2f8b2e
1 changed files with 52 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/debashify.cpp
View file

@ -155,6 +155,49 @@ std::string get_declare_opt(cmd* in)
return "";
}
bool debashify_readonly(list* in)
{
bool has_found=false;
for(uint32_t i=0; i<in->cls.size(); i++)
{
// not a cmd: go to next
if(in->cls[i]->pls[0]->cmds[0]->type != _obj::block_cmd)
continue;
cmd* c1 = dynamic_cast<cmd*>(in->cls[i]->pls[0]->cmds[0]);
std::string const& cmdstr=c1->arg_string(0);
if(cmdstr == "readonly")
{
has_found=true;
c1->is_cmdvar=false;
for(uint32_t i=0; i<c1->var_assigns.size(); i++)
{
if(c1->var_assigns[i].first == nullptr || c1->var_assigns[i].second == nullptr)
{
if(c1->var_assigns[i].first != nullptr)
delete c1->var_assigns[i].first;
if(c1->var_assigns[i].second != nullptr)
delete c1->var_assigns[i].second;
c1->var_assigns.erase(c1->var_assigns.begin()+i);
i--;
}
}
if(c1->var_assigns.size() == 0)
{
delete in->cls[i];
in->cls.erase(in->cls.begin()+i);
i--;
}
else
{
delete c1->args;
c1->args = new arglist;
}
}
}
return has_found;
}
bool debashify_declare(list* in, debashify_params* params)
{
bool has_found=false;
@ -166,15 +209,11 @@ bool debashify_declare(list* in, debashify_params* params)
cmd* c1 = dynamic_cast<cmd*>(in->cls[i]->pls[0]->cmds[0]);
std::string const& cmdstr=c1->arg_string(0);
if(cmdstr == "declare" || cmdstr == "typeset" || cmdstr == "readonly")
{
if(cmdstr == "readonly")
{
warn("removing 'readonly'");
}
else
if(cmdstr == "declare" || cmdstr == "typeset")
{
std::string const& op = get_declare_opt(c1);
if( cmdstr != "readonly" )
{
if(op == "-a")
{
for(auto it: c1->var_assigns)
@ -191,12 +230,11 @@ bool debashify_declare(list* in, debashify_params* params)
params->arrays[it.first->varname] = true;
}
}
else
warn( strf("removing '%s' with argument '%s'", cmdstr.c_str(), op.c_str()) );
}
has_found=true;
delete in->cls[i];
in->cls.erase(in->cls.begin()+i);
i--;
}
}
return has_found;
@ -440,7 +478,7 @@ bool debashify_array_set(cmd* in, debashify_params* params)
it->second->add(sb);
has_replaced=true;
}
else if(it->first != nullptr && it->second->first_sa_string().substr(0,3) == "+=(")
else if(it->first != nullptr && it->second!=nullptr && it->second->first_sa_string().substr(0,3) == "+=(")
{
// array add: VAR+=()
// can be done by creating a new array with old array + new
@ -485,7 +523,7 @@ bool debashify_plusequal(cmd* in, debashify_params* params)
bool has_replaced=false;
for(auto it = in->var_assigns.begin() ; it != in->var_assigns.end() ; it++)
{
if(it->first != nullptr && it->second->first_sa_string().substr(0,2) == "+=")
if(it->first != nullptr && it->second != nullptr && it->second->first_sa_string().substr(0,2) == "+=")
{
string_subarg* tt=dynamic_cast<string_subarg*>(it->second->sa[0]);
variable* v = new variable(it->first->varname);
@ -656,6 +694,7 @@ bool r_debashify(_obj* o, debashify_params* params)
case _obj::_list: {
list* t = dynamic_cast<list*>(o);
debashify_declare(t, params);
debashify_readonly(t);
debashify_procsub(t, params);
} break;
case _obj::_pipeline: {