Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 217 insertions, 0 deletions

diff --git a/libXfont/src/builtins/dir.c b/libXfont/src/builtins/dir.c
new file mode 100644
index 000000000..dd2ea1a86
--- /dev/null
+++ b/libXfont/src/builtins/dir.c
@@ -0,0 +1,217 @@
+/*
+ * Id: dir.c,v 1.2 1999/11/02 06:16:47 keithp Exp $
+ *
+ * Copyright 1999 SuSE, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of SuSE not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  SuSE makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:  Keith Packard, SuSE, Inc.
+ */
+/* $XFree86: xc/lib/font/builtins/dir.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "builtin.h"
+
+static 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+1) ;
+        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+1) ;
+        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.
+ */
+static 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 ;
+}
+
+
+static 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 ;
+}
+
+static 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+1) ;
+        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.
+ */
+static 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 ;
+}
+
+static 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)
+{
+    FontDirectoryPtr	dir;
+    int			i;
+
+    static BuiltinDirPtr saved_builtin_dir;
+    static BuiltinAliasPtr saved_builtin_alias;
+
+    dir = FontFileMakeDir ("", builtin_dir_count);
+
+    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,
+				  (char *) builtin_dir[i].font_name,
+				  (char *) builtin_dir[i].file_name))
+	{
+	    FontFileFreeDir (dir);
+	    return BadFontPath;
+	}
+    }
+    for (i = 0; i < builtin_alias_count; i++)
+    {
+	if (!FontFileAddFontAlias (dir, 
+				   (char *) builtin_alias[i].alias_name,
+				   (char *) builtin_alias[i].font_name))
+	{
+	    FontFileFreeDir (dir);
+	    return BadFontPath;
+	}
+    }
+    FontFileSortDir (dir);
+    *pdir = dir;
+    return Successful;
+}