Commit 343da0a9 authored by jan.koester's avatar jan.koester
Browse files

test

parent a87ad0ae

src/shell.cpp

+12 −1
Changes for src/shell.cpp: 12 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1152,7 +1152,18 @@ std::vector<fresh::ShellWord> fresh::tokenizeShellWords(const std::string &input 
                           (input[i+1]=='"' || input[i+1]=='\\' ||

                            input[i+1]=='$' || input[i+1]=='`'))

                            i+=2;

                        else

                        // "$(...)" inside the quotes is its own quoting

                        // context: a '"' in its command doesn't end the

                        // string (the kernel's mkcapflags.sh:

                        // VALUE="$(echo "$i" | sed -n 's@..\("[^"]*"\)..@\1@p')")

                        else if(input[i]=='$' && i+1<n && input[i+1]=='('){

                            size_t close=cmdSubstClose(input,i+2);

                            i=(close<n) ? close+1 : n;

                        }else if(input[i]=='`'){

                            ++i;

                            while(i<n && input[i]!='`'){ if(input[i]=='\\') ++i; ++i; }

                            if(i<n) ++i;

                        }else

                            ++i;

                    }

                }else{