zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-18 23:52:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- let WildMidi tokenizer handle quoted strings.

Browse source
This commit is contained in:
Christoph Oelckers 2015-12-29 18:01:15 +01:00
parent 7fa289109b
commit 0634205d7f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/wildmidi/wildmidi_lib.cpp
View file

@ -573,13 +573,15 @@ static inline int wm_isdigit(int c) {
} }
#define TOKEN_CNT_INC 8 #define TOKEN_CNT_INC 8
static char** WM_LC_Tokenize_Line(char *line_data) { static char** WM_LC_Tokenize_Line(char *line_data)
{
int line_length = strlen(line_data); int line_length = strlen(line_data);
int token_data_length = 0; int token_data_length = 0;
int line_ofs = 0; int line_ofs = 0;
int token_start = 0; int token_start = 0;
char **token_data = NULL; char **token_data = NULL;
int token_count = 0; int token_count = 0;
bool in_quotes = false;
if (line_length == 0) if (line_length == 0)
return NULL; return NULL;
@ -589,8 +591,11 @@ static char** WM_LC_Tokenize_Line(char *line_data) {
if (line_data[line_ofs] == '#') { if (line_data[line_ofs] == '#') {
break; break;
} }
if (line_data[line_ofs] == '"')
if ((line_data[line_ofs] == ' ') || (line_data[line_ofs] == '\t')) { {
in_quotes = !in_quotes;
}
else if (!in_quotes && ((line_data[line_ofs] == ' ') || (line_data[line_ofs] == '\t'))) {
/* whitespace means we aren't in a token */ /* whitespace means we aren't in a token */
if (token_start) { if (token_start) {
token_start = 0; token_start = 0;