Commit 1aecdffa authored by Daniel Stone's avatar Daniel Stone

Don't scan paths which make NO SENSE WHATSOEVER TO SCAN

Hey, I wonder if we have XKB files in our directory! I wonder if we
haven't bothered with a structure, and let's try to open a file called
'misc' in someone's home directory! What a surprise, it's not a valid
XKB file! Let's fail miserably!

SURPRISINGLY, THIS IS NOT USEFUL BEHAVIOUR.
parent a3a05fd4
......@@ -133,7 +133,6 @@ XkbAddDefaultDirectoriesToPath(void)
{
if (noDefaultPath)
return;
XkbAddDirectoryToPath(".");
XkbAddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
}
......@@ -298,16 +297,7 @@ char buf[PATH_MAX],*typeDir;
typeLen= strlen(typeDir);
for (i=0;i<nPathEntries;i++) {
pathLen= strlen(includePath[i]);
if ((nameLen+pathLen+1)>=PATH_MAX) {
ERROR2("File name (%s/%s) too long\n",includePath[i],name);
ACTION("Ignored\n");
continue;
}
sprintf(buf,"%s/%s",includePath[i],name);
file= fopen(buf,"r");
if (file!=NULL)
break;
else if (typeLen<1)
if (typeLen<1)
continue;
if ((nameLen+typeLen+pathLen+2)>=PATH_MAX) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment