1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
commit 7670d4a2720c61fbc7b989fed14c676f04ac3ad1
Author: Dodji Seketeli <dodji@openedhand.com>
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,
|
