RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

parser-cfg: parse % escapes 

This parses "%len%string" escapes, where string can contain any
characters. This method of escaping has also been used in other parts
of mplayer and mpv, so it's not a new idea.

(Also, don't confuse with URL encoding.)

Needed by the following commit.
This commit is contained in:
wm4 2013-10-14 21:00:00 +02:00
parent 5a1b60c567
commit 5106edfd5e
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mpvcore/parser-cfg.c
View File

@ -173,21 +173,45 @@ int m_config_parse_config_file(m_config_t *config, const char *conffile,
}
}
line_pos++; /* skip the closing " or ' */
} else {
for (param_pos = 0; isprint(line[line_pos])
&& !isspace(line[line_pos])
&& line[line_pos] != '#'; /* NOTHING */) {
param[param_pos++] = line[line_pos++];
if (param_pos >= MAX_PARAM_LEN) {
goto param_done;
}
if (line[line_pos] == '%') {
char *start = &line[line_pos + 1];
char *end = start;
unsigned long len = strtoul(start, &end, 10);
if (start != end && end[0] == '%') {
if (len >= MAX_PARAM_LEN - 1 ||
strlen(end + 1) < len)
{
PRINT_LINENUM;
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "too long parameter\n");
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "bogus %% length\n");
ret = -1;
errors++;
goto nextline;
}
param_pos = snprintf(param, sizeof(param), "%.*s",
(int)len, end + 1);
line_pos += 1 + (end - start) + 1 + len;
goto param_done;
}
}
for (param_pos = 0; isprint(line[line_pos])
&& !isspace(line[line_pos])
&& line[line_pos] != '#'; /* NOTHING */) {
param[param_pos++] = line[line_pos++];
if (param_pos >= MAX_PARAM_LEN) {
PRINT_LINENUM;
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "too long parameter\n");
ret = -1;
errors++;
goto nextline;
}
}
param_done:
while (isspace(line[line_pos]))
++line_pos;
}