Skip to content

Resolve issue #14 consecutive spaces #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Resolve issue #14 consecutive spaces #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f812686
prospective fix for issue 14, need to test and remove debug code
joemcool Nov 8, 2021
ed1852d
Issue 14 testing complete and debug code removed
joemcool Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,20 @@ static int shell_parse(char * buf, char ** argv, unsigned short maxargs)
case ' ':
if (toggle == 0) {
buf[i] = '\0';

// Loop past any consecutive spaces
while((i < length) && (buf[i + 1] == ' ')){
i++;
buf[i] = '\0';
}

// If we're at the end of the input (length - 2 because we're on the last char,
// and length points to char after terminating NULL
if(i == length - 2){
break; // Break out of loop to avoid adding an empty argument at the end
}

// Increment argument counter and add argument to argv array
argc++;
argv[argc] = &buf[i + 1];
}
Expand Down