Commit dfb5602a authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Font.c: Let dix check if a font path exists

Dix will only add font paths that are existing on the system. There's no need to check that ourselves.
parent 8029141e
...@@ -1433,14 +1433,9 @@ static Bool nxagentGetFontServerPath(char * fontServerPath, int size) ...@@ -1433,14 +1433,9 @@ static Bool nxagentGetFontServerPath(char * fontServerPath, int size)
void nxagentVerifySingleFontPath(char **dest, const char *fontDir) void nxagentVerifySingleFontPath(char **dest, const char *fontDir)
{ {
struct stat dirStat;
if (!dest || !*dest) if (!dest || !*dest)
return; return;
if (stat(fontDir, &dirStat) == 0 &&
S_ISDIR(dirStat.st_mode) != 0)
{
#ifdef TEST #ifdef TEST
fprintf(stderr, "%s: Assuming fonts in directory [%s].\n", __func__, fprintf(stderr, "%s: Assuming fonts in directory [%s].\n", __func__,
validateString(fontDir)); validateString(fontDir));
...@@ -1472,7 +1467,6 @@ void nxagentVerifySingleFontPath(char **dest, const char *fontDir) ...@@ -1472,7 +1467,6 @@ void nxagentVerifySingleFontPath(char **dest, const char *fontDir)
*dest = tmppath; *dest = tmppath;
tmppath = NULL; tmppath = NULL;
} }
}
} }
void nxagentVerifyDefaultFontPath(void) void nxagentVerifyDefaultFontPath(void)
......
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