libxfont: Changes to 'upstream-unstable'
configure.ac | 2
src/FreeType/fttools.c | 7 --
src/builtins/dir.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++
src/fontfile/catalogue.c | 23 ++++++
4 files changed, 177 insertions(+), 10 deletions(-)
New commits:
commit f2725a5c9da771fb610d503ebfda3b4d1553bac4
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 5 13:10:43 2007 -0700
Bump version to 1.3.1.
diff --git a/configure.ac b/configure.ac
index dd26bca..63737ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT([libXfont],
- 1.3.0,
+ 1.3.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
commit aca95d12a8b35de7ae914632fc9e8a723d58a860
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Sat Aug 25 23:32:54 2007 +0200
Kill unused macro definition.
diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c
index 002b62c..10604b1 100644
--- a/src/FreeType/fttools.c
+++ b/src/FreeType/fttools.c
@@ -43,13 +43,6 @@
#include FT_TRUETYPE_IDS_H
#include "ft.h"
-/* backward compatibility hack */
-#if (FREETYPE_VERSION < 2001008)
-# ifndef ft_isdigit
-# define ft_isdigit isdigit
-# endif
-#endif
-
#ifndef LSBFirst
#define LSBFirst 0
#define MSBFirst 1
commit 9f86614394af81bc484cf00f3e9996510d3718cb
Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
Date: Mon Jul 30 14:36:21 2007 -0400
Fix dirfd leak on CatalogueRescan().
diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
index 8168ffd..33d4434 100644
--- a/src/fontfile/catalogue.c
+++ b/src/fontfile/catalogue.c
@@ -218,6 +218,8 @@ CatalogueRescan (FontPathElementPtr fpe)
}
}
+ closedir(dir);
+
qsort(cat->fpeList,
cat->fpeCount, sizeof cat->fpeList[0], ComparePriority);
commit 87f50267181887ed9214536608bd2035d2dd70f7
Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
Date: Mon Jul 30 14:35:01 2007 -0400
Support relative paths in catalogue:<dir> symlinks.
Relative symlinks are common inside the catalogue directory and
should be supported as well.
diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
index 812b050..8168ffd 100644
--- a/src/fontfile/catalogue.c
+++ b/src/fontfile/catalogue.c
@@ -136,6 +136,7 @@ CatalogueRescan (FontPathElementPtr fpe)
DIR *dir;
struct dirent *entry;
int len;
+ int pathlen;
path = fpe->name + strlen(CataloguePrefix);
if (stat(path, &statbuf) < 0 || !S_ISDIR(statbuf.st_mode))
@@ -159,6 +160,17 @@ CatalogueRescan (FontPathElementPtr fpe)
if (len < 0)
continue;
+ dest[len] = '\0';
+
+ if (dest[0] != '/')
+ {
+ pathlen = strlen(path);
+ memmove(dest + pathlen + 1, dest, sizeof dest - pathlen - 1);
+ memcpy(dest, path, pathlen);
+ memcpy(dest + pathlen, "/", 1);
+ len += pathlen + 1;
+ }
+
attrib = strchr(link, ':');
if (attrib && len + strlen(attrib) < sizeof dest)
{
commit 32d2d335eacd1b55980323a71ef35cdf7c22366d
Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
Date: Mon Jul 30 14:36:21 2007 -0400
Fix dirfd leak on CatalogueRescan().
diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
index 8168ffd..33d4434 100644
--- a/src/fontfile/catalogue.c
+++ b/src/fontfile/catalogue.c
@@ -218,6 +218,8 @@ CatalogueRescan (FontPathElementPtr fpe)
}
}
+ closedir(dir);
+
qsort(cat->fpeList,
cat->fpeCount, sizeof cat->fpeList[0], ComparePriority);
commit 0a5b31a40c4933f4c69157c61d4d4890af2205b1
Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
Date: Mon Jul 30 14:35:01 2007 -0400
Support relative paths in catalogue:<dir> symlinks.
Relative symlinks are common inside the catalogue directory and
should be supported as well.
diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
index 812b050..8168ffd 100644
--- a/src/fontfile/catalogue.c
+++ b/src/fontfile/catalogue.c
@@ -136,6 +136,7 @@ CatalogueRescan (FontPathElementPtr fpe)
DIR *dir;
struct dirent *entry;
int len;
+ int pathlen;
path = fpe->name + strlen(CataloguePrefix);
if (stat(path, &statbuf) < 0 || !S_ISDIR(statbuf.st_mode))
@@ -159,6 +160,17 @@ CatalogueRescan (FontPathElementPtr fpe)
if (len < 0)
continue;
+ dest[len] = '\0';
+
+ if (dest[0] != '/')
+ {
+ pathlen = strlen(path);
+ memmove(dest + pathlen + 1, dest, sizeof dest - pathlen - 1);
+ memcpy(dest, path, pathlen);
+ memcpy(dest + pathlen, "/", 1);
+ len += pathlen + 1;
+ }
+
attrib = strchr(link, ':');
if (attrib && len + strlen(attrib) < sizeof dest)
{
commit 7670d4a2720c61fbc7b989fed14c676f04ac3ad1
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Mon Jul 16 12:24:34 2007 +0200
Remove side effects from BuiltinReadDirectory()
The first time BuiltinReadDirectory() is called,
save the content of builtin_dir and builtin_alias,
before calling FontFileAddFontFile(), because that fonction
will modify those.
Then, in subsequent calls to BuiltinReadDirectory(), restore
builtin_dir and builtin_alias so that the side effect incurred
by the first call disappears.
diff --git a/src/builtins/dir.c b/src/builtins/dir.c
index c272449..97f1e1e 100644
--- a/src/builtins/dir.c
+++ b/src/builtins/dir.c
@@ -29,6 +29,133 @@
#endif
#include "builtin.h"
+BuiltinDirPtr
+BuiltinDirsDup (const BuiltinDirPtr a_dirs,
+ int a_dirs_len)
+{
+ BuiltinDirPtr dirs=NULL ;
+ int i=0 ;
+
+ if (!a_dirs)
+ return NULL ;
+
+ dirs = xcalloc (a_dirs_len, sizeof (BuiltinDirRec)) ;
+ if (!dirs)
+ return NULL ;
+
+ for (i=0; i < a_dirs_len; i++) {
+ int len = strlen (a_dirs[i].file_name) ;
+ dirs[i].file_name = xcalloc (1, len) ;
+ memmove (dirs[i].file_name, a_dirs[i].file_name, len);
+ len = strlen (a_dirs[i].font_name) ;
+ dirs[i].font_name = xcalloc (1, len) ;
+ memmove (dirs[i].font_name, a_dirs[i].font_name, len);
+ }
+ return dirs ;
+}
+
+/**
+ * Copy a_save back into a_cur
+ * @param a_cur the instance of BuiltinDir to restore
+ * @param a_saved the saved instance of BuiltinDir to copy into a_cur
+ * @return 0 if went okay, 1 otherwise.
+ */
+int
+BuiltinDirRestore (BuiltinDirPtr a_cur,
+ const BuiltinDirPtr a_saved)
+{
+ if (!a_cur)
+ return 1 ;
+ if (!a_saved)
+ return 0 ;
+
+ if (a_saved->font_name)
+ memmove (a_cur->font_name, a_saved->font_name, strlen (a_saved->font_name)) ;
+ return 0 ;
+}
+
+
+int
+BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
+ const BuiltinDirPtr a_saved_tab,
+ int a_tab_len)
+{
+ int i=0 ;
+
+ if (!a_cur_tab)
+ return 1 ;
+ if (!a_saved_tab)
+ return 0 ;
+
+ for (i=0 ; i < a_tab_len; i++) {
+ if (BuiltinDirRestore (&a_cur_tab[i], &a_saved_tab[i]))
+ return 1 ;
+ }
+ return 0 ;
+}
+
+BuiltinAliasPtr
+BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
+ int a_aliases_len)
+{
+ BuiltinAliasPtr aliases=NULL ;
+ int i=0 ;
+
+ if (!a_aliases)
+ return NULL ;
+
+ aliases = xcalloc (a_aliases_len, sizeof (BuiltinAliasRec)) ;
+ if (!aliases)
+ return NULL ;
+
+ for (i=0; i < a_aliases_len; i++) {
+ int len = strlen (a_aliases[i].font_name) ;
+ aliases[i].font_name = xcalloc (1, len) ;
+ memmove (aliases[i].font_name, a_aliases[i].font_name, len);
+ }
+ return aliases ;
+}
+
+/**
+ * Copy a_save back into a_cur
+ * @param a_cur the instance of BuiltinAlias to restore
+ * @param a_saved the saved instance of BuiltinAlias to copy into a_cur
+ * @return 0 if went okay, 1 otherwise.
+ */
+int
+BuiltinAliasRestore (BuiltinAliasPtr a_cur,
+ const BuiltinAliasPtr a_save)
+{
+ if (!a_cur)
+ return 1 ;
+ if (!a_save)
+ return 0 ;
+ if (a_save->alias_name)
+ memmove (a_cur->alias_name, a_save->alias_name, strlen (a_save->alias_name)) ;
+ if (a_save->font_name)
+ memmove (a_cur->font_name, a_save->font_name, strlen (a_save->font_name)) ;
+ return 0 ;
+}
+
+int
+BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
+ const BuiltinAliasPtr a_saved_tab,
+ int a_tab_len)
+{
+ int i=0 ;
+
+ if (!a_cur_tab)
+ return 1 ;
+ if (!a_saved_tab)
+ return 0 ;
+
+ for (i=0 ; i < a_tab_len; i++) {
+ if (BuiltinAliasRestore (&a_cur_tab[i], &a_saved_tab[i]))
+ return 1 ;
+ }
+ return 0 ;
+}
+
int
BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
{
@@ -36,6 +163,34 @@ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
int i;
dir = FontFileMakeDir ("", builtin_dir_count);
+ static BuiltinDirPtr saved_builtin_dir ;
+ static BuiltinAliasPtr saved_builtin_alias ;
+
+
+ if (saved_builtin_dir)
+ {
+ BuiltinDirsRestore ((BuiltinDirPtr) builtin_dir,
+ saved_builtin_dir,
+ builtin_dir_count) ;
+ }
+ else
+ {
+ saved_builtin_dir = BuiltinDirsDup ((const BuiltinDirPtr) builtin_dir,
+ builtin_dir_count) ;
+ }
+
+ if (saved_builtin_alias)
+ {
+ BuiltinAliasesRestore ((BuiltinAliasPtr) builtin_alias,
+ saved_builtin_alias,
+ builtin_alias_count) ;
+ }
+ else
+ {
+ saved_builtin_alias = BuiltinAliasesDup ((const BuiltinAliasPtr) builtin_alias,
+ builtin_alias_count) ;
+ }
+
for (i = 0; i < builtin_dir_count; i++)
{
if (!FontFileAddFontFile (dir,
commit e3642d9b2c0819a607d4cce413b9f0541285545b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 2 15:01:05 2007 -0400
Bump version to 1.3.0.
diff --git a/configure.ac b/configure.ac
index 379243a..dd26bca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT([libXfont],
- 1.2.9,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
commit f33f9361086db3cf1d09cec067f38fe751ed22eb
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 2 14:59:11 2007 -0400
Fix crash when no attributes are present for symlink.
diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c
index 6d364a5..812b050 100644
--- a/src/fontfile/catalogue.c
+++ b/src/fontfile/catalogue.c
@@ -81,8 +81,13 @@ ComparePriority(const void *p1, const void *p2)
{
FontDirectoryPtr dir1 = (*(FontPathElementPtr*) p1)->private;
FontDirectoryPtr dir2 = (*(FontPathElementPtr*) p2)->private;
- const char *pri1 = strstr(dir1->attributes, PriorityAttribute);
- const char *pri2 = strstr(dir2->attributes, PriorityAttribute);
+ const char *pri1 = NULL;
+ const char *pri2 = NULL;
+
+ if (dir1->attributes != NULL)
+ pri1 = strstr(dir1->attributes, PriorityAttribute);
+ if (dir2->attributes != NULL)
+ pri2 = strstr(dir2->attributes, PriorityAttribute);
if (pri1 == NULL && pri2 == NULL)
return 0;
Reply to: