0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Shell: Allow empty tokens if enclosed in single or double quotes

Browse source 
Previously the shell parser would discard empty tokens. We now allow
them when they are enclosed in quotes (either '' or "")

This means that a command like _echo ""_ will actually pass an empty
string to /bin/echo in argv[1] now.
This commit is contained in:
Andreas Kling 2020-01-25 12:16:45 +01:00
parent 003d52ce6e
commit ed90d39cd7
Notes: sideshowbarker 2024-07-19 09:50:25 +09:00
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Shell/Parser.cpp
View file

@ -29,9 +29,9 @@
#include <unistd.h>
#include <ctype.h>
void Parser::commit_token()
void Parser::commit_token(AllowEmptyToken allow_empty)
{
if (m_token.is_empty())
if (allow_empty == AllowEmptyToken::No && m_token.is_empty())
return;
if (m_state == InRedirectionPath) {
m_redirections.last().path = String::copy(m_token);
@ -239,7 +239,7 @@ Vector<Command> Parser::parse()
break;
case State::InSingleQuotes:
if (ch == '\'') {
commit_token();
commit_token(AllowEmptyToken::Yes);
m_state = State::Free;
break;
}
@ -247,7 +247,7 @@ Vector<Command> Parser::parse()
break;
case State::InDoubleQuotes:
if (ch == '\"') {
commit_token();
commit_token(AllowEmptyToken::Yes);
m_state = State::Free;
break;
}

3
Shell/Parser.h
View file

@ -67,7 +67,8 @@ public:
Vector<Command> parse();
private:
void commit_token();
enum class AllowEmptyToken { No, Yes };
void commit_token(AllowEmptyToken = AllowEmptyToken::No);
void commit_subcommand();
void commit_command();
void do_pipe();