flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-25 10:55:58 +00:00
Code Issues Releases Wiki Activity

overlay: Make the config parser more lenient

Browse Source 
Allow a dot-notation outside of the [ini] style to make commandline
parameters easier to add.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-08-22 19:19:03 +01:00
parent c62cf67a6f
commit b6ee8ccffe
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
overlay/config.c
View File

@ -55,9 +55,14 @@ static const char *trim_whitespace(const char *s, const char *end)
return end + 1; return end + 1;
} }
static const char *skip_past_newline(const char *s, const char *end) static int is_eol(int c)
{ {
while (s < end && *s++ != '\n') return c == '\n' || c == '\r';
}
static const char *skip_past_eol(const char *s, const char *end)
{
while (s < end && !is_eol(*s++))
; ;
return s; return s;
@ -74,7 +79,7 @@ static const char *find(const char *s, const char *end, int c)
s++; s++;
} }
return s; return c == '\n' ? s : s < end ? s : NULL;
} }
static int parse(const char *buf, int len, static int parse(const char *buf, int len,
@ -87,10 +92,10 @@ static int parse(const char *buf, int len,
char section[128] = DEFAULT_SECTION, name[128], value[128]; char section[128] = DEFAULT_SECTION, name[128], value[128];
const char *buf_end = buf + len; const char *buf_end = buf + len;
const char *end; const char *end;
int line = 0; int has_section = 0;
int line;
for (line = 0 ; ++line; buf = skip_past_newline(buf, buf_end)) { for (line = 0 ; ++line; buf = skip_past_eol(buf, buf_end)) {
++line;
buf = skip_whitespace(buf, buf_end); buf = skip_whitespace(buf, buf_end);
if (buf >= buf_end) if (buf >= buf_end)
break; break;
@ -99,6 +104,9 @@ static int parse(const char *buf, int len,
/* comment */ /* comment */
} else if (*buf == '[') { /* new section */ } else if (*buf == '[') { /* new section */
end = find(++buf, buf_end, ']'); end = find(++buf, buf_end, ']');
if (end == NULL)
return line;
end = trim_whitespace(buf, end); end = trim_whitespace(buf, end);
if (end <= buf) if (end <= buf)
continue; continue;
@ -109,6 +117,7 @@ static int parse(const char *buf, int len,
memcpy(section, buf, len); memcpy(section, buf, len);
section[len] = '\0'; section[len] = '\0';
has_section = 1;
} else { /* name = value */ } else { /* name = value */
const char *sep; const char *sep;
int has_value = 1; int has_value = 1;
@ -143,7 +152,21 @@ static int parse(const char *buf, int len,
memcpy(value, buf, len); memcpy(value, buf, len);
value[len] = '\0'; value[len] = '\0';
} else } else
value[0] = '\0'; *value = '\0';
if (!has_section) {
char *dot;
dot = strchr(name, '.');
if (dot && dot[1]) {
*dot = '\0';
if (!func(name, dot+1, value, data))
return line;
continue;
}
}
if (!func(section, name, value, data)) if (!func(section, name, value, data))
return line; return line;
@ -186,18 +209,14 @@ static int add_value(const char *section,
} }
{ {
int name_len = strlen(name) + 1; int name_len = strlen(name) + 1;
int value_len = *value ? strlen(value) + 1 : 0; int value_len = strlen(value) + 1;
v = malloc(sizeof(*v) + name_len + value_len); v = malloc(sizeof(*v) + name_len + value_len);
if (v == NULL) if (v == NULL)
return 0; return 0;
v->name = memcpy(v+1, name, name_len); v->name = memcpy(v+1, name, name_len);
v->value = memcpy(v->name + name_len, value, value_len);
if (*value)
v->value = memcpy(v->name + name_len, value, value_len);
else
v->value = NULL;
v->next = s->values; v->next = s->values;
s->values = v; s->values = v;