Merge fd0ea3d55d
into e98bd7cde2
This commit is contained in:
commit
53d0ac3b45
|
@ -123,16 +123,21 @@ xf86parseOutputClassSection(void)
|
|||
ptr->driver = xf86_lex_val.str;
|
||||
break;
|
||||
case MODULEPATH:
|
||||
if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
|
||||
if (xf86getSubToken(&ptr->comment) != XF86_TOKEN_STRING)
|
||||
Error(QUOTE_MSG, "ModulePath");
|
||||
{
|
||||
char *newpath;
|
||||
if (ptr->modulepath) {
|
||||
char *path;
|
||||
XNFasprintf(&path, "%s,%s", ptr->modulepath, xf86_lex_val.str);
|
||||
free(xf86_lex_val.str);
|
||||
free(ptr->modulepath);
|
||||
ptr->modulepath = path;
|
||||
} else {
|
||||
ptr->modulepath = xf86_lex_val.str;
|
||||
XNFasprintf(&newpath, "%s,%s",
|
||||
ptr->modulepath,
|
||||
xf86_lex_val.str);
|
||||
free(ptr->modulepath);
|
||||
}
|
||||
else {
|
||||
newpath = strdup(xf86_lex_val.str);
|
||||
}
|
||||
free(xf86_lex_val.str);
|
||||
ptr->modulepath = newpath;
|
||||
}
|
||||
break;
|
||||
case OPTION:
|
||||
|
|
Loading…
Reference in New Issue