Skip to content

Modify option parsing to handle quoted and escaped characters #81

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
mbpowers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modify option parsing to handle quoted and escaped characters #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 40 additions & 5 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,13 +990,48 @@ static void parse_command_line(int argc, char **argv, struct wl_state *state) {
break;
case 'o':
mpv_options = strdup(optarg);
// Replace spaces with newlines
for (int i=0; i < (int)strlen(mpv_options); i++) {
if (mpv_options[i] == ' ')
mpv_options[i] = '\n';
// Split options by newline handling quotes and escaped characters
bool in_single_quotes = 0, in_double_quotes = 0, escape_next_char = 0;
int write_index = 0;
for (int i = 0; mpv_options[i] != '\0'; i++) {
if (escape_next_char) {
mpv_options[write_index++] = mpv_options[i];
escape_next_char = 0;
continue;
}

switch (mpv_options[i]) {
case '\\':
if (!in_single_quotes) {
escape_next_char = 1;
} else {
mpv_options[write_index++] = mpv_options[i];
}
break;
case '"':
if (!in_single_quotes)
in_double_quotes = !in_double_quotes;
mpv_options[write_index++] = mpv_options[i];
break;
case '\'':
if (!in_double_quotes)
in_single_quotes = !in_single_quotes;
mpv_options[write_index++] = mpv_options[i];
break;
case ' ':
if (!in_single_quotes && !in_double_quotes) {
mpv_options[write_index++] = '\n'; // Replace space with newline
} else {
mpv_options[write_index++] = mpv_options[i];
}
break;
default:
mpv_options[write_index++] = mpv_options[i];
break;
}
}
mpv_options[write_index] = '\0';
break;

case 'Z': // Hidden option to recover video pos after stopping
halt_info.save_info = strdup(optarg);
break;
Expand Down