From 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Thu, 17 Apr 2008 00:52:29 +0300
Subject: [PATCH] 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.
---
 xkbpath.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/xkbpath.c b/xkbpath.c
index 0e1beab..0a7329c 100644
--- a/xkbpath.c
+++ b/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) {
-- 
GitLab