StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor XkbFindFileInPath 

Also fixes a bug, where the check (typeLen < 1) should have been
(pathLen < 1).

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-03-03 22:43:50 +02:00
parent 19e99bb27a
commit 2473444f92
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/xkbcomp/xkbpath.c
View File

@ -26,6 +26,7 @@
#define DEBUG_VAR debugFlags
#include "utils.h"
#include <errno.h>
#include <stdlib.h>
#include "xkbpath.h"
#include "xkbcommon/xkbcommon.h"
@ -315,9 +316,8 @@ XkbDirectoryForInclude(unsigned type)
FILE *
XkbFindFileInPath(const char *name, unsigned type, char **pathRtrn)
{
int i;
int i, ret;
FILE *file = NULL;
int nameLen, typeLen, pathLen;
char buf[PATH_MAX];
const char *typeDir;
@ -325,32 +325,31 @@ XkbFindFileInPath(const char *name, unsigned type, char **pathRtrn)
return NULL;
typeDir = XkbDirectoryForInclude(type);
nameLen = strlen(name);
typeLen = strlen(typeDir);
for (i = 0; i < nPathEntries; i++)
{
pathLen = strlen(includePath[i]);
if (typeLen < 1)
if (includePath[i] == NULL || *includePath[i] == '\0')
continue;
if ((nameLen + typeLen + pathLen + 2) >= PATH_MAX)
ret = snprintf(buf, sizeof(buf), "%s/%s/%s",
includePath[i], typeDir, name);
if (ret >= sizeof(buf))
{
ERROR("File name (%s/%s/%s) too long\n", includePath[i],
typeDir, name);
ACTION("Ignored\n");
continue;
}
snprintf(buf, sizeof(buf), "%s/%s/%s", includePath[i], typeDir, name);
file = fopen(buf, "r");
if (file != NULL)
break;
if (file == NULL) {
ERROR("Couldn't open file (%s/%s/%s): %s\n", includePath[i],
typeDir, name, strerror(-errno));
ACTION("Ignored\n");
continue;
}
break;
}
if ((file != NULL) && (pathRtrn != NULL))
{
*pathRtrn = calloc(strlen(buf) + 1, sizeof(char));
if (*pathRtrn != NULL)
strcpy(*pathRtrn, buf);
}
*pathRtrn = strdup(buf);
return file;
}