walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix make check fail on MinGW again

This commit is contained in:
Akira TAGOH 2019-03-25 10:58:15 +00:00
parent 8e2c85fe81
commit ad3f335ccf
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/fcxml.c
View File

@ -1287,7 +1287,7 @@ _get_real_path_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcCh
{ {
#ifdef _WIN32 #ifdef _WIN32
const FcChar8 *data; const FcChar8 *data;
FcChar8 buffer[1000]; FcChar8 buffer[1000] = { 0 };
#endif #endif
FcChar8 *parent = NULL, *retval = NULL; FcChar8 *parent = NULL, *retval = NULL;
@ -1321,7 +1321,6 @@ _get_real_path_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcCh
if (!FcStrIsAbsoluteFilename (path) && path[0] != '~') if (!FcStrIsAbsoluteFilename (path) && path[0] != '~')
FcConfigMessage (parse, FcSevereWarning, "Use of ambiguous path in <%s> element. please add prefix=\"cwd\" if current behavior is desired.", FcElementReverseMap (parse->pstack->element)); FcConfigMessage (parse, FcSevereWarning, "Use of ambiguous path in <%s> element. please add prefix=\"cwd\" if current behavior is desired.", FcElementReverseMap (parse->pstack->element));
} }
#endif
if (parent) if (parent)
{ {
retval = FcStrBuildFilename (parent, path, NULL); retval = FcStrBuildFilename (parent, path, NULL);
@ -1330,7 +1329,7 @@ _get_real_path_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcCh
{ {
retval = FcStrdup (path); retval = FcStrdup (path);
} }
#ifdef _WIN32 #else
if (strcmp ((const char *) path, "CUSTOMFONTDIR") == 0) if (strcmp ((const char *) path, "CUSTOMFONTDIR") == 0)
{ {
FcChar8 *p; FcChar8 *p;
@ -1377,12 +1376,23 @@ _get_real_path_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcCh
strcat ((char *) data, "\\"); strcat ((char *) data, "\\");
strcat ((char *) data, "fonts"); strcat ((char *) data, "fonts");
} }
else if (!prefix) else
{ {
if (!FcStrIsAbsoluteFilename (path) && path[0] != '~') data = path;
FcConfigMessage (parse, FcSevereWarning, "Use of ambiguous path in <%s> element. please add prefix=\"cwd\" if current behavior is desired.", FcElementReverseMap (parse->pstack->element)); if (!prefix)
{
if (!FcStrIsAbsoluteFilename (path) && path[0] != '~')
FcConfigMessage (parse, FcSevereWarning, "Use of ambiguous path in <%s> element. please add prefix=\"cwd\" if current behavior is desired.", FcElementReverseMap (parse->pstack->element));
}
if (parent)
{
retval = FcStrBuildFilename (parent, data, NULL);
}
else
{
retval = FcStrdup (data);
}
} }
retval = FcStrdup (data);
#endif #endif
return retval; return retval;