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, 259 insertions, 0 deletions

diff --git a/libX11/src/GetDflt.c b/libX11/src/GetDflt.c
new file mode 100644
index 000000000..7b4015258
--- /dev/null
+++ b/libX11/src/GetDflt.c
@@ -0,0 +1,259 @@
+/* $Xorg: GetDflt.c,v 1.6 2001/02/09 02:03:33 xorgcvs Exp $ */
+
+/***********************************************************
+
+Copyright 1987, 1988, 1998  The Open Group
+
+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.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+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 Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL 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.
+
+******************************************************************/
+/* $XFree86: xc/lib/X11/GetDflt.c,v 3.22 2003/04/13 19:22:16 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include <X11/Xos.h>
+#include <X11/Xresource.h>
+
+#ifndef X_NOT_POSIX
+#ifdef _POSIX_SOURCE
+#include <limits.h>
+#else
+#define _POSIX_SOURCE
+#include <limits.h>
+#undef _POSIX_SOURCE
+#endif
+#endif
+#ifndef PATH_MAX
+#ifdef WIN32
+#define PATH_MAX 512
+#else
+#include <sys/param.h>
+#endif
+#ifndef PATH_MAX
+#ifdef MAXPATHLEN
+#define PATH_MAX MAXPATHLEN
+#else
+#define PATH_MAX 1024
+#endif
+#endif
+#endif
+
+#ifdef XTHREADS
+#include <X11/Xthreads.h>
+#endif
+#ifndef WIN32
+#define X_INCLUDE_PWD_H
+#define XOS_USE_XLIB_LOCKING
+#include <X11/Xos_r.h>
+#endif
+#include <stdio.h>
+#include <ctype.h>
+
+
+/*ARGSUSED*/
+static char *
+GetHomeDir(
+    char *dest,
+    int len)
+{
+#ifdef WIN32
+    register char *ptr1 = NULL;
+    register char *ptr2 = NULL;
+    int len1 = 0, len2 = 0;
+
+    if ((ptr1 = getenv("HOME"))) {	/* old, deprecated */
+	len1 = strlen (ptr1);
+    } else if ((ptr1 = getenv("HOMEDRIVE")) && (ptr2 = getenv("HOMEDIR"))) {
+	len1 = strlen (ptr1);
+	len2 = strlen (ptr2);
+    } else if ((ptr2 = getenv("USERNAME"))) {
+	len1 = strlen (ptr1 = "/users/");
+	len2 = strlen (ptr2);
+    }
+    if ((len1 + len2 + 1) < len)
+	sprintf (dest, "%s%s", ptr1, (ptr2) ? ptr2 : "");
+    else
+	*dest = '\0';
+#else
+#ifdef X_NEEDS_PWPARAMS
+    _Xgetpwparams pwparams;
+#endif
+    struct passwd *pw;
+    register char *ptr;
+
+    if (len <= 0 || dest == NULL)
+	return NULL;
+
+    if ((ptr = getenv("HOME"))) {
+	(void) strncpy(dest, ptr, len-1);
+	dest[len-1] = '\0';
+    } else {
+	if ((ptr = getenv("USER")))
+	    pw = _XGetpwnam(ptr,pwparams);
+	else
+	    pw = _XGetpwuid(getuid(),pwparams);
+	if (pw != NULL) {
+	    (void) strncpy(dest, pw->pw_dir, len-1);
+	    dest[len-1] = '\0';
+	} else
+	    *dest = '\0';
+    }
+#endif
+    return dest;
+}
+
+
+static XrmDatabase
+InitDefaults(
+    Display *dpy)			/* display for defaults.... */
+{
+    XrmDatabase userdb;
+    XrmDatabase xdb;
+    char fname[PATH_MAX];               /* longer than any conceivable size */
+    char *xenv;
+
+    XrmInitialize();
+
+    /*
+     * See lib/Xt/Initialize.c
+     *
+     * First, get the defaults from the server; if none, then load from
+     * ~/.Xdefaults.  Next, if there is an XENVIRONMENT environment variable,
+     * then load that file.
+     */
+
+    if (dpy->xdefaults == NULL) {
+	const char *slashDotXdefaults = "/.Xdefaults";
+
+	(void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaults) - 1);
+	(void) strcat (fname, slashDotXdefaults);
+	xdb = XrmGetFileDatabase (fname);
+    } else {
+	xdb = XrmGetStringDatabase(dpy->xdefaults);
+    }
+
+    if (!(xenv = getenv ("XENVIRONMENT"))) {
+	const char *slashDotXdefaultsDash = "/.Xdefaults-";
+	int len;
+
+	(void) GetHomeDir (fname, PATH_MAX - strlen (slashDotXdefaultsDash) - 1);
+	(void) strcat (fname, slashDotXdefaultsDash);
+	len = strlen (fname);
+	(void) _XGetHostname (fname+len, PATH_MAX-len);
+	xenv = fname;
+    }
+    userdb = XrmGetFileDatabase (xenv);
+    XrmMergeDatabases (userdb, &xdb);
+    return (xdb);
+
+#ifdef old
+    if (fname[0] != '\0') userdb =  XrmGetFileDatabase(fname);
+    xdb = XrmGetStringDatabase(dpy->xdefaults);
+    XrmMergeDatabases(userdb, &xdb);
+    return xdb;
+#endif
+}
+
+char *
+XGetDefault(
+	Display *dpy,			/* display for defaults.... */
+	char _Xconst *prog,		/* name of program for option	*/
+	register _Xconst char *name)	/* name of option program wants */
+{					/* to get, for example, "font"  */
+	XrmName names[3];
+	XrmClass classes[3];
+	XrmRepresentation fromType;
+	XrmValue result;
+	char *progname;
+#ifdef WIN32
+	char *progname2;
+#endif
+#ifdef __UNIXOS2__
+	char *progname2;
+	char *dotpos;
+#endif
+
+	/*
+	 * strip path off of program name (XXX - this is OS specific)
+	 */
+	progname = strrchr (prog, '/');
+#ifdef WIN32
+	progname2 = strrchr (prog, '\\');
+	if (progname2 && (!progname || progname < progname2))
+	    progname = progname2;
+#endif
+#ifdef __UNIXOS2__  /* Very similar to WIN32 */
+	progname2 = strrchr (prog, '\\');
+	if (progname2 && (!progname || progname < progname2))
+	    progname = progname2;
+	dotpos = strrchr (prog, '.');
+	if (dotpos && (dotpos>progname2)) *dotpos='\0';
+#endif  /* We take out the .exe suffix  */
+
+	if (progname)
+	    progname++;
+	else
+	    progname = (char *)prog;
+
+	/*
+	 * see if database has ever been initialized.  Lookups can be done
+	 * without locks held.
+	 */
+	LockDisplay(dpy);
+	if (dpy->db == NULL) {
+	    dpy->db = InitDefaults(dpy);
+	    dpy->flags |= XlibDisplayDfltRMDB;
+	}
+	UnlockDisplay(dpy);
+
+	names[0] = XrmStringToName(progname);
+	names[1] = XrmStringToName(name);
+	names[2] = NULLQUARK;
+	classes[0] = XrmStringToClass("Program");
+	classes[1] = XrmStringToClass("Name");
+	classes[2] = NULLQUARK;
+	(void)XrmQGetResource(dpy->db, names, classes, &fromType, &result);
+	return (result.addr);
+}
+