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

Improve FcGetPrgname() to work on BSD

This commit is contained in:
Akira TAGOH 2013-01-16 16:35:28 +09:00
parent ec5ca08c80
commit f9ac4c84c9
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -141,7 +141,7 @@ AC_TYPE_PID_T
# Checks for library functions. # Checks for library functions.
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_FUNC_MMAP AC_FUNC_MMAP
AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp _mktemp_s strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror readlink regexec regfree fstatvfs fstatfs lstat]) AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp _mktemp_s strchr strrchr strtol getopt getopt_long getprogname sysconf ftruncate chsize rand random lrand48 random_r rand_r realpath regcomp regerror readlink regexec regfree fstatvfs fstatfs lstat])
dnl AC_CHECK_FUNCS doesn't check for header files. dnl AC_CHECK_FUNCS doesn't check for header files.
dnl posix_fadvise() may be not available in older libc. dnl posix_fadvise() may be not available in older libc.

10
src/fcdefault.c
View File

@ -23,6 +23,7 @@
*/ */
#include "fcint.h" #include "fcint.h"
#include <limits.h>
#include <string.h> #include <string.h>
/* MT-safe */ /* MT-safe */
@ -139,6 +140,15 @@ retry:
prgname = FcStrdup (p); prgname = FcStrdup (p);
} }
#elif defined (HAVE_GETPROGNAME) && defined (HAVE_REALPATH)
const char *p = getprogname ();
char resolved_path[PATH_MAX + 1];
if (p)
{
if (realpath (p, resolved_path) != NULL)
prgname = FcStrdup (resolved_path);
}
#else #else
char buf[8192]; char buf[8192];
unsigned int len; unsigned int len;