nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-25 21:59:19 +02:00
parent c7ac1f9077 a153311040
commit 4984b81282
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cfgparse.y
View File

@ -397,13 +397,18 @@ void parse_file(const char *f) {
continue;
if (strcasecmp(key, "set") == 0) {
if (value[0] != '$')
die("Malformed variable assignment, name has to start with $\n");
if (value[0] != '$') {
ELOG("Malformed variable assignment, name has to start with $\n");
continue;
}
/* get key/value for this variable */
char *v_key = value, *v_value;
if ((v_value = strstr(value, " ")) == NULL)
die("Malformed variable assignment, need a value\n");
if ((v_value = strstr(value, " ")) == NULL &&
(v_value = strstr(value, "\t")) == NULL) {
ELOG("Malformed variable assignment, need a value\n");
continue;
}
*(v_value++) = '\0';