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

fix variable processing broken on debashified process substitution

Browse source
This commit is contained in:
zawwz 2021-01-08 12:02:04 +01:00
parent 51b2648c94
commit 6f35028e84
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/struc_helper.hpp
View file

@ -3,6 +3,7 @@
#include "struc.hpp" #include "struc.hpp"
arg* make_arg(std::string const& in);
cmd* make_cmd(std::vector<std::string> const& args); cmd* make_cmd(std::vector<std::string> const& args);
cmd* make_cmd(std::string const& in); cmd* make_cmd(std::string const& in);
condlist* make_condlist(std::string const& in); condlist* make_condlist(std::string const& in);

16
src/debashify.cpp
View file

@ -88,7 +88,7 @@ bool debashify_replace_procsub(list* lst)
{ {
for(auto ait: t->args->args) for(auto ait: t->args->args)
{ {
if(ait->sa[0]->type == _obj::subarg_procsub) if(ait->sa.size() == 1 && ait->sa[0]->type == _obj::subarg_procsub)
{ {
procsub_subarg* st = dynamic_cast<procsub_subarg*>(ait->sa[0]); procsub_subarg* st = dynamic_cast<procsub_subarg*>(ait->sa[0]);
affected_args.push_back( std::make_pair(ait, st->is_output) ); affected_args.push_back( std::make_pair(ait, st->is_output) );
@ -103,15 +103,15 @@ bool debashify_replace_procsub(list* lst)
{ {
has_replaced=true; has_replaced=true;
list* lst_insert = new list; list* lst_insert = new list;
std::vector<std::string> mkfifoargs = {"mkfifo"}; std::string mkfifocmd="mkfifo";
for(uint32_t i=0; i<affected_args.size(); i++) for(uint32_t i=0; i<affected_args.size(); i++)
{ {
// fifoN=${TMPDIR-/tmp}/lxshfifo_$(__lxsh_random 10) // fifoN=${TMPDIR-/tmp}/lxshfifo_$(__lxsh_random 10)
lst_insert->add( make_condlist( strf("__lxshfifo%u=${TMPDIR-/tmp}/lxshfifo_$(__lxsh_random 10)", i) ) ); lst_insert->add( make_condlist( strf("__lxshfifo%u=${TMPDIR-/tmp}/lxshfifo_$(__lxsh_random 10)", i) ) );
mkfifoargs.push_back( strf("\"$__lxshfifo%u\"", i) ); mkfifocmd += strf(" \"$__lxshfifo%u\"", i);
} }
// mkfifo "$fifoN" // mkfifo "$fifoN"
lst_insert->add( new condlist(make_cmd(mkfifoargs)) ); lst_insert->add( make_condlist(mkfifocmd) );
for(uint32_t i=0; i<affected_args.size(); i++) for(uint32_t i=0; i<affected_args.size(); i++)
{ {
// create ( {PSUB;} > "$fifoN" ; rm "$fifoN") & // create ( {PSUB;} > "$fifoN" ; rm "$fifoN") &
@ -122,7 +122,7 @@ bool debashify_replace_procsub(list* lst)
// deindex list // deindex list
st->sbsh->lst=nullptr; st->sbsh->lst=nullptr;
// {PSUB;} > "$__lxshfifoN" // {PSUB;} > "$__lxshfifoN"
cbr->redirs.push_back( new redirect( affected_args[i].second ? "<" : ">", new arg(strf("\"$__lxshfifo%u\"", i)) ) ); cbr->redirs.push_back( new redirect( affected_args[i].second ? "<" : ">", make_arg(strf("\"$__lxshfifo%u\"", i)) ) );
// ( {PSUB;} > "$__lxshfifoN" ) // ( {PSUB;} > "$__lxshfifoN" )
psub->lst->add( new condlist(cbr) ); psub->lst->add( new condlist(cbr) );
// ( {PSUB;} > "$__lxshfifoN" ; rm "$__lxshfifoN" ) // ( {PSUB;} > "$__lxshfifoN" ; rm "$__lxshfifoN" )
@ -134,7 +134,9 @@ bool debashify_replace_procsub(list* lst)
// replace the arg // replace the arg
delete affected_args[i].first->sa[0]; delete affected_args[i].first->sa[0];
affected_args[i].first->sa[0] = new string_subarg(strf("\"$__lxshfifo%u\"", i)); affected_args[i].first->sa[0] = new string_subarg("\"");
affected_args[i].first->sa.push_back( new variable_subarg(strf("__lxshfifo%u", i)) );
affected_args[i].first->sa.push_back( new string_subarg("\"") );
} }
lst->insert(li, *lst_insert ); lst->insert(li, *lst_insert );
li+= lst_insert->size(); li+= lst_insert->size();
@ -211,5 +213,5 @@ void debashify(shmain* sh)
sh->shebang = "#!/bin/sh"; sh->shebang = "#!/bin/sh";
recurse(r_debashify, sh, &need_random_func); recurse(r_debashify, sh, &need_random_func);
if(need_random_func) if(need_random_func)
sh->lst->insert(0, new condlist(create_random_func())); sh->lst->insert(0, new condlist(create_random_func()));
} }

5
src/struc_helper.cpp
View file

@ -5,6 +5,11 @@
// ** FUNCTIONS ** // // ** FUNCTIONS ** //
arg* make_arg(std::string const& in)
{
return parse_arg(in.c_str(), in.size(), 0).first;
}
cmd* make_cmd(std::vector<std::string> const& args) cmd* make_cmd(std::vector<std::string> const& args)
{ {
cmd* ret = new cmd(); cmd* ret = new cmd();