From 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Wed, 16 Apr 2008 21:52:29 +0000
Subject: 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.
---
diff --git xkbcomp-1.0.4/xkbpath.c xkbcomp-1.0.4/xkbpath.c
index 0e1beab..0a7329c 100644
--- xkbcomp-1.0.4/xkbpath.c
+++ xkbcomp-1.0.4/xkbpath.c
@@ -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) {
--
cgit v0.7.2-37-g538c